drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

17 files changed, 87 insertions, 560 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 447828e3218b..cc2f7fbaa4c7 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.231 2015/07/01 07:59:29 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.232 2015/07/01 12:06:13 perfinion Exp $
+
+  01 Jul 2015; Jason Zaman <perfinion@gentoo.org>
+  -xfce4-session-4.11.0-r2.ebuild, -xfce4-session-4.12.0-r1.ebuild:
+  drop old
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> xfce4-session-4.12.1.ebuild:
   x86 stable wrt bug #553500
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 453f6c27d0be..759bf88a0cb2 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -5,21 +5,27 @@ AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 367 SHA256 2be32b49b2686
 AUX xfce4-session-4.10.1-systemd.patch 12922 SHA256 0e90469248180390ce7736a5621a5c52a3444261768a959bb0d8b8cb68791980 SHA512 43f737b583bec96aae5a2da61124b5e2a6351117494af8cbe6d776e6cb066f778e01ff873ae26e7e44464c10128713d04b0521fbe16a8529833a4f5cf2dab23d WHIRLPOOL d9e15858cbbc72a487dde757844640b7d495e5c253b57b42fcf4694ff8d4168da8f9ca754da1d7947b95361cec90f21abc2257782748a636b90bf020b4febc43
 AUX xfce4-session-4.11.0-upower-0.99.0.patch 13446 SHA256 9cd7f57c00868fe1ac6847e737be4a0a3cf95ae4444e910c9072719e153d211b SHA512 479ff89bab77b521eadaa2bd1d7cfb5494df922bff7dc665e589e1faba0b8cc9a308762774315c471e834a3f732ab9d60df59137f58cbeefd063c9b751f503bd WHIRLPOOL a5d994b6cacadcefd7bf6f8ced2e9a19eaba4574cefba58e9b7d10a3af1bb37382d84691b2fcf0f93c659ab4e70d12dea9fa91e58bc85476be73ba4ce754e911
 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
-DIST xfce4-session-4.12.0.tar.bz2 1247710 SHA256 68c85453b097d3ada573dcb7e72acd06e0fc34531996122c10d20096405b7b06 SHA512 7c74991d4c105d993985a3bbd2a7b7730ebd1c84194289e883359737f8ad8683f3c728f53f4967dc7d2967258a04172d8ac8ddf8a9af56888d808f7db53850de WHIRLPOOL 144a67e66dd352020fdd41584b2ed3e0ba73673c2d029379b1122edd0c3b5db41a20ef79832d6b0b04c87062ec65fa926d0b4d7aefbe0e79b499c48cdfe5befa
 DIST xfce4-session-4.12.1.tar.bz2 1289284 SHA256 97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df WHIRLPOOL 6cf4e58782ee0cfb01ada620e58b71de5f235d2d1bcce625185e3c465dc8c356403956b88ac265f00bbf71cfbff72a2ad7e2ec3c711b4a5871b1d21d83bee56f
 EBUILD xfce4-session-4.10.1-r2.ebuild 1886 SHA256 975aa9c83c1d575585078eecec495152120ba1513b136bfb9ebcec6098a7734e SHA512 5e2066db09aa21c7c181907a64b1c668d596723c85fc7b2d53d684fcee0ca9ced5817b67598e933ad2f384f6268ced62dbe75996276b1a515fce7872744ce28f WHIRLPOOL 1e6fbfedfd18c831609d7090f4a24a852b2af82fba2af45d2f84fa523566c7c12bb40b2de28c5b7375aa41a33648d8214394770a7f6bc5b92f1b627b30f62931
-EBUILD xfce4-session-4.11.0-r2.ebuild 1962 SHA256 827133eacff8d099106a9432690a701cdb04001aef0d1bfafeae1f6c417ca9ca SHA512 2e596ca5964f24e21ec7d61141632d3580b6454b8dbce58f3295129fce4fb55a1f2820bd934864e62408a5ab49c006aecc2a315981218a124303415f5087d3fd WHIRLPOOL bb45ecfc57d16011b16134ef0fa8328a093b97a26629559c0f51de670a0b5fcd1b316fbd450a4ba8926d9d5a14240c5931a52551cdce78faea2125ed5c42b4d9
-EBUILD xfce4-session-4.12.0-r1.ebuild 2002 SHA256 78d9b89d6b4b3350c23a8d7a4e75e847f254772a301d0a520b5eed7fc925aff1 SHA512 18407c8ef411ff024f4a268b575f908a68f730875a701999892eb2884434cedaeb4f8c5179a4e26144696a4aa6358d6e3d80078bcbe85f88f84ca1d6bdf6ead3 WHIRLPOOL b5e712ab9dbe152fa3cef36a5fe66a44e20087d2cc680828005ad586fbe30be0af466b6908901067eaef38fd69ecf3b5a1434983ecb8d20211653d2bc8ea21c5
 EBUILD xfce4-session-4.12.1.ebuild 2000 SHA256 d66ffe41da2e909d0a1e860298ef0c51f169708795ab6539ba1806b884861fae SHA512 3dcf7770d14f32b78a0923bfb42ae6826b70f66a593ee5e6f9fa3d14b6903dacca665086672b52a12e13b97fdc3ce258e423531124d0b320277b70ef0aa3f338 WHIRLPOOL 96916d324e2bdc0bbe56fa4ebd9b0e615f9a678896960b41b715d40c7366480f839cf6b761225ec61574c29c33a241ed52a0f306c4e1ed2adc284f1067f97128
