old

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

28 files changed, 103 insertions, 826 deletions

diff --git a/xfce-base/garcon/ChangeLog b/xfce-base/garcon/ChangeLog
index 7c8b2f7aada4..8eb636fd0d61 100644
--- a/xfce-base/garcon/ChangeLog
+++ b/xfce-base/garcon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/garcon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/garcon/ChangeLog,v 1.67 2014/04/19 17:46:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/garcon/ChangeLog,v 1.68 2014/04/22 13:46:56 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> -garcon-0.2.0.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> garcon-0.2.1.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index cd58755d14ba..40350e2f3981 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST garcon-0.2.0.tar.bz2 431573 SHA256 02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c SHA512 1d3d446f8a8b7902e431fd34b77b6be8bbc92a065d319b8425adb78a62d75ec145486b768e6f823afe3cce7370f63b31d7cd6246a496d00c235bd08e34bca04f WHIRLPOOL f404aa6dc2635e93d9b88d04e15b3f5a448bafa474f2d54c3d258768e30bacdfabdd6c2a1f9fc5ed46b3e0b1de4d966e71a2e00dbe619c9388ff1f9cb0805b51
 DIST garcon-0.2.1.tar.bz2 454321 SHA256 48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7 SHA512 2ef784419e58ef3bffef94061735fcf814fb313d16c6bed4d3a1aa86982fccce8ba582b708ff19260c80708fa132b789b4dc81963193484320c86ab3f0d7b003 WHIRLPOOL ff64b1c2f7c62b27e8c03ba13824d8f4d04215a60c794c39b43e6bfe591d80b9a39d4f1ea03f10692daa8a75af6726ce78ac12cd676ff368bb93561da5e77ca0
 DIST garcon-0.3.0.tar.bz2 447918 SHA256 59348179f3cb9589d13ba8d18d5746be421b311cab974ce057dfdef0365b1e55 SHA512 535ce6c84b034c01b8b5ebae84eb7c3dfb14c6ba4a502ad68bc026d4442f243f61156748e6d86c222462aa8b2d397b7d3eb342ac7e0d7e451dd71bbaf48bb44f WHIRLPOOL 1cd438e8a5e4b2f97b9d4cffdc3ffd06039e975047da928f706b5a394b82eb875c889ccf9808f126d780d31e72617586b4666f7d2585999d1baca64d6e620a80
-EBUILD garcon-0.2.0.ebuild 975 SHA256 907623213d0a986d505309d244677baf77ef8ed9757754598e5b2eaf354f0aee SHA512 08ece8e1d302503df6edf8d5d159cbf7496ee0a5e309e43f00ba0977ee67e5f5d66cb1e79d54663f658df0a866a290f4bbfee82c53579ea20f9b82914ba0b093 WHIRLPOOL 32a9d82d6cba7b2149a12ffa36ac00fba5844889d4922337b9d30d762faa5bd2e630878b88a542eee2e7a7793fb2ff03974dd59dd9192029e209cef7f15bd135
 EBUILD garcon-0.2.1.ebuild 954 SHA256 521c29c2a3ee3822d642a61565ba1f6fbd8bb9f713cb7f2ef8d3fa6aa7b1d6fd SHA512 1a887275b22830dc7788058fb6c26d4c4360a2d2584b75ae8515efe305dd844ec11bcedf0bd995179deae1c596094c3a4f2dbd48a146285b8ab14e3b97364211 WHIRLPOOL abb23e909475fb5307e31020e99424b89ddc93593f641348918d9e3b99855a5956430469264a0f322fd9cc38278efac3fd290e18fd06474d65c974379172cefa
 EBUILD garcon-0.3.0.ebuild 1019 SHA256 104b97f09e6ebbb98c10e8f662a47b2b3a9eb8da30f3834304f77f7169157873 SHA512 74de7e92a7d21ba6c3f2dec7216e32da9b4c6e6dac455d672d931b7efce5191925689de4d2b49a6792c9c9849cd420e24936c0dce92fa55015e71b1614e10dc8 WHIRLPOOL 0756581867df2f8efda1fecbd782131b0e360f7fdfc140229ad784ca61b77e8c5c4b998f2c7e2e8d9a387a7894e210d363ffad3baaeb9ce9ada867b13e650c90
-MISC ChangeLog 7817 SHA256 917433c3175f506f6925b5e2f11be62c7ba6d6dc55417c088f143ebe96d6b886 SHA512 3482d6878452641984c112dd7bc8dc5e498c589482b22e50d0bacf92d4fea44b1d374976c8c0ba50f5ea23a85c45e2768d0bd51ff31cb335423bf7ffdc637039 WHIRLPOOL 117b3830df4708dedd6754c1b600bb665a4823f9fbcb8c411a6f74d1029dd5cf9be7fffa27b3a37ba93dd1a750e0ac042e87c516e4dadb79e3182bf96a84e348
+MISC ChangeLog 7906 SHA256 d6acb0ec3a897275fbb09cd7f977d649523230b23b25fabb925e4a258403347d SHA512 832a8d6acbd2f8f048b19eb4011783596c2bb69b5fe8a7bd507881bd16866abfefd7e859518f2f3de8b1030ac72123bf4bf3efb07d1a3f6e129183292e163aaf WHIRLPOOL e943144b1178632d8a8a3e88b285251c818a2908ae9ec77c77021fb174eedfeed66f496a791877720dda4180fbdb6b443ddfb44005b90eadf4e2c5c66eaddd3a
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZZAAoJELp701BxlEWfzlwP/RVaPCvOYz6m9fqQEs/qAfBQ
-ATQ/G+a6ETB6Ku74V7e1n6bRGam7Zms+3qKW8/q2cGVDa9ETlwNAr498Ip6FpAIy
-6ZRP4HUVLfLAR5a1LNalHCVUh5LfhQ/a/Q6B3jy73/ppC/0Rz4bzuPGGK5J/H4Fl
-HAN/kTmNFEsoyf39IvsT3MdxyF6x2kufq3WnFTyzKAeAt04OFMv5/uR/h98orJLW
-/nt/ut2ZEUxbO3zLVFV7GXJxuTzO6P8CCZzpeTAsp8hs/XEhhe+/cOQMgODq/vK8
-gWriPtU+fLO5S/CvmuVKUTbqVbNk4pnvAdQsIQqjq7MzTSnEQUyvHLWntPqr/TCf
-Oo0pw8y7HMWDoUdR9mtNpyp9KCZl94UZ/WVWk0RJExphGzjbbzmeFIblgzusKsWj
-Fl10TiSua6Iwo5qQk1ECVQ+c91GpeRAyCQL26ppWhVgZpdR6ljEdI+Kk+LLVEiYt
-Ern4v3CRPMTNjYh+CQH499v+adSdvbfdKRMkwsDMRUKtxIfVOTyeu9vR1XTe7kNY
-9C9iVh0LhiiWHDvgTRiJQHsCOl7Cc/kLgX/u4lX41JBj1Bcy8E7Vt8Rok6EGglZ9
-UgacQC7NpXSUtn3686jLrPXGanOsfRg6IueMENTM+Kjx3bsgLd6OHk1MnAepqN2B
-2eynfQhb7sOus58nBRdk
-=YfCg
+iQEcBAEBCAAGBQJTVnLQAAoJEEdUh39IaPFNJPAH/34znFFmuSoGGgg8es3+99KT
+d6484MVX2wwnjqAv3rpvlmQKfaSdjy3tm0vNOxq305wyh62/Pe0f/5SfltdiAhdq
+7VhArNR2q+AskZC4+vV0TPviJEwIt6XsKfg035DU0W5EUGsOzzMuZb9ZH4gjxCSa
+HqH1xIpoWSusCTbr9EYkYrHRYYBgmoSJuK3Qr84zbH9BaPIYWjrujSXVBtRqUU3n
+Z2lUqYuHx40WuBRbA9h4bO6o9yyKnH91wX7Wnc7zXpERnY18W/YVsP2em6yC5yvS
+1Y4bfNkjPCidmvzdMfgAx9KlaFetj5ZKvHG6Pb3v43Y2/OODTqWYy0tEOuNJagg=
+=TkNl
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/garcon/garcon-0.2.0.ebuild b/xfce-base/garcon/garcon-0.2.0.ebuild
deleted file mode 100644
index 6777b6657e4c..000000000000
--- a/xfce-base/garcon/garcon-0.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/garcon/garcon-0.2.0.ebuild,v 1.11 2012/11/28 12:28:41 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="http://www.xfce.org/projects/libraries/"
-SRC_URI="mirror://xfce/src/libs/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=xfce-base/libxfce4util-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		--disable-static
-		$(xfconf_use_debug)
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-		)
-
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
-}
diff --git a/xfce-base/libxfce4util/ChangeLog b/xfce-base/libxfce4util/ChangeLog
index 01c0bc2ddc82..cdc8c6c0a226 100644
--- a/xfce-base/libxfce4util/ChangeLog
+++ b/xfce-base/libxfce4util/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/libxfce4util
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/ChangeLog,v 1.195 2014/04/19 17:46:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/ChangeLog,v 1.196 2014/04/22 13:43:48 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -libxfce4util-4.10.0.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libxfce4util-4.10.1.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 02d2bf0654cd..9a9f22e1db36 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libxfce4util-4.10.0.tar.bz2 430542 SHA256 0979fee12880bb5f011ab38d6c7cc9afe5fd68eb96ccda895cb56dbc16e7608e SHA512 af05f360d8218a0cdc28c7d9cf2f8482ece1b329cf3f3982af2e19d3356859e4648703d0587e67574c8848283fc96fd5631ce05633f9a0afd655420123875cd0 WHIRLPOOL 69efc3440475b6cffbdc0d68a482c36be27314f60236ac70dc2b090b478ea7aa59bcfabfaa9e09e6866235b9cd079943cda9f58355ba25acad999ef4bd5c9b2d
 DIST libxfce4util-4.10.1.tar.bz2 453499 SHA256 e82cd1ad715c02a385b3cf6646cb89aa3c4724446dac1d7e424971df12f6cfbb SHA512 5b8f1ddcd1cb84fc298ab1088644109aa720b04adfec4cf31c1bc2815baaf3e4771b6481f1cf2630f3b27a4d7a7178a9b6c464076c23ad8b514172c20852e770 WHIRLPOOL b3a5215cd12fd70fa0dbc4515ffd20a0355e48baeaa2bebb8d70349cf4d43e63d5fef30aa8a4266269b3e9980e298599709eed5e4c31c0e935764d6c71d2a3ec
 DIST libxfce4util-4.11.0.tar.bz2 461592 SHA256 d75a7f80c4b107d927926e9d61a31605d54e62bec2939f39dc59d8eaabc0005a SHA512 bbcfa3edd464cddaacbbdc9c8915d953477e294c7f61556dde27b93e8827fe9b98b8ffe65ac4cf0dc8e666b57136e88bfa8d93c9bbd4f871cc2cdddb1f1e6b3a WHIRLPOOL 291211b7428e18040575f6f99d4d0ca8bf6807dd875a68c492c322d2df3a6b6fdfefd0daf175f3bed6d3156bbefc201ae8002b39798868eb2e3ab18ca2266f1f
