alpha/ia64/sparc stable wrt #349053

(Portage version: 2.1.9.39/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 9 insertions, 63 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 82bba8aec4a5..881fdbafa815 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.132 2011/02/05 18:43:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.133 2011/02/14 19:27:47 ssuominen Exp $
+
+  14 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-session-4.8.0.ebuild:
+  alpha/ia64/sparc stable wrt #349053
 
   05 Feb 2011; Markus Meier <maekke@gentoo.org> xfce4-session-4.8.0.ebuild:
   arm stable, bug #349053
diff --git a/xfce-base/xfce4-session/metadata.xml b/xfce-base/xfce4-session/metadata.xml
index a68f49e87893..8d1400a70a6b 100644
--- a/xfce-base/xfce4-session/metadata.xml
+++ b/xfce-base/xfce4-session/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
   <herd>xfce</herd>
   <use>
-    <flag name="consolekit">Enable support for sys-auth/consolekit</flag>
-    <flag name="fortune">Install tips and tricks app (xfce4-tips), adds dependency on games-misc/fortune-mod</flag>
-    <flag name="gnome-keyring">Support for storing your password</flag>
+    <flag name="consolekit">Enable authentication support using <pkg>sys-auth/consolekit</pkg></flag>
+    <flag name="gnome-keyring">Enable password storage support using <pkg>gnome-base/gnome-keyring</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-base/xfce4-session/xfce4-session-4.6.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.6.2.ebuild
deleted file mode 100644
index ffb17b33ac5d..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.6.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.6.2.ebuild,v 1.9 2010/09/06 17:55:51 ssuominen Exp $
-
-EAPI=3
-inherit xfconf
-
-DESCRIPTION="Session manager for Xfce4"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug fortune gnome gnome-keyring profile"
-
-RDEPEND="gnome-base/libglade
-	>=dev-libs/dbus-glib-0.73
-	x11-libs/libX11
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.12
-	x11-apps/iceauth
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfcegui4-4.6
-	>=xfce-base/xfconf-4.6
-	>=xfce-base/xfce-utils-4.6
-	gnome? ( gnome-base/gconf )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	fortune? ( games-misc/fortune-mod )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF="--disable-dependency-tracking
-		--disable-static
-		$(use_enable gnome)
-		$(use_enable gnome-keyring libgnome-keyring)
-		$(use_enable debug)
-		$(use_enable profile profiling)
-		$(use_enable profile gcov)"
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
-
-src_install() {
-	xfconf_src_install
-
-	if ! use fortune; then
-		# Wipe away unusable xfce4-tips
-		rm -Rf "${ED}"/usr/share/xfce4/tips
-		rm -f "${ED}"/usr/bin/xfce4-tips \
-			"${ED}"/usr/lib/debug/usr/bin/xfce4-tips.debug \
-			"${ED}"/etc/xdg/autostart/xfce4-tips-autostart.desktop
-		rmdir -p "${ED}"/etc/xdg/autostart
-	fi
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.8.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.8.0.ebuild
index 18ce9d6524df..4073ac4d0209 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.8.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.8.0.ebuild,v 1.5 2011/02/05 18:43:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.8.0.ebuild,v 1.6 2011/02/14 19:27:47 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="consolekit debug gnome gnome-keyring policykit udev +xfce_plugins_logout"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.88