-MISC ChangeLog 32102 SHA256 1cc63f00881c3f4095492689140abe9e447d08ed46cce96c6ddc14d6dc732449 SHA512 ab33bb4a46a3d4eaf5766e1d45da760676dcd7b385d4bb9b3fad77af7df8f5bf236f3bf07907667f82fe873ed5a8f78d471d62a606065c42dd32b40c3562a745 WHIRLPOOL 37ddd99dd3c135cdffbd1ad82cd19712a53c75a5d5bab6d94aec84e35e53ad33f618de0867584624bdf91140fb1e6b5ddeebf97bd617912940db771fcc84422a
+MISC ChangeLog 32234 SHA256 00838a4768f09ebeba2fbbff6d1f172a993d152f41a23b4a9e4047f7d9540abe SHA512 5cf7f700c5161305854b7775f331f43222844a887b2e92289004b47af11e04078e164bcddbc301cfe546bfeedda65334b528f92b4c90d29f74a555353580e976 WHIRLPOOL f56724ed2244f588a603bc29d609497a2444ceaeee07ee05d385b944dcdc35c502cc768e6df1b9c88ab756752b6f6eb5ccc508241c88f9edd4ed82e1c82d9c97
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWTnV4ACgkQG9wOWsQutdav1QP/VbJST6aZqzXrrNTYbx7i/he7
-BmCBMBRdjsTSSYuIO+M2caLE3lNUEXDq/bI4iGKcTjAuqnVaZNMkIhV4VJWF2N6o
-sPODLMjEDFJw+7kJSGld/YiZ4MQsGJnLDQfAfEuwYvztXLtwN2DaVB8IUF+hbkJR
-1UuAcyygEU8Rf+i1ac0=
-=Tnyc
+iQJ8BAEBCABmBQJVk9e2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VilgP/iCYCCg83O7ms6nqqcFz9xOw
+Zc6oJu1/ZMhWuYcbjxeyLz/150l8evOgK76NNqkyraF6I88EOBm8Th1RxT4iSIQi
+w7BowfwrCsqioldW0YTywf/BOtcXdZs8iQVy+VW1P0ftRI4J4DshCuGMNu++sHie
+BFZCVIxSok5QkVq6PObtcbhpy7oTxoKj2vH6k6SggSmg59tTbLYeX3xi80QsehEM
+T1fgJmTuXYO2xfn2CdJ7Yw4Bt803AwESavWrPIp8VO8GwpNtyvr22NQL9/IwkFWz
+hRXqMn/bBmaopUiu7y+Jd/tkAlKI6s2eu/+6Ms5ITWYi2OiF2bdSQHTBkPUFOaRB
+BLcausedFIr44gGMVhxlvDEDuMOng59bgoEU8bb4g+gdex/FZ90HVxdr6e0IUleo
+2852YvXIUV0orxUTIa71mVkcpP5peJOlLaHL6uiiVdBUPxQB1r2OBbSdpdnqmV+P
+ijDRAO44tJcwCMci6rYriOzDPLQPEZFDHencoqc0L8OEyg9yl2TxwLND8fbT28j7
+2oA4yXWFiq3qfLH8fXrwYTRONYVHQYB1KELwgwmZjkhcCQVrqaBg9L3ghGpfvPd9
+E4KMXndmtJq6tORnxpIvXbnSPtLLH1mCQ94UFtCid1LlJHod75RYLk4w7gn8OdxE
+njgV97KUD//TF2zoJ3Fo
+=dOHi
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild
deleted file mode 100644
index 3543174b0f28..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 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.11.0-r2.ebuild,v 1.4 2015/03/03 13:10:17 dlan Exp $
-
-EAPI=5
-EAUTORECONF=1
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug nls systemd upower +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.11
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/xfconf-4.10
-	!xfce-base/xfce-utils
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	systemd? ( >=sys-auth/polkit-0.100 )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	!systemd? ( upower? ( sys-power/pm-utils ) )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.26
-		gnome-extra/gnome-screensaver
-		>=x11-misc/xlockmore-5.43
-		x11-misc/slock
-		x11-misc/alock[pam]
-		) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch )
-
-	use upower && PATCHES+=( "${FILESDIR}"/${P}-upower-0.99.0.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable systemd)
-		--with-xsession-prefix="${EPREFIX}"/usr
-		$(xfconf_use_debug)
-		)
-
-	use upower && XFCONF+=( --enable-upower )
-
-	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.12.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.0-r1.ebuild
deleted file mode 100644
index ac73be2e61c2..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.12.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 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.12.0-r1.ebuild,v 1.1 2015/03/15 18:53:38 mgorny Exp $
-
-EAPI=5
-EAUTORECONF=1
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug nls policykit systemd upower +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.11:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	!xfce-base/xfce-utils
-	!=xfce-base/libxfce4ui-4.12.0
-	policykit? ( >=sys-auth/polkit-0.102:= )
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	!systemd? ( upower? ( sys-power/pm-utils ) )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.26
-		gnome-extra/gnome-screensaver
-		>=x11-misc/xlockmore-5.43
-		x11-misc/slock
-		x11-misc/alock[pam]
-		) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="systemd? ( policykit )"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable policykit polkit)
-		--with-xsession-prefix="${EPREFIX}"/usr
-		$(xfconf_use_debug)
-		)
-
-	use upower && XFCONF+=( --enable-upower )
-
-	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-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index ac2c2b2494c0..9ddb23ff8b67 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.130 2015/07/01 08:03:55 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.131 2015/07/01 12:06:13 perfinion Exp $
+
+  01 Jul 2015; Jason Zaman <perfinion@gentoo.org> -xfce4-settings-4.11.3.ebuild:
+  drop old
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> xfce4-settings-4.12.0.ebuild:
   x86 stable wrt bug #553500
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 9577ce5efe3b..a833f97a6de1 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -2,19 +2,27 @@
 Hash: SHA256
 
 DIST xfce4-settings-4.10.1.tar.bz2 777735 SHA256 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5 SHA512 cf2d3255a0c862b0d016a8653fd1ba94c86b9da36b894dd7ad733d6758b9e023807aa93b1e43deeb0f6a34c6db23507f6fe32b6b7a98fa3e0d3bc7577da429f7 WHIRLPOOL 82f6e28e5d6519fc37c2265efc759054d7208fe38374acb07b40f281f7b802e47e5230a78066e7dac0727453ed14017abc8b0c6afd069eed1f164c607ff1f2ad