-EBUILD libxfce4util-4.10.0.ebuild 981 SHA256 c3c039146f07101e8ccab0954f75631f7783d3da89c363ceccff13e82e9e1bb9 SHA512 a8dc2f0777536d906436578a136ea22705fbebfcfe0cb20d36e451b53ebc1576bfb8b76449ad9ea3bc0ad28002d82b9e82d57cc110f09398acb612f0aeecb497 WHIRLPOOL c09a77cfb010db1f54796034b95ff889a6da508a4c54b53ae595a7ddbf8c21360fc173131ab58ef0502841ea1fdc20d9d0d40fdb7582c7a02298a1e240850af7
 EBUILD libxfce4util-4.10.1.ebuild 976 SHA256 bfca93e757be0ac16b108cfa1e22e52368c2bf8d673361bfef37583ec8135512 SHA512 462aeaa256fac5972912a86ddeb37509a5cf004a58bc3b6ebfef856d0af027181a27ad2d747389a125ed6d8acface552485c1d947a9982ee0b7ca29a5dbca98e WHIRLPOOL ce66cd4b718fd38d12d85a299a2cdd811c1bd681967a165e15effb6c233e33c5243bda55b272f7ebcb3310d250a405aa747bb059fce22c62765d7dd968fce598
 EBUILD libxfce4util-4.11.0.ebuild 990 SHA256 da49f7904bdd1d9b6618a0334fd195c26ce751f4a917ef6a44b7ca80c4f022fc SHA512 e4187e861ec829bcf1ccfc1db286346ac4b07dcfe68a37a211a1152c58a11808f4fb5fd5267f3fedd3ab447a083335ce4e696e1963a535d6b46abaf3e35a13bc WHIRLPOOL ded29345a5d3d1a73f22ff54adf87d7d7d3f6858289b3a4c904aee1e08c13c930db83d5a8828c9a081129255e364d0a256dcc3df3983cd187d09dc74fd797023
-MISC ChangeLog 23138 SHA256 d0b3a425096075ff655bf7df6f8a8be0a8e164eca69ba558e814ad44e4e94473 SHA512 673b7c0ca110b1ad92badc8c67cdab44c3be534f9701276058490b841dd1849748895786392f306f95b8260bc05f59a2e5e0a38ecf5a7aadfd937ba30a47a5ae WHIRLPOOL 74e405ab563c09c85a3680fc6893eaaddca08f7ddab741a12c95162c7f60ee181b4c90c567ae2db3fea105bb2d5655f21bcdd6e73f905c47f52a6b1013d03f7f
+MISC ChangeLog 23236 SHA256 5c6ffd659089be9eed87ca056be9dfe6da72248b03151094bef4d1099e38806f SHA512 e00ef280213924b5cfa5dc3ac7bee0c1259b563f18307f017142f1624786c5a11d28cbadb67a18646378fc5329214f781beb1cfd94d780d756b3d05bac7c1b19 WHIRLPOOL e6353ad51cb4fe5d448f2265041eec4e9ccce2384d1a369b0acd6f464dc9c6a67d90c1cab9983106c1d3f8a0ce58a02515074f3d518f884d2ca8d544d91f4499
 MISC metadata.xml 157 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 SHA512 54ff64307677bfe1e9b62d427e8aef8aaf32b86216858541398b5f21974247418eba7612f801ff2c333fe9a059d60e1f568046a3ac88e0ee2d59beb3a3a77148 WHIRLPOOL a42edf92b91b9922e7af397d6cbad72ba7e2ab7e5aaa4504cdd8bebdc1d87e9523e76c016eab474f4b65581a9cd58a3be13d8f52bf5ae7dc6afe96d428433a5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZbAAoJELp701BxlEWfiSkQAL5R9zTwT7/+/F7xpmzU4trn
-kD7AB6QZD+p9EEtyitASIWxU3s3KI1y0/OWL8AWk0F65j6TYbmpXfVpu4kcw/4dg
-G8z/8nTg9Xabn/FhM9ggY1Sj2GSc1S0YgOpUpHJSNfPkuDXn5XYw7n7O4CVC8N5C
-+cOUEDkKeBznpV25uL1RcrwnemdkY9c/rAMszC+UYw+IovxoCcYWMvpBnTlpzz0Z
-THcPmXTt/ZErGdTzI5M+mdx+6rxZfmOkSJizE9/RNbZ7Dzc0/ciPiKyTCB/MHQnA
-y8iInNv9S1enUUidHlTOLM8kSKWYOB8PA24AlqZU6KEXEjH1Jy57HU2FcxjBaEyf
-JbSkylUcaZPIFV/uBq/Gn4YyIF/egv+DrAfn5e2m7w6Nii8rdnntRzEE4HNu6f1p
-9UGXCcrAq0SDD1NE34piz/O9eUQMUMBOtD71d7JXyJsmSYPM5KBCpqhrcyTMseU3
-hVJuZyJo+ln3m7/AQxp6coWMKPihUm3NDnYmyCf8mxw/pKTxKqgD1RpnaNSLkUzE
-s8gMMG7ju55gueGsCrRGkeXXqpd99CDueRFi1yy3xiQ+dANEoamVsTCfCFeGpb2D
-nllWf7Wm9t4QxlpYDOV3ooXqO8H7lpp8dVmcKHVLG+ZwPmK0EQH09+cVM0dBVPkJ
-Mw5eWLstCkCp6ydX8ji6
-=KsJF
+iQEcBAEBCAAGBQJTVnIVAAoJEEdUh39IaPFNCssH/3u0gb5Nl2KTMo1QPL8LWsay
+MMzBbpIOg2Cyst9jgcFnly1LjU8Xb44Y8AgUoYaL+J7mVPLg8n1XiP8u+BRTJvR+
+dmLL8OU7jKC2QL1YIoTWlg++PTxvBxi5hpE4yFtUp1ynqa9X2Z3Jl9H8n2/y0jWv
+v9bxU+qbNl1ULNBSezMqA0My02GbtWAxJpkSY3BiHKyD+XqnwJadky/z8aLJVH6Q
+oCYSgQnVFvs0taZvVM6kAhmLuentNyW8btDd8VI0kgFxlNLto98lrW8hu5Z6PmPb
+QURasKi+Ur+XWFwBAensu8Y/wesqi06T9mNb2QdoQ0+KYeahbs4ru6DeU9tH49Q=
+=Mmr6
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/libxfce4util/libxfce4util-4.10.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.10.0.ebuild
deleted file mode 100644
index d06bbeb2f71a..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.10.0.ebuild,v 1.11 2012/11/28 12:28:12 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.24"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-		)
-
-	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-}
diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index d4956eeb93dd..2af3654f0b03 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.172 2014/04/19 17:46:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.173 2014/04/22 13:49:36 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> -thunar-1.6.2.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> thunar-1.6.3.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 81522babbf02..cc78472072e1 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Thunar-1.6.2.tar.bz2 1953026 SHA256 7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85 SHA512 307496dcd67c46f5dbef10305c25ba4ae0a23525932f660dbeb7508dff32601173deae72fa0f2884b11677fb8dcea2473a1c7647203e74154a0d85c30e2061aa WHIRLPOOL f07d1a0079e687a6168a0897542ec9922e5adf455e0e27e4aff9f3a72ae13480b5c25592611d2e67bca9222c86b44b7a3c6a43f652a4bbdd6e29cd7b00f75fde
 DIST Thunar-1.6.3.tar.bz2 1983127 SHA256 9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d SHA512 17ff9c416a11cef2def6c2f2e1623bcfe480131aa466d55c06f81772781178f6d4bab431d9906be58e391c86f2ab0c7096728961643e2091d6ab785188490382 WHIRLPOOL 68590950513fe60a1b03fea08b4fb6d5bb4494373b27076e524d12fd3af62cd81e57818f3df8b1e15c247aba038a5b4472e0222c07203b7826267c5ae7bc469f
-EBUILD thunar-1.6.2.ebuild 2110 SHA256 66200093d50afc72ec67440b2fee6922164e397dce3aafd7cdbb5cedcc949635 SHA512 23dd8ad1a99114ef61ab988115254d793966802a2e4bbbc0f1623b388027c02cfa6ca3d6bd9fd9e3957d28bef9f34430272c8ca49e22cb444266134ce786ef45 WHIRLPOOL 9fc7c8822f879e9e5de6ae958b9fa811e5250203eec6bd6555cb09ab989a666912034b2b24726a86fa49075d3688ab0bbf81ae0ccaa917888780c360259787f2
 EBUILD thunar-1.6.3.ebuild 2112 SHA256 f0f9985dc3a4890471bc4de957232202b28b3cfbb2675ccff3cc576a585d2c00 SHA512 c8a029e8eaa87a7863dad2e53c75a5db792130075a3f0a7980e2a21b2ace6797de9ec6837d336bb17edf63a206c1a37a683ac7e31d7473ba7bbcf10a3b051886 WHIRLPOOL 80c3ccec50657e4ac3634b7bf8deae8e74102cb82161748daa76288d749b0a4fd5fad5206c60b9ba0c2894868a1beb587bb1d2ddd69421f3c0215b2f7cc51c3e
