old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 5 insertions, 128 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index eae378e011c0..dd47111639fd 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.201 2014/04/20 08:50:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.202 2014/04/22 13:37:50 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-session-4.10.0-r1.ebuild, -xfce4-session-4.10.1.ebuild, metadata.xml:
+  old
 
   20 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-session-4.10.1-r1.ebuild:
   Stable for x86, wrt bug #507432
diff --git a/xfce-base/xfce4-session/metadata.xml b/xfce-base/xfce4-session/metadata.xml
index 8d1400a70a6b..d1e72373f881 100644
--- a/xfce-base/xfce4-session/metadata.xml
+++ b/xfce-base/xfce4-session/metadata.xml
@@ -4,6 +4,5 @@
   <herd>xfce</herd>
   <use>
     <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.10.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.0-r1.ebuild
deleted file mode 100644
index dc3b9afc9444..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 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.10.0-r1.ebuild,v 1.12 2013/08/21 14:30:54 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit debug gnome-keyring policykit udev +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
-	x11-apps/iceauth
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.30:1
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/xfconf-4.10
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-2.22 )
-	!xfce-base/xfce-utils"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	x11-misc/xdg-user-dirs
-	consolekit? ( sys-auth/consolekit )
-	policykit? ( >=sys-auth/polkit-0.104-r1 )
-	udev? ( >=sys-power/upower-0.9.15 )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.15
-		gnome-extra/gnome-screensaver
-		>=x11-misc/xlockmore-5.38
-		>=x11-misc/slock-1
-		) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-multiple-interactive-session-save.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--with-xsession-prefix="${EPREFIX}"/usr
-		$(use_enable gnome-keyring libgnome-keyring)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
-
-src_install() {
-	xfconf_src_install
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild
deleted file mode 100644
index f1b9b9c5a215..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 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.10.1.ebuild,v 1.11 2014/04/19 17:46:11 ago Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug systemd udev +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	x11-apps/iceauth
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.30:1
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.10.1
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/xfconf-4.10
-	!xfce-base/xfce-utils
-	systemd? ( >=sys-auth/polkit-0.100 )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	x11-misc/xdg-user-dirs
-	udev? ( >=sys-power/upower-0.9.20 )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.15
-		gnome-extra/gnome-screensaver
-		>=x11-misc/xlockmore-5.38
-		>=x11-misc/slock-1
-		) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable systemd)
-		--with-xsession-prefix="${EPREFIX}"/usr
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
-
-src_install() {
-	xfconf_src_install
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}