-DIST xfce4-settings-4.11.3.tar.bz2 928068 SHA256 f9e40c039f3a06111b5b596abfe462ee067d98e46c6640bf33d3b6e76bc6cd34 SHA512 edde5cd41e42da1a5a20a89f906907fef3e09bc795c3713426e1e7a38570aabeca3cda33a768455f5c5c866cb3842eec771109e3e10cc8431b0c01b512a06e06 WHIRLPOOL 0f1fefaa501c3b4b472b0796f150e7e897472c6fd8856a25ee35f3827af75a408706d4e35289f958199e8c104bb0dd7be5571c535dc54561813188b6b554ec57
 DIST xfce4-settings-4.12.0.tar.bz2 973324 SHA256 04becef105c19d0266cfe8dbf42619e7233c3b9fa99b43dbfc9c6a5959501f81 SHA512 4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856 WHIRLPOOL 52a66c1b99f67b1e92ccbc223535617a6edff67857032d7c19581fe38e4b5b7e2b32a42bb5263f92ec02596035dd76f6a8f6387f17e524b035def717eda373ff
 EBUILD xfce4-settings-4.10.1.ebuild 1485 SHA256 359a111c2e2509555c017ee58630c3927cc0db5cf433a453410e52d7d1e1b521 SHA512 0a6d4525af3e569fef8e7528b9ded7c543fecdc9dfdb0a6264e8fd2752c9dcc56a9aedc2d8b96b7670bec3cfd11f85cef95cd93902609da8d3608d7f271c3b32 WHIRLPOOL 4076971d0e4561ed74a904115986064eba57ec8ea91dbcf4ba01b7e88ea6f4382333197ab56f1f98c8d7b29f4297527be517a645d1b76443027e05b76741b97b
-EBUILD xfce4-settings-4.11.3.ebuild 1549 SHA256 c47168f53923b2f5d366dcb8f4cc48e868319a8c8bf6f6261e723d25dc237108 SHA512 f3cbecc507d647bba0a569f543f5072c6d14f7e261125d1b45095dc957e8f32cdd017175b7362f5bb828e2ac7080bf494976ed230139908cb141e05a4684e7fe WHIRLPOOL e5f243ffb5c0ce829f81d0312014668e8f775dbc06cd751791cc312b9aa6465bb05a5d72b9d1e1308ad013c216d356ffcc0e0f94548ca1675db90b7bb1fe7729
 EBUILD xfce4-settings-4.12.0.ebuild 1645 SHA256 757775e0d1be864fa39754f8deb026216b20914bb693db31f0053086ce486891 SHA512 c0b636d07d6f1407828b37b4bbc4a4493cab10a8f84eb494e58078cfa796b94e1e51d9cd3427be3404d61306429d3a07b15b2ed9be11e6ef42f93e0efbe30381 WHIRLPOOL b3225f3b6660efcbee16a2d2c51be142700b7d966f9590af3eaf82475f967a2500855d00f42cc4b2a346d018724c0607295fc583e1ecf065b65fa06e593bdcd5
-MISC ChangeLog 17155 SHA256 18c7f3562959aa3c78772694c7ff24996f06e7bb6246d29f149127b10c492f61 SHA512 640a30b59936a2b634d90a3c371b64e460e84251b5626e3f4454038be01c59fa4362219c34036b0f6d48f27139495b04644250cc9878cba3c04cd31bad2f9fac WHIRLPOOL 6cb931cce450d6502484b1c823001c7dd3540fdf065aa50aa4a11cd5821f1b8d2d81cdeab7a570861e40efd8a89a3402b5003ed9c585dc70bc67a2f82de2e186
+MISC ChangeLog 17250 SHA256 3c0386680c8f28d3f9dde69ea1756ce22dfee9b9b7fd2065f73b2fee87415e61 SHA512 d77afe3c01e5b3dbd8b1d04c5f6c9f5ea30abeb6662f9bf1b5bb1cce2208dbeda147e7ad5feac68715f918bc5c88b4c5b51d63b0d89229b198744e25eab58391 WHIRLPOOL 531dfee5341d3f35e07c83c5daa7e3f236f98149b603b43fe27c5be5a448c5d52c09c5e4df66b91a351aa9b226a4b229d8af8d17407c60625390b299e5584393
 MISC metadata.xml 505 SHA256 ce2bfb5c8f2b4ca75e51b1221b1eb45ce0008f3316e43fc038109122d8f9b13f SHA512 fe51a4a26d14f02521863e577546111c3af7e265ec956d97d6ee7711bff1eca7a7482679539057fb0e3b662dfb637eafa683e6eee3d9efac92c46e0c11caf855 WHIRLPOOL a2fe37b5330fc52d60e0bdad78ca6962d1755819825aa244cd6b347b580ad7bbaa7e6a3f47c5b34c7aadc00434ea6a1cfb68321b378deadb8e8209dec35b424c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWTnmgACgkQG9wOWsQutdbMQAP/b6XwO23l9iFN92Uu8XzNOF4+