-MISC ChangeLog 21545 SHA256 d849cad69350d97aab76b57a1289acb92583de3c71901a18882d6fcf291b9fa3 SHA512 dc16199d4be76b7d9a3b020b951f74c058616b641f8590272a1d8568189927f238bd09670524f14bcb41f591395e807839f053757b14873d280642ad7ec6ee7f WHIRLPOOL 6cadb6fe8be249bd40144b86a6121393529dca4cd3d7a06d4e57666e773325fcf53e957af37f2f6a1d0fcbb9219ed4da279ef450989c7a35c0b22ab107de3ce3
+MISC ChangeLog 21634 SHA256 539156d9e4ed65c22c5b5c4b1ba1bd2159b2328a52f0d96c69918bff5cdb25c4 SHA512 5e996b6e4c14eb1239bcdc0cbb552fc055110b48575edc962b7e13ca9cd5f2103c33f6858c9efb675a17021048927451eda4829e4314af4ac0693d56af131598 WHIRLPOOL c7112051933117a8b25b864602e942609686071d29a017527119664349a1738b45a1aa34bcc92e643f887004f0d1c8a71368dea7a2889db937caceb3b9845839
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZeAAoJELp701BxlEWfUkEP/RD9VGXOctYrlmpY3gPWmkTR
-PECQxP9bFywvrvLbG2OKSa3kE9u47hbsQjiOLCWob21xemu3otEwwvqIruRDzk7L
-WhwyXNXA53zAo9HTlJ4W/PBFkzN8KyOwttrDNBIYze2j6vb6i5KF85cTTNJempE4
-U969JDx3ocDfQDxPvf7a0jcj4FpxLqp7ivEYiE0IMBYcSswhGkjnzZ0uoH76HVYF
-sv7rV+6WC7dfguqv8x45a3mqng3xLi8gW9rDfX8hAFfJPw+hFcPgbbfImNTex2KD
-oQJrsCvBi5qCxxLCTKvC77z8toTfSVDvv4n4D1K95OqKp4qe/OSwx4F/Oh9U4mjR
-unZQc1DUHSPAHnOrasZFGCqUV0H2ADuv4FOWGvr6boUo+SmLV0AU44fk0Vq1eq4Q
-i8uVlXfB02zbHyqj4+VUBYmDOCrgVf5aNsL2rZKbeKlHgKQttkRTc9earCzneo4r
-YL/0eh90YX6Kc9ZloPElldneVKCT5YH0P2xFWBjfvtX+4wxXKgszzjq20aI7NTkS
-bJHabB3VAu68EfR3HkhxY6QjEtMCzXpFk+EdlC9bsah8zr7rmKcxPvwBNNi2gAbv
-sDppMEqxVtrNUtGR0rjJnUp2zoJp4IGszcLgA3Ki+kztEms+BnTQbMY75QH8KZLH
-fcejvCMA3ZmdjuzQEEGq
-=K3y7
+iQEcBAEBCAAGBQJTVnNxAAoJEEdUh39IaPFNcmAH/AsA9qyB3RSQKhX0bQyhoM+M
+zt1oj7JBtKDIZnss17oFG0xmhYE6LrqtEHsSNkBFb/6VISIvO0q7GuYgPlI2EbW8
+QsA1k4kVveSBKVBg//cxGBRv3XrRUmV/yEb9K21cBjQu2FCZBhtAsWNbKCZYaSKx
+IQHTh/fC9PeDHy1pJQ8Bq2ADwz/eiauMCI4TpueLpCyZbQKlCHprIhAumSIJ5HmO
+BUoGnJzOt/dV0TXzUY3jKeoUtoFsY1AfNYCt6OUH+9ydkpYMbXpF0gbRpsQuO2qi
+lmvn/QM0liLz/thJcgTXntNF7gLp9i0KvOKIsI3qnMgMH9BEM7b3b1ARFnSXUYI=
+=o4If
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/thunar/thunar-1.6.2.ebuild b/xfce-base/thunar/thunar-1.6.2.ebuild
deleted file mode 100644
index a1080f0ecac7..000000000000
--- a/xfce-base/thunar/thunar-1.6.2.ebuild
+++ /dev/null
@@ -1,69 +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/thunar/thunar-1.6.2.ebuild,v 1.9 2013/04/13 07:19:29 ago Exp $
-
-EAPI=5
-inherit virtualx xfconf
-
-MY_P=${P/t/T}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/ http://thunar.xfce.org/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.10.1"
-COMMON_DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.30
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-2.24:2
-	>=xfce-base/exo-0.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfconf-4.10
-	dbus? ( >=dev-libs/dbus-glib-0.100 )
-	exif? ( >=media-libs/libexif-0.6.19 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	pcre? ( >=dev-libs/libpcre-6 )
-	startup-notification? ( x11-libs/startup-notification )
-	udev? ( virtual/udev[gudev] )
-	xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10 )"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	dbus? ( ${GVFS_DEPEND} )
-	udev? ( || ( ${GVFS_DEPEND}[udisks,udev] ${GVFS_DEPEND}[gdu,udev] ) )
-	xfce_plugins_trash? ( ${GVFS_DEPEND} )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-REQUIRED_USE="xfce_plugins_trash? ( dbus )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable dbus)
-		$(use_enable startup-notification)
-		$(use_enable udev gudev)
-		$(use_enable libnotify notifications)
-		$(xfconf_use_debug)
-		$(use_enable exif)
-		$(use_enable pcre)
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-		)
-
-	use xfce_plugins_trash || XFCONF+=( --disable-tpa-plugin )
-
-	DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/xfce-base/xfce4-appfinder/ChangeLog b/xfce-base/xfce4-appfinder/ChangeLog
index 0ec879830641..9f8049a59a38 100644
--- a/xfce-base/xfce4-appfinder/ChangeLog
+++ b/xfce-base/xfce4-appfinder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-appfinder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/ChangeLog,v 1.38 2014/04/19 17:46:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/ChangeLog,v 1.39 2014/04/22 13:51:06 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch,
+  -files/xfce4-appfinder-4.10.0-null-pointers.patch,
+  -xfce4-appfinder-4.10.0-r1.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-appfinder-4.10.1.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 466f473efdda..e0a568ab22d5 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xfce4-appfinder-4.10.0-icon-theme-segfault.patch 2712 SHA256 9f9f9069ecb41adc2834081505779294b433e5b545e953a5b8b4be986ed332d3 SHA512 123643aeb7ca201e3133a04bf0ca71b81b21a224522cf806f908209d203a88683b6844bf47c605b5e02b943b73c6e4e83f06fcb7448ea3916b7e7fcd851bda7f WHIRLPOOL ba0669d0eb5c51e7f38eb9ecd82e4f69b8bb0d6d3a9faf10f00c7b7f532e0fd50710abd4b6e779888bb6ce417d9cad9a65db5c1f93c81b5b34c005982f8c3ced
-AUX xfce4-appfinder-4.10.0-null-pointers.patch 1594 SHA256 ea2d1673f003bc5043abca1d5f5bac74d3fee206b3b1ad81d3e6d5e3e7837da2 SHA512 ae17bcc81580caa3294a378e8ed19e2190891e9943b8ecf7fcd76e3a5874be1e637c75a4a59998f4f2dad3b8b2fde09a6bf1f85758b99f7053a23c20c589e1aa WHIRLPOOL 223ef12c4a65302f564884bc6a107241be7d71752654b7c42836b2fad29fa5f27b2494b6882867a98e37b9d7cb5eb6a5106edae99ce2ae880ba6debe9bce931e
-DIST xfce4-appfinder-4.10.0.tar.bz2 429196 SHA256 042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439 SHA512 a43844132d9593d715c1c08a187825757bda9efd20008b517c0f353411c4d0c1409c0f3a595bc751ba4ec7801813e3e33381e46b78d7a7c9ac30522201a40ce0 WHIRLPOOL 1a471bed8d311b340a1e384a17227fb12f7b40f103368a3ba78ad4d2355b324198365a38eb58852b590aad9b080837fa74dd49239654645e51708308feb6d791
 DIST xfce4-appfinder-4.10.1.tar.bz2 446043 SHA256 65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77 SHA512 5a9e1ac2d140549fa332bb8578cd12291a331ed017b72b0684aba9d36b16bf3231552a2d5f6aa5b0ccaf9fe2b899d42872f6726a80e4f68a80474092dd245a28 WHIRLPOOL 08284445624ab935ab38a12eb4d0faaf61fc717a3343b91ee3bf91002c282c1afd3f6ae5dcbba0ab04dba15b7ffa921ddcefe6f05cbdaeb724cca9e68a35c7a3
 DIST xfce4-appfinder-4.11.0.tar.bz2 451004 SHA256 49bfe38623b5a6e65b8a654d353f439e6dcf981aaf831fe2e31d59dacd95c618 SHA512 e7eb2408ab345db5322d95a3b1ffc494f1170d47b242d1d78985af1afacc023af9bfc74c8975a9507e219f9883119f7573075a581782ff92c467773ab3d633c3 WHIRLPOOL 8088b4a00b69efc84777ebee743afa7ecb65b4cb42fda6666a865d85c985c541fe5978fa46ee5f8d76382a00faaabb0ddacb0b383438c901c11d6d1ef2911061
-EBUILD xfce4-appfinder-4.10.0-r1.ebuild 1131 SHA256 769147eaa7b7f038622ab28604d78ec704c7704c21df40fa4de1ca7c3a4ebb40 SHA512 213775e70b1cdf78be1ecef2be8f7cd2707c376910db49dbb224caad47db1197323c10bd40ab62936dd7a63bcbad7e66b1e4546ba3abcc5b9d923fdf63916a68 WHIRLPOOL b5308cc80b63c1920bd70590ddfaecd587da722d45c034c418d0a40cd3b70cc7f457fa3d8348639d3e6d7f62c9c4811b83f606b868273b8982a0376cd7b3a934
 EBUILD xfce4-appfinder-4.10.1.ebuild 1024 SHA256 f123982f7c553e0b64238a84365b2b17fb11f2d0157dd76dd53fbe7e9dadd961 SHA512 601c9eb7832850b7cae84623b5b35f7507943ac2db8a852e06b32c582f95ae51c8e13a42e1ce0663f3aa93420fb6b96da7feaffe1d01d075c2f7ba6f4c752950 WHIRLPOOL a3ad6827c85b68ae89d5ea24d41d44c6d23b2d265a34510c3b9e4e90c754b412e002098e68409894999aaca0e0626d778c1c099c83fff7ebabef3c07965a7eda
 EBUILD xfce4-appfinder-4.11.0.ebuild 1053 SHA256 74c216bb8823041fa91c34246a632c5432f43eb3f66a99481375a21e77a7a066 SHA512 18d6846c705a110d1a97c1fc6ed7f1c2fb620c2a035e12bf152355a34ca27b7c62f05b44d79deafa7d76c1fde9dd08320266cb2b2510ed8f5d1cd4e63cac5169 WHIRLPOOL 79e52efba6fa1fde094dc97e6c942f918deec943bbbc541efe19788b3b067cc42bd8153cd6ddacee99c07d551dc976ceff338ba8fc467295103140758dce5660
