old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 14 insertions, 146 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/Manifest b/xfce-base/xfce4-session/Manifest
index b737bc46be05..23304dcaa6b3 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -3,29 +3,20 @@ Hash: SHA256
 
 AUX xfce4-session-4.10.0-multiple-interactive-session-save.patch 6032 SHA256 b74af07a4182c65cde629d2a71cded4ec1a7fddf39d20d6c8d5b1f104052edfd SHA512 aa648f157d9efad1fc9d3d12db2bc571693f158584e509734330f7a72ae866c20d53e60649e056adbc1e6302f49d50bbbf4c97b87391dbd178a82c263b6fc556 WHIRLPOOL 03998921080a92380d022e268080d7a05ad73adaf46d94156db0f1a0d71707b7139061f0b781bdf51dbe99af27a489051e3f1f2cf609aaebfbfa2fa0ef2c0eb1
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 367 SHA256 2be32b49b268649e509b99e8d93a3d4e57665cbe8e03693bc85f88ea088e0650 SHA512 8ee765241997cbf32c08e9597d42ee666400fb27792a8716f59aa91daba7476e1de679e4c9254653cf9b14d95fc293f22d02e99ef3288287113a72407e513975 WHIRLPOOL b4b440c393c6175c9555d4df5d3eb4e730512c41fd83d291df2817206225efabc8db752887bd3316ae7fc915158a513202fa592536b78d52c4c40bbff7aa7ae8
-DIST xfce4-session-4.10.0.tar.bz2 1257385 SHA256 bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce SHA512 d8d8d7c6c764182e8477d87d3c0d30ea4988e34c3411ffa15901b07738671960c1e62c02c05c45724890cec063f1a5aeeb04ab8b48992917ebfe1975165e969c WHIRLPOOL 21919865dbd9ef9bf3782586d6f2e089860cd21c3a4caad48e75afb0cb139119a8d7c151975466a9b3fd6cb57fc7711f2ec5dad142bc1c14287758577e8081f8
 DIST xfce4-session-4.10.1.tar.bz2 1273015 SHA256 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 SHA512 4c6931c350957107fc13f244748287141d524a0e954f48935b5dac2c46a8125af702e1164af98414644f9ea51f5a952db6c57a96fe2a51cab21b616381aac015 WHIRLPOOL fb6193b4d769fb0cd5461a925538bbfa9224b31209d3d16b8bef2f81cbf29aa4cf1c56373335b27326cc2a9f8905a11eec975ee7bc2068168b39e06cd08e64fa
 DIST xfce4-session-4.11.0.tar.bz2 1213569 SHA256 c68905b5124382e30e90f7e4f080fd7e24d58a065991eba9cfcb99e5d59a7c8e SHA512 cbb574117acdefb4781ecb16f7e4681c4c31e624eea2976c88199d3bba883c9a1f114d8b88eebfdd1f5e2c298a672ebf6171ee2b0a117dc54cb675ebd38db90e WHIRLPOOL fa14aa5e321339903460df8471b59b018d34c8453f639f8726e6961d88383aded6319448704d08f74be53ca08c03625dc76857ee328b19cfbaeffadce160d1fe
-EBUILD xfce4-session-4.10.0-r1.ebuild 1859 SHA256 3472930ef687778175aa77d2bcdf2f1cc228fc73b74004fc2d346654d93a04db SHA512 647a86b7cfb3fc2912754ce3aee50a1f487533df47bb0a329d730fe814ba6f35877dd91f86128d1bfdb7ab24ff307b84f0212a8bf0404e561652a518be38f899 WHIRLPOOL 91d431b63a7f4da635c425be0ed8a433bd577c38eccdb3bb13429c609a302c9568c66fbb43626b57642138c9c60181e6e3db4255b5c8c4c08d47a0df286c36a8
 EBUILD xfce4-session-4.10.1-r1.ebuild 1731 SHA256 cbb2b1507221470058040d846bfc92abcaa392ac790866a2d192c67882b34349 SHA512 ec7465c9e8b35bb3abf9fa64202274d6c309f4d46e800465a56548fc7d87a9278c2190191510a971776e292ef43fe6da822832faaf4a7360c01e872ce9d0751f WHIRLPOOL b28fa3da7accbafe4dfe24952e184a8f616f025f9472ad7af90b39625d8c9339265494736951710b412e3096bc36b5d95e975f72a89b5772ce96dc21e8925332
-EBUILD xfce4-session-4.10.1.ebuild 1633 SHA256 2aaeac8b45f83c37ccea6055fb40062fc5ea0ac7b2e46336562d1f0e9ca50af4 SHA512 b7e87e4f2d7245203608421f38291b7ac5be7e6ea33ffc52bb3e202017721620e38b4a5252213dd08641eab3f66a26a3c7a49e34a20ff3c1fa3a15b73838f6f3 WHIRLPOOL 5f5e8f87443f352ea5a88a6c687234714aa00763a145b6cfa4beb503204a58a5591e4cb711a879d63ab4c17bbb2d96f444ce9e747506baf10d55faa25909bf2e
 EBUILD xfce4-session-4.11.0.ebuild 1748 SHA256 f779f600ea3156d0e1f88d01ea3e0c5099ae64e379a4136482625c7638be6069 SHA512 b1e26dcd183268ce90e6bacaac32283295063731b0c2a391a8f3b7361f3c6c590fe3f8931446b54006ddc423b3d0c1e29a0e8dcc031ef785fbf3fc77243426cb WHIRLPOOL 211230d80a1a72e1cf873e877ee8da858cdd1969e39d394825ef9fbdd022482fe84a528c5bfd6e3fe8cf60ccc44adec6a0076120427e1181a96c9c3721d23134