-3s4hNAoDXEAgNoUeX103Qrrd2jtVqv91zNe1mocz2zoceCaxzpVtrOkx46pMGSEu
-HJeYP36C+5OIYOCvf1Vl8JMEcfAqJDB+ylULLbYLhMm244XMPY55r5O3ySJ88i6R
-51CJt+B0XKGKtgLko6c=
-=8F/L
+iQJ8BAEBCABmBQJVk9e2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VS6YQALyILBu2zNCH5JRC0Y0omhWx
+ua92hkmgoDER4Tnkey7xJCKqo60oq8Bv9fSaUnxZeHUhH2rMgvxsQE9y9xzTK8Xz
+GSDTpIsYBSHqZyFD5l9AfjWcVdD/9WzC+vKT7qx282uKxW0lXMzDZLQl01kVv6OG
+ez6VWIzQODjf+EpkLH5QYsRzvxT8KD9YosUE84N2BuuSRGPNugt21xsjefMhe9Dn
+uekYWqmLsKydKBF7+MyzURrBvmFWytqeENZDhvF4tA3pB2BS0wWNfQFX/5sF3h9f
+69sikYOUHWZoOS8lDFZhugmrfvR61qCrFSWCj4BmuCaUpJnCVqaTSIBlD9aPYR60
+6Tz84PlwY+GjoHggjs3Kv/FymO/kVV8+6J1D3EGHDb1MjlF0w8GO1JNHzkaAEuiE
+p45GV2MfeH7B9s0CoUfk1lHzxomZNRfHsWg+xCheHp3uPykRRUYwtz92rl8FHB3+
+NsWOMqBfk1QkfqQeBAw64Q3OfZlqLA5UZwoL1atU4gAjKtva9IfJIpg0ykBqk1KX
+LQT+aJZoZfcq0k84A+xGAPPIom4oAXgeyKwbo3+yqRJB0CregqEJrVbHkYBsoTq6
+QCS/YOzo8b7C1Z2Rjg0mZM6Q64PyVjpo9HF0fzPGXoG9oUd/4JTXrFu0RIBs3K6V
+5gvDpM619gI0Nvqh08rz
+=aCi/
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.11.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.11.3.ebuild
deleted file mode 100644
index 8d0af5078faf..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.11.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.11.3.ebuild,v 1.2 2015/03/03 13:11:45 dlan Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug libcanberra libnotify upower +xklavier"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.8
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=x11-proto/inputproto-1.4
-	x11-proto/xproto"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable upower upower-glib)
-		$(use_enable libnotify)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}
diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 8668d2db7e38..e370b867dd98 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.257 2015/07/01 08:05:18 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.258 2015/07/01 12:06:13 perfinion Exp $
+
+  01 Jul 2015; Jason Zaman <perfinion@gentoo.org> -xfdesktop-4.11.8.ebuild,
+  -xfdesktop-4.12.0.ebuild, -xfdesktop-4.12.1.ebuild:
+  drop old
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> xfdesktop-4.12.2.ebuild:
   x86 stable wrt bug #553500
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index f14c75bff034..a43ecccb52ce 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -3,23 +3,27 @@ Hash: SHA256
 
 AUX xfdesktop-4.12.1-no-thunar-build.patch 1106 SHA256 2a44599a758209419a49fa6499091a6cdac12e1098b7dbb0a3c7579c2c9393ed SHA512 c1a8dcfccbe75033b443ddf61d5219a013f7be77feafceb377c4a3ce6057b11f0afbab0ac8c085876e904498b3404e014bd90461f4cb0412fdb9149b2d5772bb WHIRLPOOL e73af5f8111b01233f509c9f70b6e77d3c70c4c0c72a84fb7f2997e115ccd16aa1bc066a1e282d12e7c7e4e85b02eb50e27ced2c767892d07e34dfcc9b7c2154
 DIST xfdesktop-4.10.2.tar.bz2 1144561 SHA256 49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d SHA512 274e61fc08ab7738584a27cabce897bd3692200ffe88ad5542bf3c3d6fba128166a499b8aca2b571501d9c66cafa1b3af6a9d52638e20dee7dc79dc5ea48544c WHIRLPOOL 5f3b0ffcc7baf2cbc0d864038f38691f8ae60f60288ae558754d0a503373fd31ba49c605ae512c51e78614eaacb4e3c414f07bd1d46dcd151e10154486325e9f