-MISC ChangeLog 18636 SHA256 73367e65f29ea3a9c0a8c55651224c04e0d7164444d15fbab022405ba095d9de SHA512 9387f1bb033dafa6f0274b166c8c3594be2dcf1e0e39b94d0976f6dd428253893341234f1659530aecc8b907cbf4c79c76e96cc8228801e7c3f2ebe49555138d WHIRLPOOL 948875c913256ade084f076ad764dc5198999e822fdd6048ba313de41a77a78dd26dd93394fef3a8f0491004e8605259b90856d1e3eeeeac63983220bc096491
+MISC ChangeLog 18852 SHA256 11ca5272bd7e9e8c7190c87db6491562c338452ade0e73fe349454efcde4601c SHA512 d42ee1b0e8635b3dd9f5d76039ece20757065d3b2acd3e98b45d33f48de963f084e18d468e5e46d66ef53a385031c0a4038a70e7fbe60d6c65d3d61237c1d057 WHIRLPOOL 71f1ba17f99a05b2f91d10b60b14779460b20f9f84571d6a00ab5521ba29bf4146dd9884caf33138332a1e820e4271fa47c47e485265e088ee2f9ff51aa754af
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZgAAoJELp701BxlEWftRUQAKB6PZM7fy2NgZHVn7NdvuIv
-oiaom3OzgkrtJ0Fyq+ZQITvzkTxalZbThAuvtH1u+IRl/x2kpmsBoHuT1sL3ylrd
-+u5V3P2RJGwcMTq7LVCSRIsSOoS/HPlX4QnD9OQ5tJJGrZoCVSPxKBOafwJhJMQL
-hAVQdISICJhQnSwNILD2L68wcIaUqHkfaYuKaElxxY9xkK9Ue0DE/j2L1MxrvdCQ
-m6Aemivg3uUA2iSNGIaFg+D/ACrWzzSCcTjZ60rFOPVXk3cUPc8+JnUSkI44l4N9
-lPksc6dxMv6jB0Vvcp0fNxipl0QYa2tid+gM5jy02N6ug5jBpM+JIlG2d6aIuST4
-DcZBOx/2FhrfGaJN78EyUSCjY3CtaS9gGFNBWZDX33bPdSV5cr3a6URCg5JBPhRy
-gNq1+ipWdVdtwwbtILTUN4H7icdnbR1XRb8Pn4nkchZwsUuIaUSrXFzvzwXnNZ2h
-NWkrh4rgxwcawizQ9R0OS0/xr0o+KVjrj9TuV6Wlkl7rPCHH3goEXxHrJBo2W9Np
-9fYaZPVvHtwn0zDSXUjuLWopUsuTy8IxpkOMci9vJh1Tq8B4PW/HXrJdwc04Ufjc
-97qhm0lXgS8ItckTCa2V5cacBXmGx74Q2BxgMZWIZQeirVapadnOJ+zkc1VrkLnU
-sh2x1KjtB6ZM1b5CXqTI
-=Unbo
+iQEcBAEBCAAGBQJTVnPLAAoJEEdUh39IaPFNj24H/18INshwZm9LuTv14n3rlSIq
+hjIfQtaEEkCyE7BmxAMhclCMBJ0A/jcUNEi2Qm1fVTxIdEkH63pUi5OcR3uytc7f
+aefb6puHtnT3Ku2RHsstKTcWsABBqyVgujXFYS3HKNRhttwZ4NLuU/t7WMmEeihq
+HR0ue3r9c3FUXaHQ8wDxQDhw7kwm+CLIA2IxI5Ddsv6Wv5LaPJwupM0Ii4z2Te/k
+G1C/3AFkxCby2TtWQ6Y9eo8yTUGpFgzur0ZYLG5CuXkbmxqafMmhkhW/py305XMv
+D70lKObp8+QqgziZ6XBtJaaiCPF+Fu01PkOfYXqUBwQd4vt31+soAI0bT8PlJfc=
+=tm2S
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch b/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch
deleted file mode 100644
index 02e3e7b1256e..000000000000
--- a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From eb46f5acd4b0b985a94bee6942d6527f9f620b84 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Sat, 16 Mar 2013 18:03:01 +0000
-Subject: Detatch from icon theme to avoid segfault (bug #9730).
-
----
-diff --git a/src/appfinder-window.c b/src/appfinder-window.c
-index d3cd567..b5ca272 100644
---- a/src/appfinder-window.c
-+++ b/src/appfinder-window.c
-@@ -129,6 +129,8 @@ struct _XfceAppfinderWindow
- 
-   XfceAppfinderActions       *actions;
- 
-+  GtkIconTheme               *icon_theme;
-+
-   GtkEntryCompletion         *completion;
- 
-   XfconfChannel              *channel;
-@@ -204,7 +206,6 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
-   GtkWidget          *bbox;
-   GtkWidget          *button;
-   GtkEntryCompletion *completion;
--  GtkIconTheme       *icon_theme;
-   gint                integer;
- 
-   window->channel = xfconf_channel_get ("xfce4-appfinder");
-@@ -400,9 +401,10 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
-   image = gtk_image_new_from_stock (GTK_STOCK_EXECUTE, GTK_ICON_SIZE_BUTTON);
-   gtk_button_set_image (GTK_BUTTON (button), image);
- 
--  icon_theme = gtk_icon_theme_get_for_screen (gtk_window_get_screen (GTK_WINDOW (window)));
--  g_signal_connect_swapped (G_OBJECT (icon_theme), "changed",
-+  window->icon_theme = gtk_icon_theme_get_for_screen (gtk_window_get_screen (GTK_WINDOW (window)));
-+  g_signal_connect_swapped (G_OBJECT (window->icon_theme), "changed",
-       G_CALLBACK (xfce_appfinder_window_icon_theme_changed), window);
-+  g_object_ref (G_OBJECT (window->icon_theme));
- 
-   /* load categories in the model */
-   xfce_appfinder_window_category_set_categories (NULL, window);
-@@ -432,6 +434,11 @@ xfce_appfinder_window_finalize (GObject *object)
-   g_signal_handler_disconnect (window->channel, window->property_watch_id);
-   g_signal_handler_disconnect (window->model, window->categories_changed_id);
- 
-+  /* release our reference on the icon theme */
-+  g_signal_handlers_disconnect_by_func (G_OBJECT (window->icon_theme),
-+      xfce_appfinder_window_icon_theme_changed, window);
-+  g_object_unref (G_OBJECT (window->icon_theme));
-+
-   g_object_unref (G_OBJECT (window->model));
-   g_object_unref (G_OBJECT (window->category_model));
-   g_object_unref (G_OBJECT (window->completion));
-@@ -1520,6 +1527,8 @@ xfce_appfinder_window_row_activated (XfceAppfinderWindow *window)
- static void
- xfce_appfinder_window_icon_theme_changed (XfceAppfinderWindow *window)
- {
-+  appfinder_return_if_fail (XFCE_IS_APPFINDER_WINDOW (window));
-+
-   if (window->icon_find != NULL)
-     g_object_unref (G_OBJECT (window->icon_find));
-   window->icon_find = xfce_appfinder_model_load_pixbuf (GTK_STOCK_FIND, XFCE_APPFINDER_ICON_SIZE_48);
---
-cgit v0.9.1
diff --git a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch b/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch
deleted file mode 100644
index fa333fd09464..000000000000
--- a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2a14564c8e1677c002ffac8643f706b334050988 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Sat, 08 Sep 2012 09:55:19 +0000
-Subject: Protect against possible null pointers (bug #9109).
-
-(cherry picked from commit 424418316733e3f8b9b17cd7345fe6d967b06ef8)
----
-diff --git a/src/appfinder-category-model.c b/src/appfinder-category-model.c
-index 483c4cc..3f3a060 100644
---- a/src/appfinder-category-model.c
-+++ b/src/appfinder-category-model.c
-@@ -589,6 +589,7 @@ xfce_appfinder_category_model_icon_theme_changed (XfceAppfinderCategoryModel *mo
-   for (li = model->categories, idx = 0; li != NULL; li = li->next, idx++)
-     {
-       item = li->data;
-+      appfinder_assert (item != NULL);
- 
-       if (item->pixbuf != NULL)
-         {
-diff --git a/src/appfinder-window.c b/src/appfinder-window.c
-index 155e011..4f99c6a 100644
---- a/src/appfinder-window.c
-+++ b/src/appfinder-window.c
-@@ -1453,8 +1453,11 @@ xfce_appfinder_window_icon_theme_changed (XfceAppfinderWindow *window)
-   window->icon_find = xfce_appfinder_model_load_pixbuf (GTK_STOCK_FIND, XFCE_APPFINDER_ICON_SIZE_48);
- 
-   /* drop cached pixbufs */
--  xfce_appfinder_model_icon_theme_changed (window->model);
--  xfce_appfinder_category_model_icon_theme_changed (window->category_model);
-+  if (G_LIKELY (window->model != NULL))
-+    xfce_appfinder_model_icon_theme_changed (window->model);
-+
-+  if (G_LIKELY (window->category_model != NULL))
-+    xfce_appfinder_category_model_icon_theme_changed (window->category_model);
- 
-   /* update state */
-   xfce_appfinder_window_entry_changed (window);
---
-cgit v0.9.0.3
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.0-r1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.0-r1.ebuild
deleted file mode 100644
index 32eb7e73dc66..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,41 +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-appfinder/xfce4-appfinder-4.10.0-r1.ebuild,v 1.10 2013/04/13 07:19:50 ago Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A tool to find and launch installed applications 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 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	>=x11-libs/gtk+-2.20:2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/xfconf-4.10
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-null-pointers.patch
-		"${FILESDIR}"/${P}-icon-theme-segfault.patch
-		)
-
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS )
-}
diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 271f916dcb76..80d2f970a482 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.251 2014/04/19 17:46:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.252 2014/04/22 13:48:59 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfce4-panel-4.10.0-icons.patch, -xfce4-panel-4.10.0-r1.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-panel-4.10.1.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 0b5eec59cde9..8a43cb14abcd 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xfce4-panel-4.10.0-icons.patch 1356 SHA256 552c67962b78f607513da5eb7a590cd10b0ab09a025f0b1ea0d33d292475a218 SHA512 7f6f8d5e57e371e4e9c361f54b6375ccfa2e4d4de92eca4c8d91df282291bc5da63e558cf091cdb762b1fd6cb657e2ec164fa5ef76f557a9de4f3683effa30c6 WHIRLPOOL 13a10741052d5f130e3f6f884a15ae7b14b4ad9ef46d4c3fc83c87a3e60d3550267892fa6545c0403b86f096067a1b35521a18f8f015af340741408021cbdf88
-DIST xfce4-panel-4.10.0.tar.bz2 1036257 SHA256 3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9 SHA512 d37ebeabcb3b532c41199c25b071a518743460e8e2107ab24af67b099ad829fa625599436ff5bb4ce5b0b8e641a1d29d7fd18b35048e15a11cf490eab1ade60e WHIRLPOOL 44acdd49eb3480449f24b8aedc655ccf1da2d527c4edb31f7bc766b2a81d0f2c34e619e4b4f65722d67be65028e0fce9dec0eda045be607f1cda8a5485735081
 DIST xfce4-panel-4.10.1.tar.bz2 1061090 SHA256 573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6 SHA512 0a115fcfa5cdf28158e7d56038a8669849494259c1c6e622614384179015edf868978c4226e13fd8b244ccb6b1a9798577eb38604b71c872bfb9229b87ccc531 WHIRLPOOL 2a27c20eeb7a2f965540997c94bdc2727f816f0956dd995faa1af583ae294152fb77b438e090f13324c69a303e8d90490097e2a1534b143757d31ab096c53c96
 DIST xfce4-panel-4.11.0.tar.bz2 1120711 SHA256 87062803dc7923d8ab21511c89a575ce7af54c19d3bc7ff15093f09852ad2c75 SHA512 ada36d603d0a8ebf403d75ca7ea38ad65b1c1badac05053870445651a2d6dde160991f4bf4f47e822a8dfc4bb339a61411a3ad4041eb87495c3d3216174ea6fe WHIRLPOOL 8baf79cd347af929d5d491941ff1a291f3f266a0f9dc41a65d75431eb3c514df8cbc212632ae352c9af0c6e6153a76d5daaeae0eee6e6a05e28e2c0610994aaf
-EBUILD xfce4-panel-4.10.0-r1.ebuild 1202 SHA256 4d17999cdf524b069933803f9b865de63d3cdec53bbca77ab0070e064ba3506c SHA512 6be17fb53dcf17bfa89b9a983efa3a0fdd68ae1e5e8d8f0575f0c5ca8c2d2316f3c07ecc8e55d0ee7daabe84ea44eaf978d380313b1c80e2e60aeb34d5657f37 WHIRLPOOL 553c01cffce548ef5969f4afc9374a0c8b8a582f4e592469cd2fe63a82eb529f4637e5c6be4a045cd48caa5fffd992a71b3e4ef687734accb46c923cdb1e23cb
 EBUILD xfce4-panel-4.10.1.ebuild 1154 SHA256 24d410b64acc96e3282274b2abe107da381e8bbd55c36726ba98ef060d63a56c SHA512 4c205a2a025c71b8f33657d67f259ef06dac47f23611206654e21b159c89fb7a2fb2a47dc4cf594167b412e91f1cc8be848ac2c7df34f604c1a4dd44e8360316 WHIRLPOOL 328940050cf91fb999f19496d058fe9f0f8b5a20de06470a62c292396967cb09e2d4aa99bab562437cc164e531043a801adc6e04e8ae672b34f714fbc0960a37
 EBUILD xfce4-panel-4.11.0.ebuild 1207 SHA256 91718e1b905a0dd09aa510a8a0fbd83a3d252be43a60f2b7b2593b3abb7c6207 SHA512 16e15357cd54d266523289ecd7085c0a2dec9a41784000e32116c2232808d70a940115cd78bd9b3538e235994bdf2bfcd5712884df61b7c3e9ff0cb601ef04ee WHIRLPOOL 1043ecbe6819519f22688e1676f57b310ef52773a5939860d3ef0e0e63ecb88a01e28ae118099d4f59d7dd65ee05679ef4f21b494d68852035dd469870ac70a4
-MISC ChangeLog 31151 SHA256 6ed451c93f0a23ba05b7b56b4df3a5e611591f853c5036a2b391e278e338645c SHA512 efceea14ebc243ec0ab6e104074006acefa401ad81c010710ca9a4bc5716894025c5b296eb46f71945d4ca897e0a2710401de286acb91327d877a3cbc6158f03 WHIRLPOOL 4885cbc718e1d4f09560581a9b7e4d897ed2347a1ab1933cb06a8adc96736d92718416c4eca411a752ae846529d74b6a094914d9b55ae369fbe790f924ff09b6
+MISC ChangeLog 31290 SHA256 d0ca94a3f8d93ee707c9f0aa5d040e7803b5d10da4717f615f9aefe595a4ac1c SHA512 dbeff053a84336a90778097210db206959035e61db2d03ddbe0a9048e01707e1e5e0084e32cc29a79d146a058a0d43bb1b1c2b79e25c5c574f150c654067d746 WHIRLPOOL 5623c6ccb457b7ccd1c92b687e3d1cf5c7a2dc73348bc5a5bcffed74f1ba826598026463dff0664b583054dafcd6265a3f620378df06630a5d9b26fc68ce6336
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZiAAoJELp701BxlEWfKV4QAKPAX2fmje8UMKPzqxDjb6Sd
-UyieTwg0VqXyG6OdBgWCjsUYsrKVfMjp3IKV5IsIXt75wtMK/btJL0aBQr9LOoo5
-7SvZpjNi8MdXAkiLbqWFRfCDFTGZz6OjV2f5aouAktqyn7hGPomt8ZnQ1wMRMD1E
-GNiIyxB9ApTy7RQ5JdhQ15KyXd3SKBTY/XoU+k2gNOygJJCtU0hee358cckK9XNn
-mvYiyKawrI1PRTjkftKyeuOfBUnijLIdvOUYrvlTy8HK89Drw3PMUuhDxbAw4N57
-//OiaXT1LwGCRiTpRTmBH7CorWSrE7p9VTjH1q8XzAaF5yBeiIpOP/BPsc1zzdtK
-jCAkv6b/yb0BVssR8lpLB9Fsz8FdUaCGdRgIts+vD65/qa5J2K3VMXJLMMJ7RbXn
-GVwjTWJpzUYqQGCCsoQNTuFGm3P7DppYixSK21U6bj1wC30gXmyKO0fPfdV2M6L/
-vEAxNtd6XwYeamDvvaRmD1HDy4iMb9lCXbWmittxUKppsW2CPP9MllNCDe3yqyKu
-QvjBdVZPBZ8qesEXKCfRJ5N6gdxzvFkYCQmQvO1qzuNLy4dPo1kDGHp73FlbFgUW
-fx5Mw5Npxrehj/rdsZHpljKsHhDvOHaXUvhnPgXb5pZKxN7qFJJd55dGjYrN5UQ6
-39VVzt8OvZcWL00Z+I8L
-=InZo
+iQEcBAEBCAAGBQJTVnNLAAoJEEdUh39IaPFNG7AIAJmcCxu1g9scpOm3o43ECMPF
+pz9pr4Q/DePA1mMW4YoOfIfqEja/rANEqidYheGiKZYq6YLcoI3izwtxP9lOAMts
+bRkprT82tdPw5Ad3HFRTSLnJ5bDX5Cxy7/Pu1/9wEpfcM480+N6f9KwoCk9f1IIL
+nlEsipp5OnUmVgJsP+lhfWk8Iu3JtAgwLUzQLaZXP6VS3SiMdzz6bjJxJV0yUlwH
+XHrMDB88xpGvKi2E2SdVsLZO0h+x27ipvVusOlk5hU2Gm6JrCOODSt1LFf5QkkoD
+f3MvFJ+gsKdg5lJLlTzbo/5ouEkoUvZisOy9ZU+enj0FBY0YajRatwh9KjFkXNk=
+=v9/F
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch
deleted file mode 100644
index 0bc7d0f6b36e..000000000000
--- a/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/447182
-http://bugzilla.xfce.org/show_bug.cgi?id=9615
-
-From 48e1016394fa6bdb1d708823a23a12641482a561 Mon Sep 17 00:00:00 2001
-From: Carlos Silva <r3pek@r3pek.org>
-Date: Fri, 14 Dec 2012 01:14:36 +0000
-Subject: Fix icons not probably resizing when requested.
-
-Looks like gdk_pixbuf_new_from_file_at_scale and gdk_pixbuf_new_from_file_at_size really don't scale the image leaving the image loaded with its original size. So, just load the file without any scale and let the scale be done later on the function.
-
-Signed-off-by: Carlos Silva <r3pek@r3pek.org>
----
-diff --git a/libxfce4panel/xfce-panel-convenience.c b/libxfce4panel/xfce-panel-convenience.c
-index 19c51bb..a3f3be1 100644
---- a/libxfce4panel/xfce-panel-convenience.c
-+++ b/libxfce4panel/xfce-panel-convenience.c
-@@ -170,15 +170,13 @@ xfce_panel_pixbuf_from_source_at_size (const gchar  *source,
- 
-   if (G_UNLIKELY (g_path_is_absolute (source)))
-     {
--      pixbuf = gdk_pixbuf_new_from_file_at_scale (source, dest_width, dest_height, TRUE, &error);
-+      pixbuf = gdk_pixbuf_new_from_file (source, &error);
-       if (G_UNLIKELY (pixbuf == NULL))
-         {
-           g_message ("Failed to load image \"%s\": %s",
-                      source, error->message);
-           g_error_free (error);
-         }
--
--      return pixbuf;
-     }
-   else
-     {
---
-cgit v0.9.0.3
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild
deleted file mode 100644
index 3c0c0f7c094a..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,44 +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-panel/xfce4-panel-4.10.0-r1.ebuild,v 1.10 2013/04/13 07:21:13 ago Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Panel 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 LGPL-2.1"
-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"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libwnck-2.31:1
-	>=xfce-base/exo-0.8
-	>=xfce-base/garcon-0.2
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfconf-4.10"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-icons.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(xfconf_use_debug)
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS THANKS )
-}
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index dd47111639fd..6529ca7d495f 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,9 +1,11 @@
 # 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.202 2014/04/22 13:37:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.203 2014/04/22 13:39:40 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:
+  -xfce4-session-4.10.0-r1.ebuild, -xfce4-session-4.10.1.ebuild,
+  -files/xfce4-session-4.10.0-multiple-interactive-session-save.patch,
+  metadata.xml:
   old
 
   20 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-session-4.10.1-r1.ebuild:
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 23304dcaa6b3..2e35966a537b 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.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.1-r1.ebuild 1731 SHA256 cbb2b1507221470058040d846bfc92abcaa392ac790866a2d192c67882b34349 SHA512 ec7465c9e8b35bb3abf9fa64202274d6c309f4d46e800465a56548fc7d87a9278c2190191510a971776e292ef43fe6da822832faaf4a7360c01e872ce9d0751f WHIRLPOOL b28fa3da7accbafe4dfe24952e184a8f616f025f9472ad7af90b39625d8c9339265494736951710b412e3096bc36b5d95e975f72a89b5772ce96dc21e8925332
 EBUILD xfce4-session-4.11.0.ebuild 1748 SHA256 f779f600ea3156d0e1f88d01ea3e0c5099ae64e379a4136482625c7638be6069 SHA512 b1e26dcd183268ce90e6bacaac32283295063731b0c2a391a8f3b7361f3c6c590fe3f8931446b54006ddc423b3d0c1e29a0e8dcc031ef785fbf3fc77243426cb WHIRLPOOL 211230d80a1a72e1cf873e877ee8da858cdd1969e39d394825ef9fbdd022482fe84a528c5bfd6e3fe8cf60ccc44adec6a0076120427e1181a96c9c3721d23134
-MISC ChangeLog 27192 SHA256 283311f35979a24f363cfa0269c3aefd8bd198929097a786d869b2dedfc358aa SHA512 68e84413660f5c5a6593aa5c131157ca77fb4bc07692b05bf17d6c8c522bbc7013a09e851fea68818539250c2d4fb13aebc8203c8432d92f8486aa0e61b55991 WHIRLPOOL ea2771cfab0a918c606e87aa330d8957878127fb903d61cf1bd9fe1bd5e65436edb3854f4cfdfa4ba8d57071871bc285e82a0730a44a9831c3b5263790b69d2d
+MISC ChangeLog 27265 SHA256 22810b9955a49c1e5227ce20850b47bd0e406e02c408d93c9da70bfcd4e00765 SHA512 6163176fda2f924b63575a415f07a1606ae426eeb8758ea277b8aebced1f0cc35de82b12ddc7f6028571c534503251b8ef3565738df7dce9fdfb9e6e711437ea WHIRLPOOL 80c36ede46a7db339ddd59053736f4dbc55ed23eb810402ee022a1349ffa6d90381fcadf0510f7f2170097c246d3f257ca09b25bbcdf4e90658b278d8803632a
 MISC metadata.xml 278 SHA256 5eb4efb02e8a95c958336cf7a4b113d21f619252e878c6ea9a26abae21dec2e5 SHA512 270a8de69b02ee01f920f54f14c192ae1a733428119a1291894b1b738ad70ff64d5c9e63ddba0fab1b62b63bfd44bfefc5a2664f4488afcc65a8433ad2d65d72 WHIRLPOOL b0284f820c5cf0bbdc804b65cea8b0123b85b021c99b9166fcd0a3bc9373fbac70da3ccad5a5d95afeb4787a978912804b300a9a0b036aa98f4129493c6d327d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTVnCvAAoJEEdUh39IaPFNoPYH/1BFG8KMmiuhw1Uvg7neX5y9
-VWFipCSKS51bAvP03OkNWE+YicLmpBbSWnI3ogKSszfpyeVxQJWWdok84H6IA2Io
-Xv+UUwArCgFuC2GQFdsU0osrwjj2bEr7/MgTJy46Om3/c6GjQ9jkfph1+BDIj7oB
-XCjijFSKUi8jzFovnua/wV5NZV86W5zHrX03q1B898rjG4+hvORFzRj1MJ0Ohs+G
-X/yCxI+CxUsnum0lf2HnArDgL2y50P60pOqFDmjfpzDeNl2jMe2HTQag+Rxr0Mkj
-V6GW5q+LrA/HIQlGZ81h0RoYaJmv7NPo+EnvSO+PWX6MP2t4hy3QxoVN7raWIV8=
-=KIyE
+iQEcBAEBCAAGBQJTVnEcAAoJEEdUh39IaPFNrpgH/jdmQyoj8pCo5JgwMCkFFWIL
+ZmyKMaa7eaHC9xylHO21yuUSe0zLGgEAIu4xwWm46RZ6/9QYtEzpY+HuS6KM6hpo
+1m0gAactwhWik0thlSncN4BvqUSp9W9weDT+rCekqQyKrjLV7OX0OED3ALaKHJcB
+GMmbeV0IfSZDoswpP2zyBQJnCFraPzFkqd6ZNBI+f6B9PtMyiqKxKdnLywvDUgAB
+JMiAHWgGpQuh29fWlSJWfhgdwmg5J+vB0GAkN3NmTJmmAATwuDTKiVos84E6UXKt
+03roIUUZmn30eVP3ABYsptFfGV9w+fj2AklWX++6fsyVUlRhcmjDtByS95uZKPI=
+=y2tU
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.10.0-multiple-interactive-session-save.patch b/xfce-base/xfce4-session/files/xfce4-session-4.10.0-multiple-interactive-session-save.patch
deleted file mode 100644
index 2fc908495bfa..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.10.0-multiple-interactive-session-save.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 6cb3937aa9cf0c9905a77d0bc2b5be8cc2536e44 Mon Sep 17 00:00:00 2001
-From: Dimitar Zhekov <hamster@mbox.contact.bg>
-Date: Thu, 30 Aug 2012 20:52:14 +0000
-Subject: Handle multiple interactive session save (bug #5379).
-
-Additionnaly, we now use SmSaveGlobal on log out / shutdown without
-session save which avoids data loss. Previously clients would not save
-anything on log out without session save.
-
-Based on original work by Chris Bainbridge (chris.bainbridge@gmail.com).
----
-diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
-index bf6a446..35811c5 100644
---- a/xfce4-session/xfsm-manager.c
-+++ b/xfce4-session/xfsm-manager.c
-@@ -98,6 +98,7 @@ struct _XfsmManager
- 
-   XfsmShutdownType  shutdown_type;
-   XfsmShutdown     *shutdown_helper;
-+  gboolean          save_session;
- 
-   gboolean         session_chooser;
-   gchar           *session_name;
-@@ -230,6 +231,7 @@ xfsm_manager_init (XfsmManager *manager)
-   manager->failsafe_mode = TRUE;
-   manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT;
-   manager->shutdown_helper = xfsm_shutdown_get ();
-+  manager->save_session = TRUE;
- 
-   manager->pending_properties = g_queue_new ();
-   manager->starting_properties = g_queue_new ();
-@@ -989,7 +991,9 @@ xfsm_manager_interact (XfsmManager *manager,
-           XfsmClient *cl = lp->data;
-           if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING)
-             {
--              xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT);
-+              /* a client is already interacting, so new client has to wait */
-+              xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT);
-+              xfsm_manager_cancel_client_save_timeout(manager, client);
-               return;
-             }
-         }
-@@ -1138,44 +1142,47 @@ xfsm_manager_save_yourself_global (XfsmManager     *manager,
-         }
-     }
- 
--  if (!shutdown || shutdown_save)
-+  /* don't save the session if shutting down without save */
-+  manager->save_session = !shutdown || shutdown_save;
-+
-+  if (save_type == SmSaveBoth && !manager->save_session)
-     {
--      xfsm_manager_set_state (manager,
--                              shutdown
--                              ? XFSM_MANAGER_SHUTDOWN
--                              : XFSM_MANAGER_CHECKPOINT);
-+      /* saving the session, so clients should
-+       * (prompt to) save the user data only */
-+      save_type = SmSaveGlobal;
-+    }
- 
--      /* handle legacy applications first! */
--      xfsm_legacy_perform_session_save ();
-+  xfsm_manager_set_state (manager,
-+                          shutdown
-+                          ? XFSM_MANAGER_SHUTDOWN
-+                          : XFSM_MANAGER_CHECKPOINT);
- 
--      for (lp = g_queue_peek_nth_link (manager->running_clients, 0);
--           lp;
--           lp = lp->next)
--        {
--          XfsmClient *client = lp->data;
--          XfsmProperties *properties = xfsm_client_get_properties (client);
--          const gchar *program;
-+  /* handle legacy applications first! */
-+  if (manager->save_session)
-+      xfsm_legacy_perform_session_save ();
- 
--          /* xterm's session management is broken, so we won't
--           * send a SAVE YOURSELF to xterms */
--          program = xfsm_properties_get_string (properties, SmProgram);
--          if (program != NULL && strcasecmp (program, "xterm") == 0)
--            continue;
-+  for (lp = g_queue_peek_nth_link (manager->running_clients, 0);
-+       lp;
-+       lp = lp->next)
-+    {
-+      XfsmClient *client = lp->data;
-+      XfsmProperties *properties = xfsm_client_get_properties (client);
-+      const gchar *program;
- 
--          if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
--            {
--              SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown,
--                               interact_style, fast);
--            }
-+      /* xterm's session management is broken, so we won't
-+       * send a SAVE YOURSELF to xterms */
-+      program = xfsm_properties_get_string (properties, SmProgram);
-+      if (program != NULL && strcasecmp (program, "xterm") == 0)
-+        continue;
- 
--          xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
--          xfsm_manager_start_client_save_timeout (manager, client);
-+      if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-+        {
-+          SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown,
-+                           interact_style, fast);
-         }
--    }
--  else
--    {
--      /* shutdown session without saving */
--      xfsm_manager_perform_shutdown (manager);
-+
-+      xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
-+      xfsm_manager_start_client_save_timeout (manager, client);
-     }
- }
- 
-@@ -1249,7 +1256,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager,
-                                  XfsmClient  *client,
-                                  gboolean     success)
- {
--  if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-+  /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in
-+     XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone
-+     (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */
-+  if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING &&
-+      xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL &&
-+      xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT)
-     {
-       xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being "
-                     "in save mode. Prepare to be nuked!\n",
-@@ -1521,7 +1533,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager)
-   xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n");
- 
-   /* all clients done, store session data */
--  xfsm_manager_store_session (manager);
-+  if (manager->save_session)
-+    xfsm_manager_store_session (manager);
- 
-   if (manager->state == XFSM_MANAGER_CHECKPOINT)
-     {
---
-cgit v0.9.0.3
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index dbb81c5d75e2..11b680d47ccd 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.118 2014/04/19 17:46:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.119 2014/04/22 13:50:22 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-settings-4.10.0.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-settings-4.10.1.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 7aa25c3b0316..ad921e68f6a8 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST xfce4-settings-4.10.0.tar.bz2 782922 SHA256 0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e SHA512 a4f1f464ceb64b9e495414cb180d52b71643ea7bd6a8949d55fa1307dc3cf3094670d3198a87c60916a749b0fe63a823d22fa41e9e56127384e32a992482c5d3 WHIRLPOOL 16c874f6ed01dcdc29d390b9e8b1638af197fa7db7531b6c5f174287fc3b78f107844017f89b34f87bc374efa162c463e1f3cc6d82e83a33d1d1f400ba8fd985
 DIST xfce4-settings-4.10.1.tar.bz2 777735 SHA256 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5 SHA512 cf2d3255a0c862b0d016a8653fd1ba94c86b9da36b894dd7ad733d6758b9e023807aa93b1e43deeb0f6a34c6db23507f6fe32b6b7a98fa3e0d3bc7577da429f7 WHIRLPOOL 82f6e28e5d6519fc37c2265efc759054d7208fe38374acb07b40f281f7b802e47e5230a78066e7dac0727453ed14017abc8b0c6afd069eed1f164c607ff1f2ad
 DIST xfce4-settings-4.11.2.tar.bz2 869865 SHA256 2745fc11fe6e856344a6a7c1ae9c12e1f0f21cc6d56c5a46bd16987a7e10081f SHA512 677633cc6c965b85092662a3d2e38f1775d6af8d6b91a3e650eee394f96364216b9614a3a0af24b7848857108b0d42b3cecfc2770e9759e0803b3a32e05db362 WHIRLPOOL cdfd5a2ba217afda5a091f9350f01cc2295ef955c8dcd0bdb25fb1f819a8767a0ed0e44227eb95566dc3f1e575237efa0c4fbc291e248842a23b0a9a65781bb1
-EBUILD xfce4-settings-4.10.0.ebuild 1424 SHA256 da1e14f29f07f1f715ec0276836cebc25566c0676ff097a8d4a9d0c16f7e6f7d SHA512 444e0d935da74a4d01b42252ba9b715ed40f4015bc4930ac4d2ec89563fb508ce82fd4e7f3f8594b5e4df19963a7ccf5332a927b798d59665ad4a20198ff2179 WHIRLPOOL 633b6d301fa9b422e1a4caba015db0649eda6ecac905c236e78676b1bbb3d7ec289238af3dc54109809eaeda4931a34fd7928e6a49b16ab21e2f9a7554e3962d
 EBUILD xfce4-settings-4.10.1.ebuild 1419 SHA256 efe4385a1b5cdbd574454280736f274005b2be13dc89d814043274e027bbb14e SHA512 a9a22e04566405d987199fbf8855854e6022dbc60698d8ab3a72966b681fdf70b4e0df562719b2ea2d9e6cb71ff9ba013d269734bf0af1e61cbc3542b1d62083 WHIRLPOOL e5acf5ac8f8587ea4d34023bbda1afc7123305d4c9f0ff8f188cfa181269ed571c93053bc267af8c761f4bf29d544920e626e26bc0bc0a59416855f7ad51cc44
 EBUILD xfce4-settings-4.11.2.ebuild 1507 SHA256 27e77c113ddd4aed6cbd709e653eb845feb04913234e6ebfa90dbe0ad5342a52 SHA512 f4d6a55631f49c4f905c0e574dd3118d5b60cb8f04332a2fb32cda812b00a471bbff4820c7671ee64fd4f9e1e8e138a05a43b5372c786f26ff1381f9826319a0 WHIRLPOOL d47e28ac703e211c9376147d9daeeb46d05b9392fcf81d9e7a5b908bc675b6e156d4d63dba1761877b4f016d6acca7fe6688d6a1700947903db49c31eef882a3
-MISC ChangeLog 15361 SHA256 5ed1dedfe6e2ac24523eb902e341176cae4799b61c9e356690a4ab73017a0c8a SHA512 96bb8b2f0fef9b6f87e365e047b23c1b69656fcad9963fe1adf01d4646f17b9661ab24e53e73c9bd1462b9c301258c7d74eb4f726bb3f96597b51cbe116ed5b9 WHIRLPOOL c7e9ec5e0b42cc7a3ab05a0b0018ea5a0a7affdd6443f51e93b1fc9743cafe2bdfa454176bc305837580001d6b7d4629bf6cb1683da3b705c1f41146e2445652
+MISC ChangeLog 15461 SHA256 cdb7fb4d346a68c6e76ea9947e349904884f81dfe3532de3eddb2ea001f4dfd8 SHA512 72ca408a026cf85db34780da952da20c98e1f752490641a3fa5584a80095b22ff83451354b901d574070ee123e69d43f2e8193b74ff16446683e83bf6a64f7db WHIRLPOOL 2b746f659bc24da2da865244e16fc9a278d32a03f9e3993c8294f1c91978b312ce71cce0082bb64253fe0a7ece19470b2e6710c161bdccb77766bfb236cfa7a3
 MISC metadata.xml 391 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815 SHA512 61b5f4e2794713eda461738e970a8609eb357618bb260e4aa7c651a5e85680e128ad1aa2600af8cc100ebcfc493028bb8aedc09b860145b4b61fdc7dd1b5ce59 WHIRLPOOL a482a5c406cfd50f608dbaa9c4a58c60d0d0e8ab1ce07e82d9ef51c99145289e6a9b8cb1b8b419077683b08df5be6086236a069fff6527643c4be08126f7e79f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZmAAoJELp701BxlEWfO6sQALlZ4hTHQlpgzcppBzwNvVtv
-U3tATZ0gWtX7z3ZF/lXFr3VWILpr+P+WkRtvKKAMCrLeWoUWSeKStPPeb9POyM17
-hjR1OCt9ZL2Yf1li58sfAxmKNnM59DhzsRrNz9SGMtDM3hCKsUpPj9x07dNAPViy
-UKTzTPcTbPf3pUCDaepFsoZUe9qySqHOzqT8WEOqec72e0OaHBxn2KFgzWFXc+v6
-wH6JzK/Gw4os/ILeHmG1z8CrlDy9WHZb2F4cJCLwdT1NGLEESF7c7cQab2hmBfMp
-Gfe2jsUUEr5jIW5CUjhiFT7rohh296MDBVkJSKwqNOzEnhi5fL48wn3VX65CLfHa
-RN9b/1/5DKRmB6uDy4PEY5zHHZQQCggz0xtRZ39z2zT2fGoDrrcdhrUTGYBi9vNl
-HHZ67c1q4nTOWs5pIK5oKwJDS0xEw/qXhAIv4NC6Y0jJvpbzuVaV2JDzw6geCPPF
-CXSPjL0MoMdxejcrE+WQ4aUBbar0Pu6K9Xk7cGpxhAQwsQem6DcstJMUilprQ5gJ
-wpsVnaYHsdgE+peTAljiWpKiAh6dZ+tu0KeliAT7unfKXCc8BzezBFlycNnGkOL4
-fSB6tZeNf2JmRsp6bhCC46JybpCrtYEPY+8+b50Vk/wcawOndQSp2A+yk3zb5v1N
-M++karyNzHfwA8tCAjlq
-=1UxY
+iQEcBAEBCAAGBQJTVnOeAAoJEEdUh39IaPFNWSgH/ihWwHf1riAAI0gGdak4cn/T
+v/yrQEI3/2P45z93mxHa0k7qhh6IhqAvafA9SZbPAhxR3ZrXwEbdCPtrqNDg9Dpr
+alNTX/CxpodyZTKN6VcVUZh4n6P2zQK6mKNoIGSAYUx017v6jOw0C+AItnslXCyc
+MG5YUpK3KpAclhKCbR4/WHuGuGJ/BmYTi/SYkP7mg1wCQWlbyN3LMRN4FFU45dFV
+8Pr2G0oGbnWiMIjCefnKpoL/07IIexP8zXbQpf5zXTPzcf0aMinM1jjlLvpRV7mR
+DoZaZnkjVGTYM5quyD6Ji2/mHFQVZvTmdG7GVMCQI4PQri3xhkLvrz9QNsw3ykA=
+=0keQ
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.10.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.10.0.ebuild
deleted file mode 100644
index f88b2052e879..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 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.10.0.ebuild,v 1.10 2012/11/28 12:27:44 ssuominen 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 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug libcanberra libnotify +xklavier"
-
-RDEPEND=">=dev-libs/dbus-glib-0.98
-	>=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.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfconf-4.10
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	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 libnotify)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}
diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index 19840e7b197a..445dccbf186c 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.225 2014/04/19 17:46:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.226 2014/04/22 13:45:21 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfwm4-4.10.0-gtk34.patch, -xfwm4-4.10.0-r1.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfwm4-4.10.1.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index c4571aa0d121..952c50670f95 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xfwm4-4.10.0-gtk34.patch 2680 SHA256 7534ed9a4f407209f5e553e80ee7268edad7ac5b6af20786109780ff8a173a3d SHA512 4a63cc1ca799b0e5e034f8d4bee3988bb1b54fb79b7f2e7de0f524074c19fc325d639ef8c8fadef3735470575961441dab4fd93dd219d06514413683307c658b WHIRLPOOL 09a21a32a11688a495a5b9d6a4a9bf01b929c0a1e047acc045ad543f295dd210ce2cf0b707599ed112e1e625622001330c303cd61789c76f4f731c7857482c47
-DIST xfwm4-4.10.0.tar.bz2 1100067 SHA256 492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c SHA512 5581168a902c247131ab6997571e08fabb2de66f26e033fb6cb90533c7c4065c44980d86a48851d7252b6d38132ed57107028eee66274900d4ee147297e9446d WHIRLPOOL 9e49e58ab08055b25b1cf03a8c16428dde58447332364064b892a2855743d7c695bf97a0be950fc61dce02b26850ad951262aab0be562fc7ebff316dc55e98b0
 DIST xfwm4-4.10.1.tar.bz2 1093825 SHA256 380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740 SHA512 dad7cdb929b60cdee539dd96e0cc5fb5c71ab13163469b075164b4e54f1b7d72b8e84423aa533d6619902e269bd3d8070dac835729cf22ecbdbecffa36ce4004 WHIRLPOOL 582526f987df98ff3fa5c49e5acbb1e097e4b94fdd0494e6726542879feb3ede8bad34de10c86e343f4daf8b1fd3c8f5b966deb87e6091c3c047ee4994e8828f
 DIST xfwm4-4.11.1.tar.bz2 1028193 SHA256 1a58e385d4d8dda4d6ac3c7b1e94b3d499bcb78619d91004ffa65a3e6bb58f3e SHA512 ea27a7e24d755a92798d1e6f3988df0b53e04177e782cf44930c424a87cec8d80ff86582be3e5d668bfd71171569497a46c616e8804b1a7da23bb69a3ee0c7c7 WHIRLPOOL ca55a0446330a15820165a2103c29793bdadfff79d35d4ca49b94483c5479aa9c275f80193bd4d65ff41ffe28da987f082d178bdb94a67a64d6cead9c04b0445