-MISC ChangeLog 27046 SHA256 b1f1fe0e4bde1ad51dc5cfdffb6bd590d085c7d5fae1acf650d8c9961166b539 SHA512 7eda442b4f45b102863f48beb4e98c45357ae692bbd5f834c96983f1ea6249ca292419844777690263c14b8371328d7b08ff0e9ab98993a1e4f87816b776be19 WHIRLPOOL 9fe64ca2215cc29046c7a6e04beca2957783e580d696dabda2ac7225540789adc8c7706b391cfb7bfe2e78421702758957900427f5d3bea08172353e2643fa1e
-MISC metadata.xml 390 SHA256 1d122a4418cea15fd68cb18d3c1b6db5120ac2109f228fbf6805967d9cb1431c SHA512 662e0dc55e20f785d376ce74919c280af92ddd43b61eca9eb364e736b76c854427b8d87e392eaa54576073c44f074939789d86b28cbf4eb5515ba1f1f4b8554e WHIRLPOOL 95207640f5dad56c4129aaa9c947e668f4b8617919e27b1471be644fc6f56fed264740f37b92e63a8af0594ee63b0089a37d33c81496a0b7679be8389ba0a3cc
+MISC ChangeLog 27192 SHA256 283311f35979a24f363cfa0269c3aefd8bd198929097a786d869b2dedfc358aa SHA512 68e84413660f5c5a6593aa5c131157ca77fb4bc07692b05bf17d6c8c522bbc7013a09e851fea68818539250c2d4fb13aebc8203c8432d92f8486aa0e61b55991 WHIRLPOOL ea2771cfab0a918c606e87aa330d8957878127fb903d61cf1bd9fe1bd5e65436edb3854f4cfdfa4ba8d57071871bc285e82a0730a44a9831c3b5263790b69d2d
+MISC metadata.xml 278 SHA256 5eb4efb02e8a95c958336cf7a4b113d21f619252e878c6ea9a26abae21dec2e5 SHA512 270a8de69b02ee01f920f54f14c192ae1a733428119a1291894b1b738ad70ff64d5c9e63ddba0fab1b62b63bfd44bfefc5a2664f4488afcc65a8433ad2d65d72 WHIRLPOOL b0284f820c5cf0bbdc804b65cea8b0123b85b021c99b9166fcd0a3bc9373fbac70da3ccad5a5d95afeb4787a978912804b300a9a0b036aa98f4129493c6d327d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTU4pLAAoJELp701BxlEWfzbMP/RJTmSA9TYH3iVkuivrrn3yx
-1VHQt1cIHbU8NSi6mZl09aI2IbmPjlveEy1Vdo8Rpt7tZe1Rzz2iyyphGni5UJdw
-oXU+a5YX+JODFmEQJf+zOeeCpMlRJyBXrRqsCPgNCumaaha8dyXAUTvXp0drc7fG
-WwWww8xn5ixdMd87WDp8hAOULeJu2ISxAplzi9hUdogXbDgptCfsI+RMtxgGVSwP
-1SWH8ZfeO3gTG5kpKrOM9QwiT2lyCpfliZJLu8h26fWbLK2IuxMWcqJbooDa+2ac
-uUT1/4WvtOKBn3QEdKXJ30TdhTSCSVkI+5fjqPmxcxmVLEOOlm6mAyCpml7IDOC5
-iiUcyviaC9fPAqvBFZjsZ2h4uNKGx7euoR8QMGY6hV38lQRM5HDGc1IXDe0Bkd+X
-s3r/C9Iv6FaX2pKs7tlfzQReKcMZvTE2edS3IF9IDHIBbONQ7By8tp9UVnAe12oL
-A/znNPqb7WsMs+r9T9chGNX5Uf0ETS8o5dlkNAU+gQq/IbnrvIbDJZ2MZ+XZTlVm
-bvIWL8uRfa/Hz/4/888nPdDksR25dfi7laeKbjYf/PUe3DnajpHJmAwfXAOTPbGR
-05SK9xeicu4RY0qvEgka9J/L4eYsaCyFY/TOpfUmEuzhqd/9F/vX7NM4jnMoDo2Z
-iyixWjagJxK3MbpobzS5
-=bdZx
+iQEcBAEBCAAGBQJTVnCvAAoJEEdUh39IaPFNoPYH/1BFG8KMmiuhw1Uvg7neX5y9
+VWFipCSKS51bAvP03OkNWE+YicLmpBbSWnI3ogKSszfpyeVxQJWWdok84H6IA2Io
+Xv+UUwArCgFuC2GQFdsU0osrwjj2bEr7/MgTJy46Om3/c6GjQ9jkfph1+BDIj7oB
+XCjijFSKUi8jzFovnua/wV5NZV86W5zHrX03q1B898rjG4+hvORFzRj1MJ0Ohs+G
+X/yCxI+CxUsnum0lf2HnArDgL2y50P60pOqFDmjfpzDeNl2jMe2HTQag+Rxr0Mkj
+V6GW5q+LrA/HIQlGZ81h0RoYaJmv7NPo+EnvSO+PWX6MP2t4hy3QxoVN7raWIV8=
+=KIyE
 -----END PGP SIGNATURE-----
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
-}