Stable on arm.

(Portage version: 2.1.2.9)

4 files changed, 6 insertions, 55 deletions

diff --git a/xfce-base/xfce4/ChangeLog b/xfce-base/xfce4/ChangeLog
index bf8c84376753..1adc9df3f00b 100644
--- a/xfce-base/xfce4/ChangeLog
+++ b/xfce-base/xfce4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.108 2007/06/01 00:19:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.109 2007/06/07 18:48:03 drac Exp $
+
+  07 Jun 2007; Samuli Suominen <drac@gentoo.org> xfce4-4.4.1.ebuild:
+  Stable on arm.
 
   01 Jun 2007; Brent Baude <ranger@gentoo.org> xfce4-4.4.1.ebuild:
   Marking xfce4-4.4.1 ppc64 stable for bug #178510
diff --git a/xfce-base/xfce4/files/digest-xfce4-4.4.0 b/xfce-base/xfce4/files/digest-xfce4-4.4.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/xfce-base/xfce4/files/digest-xfce4-4.4.0
+++ /dev/null
diff --git a/xfce-base/xfce4/xfce4-4.4.0.ebuild b/xfce-base/xfce4/xfce4-4.4.0.ebuild
deleted file mode 100644
index 4872a85d033b..000000000000
--- a/xfce-base/xfce4/xfce4-4.4.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.0.ebuild,v 1.17 2007/03/17 21:31:23 vapier Exp $
-
-inherit xfce44
-
-xfce44
-
-HOMEPAGE="http://www.xfce.org/"
-DESCRIPTION="Meta package for Xfce4 desktop, merge this package to install"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa cups minimal oss"
-
-RDEPEND=">=x11-themes/gtk-engines-xfce-2.4
-	>=xfce-base/thunar-${THUNAR_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-plugins-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfwm4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-utils-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfdesktop-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce4-session-${XFCE_MASTER_VERSION}
-	>=xfce-extra/xfce4-appfinder-${XFCE_MASTER_VERSION}
-	>=xfce-extra/xfce4-icon-theme-${XFCE_MASTER_VERSION}
-	alsa? ( >=xfce-extra/xfce4-mixer-${XFCE_MASTER_VERSION} )
-	oss? ( >=xfce-extra/xfce4-mixer-${XFCE_MASTER_VERSION} )
-	cups? ( >=xfce-base/xfprint-${XFCE_MASTER_VERSION} )
-	!minimal? ( >=xfce-base/orage-${XFCE_MASTER_VERSION}
-		>=xfce-extra/mousepad-0.2.12
-		>=xfce-extra/xfwm4-themes-${XFCE_MASTER_VERSION}
-		>=xfce-extra/terminal-0.2.6 )"
-DEPEND="${RDEPEND}"
-
-# hack to avoid exporting function from eclass.
-# we need eclass to get _MASTER_VERSION.
-src_compile() {
-	echo
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo startxfce4 > ${D}/etc/X11/Sessions/Xfce4
-	fperms 755 /etc/X11/Sessions/Xfce4
-}
-
-pkg_postinst() {
-	elog
-	elog "Run Xfce4 from your favourite Display Manager by using"
-	elog "XSESSION=\"Xfce4\" in /etc/rc.conf"
-	elog
-}
diff --git a/xfce-base/xfce4/xfce4-4.4.1.ebuild b/xfce-base/xfce4/xfce4-4.4.1.ebuild
index 1fe3b1f40d4d..8fef59774ee5 100644
--- a/xfce-base/xfce4/xfce4-4.4.1.ebuild
+++ b/xfce-base/xfce4/xfce4-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.1.ebuild,v 1.9 2007/06/01 00:19:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.1.ebuild,v 1.10 2007/06/07 18:48:03 drac Exp $
 
 inherit xfce44
 
@@ -9,11 +9,9 @@ xfce44
 
 HOMEPAGE="http://www.xfce.org"
 DESCRIPTION="Meta package for Xfce4 desktop, merge this package to install."
-KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="alsa cups minimal oss xscreensaver"
 
-# xscreensaver dep to 5.02 because of previous security bug in lock screen,
-# but also for .desktop file we get in settings.
 RDEPEND=">=x11-themes/gtk-engines-xfce-2.4
 	>=xfce-base/thunar-${THUNAR_MASTER_VERSION}
 	>=xfce-base/xfce-mcs-plugins-${XFCE_MASTER_VERSION}