-EBUILD xfwm4-4.10.0-r1.ebuild 1466 SHA256 69e9b029beba6660d61f94d0122488cd76a6b3d4147cfe7fded2043f86685f21 SHA512 ab672fc111ffc3f022f146a5e744c88ec874f359597c64a6449fa4716b99bd89f6767f7f496751b49f2c838f1691937ac47da65d0fe18233c77bfc5ef0534329 WHIRLPOOL e2d0bd1d6c9b05fd431a7b4af2899287d993e40eb5b03e82a430f707bc3d9effcf35ed74977bb02ffe0f85ec0910c78a52066a95f59472afa96ea4e1665ba7d5
 EBUILD xfwm4-4.10.1.ebuild 1418 SHA256 881a317c4d00a4157b1308bd2e79652d6ebee430cbfd68e8d27c0bd71fb25db5 SHA512 73de378f563f6fe45350a70f9c3b731971b503e28664af020dcf8567bc5a2ba7c85e745fcbf0016395e7371b026768af976c2805d9829efacc25846981980b87 WHIRLPOOL dbd169bb3ea36dfe764b3257fba5bd96a9067f53b4da84f10fca87e265d27e7b75c3c0fa4067960358b0cbf53a4ffd2f370243951096477b00375772e7563e4a
 EBUILD xfwm4-4.11.1.ebuild 1495 SHA256 0870f750ef4aa55c9661dccde5daf81253b8476afe01184875b312e00bafa453 SHA512 ae67cfba30d239d093172b72b64a04adc6aac6e7823bca9c2bbc20c9f0cb7a70aab9a632430e8324f7d5d20b3c101aef104a71d4ea40bfd8db640966e6e96a1d WHIRLPOOL 3ef439bcf13e049e01df69cb17b6994516754d0563b1daf1223c7d2dfcd235136e5c96a49db70539c1a374e6bd17dca1f2d25feaf78f5d2b4a620a888f65e95d