-DIST xfdesktop-4.11.8.tar.bz2 1101322 SHA256 c17eeaecdf7bea23fac8ef64c15f7dda899ec81076c9dee99b7f74642cd8f105 SHA512 e12ac9cb4535a76118007bae882d66cdd0d095a1219cc8c33503966d51d8c3693f3bfac09c41f4310f01c9636884f1edb5c4e56fd3a319673a358c8c7cfed0ea WHIRLPOOL 1df82613aa883ff578728f89b8921352108793ae9dd67ea067bc77c4977689dc5c5cd25976d07623c768fbf0ab59b5c43ab187a0033e241847862eda3996b38b
-DIST xfdesktop-4.12.0.tar.bz2 1408116 SHA256 6e7a8b87317762214b6407576f6e2c1efcc176c136b4c7b869d18a74c87b7fc7 SHA512 b027256d0b5db13651fa2e77c4d55f31cd177469e27acb4bc9ccf87cd6d395632a65bc20b536872a065fe96f1abb7219bcd83982b44dbe3944dce2e6e5a68e18 WHIRLPOOL 3923752fd83166618bf48bb467fa767c6f742195ca3cd097e44b4fb5af0c0bb5da7c9ceab2c8ae291d65165a86a0fdfa59acbfe73730e7725a7d1344c8730648
-DIST xfdesktop-4.12.1.tar.bz2 1417153 SHA256 95beff25b20957ec7b7c617b2f3f77a90b8d334393cd7dc3c1c1efa30151a725 SHA512 a6b1edc5955fb321ecbb99c5985aea013070193172af660feb697f9359566d69a747aa1df89892610322919601af2fdfdb0f9f46edae8db092cea817c4f9b2d4 WHIRLPOOL b0c5ef95eb4acb51964837493f791ca9496319e1865d4e6ad9ba039921b4aa5b1b85e8efc8a91ff1a81f47555c8d4c7ac26d76f49a32d56652ee6cb01ffdfe1b
 DIST xfdesktop-4.12.2.tar.bz2 1419922 SHA256 c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225 SHA512 b83f3d632b47593a6a600f508c06a097e77794cae8caa6e9c5c86300d1ebdb12967bdbd6638179c8b41855216ab534db2fae7f3bba2bda18e8fb8fb7c6966121 WHIRLPOOL e610ea2879834052623c2d984baacd803ec8e7de0a212676f25b776f1c417f4c244580f42f2fefb4346d4fc7b597d7bef63e4dace7b2ff61a8f0cc6d43d222a5
 EBUILD xfdesktop-4.10.2.ebuild 1291 SHA256 47b1323c03caf58e350c0dece77bd4c79eced49dc66a19775d173fe1efa39906 SHA512 930b66e05b127d74565b58d83764edd7086ddfe9fba114e69963baa3d29816d59a08af017ed76b32837b23284a9345ba3b072ff3e5012097f9343f8d297e9d14 WHIRLPOOL 86d5f2738994ec7cb46ed11946fa9c078500f96bed0c441d9221b1dcd768b0f9037e5c7255e097b35cb5e7dd7b1c2c2d7f418baeae963ebb49e8b001775daedd
-EBUILD xfdesktop-4.11.8.ebuild 1393 SHA256 af90e1ae75cc8dc8f5adb9a97374669acd70564776a9e4d79eaf410e78afc4e5 SHA512 0be6d35dccabce958fe9d849d1e18217bdb9c27594a783f5a71a130c22ac0beacfca41a19bfe6bd6e6a05cfeb69d10572d5a56f28a562e092d49acd4bcb36ab5 WHIRLPOOL 293fc01f327515fc1bc56e61722b4c4d3b524c3c634770448e9601e59a516881846e991d2178b85fa894ffa846c38ee10bd22f5439e8fed4c2bb38ce3f2750b6
-EBUILD xfdesktop-4.12.0.ebuild 1417 SHA256 460a51031671378c1514903150ff2d6d2cddafd032da8095ad7de230aab6a2ba SHA512 924c017ad0fc3f348e8e4a4fecc80f3da41e99e92c9e6f12666f1d692e3b63123394a9782d73a7766c8527327dd06c225862b6edf12a27df6681b8b1e3d699b4 WHIRLPOOL addb5130662b62c3fe3d23d0da58bf856ce9603b1d7848ae0f59be18b33aa8bf6becb8f799d0f28c3b2913003bc71b697a294494f781d871a6da5a9a1bca901f
-EBUILD xfdesktop-4.12.1.ebuild 1501 SHA256 40196a0af46983741f71f01828cad9220d34180c98df114fe01a6e9cafbba07e SHA512 ea05bc76d16be9181484ebc6bb98b632252d259b1cc8ba5d19cf3a6692783747bad4285c3cc9682257ee510cce5f0d95da3dcc691d9b8d8ce36857564107562d WHIRLPOOL ebdde9abab0a0a90b2da6167420c95a798850ac0b64514e76d55899909cfb48f430620e3ecef394eae89619257ef3e438bfa5c2822e5ece6f72b15ca18942988
 EBUILD xfdesktop-4.12.2.ebuild 1426 SHA256 f1f9da872067844c64fba1e8cc73b13f07735f69060d1a5dff3bc32922e913fc SHA512 a62304ba063723c4aabc89456d8b5af74575cbb007b8ebe85008886e116d3f2b9402576d8be929a0746c7bfa7dfc5b2984755006e2001df9b0f93cb332cd1b0f WHIRLPOOL e4caa4d038aa49a2fa0ca86f0a5905e6a4cbe63e174f9ba36dbbdf79472fc2dd3993ab231921ca1719551e5aa2790ba775f3bb439b42b592aa970df2a04a0684
-MISC ChangeLog 32150 SHA256 bdaa456d23e0203a66ba925f4351b8e284668fc32e345d5d68d25dd38419df51 SHA512 6fc9b56aebaaa80ad89c02b503e17efd73f289251b605677d0691aa346aea7edc257fe56a8911c12a059ddb8886d0bd52377f27419391263988fb67158d1ff34 WHIRLPOOL efaba02cb69a245bbe62c8d2d78b608a0dc1ca8d5681f7436e556674ee84673fbba895693244cb0916ddd349c35337c11eea78121478e74b35efeb8b8ad6a12c
+MISC ChangeLog 32294 SHA256 b03ad4651bc411081286df4c37298c292b562d8a7357f6eb5abf1b49899ede31 SHA512 0664d6c9269bb2109ba84c9dbf1a3c213a6e6954cce29a8bd2c6d64be33e030283597dc029609f341c2d65f77296d35dd027165d2257f0ab4c12bd2721e5d925 WHIRLPOOL bf3c5bb91c0f71cef48a9ce3eb0830c90f57e5686fe91979d4e599eee8aa9ab113be2c96317569cb881af89771bb1ceac2a2a7888972387a5bc8ea7ce498e4a4
 MISC metadata.xml 276 SHA256 02ac0bb7333dd11cef3a53b2d3c3cc744406509d104d37bd8bd31641646d8ae4 SHA512 dcf457c4c23b1ca2fa17ac689d29ac59a67475aa6c836fd65562f95084b42d8d763af6e90ea6db4fd1d0fc572d58c12a2fa269eb58c736a9317eb9859369bd1e WHIRLPOOL 79acb0d5a077a29a51c63f73a3f8ec1b1ab78a3c381f6dbae8d037ebb9e98bf69929ea0301da2a0e044a93469e48f3161f00fcd804a3f85df61a968597fc44bd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWTnroACgkQG9wOWsQutdYMUwQAwVlUUCwhDsSKIWvnPiYI7dM+