-MISC ChangeLog 24734 SHA256 cdf78098f98c8c5beba1c5b7cc3ef7b3ead4263a68d347b69ea052e6ad63e8b2 SHA512 ebb0aa5bc01e2873422178993df98555f05a024210835b0d5a0deafc7b4572fd0489ddf22e5c4ca13d27db4bd52ab3e2db01171cf3a3d9016d583ab3899baee6 WHIRLPOOL 59766d4cdbe545e9ee3f829c45329c46d15da1acdd80694bc1a6776601546d96e6f7e7b91f81b772514657b6f6ba7d7c757ee0ebbddfc723fb204eb681367ea9
+MISC ChangeLog 24861 SHA256 af0131c37f0aa1f5a995092bdde3307366813592416f0331a631517889e42846 SHA512 1da0d3dcab7fa70836f94b0e5c00581804d53b619e4398366a8bc8e819ca99b2b3b477f54b0682b55ab9acdcc6a5cd1b648f1303e7465c8d0a0f4cb3689b01b8 WHIRLPOOL fa3ef91cac7d880d80f034dedf06b727acea3af9242b2df25d0923540ac3dac7a37fad3a1462237045743e66602a53f157b29584456a743025497734493983af
 MISC metadata.xml 157 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 SHA512 54ff64307677bfe1e9b62d427e8aef8aaf32b86216858541398b5f21974247418eba7612f801ff2c333fe9a059d60e1f568046a3ac88e0ee2d59beb3a3a77148 WHIRLPOOL a42edf92b91b9922e7af397d6cbad72ba7e2ab7e5aaa4504cdd8bebdc1d87e9523e76c016eab474f4b65581a9cd58a3be13d8f52bf5ae7dc6afe96d428433a5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZoAAoJELp701BxlEWfWuEP/2rMe96fchja7shNPSRcQ9Pi
-L3u6FhXAM6GMPXnVSt8USlAMwWwELXtrPcBKQkwlW+UwgKhT6psdf3TGSp4bLUBb
-LIMtKBxVsrf0oE+iyi4e00HdB3YaMmZbq5dAAtWu4BEJ7vCnxJFoBo95fbnh9yod
-oNUA7GI1JLlgZKXYpWRnL25Ntij+FlA8VxwugFEj6AJ99K7dF+AIgO8yBlSOsRr/
-lbJG9iFGjCcFYAokiwGSycgsd2qsOFL37wvZyWWvDKy+GjxjacA2yGTEVVA4DyRs
-VmjP1FRgMB/0+K5QtMNhFGdzS9vyorNg2X3VupmBfGNr/zrK9uM1rnn8uHPcsGSU
-k1uv1KKnQXVRzmryCNW6SA1RQJSk2GyPuB/B1zIAQr1ShHadzTWABG9WJ4H25+pk
-MPG0QhjkJus2FfsrRWBWVSxZBw3sHOqICJmpoByvOweCIMebjU+Ojoem5W+sxHDK
-J+tpSB1rUy9A/0R6+slPLuojM+mU9uuFakXOle7XyNULbyErUp350JdU3HpDhxkc
-UC65meHMdLQh43Vufj/mHpnPX6IBAP9RxRrE/e+IGUMazRQoPD+xmdq+R5Fay3G/
-0aUpnvsatizFGzu/6BdNfuoT9j6kVItmbgqLuSSlUA/4Kb27Pmxz4RgNPQd+wbC1
-fwzEOSJ04ZYyO4elAAIy
-=KqJ4
+iQEcBAEBCAAGBQJTVnJyAAoJEEdUh39IaPFNwDwH/1nDmVYBWWM9+BUNBDlTPtSR
+PcbekT03VooMTnnpoadLDPX1R2eU3STV4b9ELIPMGMHyPSwoSpDCoGvd++AE8DAR
+1AB+GQhudGpkS8yPoUne4oVN5Ak8PjeaGAyo2OP2viYWprK4K0GJi/ruvh7uw8rK
+r96z72+StG7LPXPIr1OFb0yHde89Y8ibeHAuezR4nOX7ny62BCKuflGgP4Vx5d3x
+hNluZOTgEHdlc3Ppf+0fIPkwUPglt38mEY4g0KD/phr+xUl5Smy95H6Xo6IuBO8P
+CdGGfBXvsM5Gtc9VnWSlLL5uo06k91HNEmlLECcaHwZgCMsJpOHdxBsg70DEpVs=
+=OuQe
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfwm4/files/xfwm4-4.10.0-gtk34.patch b/xfce-base/xfwm4/files/xfwm4-4.10.0-gtk34.patch
deleted file mode 100644
index c9352fdee77c..000000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.10.0-gtk34.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-http://bugs.gentoo.org/442218
-
-From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Wed, 18 Jul 2012 20:12:07 +0000
-Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
-
-as gtk+-3.4 now uses it.
----
-diff --git a/src/display.h b/src/display.h
-index 1ad2ef8..8797237 100644
---- a/src/display.h
-+++ b/src/display.h
-@@ -163,7 +163,8 @@ enum
-     NET_WM_MOVERESIZE_SIZE_LEFT,
-     NET_WM_MOVERESIZE_MOVE,
-     NET_WM_MOVERESIZE_SIZE_KEYBOARD,
--    NET_WM_MOVERESIZE_MOVE_KEYBOARD
-+    NET_WM_MOVERESIZE_MOVE_KEYBOARD,
-+    NET_WM_MOVERESIZE_CANCEL
- };
- 
- enum
-diff --git a/src/moveresize.c b/src/moveresize.c
-index 9893c30..a98bdf7 100644
---- a/src/moveresize.c
-+++ b/src/moveresize.c
-@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
-     eventFilterStatus status = EVENT_FILTER_STOP;
-     MoveResizeData *passdata = (MoveResizeData *) data;
-     Client *c = NULL;
--    gboolean moving = TRUE;
-+    gboolean moving;
-     XWindowChanges wc;
-     int prev_x, prev_y;
- 
-@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
-     display_info = screen_info->display_info;
-     configure_flags = NO_CFG_FLAG;
- 
-+    /*
-+     * Clients may choose to end the move operation,
-+     * we use XFWM_FLAG_MOVING_RESIZING for that.
-+     */
-+    moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-+
-     /* Update the display time */
-     myDisplayUpdateCurrentTime (display_info, xevent);
- 
-@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
-     screen_info = c->screen_info;
-     display_info = screen_info->display_info;
-     status = EVENT_FILTER_STOP;
--    resizing = TRUE;
-+
-+    /*
-+     * Clients may choose to end the resize operation,
-+     * we use XFWM_FLAG_MOVING_RESIZING for that.
-+     */
-+    resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
- 
-     frame_x = frameX (c);
-     frame_y = frameY (c);
-diff --git a/src/netwm.c b/src/netwm.c
-index 545e64a..1352f08 100644
---- a/src/netwm.c
-+++ b/src/netwm.c
-@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
-             resize = TRUE; /* Resize */
-             break;
-         case NET_WM_MOVERESIZE_MOVE:
--        default:
-             event->type = ButtonPress;
-             resize = FALSE; /* Move */
-             break;
-+        case NET_WM_MOVERESIZE_CANCEL:
-+            FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-+            /* Walk through */
-+        default: /* Do nothing */
-+            return;
-+            break;
-     }
- 
-     if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
---
-cgit v0.9.0.3
diff --git a/xfce-base/xfwm4/xfwm4-4.10.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.10.0-r1.ebuild
deleted file mode 100644
index 28e4327a86ec..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,55 +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/xfwm4/xfwm4-4.10.0-r1.ebuild,v 1.10 2013/04/13 07:20:11 ago 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 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug 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
-	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() {
-	PATCHES=( "${FILESDIR}"/${P}-gtk34.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xcomposite compositor)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-}