-sT76fZcC3gSrAtE0FMB/JnM0Q7dD7n3bI8gLSMlGRjeaqzB3kTX/Ppm4qX0jzyuU
-TM5OTudHhQyAydGMja9M0XImqJn2uLbXxqQzLKgtH3uwIueuhgOTpfIoZwdA9E9i
-Z/wsHoePGrQ6kVbvQzk=
-=A8bb
+iQJ8BAEBCABmBQJVk9e2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VTXgP/jmgtVw9nGaPZ3G12LzsDSzg
+StiuLPuMddExQXYhbSEH/fGCNbcjjTNQKyt+9yXJu1OHLaI/vJgbVXZM4TMVluGP
+AEu9HkhpZUQfMe8lmMhsEYLiYPTfYW2ib6ShM1Qn4o/h8lxckXSCLBLFZ5zzw53m
+CzD0fROxdHhP8e1aNXo2ShMjpxk9Yq0If0W1ZPj+lUPm14s2O0H3Y6YaOIcK2WEl
+shJTdlVlYXj8rVfOj3Rr9LmAdQtx8zKLvICBeZzHNqsnItiYkoJvsR/uueA/Lar/
+PqiZzm0rkSot7OZPhuy+Vubzh7PCK/PD1iBk6KLMawJ0FQkUVJARlKhP5sVs61Zw
+eO42aSjz/KhWwOA62LXcqjvk3pmR2mGXgPE4hRRAPcc0DBbBlhI4Yy/HbCOdknz9
+Ecs0QUK/8t2T5bpp9GSlPY7cP3p9nQRcMFuL2pBsB8Bs+CIqy8Erb+pVDplJzkao
+YrDVRLX4HcHnV70Cx2IFDttVPRGxeUEA4yeT/1FvL0XfU2BFhnUlknub7E8OaTpM
+BUMqCzMY3nFeD41sNEopArjvRlhFI/L11Vpdw/0FK0TdipnGDhH1Si5gid1/4zNW
+XaV8gbHZqtTjMz7+r1ftT3Ck6as1/4/l3bXevRLAQsWwfrq2zZVNa8O+slWWnwyQ
+fwQNAOf2R1wmj6LXD5Bp
+=s2cA
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfdesktop/xfdesktop-4.11.8.ebuild b/xfce-base/xfdesktop/xfdesktop-4.11.8.ebuild
deleted file mode 100644
index 534668ab21a3..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.11.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.11.8.ebuild,v 1.2 2015/03/03 13:14:24 dlan Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.30:1
-	x11-libs/libX11
-	>=xfce-base/exo-0.8
-	>=xfce-base/garcon-0.3
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	thunar? (
-		>=dev-libs/glib-2.38
-		>=xfce-base/thunar-1.6[dbus]
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild
deleted file mode 100644
index cf15c3d7c1d2..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild,v 1.1 2015/03/08 15:06:39 mgorny Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
-RDEPEND=">=x11-libs/cairo-1.6
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.30:1
-	x11-libs/libX11
-	>=xfce-base/exo-0.8
-	>=xfce-base/garcon-0.3
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	thunar? (
-		>=dev-libs/glib-2.38
-		>=xfce-base/thunar-1.6[dbus]
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild
deleted file mode 100644
index 64610fa70a72..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild,v 1.2 2015/04/01 16:22:15 mgorny Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
-RDEPEND=">=x11-libs/cairo-1.6:=
-	>=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.24:2=
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.30:1=
-	x11-libs/libX11:=
-	>=xfce-base/exo-0.8:=
-	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? (
-		>=dev-libs/glib-2.38:=
-		>=xfce-base/thunar-1.6:=[dbus]
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-no-thunar-build.patch
-	)
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index ab3114c145bf..c9f248964093 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.235 2015/07/01 08:06:34 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.236 2015/07/01 12:06:13 perfinion Exp $
+
+  01 Jul 2015; Jason Zaman <perfinion@gentoo.org> -xfwm4-4.11.2.ebuild,
+  -xfwm4-4.12.0.ebuild, -xfwm4-4.12.2.ebuild:
+  drop old
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> xfwm4-4.12.3.ebuild:
   x86 stable wrt bug #553500
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 7837433c58bf..cc64bfd33945 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -2,23 +2,27 @@
 Hash: SHA256
 
 DIST xfwm4-4.10.1.tar.bz2 1093825 SHA256 380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740 SHA512 dad7cdb929b60cdee539dd96e0cc5fb5c71ab13163469b075164b4e54f1b7d72b8e84423aa533d6619902e269bd3d8070dac835729cf22ecbdbecffa36ce4004 WHIRLPOOL 582526f987df98ff3fa5c49e5acbb1e097e4b94fdd0494e6726542879feb3ede8bad34de10c86e343f4daf8b1fd3c8f5b966deb87e6091c3c047ee4994e8828f
-DIST xfwm4-4.11.2.tar.bz2 1047307 SHA256 aae1ed7ef1ae77800343e7c43811ab8ef786a9498efc5c10e8ed28b2eba04779 SHA512 4d4d02fdd03658619a7892fe781027303d7e9a60f65e288d2acdac7ef6b9875053cad1cadccb84a7926710a20e71ca44e9da0141fb853512fcbcccc17321b3a3 WHIRLPOOL 393930e11056f8eef7b86c75d95445622f2e263619d764dc8ff600e51552026e6d56503b4e73dddc5f2748f3da004df53ebcecc4638a0f86ef3c9257b8cd0567
-DIST xfwm4-4.12.0.tar.bz2 1200700 SHA256 29f4cbe2869ae32a6775877ed6bfc4ded7000f013ff7eb70b2639c49f415cc3a SHA512 fd92b04d9f0dea988cc37864d947b0dbd646ed25315c99e0db69723b7bb912aede8e89c2d5bd06edc8fabc1e5e43a6306c9d8d22ce610359407c92dfedf094e2 WHIRLPOOL 035f57c9ce5ff99b46f1a5a1632a9f6f5088a1a41cf2e4f7800a73ccb7267ad268d1d1c98af2c3cede75d1363b1f2101c8132c7a55cd4c03d2316b2f93f48ad6
-DIST xfwm4-4.12.2.tar.bz2 1191635 SHA256 5bb5f72b41060d10bd3823f8b69abcd462bbd8853fdf9c82041450ae68e7d75a SHA512 00fa624743f954eed6c3254b4f9ca96611732b5d4c8285ce79cbe1584cd5f916085dd34e3f962900259e950d3977ebb093eaeb0636f3285d37d4a8789bd159da WHIRLPOOL 5519e9caed1f485c57692a706a23f212002ab7d9ce0ea0d643ce36d03a2c6ce2bc8395628a12dcb24fa1f177ed395ffaf6eb3c1c004e6eedb2053cec5b302fb9
 DIST xfwm4-4.12.3.tar.bz2 1191929 SHA256 f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac SHA512 96fcc76fc640027883a7a3373836565987b1d3d4e61fb40aa7e2f990a8140d92cf66171fb4517368faba45c9083a3ad19f589d59b07a55c3417aaaca87e408d7 WHIRLPOOL 0fd8e058694cb2f6486bc59443e00d8ed42ebd9dabe39775451d94c14c7e2ea87a520edea26e3bc7033fa1d95aa0ca1a6b2045eca9a1c9d8ecfb67f1ef88b0a8
 EBUILD xfwm4-4.10.1.ebuild 1418 SHA256 881a317c4d00a4157b1308bd2e79652d6ebee430cbfd68e8d27c0bd71fb25db5 SHA512 73de378f563f6fe45350a70f9c3b731971b503e28664af020dcf8567bc5a2ba7c85e745fcbf0016395e7371b026768af976c2805d9829efacc25846981980b87 WHIRLPOOL dbd169bb3ea36dfe764b3257fba5bd96a9067f53b4da84f10fca87e265d27e7b75c3c0fa4067960358b0cbf53a4ffd2f370243951096477b00375772e7563e4a
-EBUILD xfwm4-4.11.2.ebuild 1497 SHA256 c488a5a93f75c06013c42c49691078120f82145f81ec9ac3f2c3879ee48de5db SHA512 f05da5ef06576c58aabccc513fbfc3c688e39d12d0e9d0a98e00bc6ceb173179fdfa3df22ae3d1d44c8f68e760f934b0a256ae7342ea64c71e166cdd67868836 WHIRLPOOL 3f0c4d959ed0af6b872fd09a05d172602cc03d94d7f1bc1fe3ae26320fb82252a87b6b17d32f35cb321f9f3b1cf4861d2f4f542a126e34349565983041313d1e
-EBUILD xfwm4-4.12.0.ebuild 1499 SHA256 e99639969fcc28bbc69d54aa228b97be6feb10cf72d08ed4d6bab7a1179d6af5 SHA512 5822bb2e0ccc5f9483aabdc020a98fc0c72d90a993d791d12f52567d0ced83324e55d41ba7c2dde551f93a79e2ad5a518110fe1e7384065a6c746892fe981dfe WHIRLPOOL 9c633e50d8725e0365eae13cdf240965243caa772ba9b6880edb6f5074bdb4de7d0cbb982b1d5b16bc771907d77de29ad67a6eb418b2fd23c61223fb93eae8eb
-EBUILD xfwm4-4.12.2.ebuild 1499 SHA256 f514c41283e0248d6f56f18bbae6107036c4dc6926e795615322679cf2340765 SHA512 fec66d36aaac06400b3eee2baf4f78f2d7a6cc9efe6d44c5aa26a50e8fec68377ad9f71030efefa5ff9baae54ec1d80a84603f2686687dc65c6efa394795e688 WHIRLPOOL fffb126c6852f6433b0853339e8ec4c52239d2eb49a3caa546509af244164e688fc0783a636b8a924ee2fcd5f9b7ff8cf3323c354833066f29ad0742eacbc82b
 EBUILD xfwm4-4.12.3.ebuild 1713 SHA256 09b7fff5c3b9b5adb223dd583ede65108c7fd652ca5a4b74c9ae66166435dce3 SHA512 79050111abdb08e0dfdf041a1dfc79d7188957969ccd54c55aa75ec49e1987af89020e3528cceb12d78daa55a6a42a51b087c2a4be03ee2881578085fecfa981 WHIRLPOOL 3ae1dd5b175915d5a48bb5a2ad00798f41c4030615856ad4718405791743a821fea8cde4be7ea1509e198915adbe724bc6bb6ba04020bec610948f582a4cb7ec
-MISC ChangeLog 26053 SHA256 35af54485c790ee182258df023880d4184c617e64d6513849b04fc86aa1d0485 SHA512 9fc879f5de79d4ebdb518c7d405299e29666b90a10a04b17f598b685c155c7373601263c677f5149e864e631f3ce33121c3b359265f9b35e7878ba2ab89c53f9 WHIRLPOOL a818aa1172da07ef06854fb5fb0349a9304e56ba1655a8b8fb4aa6116d15555e4a3f3226561ac038f4f73bdb3b53c50160777b2f2c6c713c89b37ce34832991f
+MISC ChangeLog 26185 SHA256 d371ede56445c0b4a0b6c505cf760af86ea6e7307d98288ad5e2936a83fbfe17 SHA512 680a0a19ace6459bd5b86b65eeedadbaeab364618804527d132ea4ac450b0a1c9af8e6765b80b748efb24bf57e2816cd3ef4cf6eb4b4c73ffbc23e10860183db WHIRLPOOL 59d47842b796cb51635f92de7431e598c9ea6fb57cc1bc0d89dca551a80b498ef02b32eede4998d9f9ed41300d0a857791ec263bb123ba4a4523048ab633d45f
 MISC metadata.xml 157 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 SHA512 54ff64307677bfe1e9b62d427e8aef8aaf32b86216858541398b5f21974247418eba7612f801ff2c333fe9a059d60e1f568046a3ac88e0ee2d59beb3a3a77148 WHIRLPOOL a42edf92b91b9922e7af397d6cbad72ba7e2ab7e5aaa4504cdd8bebdc1d87e9523e76c016eab474f4b65581a9cd58a3be13d8f52bf5ae7dc6afe96d428433a5e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWTnwcACgkQG9wOWsQutdZ0TQQAjJQwGa96eMl/VTV6jXOt2AHZ
-cDc0Y+85zdHf2269aafn/DvC0vQ4Ja01n8p36JZ9AuA9Q/FhS3uVQ/eAu9/baYn+
-rlthoXk1k/D8vZo0fhqkjrQCpZKJQMQAR+h14NWNr8oOMxpbC0zWhXakxmP2ib0q
-yxw386wXCjexhWedPJw=
-=soVp
+iQJ8BAEBCABmBQJVk9e2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VrIUQAJa5GCGubC9YH+uPYpTUC0cy
+T5mOmL63YfvJqtHJEgz4sp8DQNG+RBGi3pr1zIIvhFfKPnPrsYBzov2/wLcP0I1v
+/YOJsr4/wU46wZzztOkIJLG+FeBA/oUoA016b7C/VnNikfkGpEwjx5dUFogrmt3H
+hsOdPCnS2rRd8O57eKXzL93M5gy6H+fRp9fxOjgb4jXoc+ZHsyaFHpk9rNCVvgXw
+cLp4GFxfo2zvQSHdPxOO0NmYUtN4LWDZ7Ns+rhitw/BcuvJj0Wud2e07uj7ev2f/
+Di/1R+9ma10A/kzTT0Gd5nMthBfUmMCw5OZZLiP2KTcOZpzme3iPwwxdzoyYZowB
+8HZpEMcoiE/uf7Qq8fjM6UD4Z+kJFwM7b6CmrWWK1/uBYtw24vYMUZe7L4zeMZ8I
+pY2a3L1gUD4HQtjNb/PhCURCAP0T3NBelEBOeOQSyItK8UmfX4MJxmJoa9+gYWuz
+7AgCLuf8OlilPUtX6Btz8R9ANKO81EVVuvrdCa6ufF3sLY1b8kD0wAWRrwCw6MPM
+2K7XXNX2e+kEnL2da5ZxeCPDCI01LfjqJNjfOpkEYEbvk8PNNIUdzDI6dgpZrMMJ
+0RblovQC6Lkdyo6HFecMTol8j6B5ZmIldM8vcMewrLOndxsKkD2vX7IFsbpOwNrf
+cgQ7Bs+kITm2wiq2Vf28
+=u8DH
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfwm4/xfwm4-4.11.2.ebuild b/xfce-base/xfwm4/xfwm4-4.11.2.ebuild
deleted file mode 100644
index 53168ce6645a..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.11.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.11.2.ebuild,v 1.2 2015/03/03 13:15:50 dlan Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug dri startup-notification +xcomposite"
-
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango
-	>=x11-libs/libwnck-2.30:1
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/xfconf-4.10
-	dri? ( >=x11-libs/libdrm-2.4 )
-	startup-notification? ( x11-libs/startup-notification )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable dri libdrm)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xcomposite compositor)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.12.0.ebuild b/xfce-base/xfwm4/xfwm4-4.12.0.ebuild
deleted file mode 100644
index 67e7e069a3c7..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.12.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.12.0.ebuild,v 1.1 2015/03/08 15:06:39 mgorny Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug dri startup-notification +xcomposite"
-
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango
-	>=x11-libs/libwnck-2.30:1
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/xfconf-4.10
-	dri? ( >=x11-libs/libdrm-2.4 )
-	startup-notification? ( x11-libs/startup-notification )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable dri libdrm)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xcomposite compositor)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.12.2.ebuild b/xfce-base/xfwm4/xfwm4-4.12.2.ebuild
deleted file mode 100644
index fec3cd4c8c37..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.12.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.12.2.ebuild,v 1.1 2015/03/15 21:43:33 mgorny Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug dri startup-notification +xcomposite"
-
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango
-	>=x11-libs/libwnck-2.30:1
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/xfconf-4.10
-	dri? ( >=x11-libs/libdrm-2.4 )
-	startup-notification? ( x11-libs/startup-notification )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable dri libdrm)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xcomposite compositor)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-}