Remove old versions

(Portage version: 2.1.2_rc2)
 (Signed Manifest commit)

14 files changed, 14 insertions, 1100 deletions

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 462fd9cbfb62..538a8ace5b9b 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX control-center-1.4.0.5-cflags.patch 744 RMD160 ff6037cf0346a87164183c6c8eeb6b7a88539ce1 SHA1 5ece0bd4b5fb59c0fe9f563382f4948e2db5f083 SHA256 fec02a1e8ec40fca0591eeeb1f41bb0d8acf592a56a383f7f2dce9fffe13baa3
 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 RMD160 ff6037cf0346a87164183c6c8eeb6b7a88539ce1 files/control-center-1.4.0.5-cflags.patch 744
@@ -6,26 +9,10 @@ AUX control-center-1.4.0.5-linguas.patch 528 RMD160 666d7deab21b7ba2f9e059843471
 MD5 09a1e4823269f8f299609708c2db8bb5 files/control-center-1.4.0.5-linguas.patch 528
 RMD160 666d7deab21b7ba2f9e059843471db1f7a9c4d30 files/control-center-1.4.0.5-linguas.patch 528
 SHA256 fe23b3e986782c3420edd946265a4fada3942e37429fc2a0987ca1dbfa8cfb8d files/control-center-1.4.0.5-linguas.patch 528
-AUX control-center-2.10.1-pathfix.patch 6670 RMD160 52524b7e944a66e15bee4eae39f9c939a3463147 SHA1 046070b6ce76570c40495bbdc61ba35b8cb56cbd SHA256 ac82ea4d0f7f0f54ccee808caac4960c2db4a9b2011afa8b2d92c187289b8e89
-MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
-RMD160 52524b7e944a66e15bee4eae39f9c939a3463147 files/control-center-2.10.1-pathfix.patch 6670
-SHA256 ac82ea4d0f7f0f54ccee808caac4960c2db4a9b2011afa8b2d92c187289b8e89 files/control-center-2.10.1-pathfix.patch 6670
 AUX control-center-2.11-gentoo_xcursor.patch 527 RMD160 bf455b0cf0c98c303c0885d5bcc7a72005b63108 SHA1 dc3e5afcb696034069d2ddc4d87c2905532e914c SHA256 682ed264c5ac0ed848b5cf3e856ee4440201be94f81b3dad4066233aaec48d9a
 MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
 RMD160 bf455b0cf0c98c303c0885d5bcc7a72005b63108 files/control-center-2.11-gentoo_xcursor.patch 527
 SHA256 682ed264c5ac0ed848b5cf3e856ee4440201be94f81b3dad4066233aaec48d9a files/control-center-2.11-gentoo_xcursor.patch 527
-AUX control-center-2.12.2-gcc-Wextra.patch 359 RMD160 e9b9182f79c30522a5a634865f54d3bf565f0e6b SHA1 86448a3577a31cac9990be4d0827eaefa9746d49 SHA256 736e5c83c4940eda1223c0dfff9f67e656a16cfceb446abdaeeb43c39d5e05e3
-MD5 ffaf30fdb4e8f79169e8a8c8bbe22283 files/control-center-2.12.2-gcc-Wextra.patch 359
-RMD160 e9b9182f79c30522a5a634865f54d3bf565f0e6b files/control-center-2.12.2-gcc-Wextra.patch 359
-SHA256 736e5c83c4940eda1223c0dfff9f67e656a16cfceb446abdaeeb43c39d5e05e3 files/control-center-2.12.2-gcc-Wextra.patch 359
-AUX control-center-2.12.2-pathfix.patch 6758 RMD160 a60f2c88e038f394912cfcbfb67951c7f9fe5f52 SHA1 5a48c2ada0d3bce66e48c1d36c2c35e36e555fca SHA256 6a72818353413885830e3b795445f4272730b0ca0a4b710a17ce94b908ed0096
-MD5 dac847149ae0099bb34f493727bed270 files/control-center-2.12.2-pathfix.patch 6758
-RMD160 a60f2c88e038f394912cfcbfb67951c7f9fe5f52 files/control-center-2.12.2-pathfix.patch 6758
-SHA256 6a72818353413885830e3b795445f4272730b0ca0a4b710a17ce94b908ed0096 files/control-center-2.12.2-pathfix.patch 6758
-AUX control-center-2.12.3-buttons.patch 2602 RMD160 a861585bfe2184d2f524131284b170d9761eaa20 SHA1 eb639e8f6db5c04959976a23871bc36d34a49f8c SHA256 f2ed3cde76fe4d68ccb3333e1306c6533011c6b0ba584320e807bfd23564eb4e
-MD5 d7d3d8bee73e24b1da32ef24e553ca59 files/control-center-2.12.3-buttons.patch 2602
-RMD160 a861585bfe2184d2f524131284b170d9761eaa20 files/control-center-2.12.3-buttons.patch 2602
-SHA256 f2ed3cde76fe4d68ccb3333e1306c6533011c6b0ba584320e807bfd23564eb4e files/control-center-2.12.3-buttons.patch 2602
 AUX control-center-2.13.5-disable-master-pty.patch 2757 RMD160 f6f794a9520913ebdbf430b8fb2581101b4f9c4e SHA1 c3f4ec64cac1f7fe5ccc6ddb3d93799e239f9188 SHA256 3606db5462447f6034047b8697762065681b9dbfe94c52afda7ea5e375b1a38f
 MD5 680d269279890131049c6d8ac4aee94f files/control-center-2.13.5-disable-master-pty.patch 2757
 RMD160 f6f794a9520913ebdbf430b8fb2581101b4f9c4e files/control-center-2.13.5-disable-master-pty.patch 2757
@@ -34,31 +21,13 @@ AUX control-center-2.14.1-path-fix.patch 6726 RMD160 8a4bfc343e8f4b5ca3609fce696
 MD5 689f563f79fc4a72120cc4fcc2c58cf4 files/control-center-2.14.1-path-fix.patch 6726
 RMD160 8a4bfc343e8f4b5ca3609fce696cbe01c9bd69f7 files/control-center-2.14.1-path-fix.patch 6726
 SHA256 c846f18199d664f3e40fb468439b7fb83638a2b3a22e9294c6401dd71292ae64 files/control-center-2.14.1-path-fix.patch 6726
-AUX control-center-2.2.0.1-alpha_hack.patch 2997 RMD160 0526e8eb5eb906e62269be1b7c34114c00de97ba SHA1 7add370ec5fba49d5bcfeb9ebcf0f8509fe7b723 SHA256 2e70b93f939824151eaf6c1a98ddb5ba7e8d233cd126b6dcd747692075a57e93
-MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-RMD160 0526e8eb5eb906e62269be1b7c34114c00de97ba files/control-center-2.2.0.1-alpha_hack.patch 2997
-SHA256 2e70b93f939824151eaf6c1a98ddb5ba7e8d233cd126b6dcd747692075a57e93 files/control-center-2.2.0.1-alpha_hack.patch 2997
 AUX control-center-2.6.0-remove-pmu.patch 1210 RMD160 f0c8f118312e64196ca60f8af62e62a6e93d84be SHA1 3039d763a7d5500ceeb555308c58cd253b510538 SHA256 7f773a3ffe06fff8244fba41b4068111a55d3c9b2cf3d759a855f5e3708973c0
 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
 RMD160 f0c8f118312e64196ca60f8af62e62a6e93d84be files/control-center-2.6.0-remove-pmu.patch 1210
 SHA256 7f773a3ffe06fff8244fba41b4068111a55d3c9b2cf3d759a855f5e3708973c0 files/control-center-2.6.0-remove-pmu.patch 1210
-AUX control-center-2.9-logout.patch 4083 RMD160 4f7f685598659142d5ed0e66de46cc1ccf143a38 SHA1 9248be2650890fb6cf1b30c0ce17d296a27c829f SHA256 0e40983d1c5b25f357a3f51b4653c2d038c69d6a729a62ca99dc121433f1f771
-MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
-RMD160 4f7f685598659142d5ed0e66de46cc1ccf143a38 files/control-center-2.9-logout.patch 4083
-SHA256 0e40983d1c5b25f357a3f51b4653c2d038c69d6a729a62ca99dc121433f1f771 files/control-center-2.9-logout.patch 4083
-AUX control-center-libkbdraw-fix.patch 1482 RMD160 f411f0228f861d83d2d3c157d067252235a59fa9 SHA1 5937a32bf24cffe47c193de8c850295f25d9bd8f SHA256 a099b0df1fcffa9d50b27f755e22cb34545115e96c793d8b038cc72c8e702c79
-MD5 19f752d2b464cdd5fbbc16d4ae13313e files/control-center-libkbdraw-fix.patch 1482
-RMD160 f411f0228f861d83d2d3c157d067252235a59fa9 files/control-center-libkbdraw-fix.patch 1482
-SHA256 a099b0df1fcffa9d50b27f755e22cb34545115e96c793d8b038cc72c8e702c79 files/control-center-libkbdraw-fix.patch 1482
 DIST control-center-1.4.0.5.tar.bz2 3382798 RMD160 e410127108d6990f787ba502daed9d2fad6ce35d SHA1 ecdf3cd4aaceca8bbfcdcb7c687e2d7a8fa60706 SHA256 bfefec4042b0bc64463f07c4486c5af65b20c07974b184f8a547f77ea20ced06
-DIST control-center-2.10.2.tar.bz2 2833639 RMD160 6c73d3c2c00fee3ee774bf0a10994af00af73625 SHA1 96daf4aff313bb9ee0abbb2b23af15cebd92206b SHA256 5b29e60e401dbaa76aa945d17be9b64e0052101610359199c4190dc6f251b7c9
-DIST control-center-2.12.3.tar.bz2 1787009 RMD160 615d843d1050570a7a7ba54abfa8888608c983d9 SHA1 0c28c0f8c3318e315d29735a83cd22f4146408e0 SHA256 c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8
 DIST control-center-2.14.2.tar.bz2 1864719 RMD160 7c144f408245cace7c73c13432c900ae66dc190c SHA1 56f9dba38247712af97af6ec27cf6d4c7eca4206 SHA256 c0b428127f0e57921a36aff246f4a1b9d71c727506794afe7a778c2095b740d8
 DIST control-center-2.16.1.tar.bz2 1992731 RMD160 13924bd1f0f3bd7c223a63e2479237a6c67b4c53 SHA1 8f2342f904cec38425db3f6089a2aee1dbf319bc SHA256 eb78914d1d783e06c7b2ae04adf738750b6c00d146a47d591497a9a354afbb35
-EBUILD control-center-1.4.0.5-r1.ebuild 1328 RMD160 d876a5c264f381708eec62482fe5560cf1d7404c SHA1 3495deabf47967f0e4ca248d04fb9adaddeae3e8 SHA256 33c1359cb5f668796a6617d915fa6b752f04ceab3a12aaaf2ccd6104ea8d3069
-MD5 c816872cce3a9c6b1abcf320f2eb4c63 control-center-1.4.0.5-r1.ebuild 1328
-RMD160 d876a5c264f381708eec62482fe5560cf1d7404c control-center-1.4.0.5-r1.ebuild 1328
-SHA256 33c1359cb5f668796a6617d915fa6b752f04ceab3a12aaaf2ccd6104ea8d3069 control-center-1.4.0.5-r1.ebuild 1328
 EBUILD control-center-1.4.0.5-r2.ebuild 1394 RMD160 e0ed2f024a87ae07be2d261f8b7200da3311d1c4 SHA1 b6ec66506cbecaa0af32992533d6a5612c743756 SHA256 18bff99cf8aec4ca551d728972c79ce976f235b19d3c1b00b0d6c23ac10bcf72
 MD5 30a0b390919050f9ca153d8bc1ce5d2b control-center-1.4.0.5-r2.ebuild 1394
 RMD160 e0ed2f024a87ae07be2d261f8b7200da3311d1c4 control-center-1.4.0.5-r2.ebuild 1394
@@ -67,14 +36,6 @@ EBUILD control-center-1.4.0.5-r3.ebuild 978 RMD160 6c68d037cdf54d6fcb4d15d2e94cf
 MD5 c25592c91d8e20dc41c54eebd5a884c0 control-center-1.4.0.5-r3.ebuild 978
 RMD160 6c68d037cdf54d6fcb4d15d2e94cfaa4b0c44750 control-center-1.4.0.5-r3.ebuild 978
 SHA256 db03ed1b737905685c0bfe1a95bc93397c4e4c82d74c65836fdf6adc01361a1a control-center-1.4.0.5-r3.ebuild 978
-EBUILD control-center-2.10.2.ebuild 2119 RMD160 a3f6d3cdd9e164987f8a7818d1113176625f9c46 SHA1 0683d11f6e4129708cefb36859fcad58f3831f45 SHA256 c5d16829cda943ff6398b46f91316d3dd80e81d6b7526c684d8e3019948c8920
-MD5 c230bf94d7e4215e56636680b14a820f control-center-2.10.2.ebuild 2119
-RMD160 a3f6d3cdd9e164987f8a7818d1113176625f9c46 control-center-2.10.2.ebuild 2119
-SHA256 c5d16829cda943ff6398b46f91316d3dd80e81d6b7526c684d8e3019948c8920 control-center-2.10.2.ebuild 2119
-EBUILD control-center-2.12.3-r1.ebuild 2599 RMD160 e4d452766e9fe7058f57a6666571230455db4389 SHA1 e212ae4975216314223110fee5f97abefc21c86b SHA256 182076814b816b80e308f63eb4fb080c7da00fcbe62d5cdb7c7cc5fc23ba1e3f
-MD5 97fa89084996639b84512a116bf9c15b control-center-2.12.3-r1.ebuild 2599
-RMD160 e4d452766e9fe7058f57a6666571230455db4389 control-center-2.12.3-r1.ebuild 2599
-SHA256 182076814b816b80e308f63eb4fb080c7da00fcbe62d5cdb7c7cc5fc23ba1e3f control-center-2.12.3-r1.ebuild 2599
 EBUILD control-center-2.14.2.ebuild 2444 RMD160 689ba4fe0b7468731183154ff10ae5acbe69bd54 SHA1 6102c753cf5d4d2c4a2691aed58858d8576cabbb SHA256 79231146c56b8b159171ed3f860c8d7785e972b89c47a70252b120078c25a1f1
 MD5 983f7e1a0d21717ee1ced77ae71f38b9 control-center-2.14.2.ebuild 2444
 RMD160 689ba4fe0b7468731183154ff10ae5acbe69bd54 control-center-2.14.2.ebuild 2444
@@ -83,32 +44,30 @@ EBUILD control-center-2.16.1.ebuild 2280 RMD160 673b8f72b7f9d9e9b88ee40217f93030
 MD5 8035c57ae542c5a062b41dd7f7d22f8d control-center-2.16.1.ebuild 2280
 RMD160 673b8f72b7f9d9e9b88ee40217f93030cf5dd8c6 control-center-2.16.1.ebuild 2280
 SHA256 bf009ea079d7cfce09d1038c27b00eb30d0bd55f5f3c3368a36a6b1e150d26ac control-center-2.16.1.ebuild 2280
-MISC ChangeLog 27192 RMD160 f05390788077f753f3769292e961185e31e33ce9 SHA1 c4a9f747eb566e55eef389cf0ddda8b75e6367af SHA256 30a4f522e3011617d17be672025e30654bad8da014b09935e4d21a12129aaf0d
-MD5 b8dee77345c69c30cdbe5458ad279781 ChangeLog 27192
-RMD160 f05390788077f753f3769292e961185e31e33ce9 ChangeLog 27192
-SHA256 30a4f522e3011617d17be672025e30654bad8da014b09935e4d21a12129aaf0d ChangeLog 27192
+MISC ChangeLog 27686 RMD160 356e0ba159180919e865487b532f27ee48423ce8 SHA1 1966d8fe3ea4dc590bf688dcbbca51335a7357da SHA256 38e988ad1254ccef8e5bab6e601539379d09d196936df1ca1f54fb61fc649a8f
+MD5 67024b106c9a5479562d6ef9a920b925 ChangeLog 27686
+RMD160 356e0ba159180919e865487b532f27ee48423ce8 ChangeLog 27686
+SHA256 38e988ad1254ccef8e5bab6e601539379d09d196936df1ca1f54fb61fc649a8f ChangeLog 27686
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 075ab15b61ff0cfcac4342ba6cc39d81 files/digest-control-center-1.4.0.5-r1 274
-RMD160 bb11f1143901dbb8bec0d3bc741165165d168a1c files/digest-control-center-1.4.0.5-r1 274
-SHA256 ba531975354cad7ffaac4669ca93352f2d0d71b1c2bf9b38e507ca8d11feb9ec files/digest-control-center-1.4.0.5-r1 274
 MD5 075ab15b61ff0cfcac4342ba6cc39d81 files/digest-control-center-1.4.0.5-r2 274
 RMD160 bb11f1143901dbb8bec0d3bc741165165d168a1c files/digest-control-center-1.4.0.5-r2 274
 SHA256 ba531975354cad7ffaac4669ca93352f2d0d71b1c2bf9b38e507ca8d11feb9ec files/digest-control-center-1.4.0.5-r2 274
 MD5 075ab15b61ff0cfcac4342ba6cc39d81 files/digest-control-center-1.4.0.5-r3 274
 RMD160 bb11f1143901dbb8bec0d3bc741165165d168a1c files/digest-control-center-1.4.0.5-r3 274
 SHA256 ba531975354cad7ffaac4669ca93352f2d0d71b1c2bf9b38e507ca8d11feb9ec files/digest-control-center-1.4.0.5-r3 274
-MD5 b811bb12e7bc87021ff856c51cc10636 files/digest-control-center-2.10.2 271
-RMD160 6769abda727eba1bd4d0c9b719141d0ab80c8681 files/digest-control-center-2.10.2 271
-SHA256 10968f4d76631700b8abc82c49a0f5fd39b6bcd8fec5adf6f0dc5c0174a72856 files/digest-control-center-2.10.2 271
-MD5 f1439afc56e58e236e440bcb23a0d907 files/digest-control-center-2.12.3-r1 271
-RMD160 ebb5ccb60ad8df389daaeaa348ddac018207a8c9 files/digest-control-center-2.12.3-r1 271
-SHA256 364fe045ac062bb65a0efa57ceaf2a28a1aa7791f94ab023deb01417fce4a351 files/digest-control-center-2.12.3-r1 271
 MD5 38815455f27e1d69dbbf2b2edb35035f files/digest-control-center-2.14.2 271
 RMD160 203deb01d53e54566a3d7a8bc477ad6cdeacca40 files/digest-control-center-2.14.2 271
 SHA256 3bf3043fb1d93928d2672697ddfd129eda99445af22cf40aff730ad11cbe6d14 files/digest-control-center-2.14.2 271
 MD5 f7ce3794ea17c413976b24b68f9eecf1 files/digest-control-center-2.16.1 271
 RMD160 1398e03c49df4e861133b960d230d1745e9ef081 files/digest-control-center-2.16.1 271
 SHA256 56cf6118a6e83f6082578f4f4d3638e3f93d337566f438454903e643269e8951 files/digest-control-center-2.16.1 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFYJMrkeYb6olFHJcRApzKAJ4rsCYmBWCFwOsS/3bQwpgx68TfdwCgyPf3
+/o6xW4YJvk6KdL4yve1aN8M=
+=qcN2
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild b/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild
deleted file mode 100644
index 5c88cc3e508c..000000000000
--- a/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild,v 1.29 2006/09/05 01:38:38 kumba Exp $
-
-inherit gnome.org eutils multilib
-
-DESCRIPTION="The GNOME control-center"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND="<gnome-base/gnome-vfs-1.9.0
-	>=media-libs/gdk-pixbuf-0.11.0-r1"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=dev-util/intltool-0.11"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-cflags.patch
-}
-
-src_compile() {
-	local myconf
-
-	if ! use nls
-	then
-		myconf="--disable-nls"
-	fi
-
-	# Fix build agains gdk-pixbuf-0.12 and later
-	#	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-	# Not needed anymore? uncomment if this bugs.
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-			--libdir=/usr/$(get_libdir) \
-		    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib	\
-		libdir=${D}/usr/$(get_libdir) \
-		install || die
-	dodoc AUTHORS ChangeLog README NEWS
-}
diff --git a/gnome-base/control-center/control-center-2.10.2.ebuild b/gnome-base/control-center/control-center-2.10.2.ebuild
deleted file mode 100644
index ee054d58ccb7..000000000000
--- a/gnome-base/control-center/control-center-2.10.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.2.ebuild,v 1.16 2006/09/05 01:38:38 kumba Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="alsa gstreamer static"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.5
-	virtual/xft
-	>=media-libs/fontconfig-1
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/nautilus-2.6
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/gnome-menus-2.9.1
-	>=gnome-base/orbit-2
-	media-sound/esound
-	>=x11-wm/metacity-2.8.6-r1
-	>=x11-libs/libxklavier-1.14
-	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-	gstreamer? ( =media-libs/gst-plugins-0.8* )
-	!gnome-extra/fontilus
-	!gnome-extra/themus
-	!gnome-extra/acme"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	dev-util/desktop-file-utils"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-G2CONF="${G2CONF} --disable-schemas-install	--enable-vfs-methods \
-$(use_enable alsa) $(use_enable gstreamer) $(use_enable static)"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
-	# what this is about.
-	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
-
-	# Temporary workaround for a problematic behaviour with acme.
-	epatch ${FILESDIR}/${PN}-2.6.0-remove-pmu.patch
-
-	# Fix the logout keyboard shortcut by moving it out of
-	# the control-center here, and into metacity, bug #52034
-	epatch ${FILESDIR}/${PN}-2.9-logout.patch
-
-	# Fix the hardcoding of tar, bzip2, and gzip paths in
-	# gnome-theme-installer.  bug #84977
-	epatch ${FILESDIR}/${PN}-2.10.1-pathfix.patch
-
-	# fix #112659 , adjust include in makefile
-	epatch ${FILESDIR}/${PN}-libkbdraw-fix.patch
-	eautoreconf
-}
diff --git a/gnome-base/control-center/control-center-2.12.3-r1.ebuild b/gnome-base/control-center/control-center-2.12.3-r1.ebuild
deleted file mode 100644
index 1b92c596e08e..000000000000
--- a/gnome-base/control-center/control-center-2.12.3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.3-r1.ebuild,v 1.2 2006/09/05 01:38:38 kumba Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="alsa eds gstreamer"
-
-RDEPEND=">=gnome-base/gnome-vfs-2.2
-	>=media-libs/fontconfig-1
-	virtual/xft
-	|| ( (	x11-libs/libXxf86misc
-		x11-apps/xinit
-		x11-apps/xset )
-	 virtual/x11 )
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/nautilus-2.6
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/gnome-menus-2.11.1
-	media-sound/esound
-	>=x11-wm/metacity-2.8.6-r1
-	>=x11-libs/libxklavier-1.14
-	>=dev-libs/glib-2.5
-	>=gnome-base/libgnome-2.2
-	media-libs/freetype
-	>=gnome-base/orbit-2.12.4
-	eds? ( >=gnome-extra/evolution-data-server-1.3 )
-	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-	gstreamer? ( =media-libs/gst-plugins-0.8* )"
-
-DEPEND="${RDEPEND}
-	|| ( (
-		x11-libs/libxkbfile
-		x11-proto/xf86miscproto
-		x11-proto/scrnsaverproto )
-	virtual/x11 )
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-util/desktop-file-utils"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-
-pkg_setup() {
-	G2CONF="--disable-schemas-install \
-		--disable-scrollkeeper  \
-		--enable-vfs-methods    \
-		$(use_enable alsa)      \
-		$(use_enable gstreamer) \
-		$(use_enable eds aboutme)"
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# Temporary workaround for a problematic behaviour with acme.
-	epatch ${FILESDIR}/${PN}-2.6.0-remove-pmu.patch
-
-	# Fix the logout keyboard shortcut by moving it out of
-	# the control-center here, and into metacity, bug #52034
-	epatch ${FILESDIR}/${PN}-2.9-logout.patch
-
-	# Fix the hardcoding of tar, bzip2, and gzip paths in
-	# gnome-theme-installer.  bug #84977
-	epatch ${FILESDIR}/${PN}-2.12.2-pathfix.patch
-
-	# Gentoo-specific support for xcursor themes. See bug #103638.
-	epatch ${FILESDIR}/${PN}-2.11-gentoo_xcursor.patch
-
-	# Fix for -Wextra gcc error #114533
-	epatch ${FILESDIR}/${PN}-2.12.2-gcc-Wextra.patch
-
-	# Fix for buttons.  Bug #139413
-	epatch ${FILESDIR}/${P}-buttons.patch
-
-	aclocal || die
-	_elibtoolize --force --copy || die
-	eautoheader || die
-	eautomake || die
-	intltoolize --force || die
-	eautoconf || die
-}
diff --git a/gnome-base/control-center/files/control-center-2.10.1-pathfix.patch b/gnome-base/control-center/files/control-center-2.10.1-pathfix.patch
deleted file mode 100644
index 5a9e9aa3cd07..000000000000
--- a/gnome-base/control-center/files/control-center-2.10.1-pathfix.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-diff -u -ruN control-center-2.10.1.orig/capplets/theme-switcher/gnome-theme-installer.c control-center-2.10.1/capplets/theme-switcher/gnome-theme-installer.c
---- control-center-2.10.1.orig/capplets/theme-switcher/gnome-theme-installer.c	2005-02-08 17:42:10.000000000 -0500
-+++ control-center-2.10.1/capplets/theme-switcher/gnome-theme-installer.c	2005-05-26 12:17:39.000000000 -0400
-@@ -139,19 +139,30 @@
- transfer_done_targz_idle_cb (gpointer data)
- {
- 	int status;
--	gchar *command, *filename;
-+	gchar *command, *filename, *gzip, *tar;
- 	theme_properties *theme_props = data;
- 		
-+	if (!(gzip = g_find_program_in_path("gzip"))) {
-+		return FALSE;
-+	}
-+	if (!(tar = g_find_program_in_path("tar"))) {
-+		g_free(gzip);
-+		return FALSE;
-+	}
- 	/* this should be something more clever and nonblocking */
- 	filename = g_shell_quote(theme_props->filename);
--	command = g_strdup_printf ("sh -c 'cd \"%s\"; /bin/gzip -d -c < \"%s\" | /bin/tar xf - '",
--				    theme_props->target_tmp_dir, filename);
-+	command = g_strdup_printf ("sh -c 'cd \"%s\"; %s -d -c < \"%s\" | %s xf - '",
-+				    theme_props->target_tmp_dir, gzip, filename, tar);
- 	g_free(filename);
- 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
- 		g_free (command);
-+		g_free(gzip);
-+		g_free(tar);
- 		return TRUE;
- 	} else {	
- 		g_free (command);
-+		g_free(gzip);
-+		g_free(tar);
- 		return FALSE;
- 	}
- }
-@@ -171,18 +182,29 @@
- transfer_done_tarbz2_idle_cb (gpointer data)
- {
- 	int status;
--	gchar *command, *filename;
-+	gchar *command, *filename, *bzip2, *tar;
- 	theme_properties *theme_props = data;
- 	
-+	if (!(bzip2 = g_find_program_in_path("bzip2"))) {
-+		return FALSE;
-+	}
-+	if (!(tar = g_find_program_in_path("tar"))) {
-+		g_free(bzip2);
-+		return FALSE;
-+	}
- 	filename = g_shell_quote(theme_props->filename);
- 	/* this should be something more clever and nonblocking */
--	command = g_strdup_printf ("sh -c 'cd \"%s\"; /usr/bin/bzip2 -d -c < \"%s\" | /bin/tar xf - '",
--				   theme_props->target_tmp_dir, filename);
-+	command = g_strdup_printf ("sh -c 'cd \"%s\"; %s -d -c < \"%s\" | %s xf - '",
-+				   theme_props->target_tmp_dir, bzip2, filename, tar);
- 	g_free (filename);
- 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
-+		g_free(bzip2);
-+		g_free(tar);
- 		g_free (command);
- 		return TRUE;
- 	} else {
-+		g_free(bzip2);
-+		g_free(tar);
- 		g_free (command);
- 		return FALSE;
- 	}
-@@ -193,7 +215,7 @@
- {
- 	GtkWidget *dialog;
- 	int len = strlen (path);
--	gchar *command,**dir, *first_line, *filename;
-+	gchar *command,**dir, *first_line, *filename, *gzip, *bzip2, *tar;
- 	int status,theme_type;
- 	theme_properties *theme_props;
- 	GnomeVFSURI *theme_source_dir, *theme_dest_dir;
-@@ -206,17 +228,20 @@
- 				 			g_get_home_dir(), 
- 							g_random_int());
- 		
-+	gzip = g_find_program_in_path("gzip");
-+	bzip2 = g_find_program_in_path("bzip2");
-+	tar = g_find_program_in_path("tar");
- 	
--	if (path && len > 7 && ( (!strcmp (path + len - 7, ".tar.gz")) || (!strcmp (path + len - 4, ".tgz")) )) {
-+	if (tar && gzip && path && len > 7 && ( (!strcmp (path + len - 7, ".tar.gz")) || (!strcmp (path + len - 4, ".tgz")) )) {
- 		filename = g_shell_quote (path);
--		command = g_strdup_printf ("sh -c '/bin/gzip -d -c < \"%s\" | /bin/tar ft -  | head -1'",
--					    filename);
-+		command = g_strdup_printf ("sh -c '%s -d -c < \"%s\" | %s ft -  | head -1'",
-+					    gzip, filename, tar);
- 		theme_props->filetype=TARGZ;
- 		g_free (filename);
--	} else if (path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
-+	} else if (tar && bzip2 && path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
- 		filename = g_shell_quote (path);
--		command = g_strdup_printf ("sh -c '/usr/bin/bzip2 -d -c < \"%s\" | /bin/tar ft - | head -1'",
--					    filename);
-+		command = g_strdup_printf ("sh -c '%s -d -c < \"%s\" | %s ft - | head -1'",
-+					    bzip2, filename, tar);
- 		theme_props->filetype=TARBZ;
- 		g_free (filename);
- 	} else {
-@@ -230,6 +255,9 @@
- 		gnome_vfs_unlink(path);		
- 		g_free (theme_props->target_tmp_dir);
- 		g_free (theme_props);
-+		g_free(gzip);
-+		g_free(bzip2);
-+		g_free(tar);
- 		return;	
- 	}
- 	
-@@ -247,6 +275,9 @@
- 		g_free (command);
- 		g_free (theme_props->target_tmp_dir);
- 		g_free (theme_props);
-+		g_free(gzip);
-+		g_free(bzip2);
-+		g_free(tar);
- 		return;	
- 	}
- 	
-@@ -254,7 +285,7 @@
- 	theme_props->filename=g_strdup(path);
- 	
- 	if (theme_props->filetype == TARBZ ) {
--		if (!g_file_test ("/usr/bin/bzip2", G_FILE_TEST_EXISTS)) {
-+		if (!bzip2) {
- 			GtkWidget *dialog;
- 				
- 			dialog = gtk_message_dialog_new (NULL,
-@@ -269,6 +300,9 @@
- 			g_free (theme_props->target_tmp_dir);
- 			g_free (theme_props->filename);
- 			g_free (theme_props);
-+			g_free(gzip);
-+			g_free(bzip2);
-+			g_free(tar);
- 			return;	
- 		}
- 		
-@@ -287,12 +321,15 @@
- 			g_free (theme_props->filename);
- 			g_free (theme_props);
- 			g_free (command);
-+			g_free(gzip);
-+			g_free(bzip2);
-+			g_free(tar);
- 			return;	
- 		}
- 	}
- 	
- 	if (theme_props->filetype == TARGZ ) {
--		if (!g_file_test ("/bin/gzip", G_FILE_TEST_EXISTS)) {
-+		if (!gzip) {
- 			GtkWidget *dialog;
- 
- 			dialog = gtk_message_dialog_new (NULL,
-@@ -307,6 +344,9 @@
- 			g_free (theme_props->target_tmp_dir);
- 			g_free (theme_props->filename);
- 			g_free (theme_props);
-+			g_free(gzip);
-+			g_free(bzip2);
-+			g_free(tar);
- 			return;	
- 		}
- 		if (!transfer_done_targz_idle_cb(theme_props)) {
-@@ -324,6 +364,9 @@
- 			g_free (theme_props->filename);
- 			g_free (theme_props);
- 			g_free (command);
-+			g_free(gzip);
-+			g_free(bzip2);
-+			g_free(tar);
- 			return;	
- 		}	
- 	}
-@@ -363,6 +406,9 @@
- 			g_free (theme_props->theme_tmp_dir);
- 			g_free (theme_props);
- 			g_free (command);
-+			g_free(gzip);
-+			g_free(bzip2);
-+			g_free(tar);
- 			return;	
- 		} else {
- 			GtkWidget *dialog;
-@@ -379,6 +425,9 @@
-                         g_free (theme_props->theme_tmp_dir);
-                         g_free (theme_props);
- 			g_free (command);
-+			g_free(gzip);
-+			g_free(bzip2);
-+			g_free(tar);
- 			return;	
- 		}
- 		/* Move the Dir to the target dir */
-@@ -407,6 +456,9 @@
- 			g_free (theme_props->user_message);
-                         g_free (theme_props);
- 			g_free (command);
-+			g_free(gzip);
-+			g_free(bzip2);
-+			g_free(tar);
- 			return;	
- 		} else {
- 			GtkWidget *dialog;
-@@ -426,6 +478,9 @@
- 			g_free (theme_props->user_message);
-                         g_free (theme_props);
- 			g_free (command);
-+			g_free(gzip);
-+			g_free(bzip2);
-+			g_free(tar);
- 			return;	
- 		}
- 		
-@@ -434,6 +489,9 @@
- 	g_free (theme_props->target_tmp_dir);
- 	g_free (theme_props->filename);
- 	g_free (theme_props);
-+	g_free(gzip);
-+	g_free(bzip2);
-+	g_free(tar);
- }
- 
- static void
diff --git a/gnome-base/control-center/files/control-center-2.12.2-gcc-Wextra.patch b/gnome-base/control-center/files/control-center-2.12.2-gcc-Wextra.patch
deleted file mode 100644
index b4ac825cd0f2..000000000000
--- a/gnome-base/control-center/files/control-center-2.12.2-gcc-Wextra.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- control-center-2.12.2/configure.in	2005-11-29 16:12:38.000000000 -0500
-+++ control-center-2.12.2.new/configure.in	2005-12-05 22:59:45.000000000 -0500
-@@ -33,7 +33,7 @@
- if test "x$GCC" = "xyes"; then
-   case " $CFLAGS " in
-   *[\ \	]-Wall[\ \	]*) ;;
--  *) CFLAGS="$CFLAGS -Wall -Wextra" ;;
-+  *) CFLAGS="$CFLAGS -Wall" ;;
-   esac
- fi
- changequote([,])dnl
diff --git a/gnome-base/control-center/files/control-center-2.12.2-pathfix.patch b/gnome-base/control-center/files/control-center-2.12.2-pathfix.patch
deleted file mode 100644
index c45059f0625e..000000000000
--- a/gnome-base/control-center/files/control-center-2.12.2-pathfix.patch
+++ /dev/null
@@ -1,248 +0,0 @@
---- capplets/theme-switcher/gnome-theme-installer.c	2005-12-04 17:23:35.000000000 -0600
-+++ capplets/theme-switcher/gnome-theme-installer.c	2005-12-04 17:37:58.000000000 -0600
-@@ -139,19 +139,32 @@
- transfer_done_targz_idle_cb (gpointer data)
- {
- 	int status;
--	gchar *command, *filename;
-+	gchar *command, *filename, *gzip, *tar;
- 	theme_properties *theme_props = data;
--		
-+
-+	if (!(gzip = g_find_program_in_path("gzip"))) {
-+		return FALSE;
-+	}
-+
-+	if (!(tar = g_find_program_in_path("tar"))) {
-+		g_free (gzip);
-+		return FALSE;
-+	}
-+
- 	/* this should be something more clever and nonblocking */
- 	filename = g_shell_quote(theme_props->filename);
--	command = g_strdup_printf ("sh -c 'cd \"%s\"; /bin/gzip -d -c < \"%s\" | /bin/tar xf - '",
--				    theme_props->target_tmp_dir, filename);
-+	command = g_strdup_printf ("sh -c 'cd \"%s\"; %s -d -c < \"%s\" | %s xf - '",
-+				    theme_props->target_tmp_dir, gzip, filename, tar);
- 	g_free(filename);
- 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
- 		g_free (command);
-+		g_free (gzip);
-+		g_free (tar);
- 		return TRUE;
- 	} else {	
- 		g_free (command);
-+		g_free (gzip);
-+		g_free (tar);
- 		return FALSE;
- 	}
- }
-@@ -171,19 +184,32 @@
- transfer_done_tarbz2_idle_cb (gpointer data)
- {
- 	int status;
--	gchar *command, *filename;
-+	gchar *command, *filename, *bzip2, *tar;
- 	theme_properties *theme_props = data;
-+
-+	if (!(bzip2 = g_find_program_in_path("bzip2"))) {
-+		return FALSE;
-+	}
-+
-+	if (!(tar = g_find_program_in_path("tar"))) {
-+		g_free (bzip2);
-+		return FALSE;
-+	}
- 	
- 	filename = g_shell_quote(theme_props->filename);
- 	/* this should be something more clever and nonblocking */
--	command = g_strdup_printf ("sh -c 'cd \"%s\"; /usr/bin/bzip2 -d -c < \"%s\" | /bin/tar xf - '",
--				   theme_props->target_tmp_dir, filename);
-+	command = g_strdup_printf ("sh -c 'cd \"%s\"; %s -d -c < \"%s\" | %s xf - '",
-+				   theme_props->target_tmp_dir, bzip2, filename, tar);
- 	g_free (filename);
- 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
- 		g_free (command);
-+		g_free (bzip2);
-+		g_free (tar);
- 		return TRUE;
- 	} else {
- 		g_free (command);
-+		g_free (bzip2);
-+		g_free (tar);
- 		return FALSE;
- 	}
- }
-@@ -193,7 +219,7 @@
- {
- 	GtkWidget *dialog;
- 	int len = strlen (path);
--	gchar *command,**dir, *first_line, *filename;
-+	gchar *command,**dir, *first_line, *filename, *gzip, *bzip2, *tar;
- 	int status,theme_type;
- 	theme_properties *theme_props;
- 	GnomeVFSURI *theme_source_dir, *theme_dest_dir;
-@@ -206,17 +232,31 @@
- 				 			g_get_home_dir(), 
- 							g_random_int());
- 		
-+	if (!(gzip = g_find_program_in_path("gzip"))) {
-+		return FALSE;
-+	}
-+
-+	if (!(bzip2 = g_find_program_in_path("bzip2"))) {
-+		g_free (gzip);
-+		return FALSE;
-+	}
-+
-+	if (!(tar = g_find_program_in_path("tar"))) {
-+		g_free (gzip);
-+		g_free (bzip2);
-+		return FALSE;
-+	}
- 	
--	if (path && len > 7 && ( (!strcmp (path + len - 7, ".tar.gz")) || (!strcmp (path + len - 4, ".tgz")) )) {
-+	if (tar && gzip && path && len > 7 && ( (!strcmp (path + len - 7, ".tar.gz")) || (!strcmp (path + len - 4, ".tgz")) )) {
- 		filename = g_shell_quote (path);
--		command = g_strdup_printf ("sh -c '/bin/gzip -d -c < \"%s\" | /bin/tar ft -  | head -1'",
--					    filename);
-+		command = g_strdup_printf ("sh -c '%s -d -c < \"%s\" | %s ft -  | head -n1'",
-+					    gzip, filename, tar);
- 		theme_props->filetype=TARGZ;
- 		g_free (filename);
--	} else if (path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
-+	} else if (tar && bzip2 && path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
- 		filename = g_shell_quote (path);
--		command = g_strdup_printf ("sh -c '/usr/bin/bzip2 -d -c < \"%s\" | /bin/tar ft - | head -1'",
--					    filename);
-+		command = g_strdup_printf ("sh -c '%s -d -c < \"%s\" | %s ft - | head -n1'",
-+					    bzip2, filename, tar);
- 		theme_props->filetype=TARBZ;
- 		g_free (filename);
- 	} else {
-@@ -230,6 +270,9 @@
- 		gnome_vfs_unlink(path);		
- 		g_free (theme_props->target_tmp_dir);
- 		g_free (theme_props);
-+		g_free (tar);
-+		g_free (gzip);
-+		g_free (bzip2);
- 		return;	
- 	}
- 	
-@@ -245,6 +288,9 @@
- 		g_free (command);
- 		g_free (theme_props->target_tmp_dir);
- 		g_free (theme_props);
-+		g_free (tar);
-+		g_free (gzip);
-+		g_free (bzip2);
- 		return;	
- 	}
- 	
-@@ -252,7 +298,7 @@
- 	theme_props->filename=g_strdup(path);
- 	
- 	if (theme_props->filetype == TARBZ ) {
--		if (!g_file_test ("/usr/bin/bzip2", G_FILE_TEST_EXISTS)) {
-+		if (!bzip2) {
- 			dialog = gtk_message_dialog_new (NULL,
- 						GTK_DIALOG_MODAL,
- 						GTK_MESSAGE_ERROR,
-@@ -265,6 +311,9 @@
- 			g_free (theme_props->target_tmp_dir);
- 			g_free (theme_props->filename);
- 			g_free (theme_props);
-+			g_free (tar);
-+			g_free (gzip);
-+			g_free (bzip2);
- 			return;	
- 		}
- 		
-@@ -281,12 +330,15 @@
- 			g_free (theme_props->filename);
- 			g_free (theme_props);
- 			g_free (command);
-+			g_free (tar);
-+			g_free (gzip);
-+			g_free (bzip2);
- 			return;	
- 		}
- 	}
- 	
- 	if (theme_props->filetype == TARGZ ) {
--		if (!g_file_test ("/bin/gzip", G_FILE_TEST_EXISTS)) {
-+		if (!gzip) {
- 			dialog = gtk_message_dialog_new (NULL,
- 						GTK_DIALOG_MODAL,
- 						GTK_MESSAGE_ERROR,
-@@ -299,6 +351,9 @@
- 			g_free (theme_props->target_tmp_dir);
- 			g_free (theme_props->filename);
- 			g_free (theme_props);
-+			g_free (tar);
-+			g_free (gzip);
-+			g_free (bzip2);
- 			return;	
- 		}
- 		if (!transfer_done_targz_idle_cb(theme_props)) {
-@@ -314,6 +369,9 @@
- 			g_free (theme_props->filename);
- 			g_free (theme_props);
- 			g_free (command);
-+			g_free (tar);
-+			g_free (gzip);
-+			g_free (bzip2);
- 			return;	
- 		}	
- 	}
-@@ -351,6 +409,9 @@
- 			g_free (theme_props->theme_tmp_dir);
- 			g_free (theme_props);
- 			g_free (command);
-+			g_free (tar);
-+			g_free (gzip);
-+			g_free (bzip2);
- 			return;	
- 		} else {
- 			dialog = gtk_message_dialog_new (NULL,
-@@ -365,6 +426,9 @@
-                         g_free (theme_props->theme_tmp_dir);
-                         g_free (theme_props);
- 			g_free (command);
-+			g_free (tar);
-+			g_free (gzip);
-+			g_free (bzip2);
- 			return;	
- 		}
- 		/* Move the Dir to the target dir */
-@@ -391,6 +455,9 @@
- 			g_free (theme_props->user_message);
-                         g_free (theme_props);
- 			g_free (command);
-+			g_free (tar);
-+			g_free (gzip);
-+			g_free (bzip2);
- 			return;	
- 		} else {
- 			dialog = gtk_message_dialog_new (NULL,
-@@ -408,6 +475,9 @@
- 			g_free (theme_props->user_message);
-                         g_free (theme_props);
- 			g_free (command);
-+			g_free (tar);
-+			g_free (gzip);
-+			g_free (bzip2);
- 			return;	
- 		}
- 		
-@@ -416,6 +486,9 @@
- 	g_free (theme_props->target_tmp_dir);
- 	g_free (theme_props->filename);
- 	g_free (theme_props);
-+	g_free (tar);
-+	g_free (gzip);
-+	g_free (bzip2);
- }
- 
- static void
diff --git a/gnome-base/control-center/files/control-center-2.12.3-buttons.patch b/gnome-base/control-center/files/control-center-2.12.3-buttons.patch
deleted file mode 100644
index 624a15861a69..000000000000
--- a/gnome-base/control-center/files/control-center-2.12.3-buttons.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN control-center-2.12.3.orig/gnome-settings-daemon/gnome-settings-mouse.c control-center-2.12.3/gnome-settings-daemon/gnome-settings-mouse.c
---- control-center-2.12.3.orig/gnome-settings-daemon/gnome-settings-mouse.c	2005-11-02 06:49:32.000000000 -0500
-+++ control-center-2.12.3/gnome-settings-daemon/gnome-settings-mouse.c	2006-07-06 20:57:23.000000000 -0400
-@@ -33,24 +33,57 @@
-                          gint      n_buttons,
-                          gboolean  left_handed)
- {
--  const gint left_button = 0;
-+  const gint left_button = 1;
-   gint right_button;
-+  gint i;
- 
-   /* if the button is higher than 2 (3rd button) then it's
-    * probably one direction of a scroll wheel or something else
-    * uninteresting
-    */
--  right_button = MIN (n_buttons - 1, 2);
-+  right_button = MIN (n_buttons, 3);
-+
-+  /* If we change things we need to make sure we only swap buttons.
-+   * If we end up with multiple physical buttons assigned to the same
-+   * logical button the server will complain. This code assumes physical
-+   * button 0 is the physical left mouse button, and that the physical
-+   * button other than 0 currently assigned left_button or right_button
-+   * is the physical right mouse button.
-+   */
-+
-+  /* check if the current mapping satisfies the above assumptions */
-+  if (buttons[left_button - 1] != left_button && 
-+      buttons[left_button - 1] != right_button)
-+      /* The current mapping is weird. Swapping buttons is probably not a
-+       * good idea.
-+       */
-+      return;
- 
--  if (left_handed)
-+  /* check if we are left_handed and currently not swapped */
-+  if (left_handed && buttons[left_button - 1] == left_button)
-     {
--      buttons[left_button] = right_button + 1;
--      buttons[right_button] = left_button + 1;
-+      /* find the right button */
-+      for (i = 0; i < n_buttons; i++)
-+        {
-+          if (buttons[i] == right_button)
-+              break;
-+      }
-+      /* swap the buttons */
-+      buttons[left_button - 1] = right_button;
-+      buttons[i] = left_button;
-     }
--  else
-+  /* check if we are not left_handed but are swapped */
-+  else if (!left_handed && buttons[left_button - 1] == right_button)
-     {
--      buttons[left_button] = left_button + 1;
--      buttons[right_button] = right_button + 1;
-+      /* find the right button */
-+      for (i = 0; i < n_buttons; i++)
-+        {
-+          if (buttons[i] == left_button)
-+              break;
-+      }
-+      /* swap the buttons */
-+      buttons[i] = right_button;
-+      buttons[left_button - 1] = left_button;
-   }
- }
- 
diff --git a/gnome-base/control-center/files/control-center-2.2.0.1-alpha_hack.patch b/gnome-base/control-center/files/control-center-2.2.0.1-alpha_hack.patch
deleted file mode 100644
index beb42d2f6a38..000000000000
--- a/gnome-base/control-center/files/control-center-2.2.0.1-alpha_hack.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- capplets/common/gconf-property-editor.c.old	2002-07-16 18:07:40.000000000 -0400
-+++ capplets/common/gconf-property-editor.c	2003-02-18 16:55:14.000000000 -0500
-@@ -101,6 +101,7 @@
- 					       GConfChangeSet        *changeset,
- 					       GObject               *ui_control,
- 					       const gchar           *first_prop_name,
-+					       int                    alpha_hack,
- 					       va_list                var_args,
- 					       const gchar	     *first_custom,
- 					       ...);
-@@ -341,6 +342,7 @@
- 		   GConfChangeSet        *changeset,
- 		   GObject               *ui_control,
- 		   const gchar           *first_prop_name,
-+		   int                    alpha_hack,
- 		   va_list                var_args,
- 		   const gchar		 *first_custom,
- 		   ...) 
-@@ -452,7 +454,7 @@
- 		 changeset,
- 		 G_OBJECT (checkbox),
- 		 first_property_name,
--		 var_args,
-+		 0, var_args, 
- 		 NULL);
- 
- 	va_end (var_args);
-@@ -526,7 +528,7 @@
- 		 changeset,
- 		 G_OBJECT (entry),
- 		 first_property_name,
--		 var_args, NULL);
-+		 0, var_args,  NULL);
- 
- 	g_signal_connect_swapped (G_OBJECT (entry), "changed",
- 				  (GCallback) peditor_integer_widget_changed, peditor);
-@@ -618,7 +620,7 @@
- 		 changeset,
- 		 G_OBJECT (entry),
- 		 first_property_name,
--		 var_args, NULL);
-+		 0, var_args,  NULL);
- 
- 	g_signal_connect_swapped (G_OBJECT (entry), "changed",
- 				  (GCallback) peditor_string_widget_changed, peditor);
-@@ -748,7 +750,7 @@
- 		 changeset,
- 		 G_OBJECT (cp),
- 		 first_property_name,
--		 var_args, NULL);
-+		 0, var_args,  NULL);
- 
- 	va_end (var_args);
- 
-@@ -902,7 +904,7 @@
- 		 changeset,
- 		 G_OBJECT (option_menu),
- 		 first_property_name,
--		 var_args, NULL);
-+		 0, var_args,  NULL);
- 
- 	va_end (var_args);
- 
-@@ -943,7 +945,7 @@
- 		 changeset,
- 		 G_OBJECT (option_menu),
- 		 first_property_name,
--		 var_args,
-+		 0, var_args, 
- 		 "conv-to-widget-cb",
- 		 peditor_enum_conv_to_widget,
- 		 "conv-from-widget-cb",
-@@ -1041,7 +1043,7 @@
- 		 changeset,
- 		 G_OBJECT (first_button),
- 		 first_property_name,
--		 var_args, NULL);
-+		 0, var_args,  NULL);
- 
- 	va_end (var_args);
- 
-@@ -1116,7 +1118,7 @@
- 		 changeset,
- 		 G_OBJECT (adjustment),
- 		 first_property_name,
--		 var_args, NULL);
-+		 0, var_args,  NULL);
- 
- 	va_end (var_args);
- 
-@@ -1351,7 +1353,7 @@
- 		 changeset,
- 		 G_OBJECT (font_picker),
- 		 first_property_name,
--		 var_args,
-+		 0, var_args, 
- 		 "data", GUINT_TO_POINTER (font_type),
- 		 NULL);
- 
-@@ -1445,7 +1447,7 @@
- 		 changeset,
- 		 G_OBJECT (checkbox),
- 		 first_property_name,
--		 var_args,
-+		 0, var_args, 
- 		 "conv-to-widget-cb",
- 		 peditor_enum_toggle_conv_to_widget,
- 		 "conv-from-widget-cb",
-@@ -1670,7 +1672,7 @@
- 		 changeset,
- 		 G_OBJECT (button),
- 		 first_property_name,
--		 var_args, NULL);
-+		 0, var_args,  NULL);
- 
- 	va_end (var_args);
- 
-@@ -1715,7 +1717,7 @@
- 		 changeset,
- 		 G_OBJECT (first_button),
- 		 first_property_name,
--		 var_args,
-+		 0, var_args,
- 		 "conv-to-widget-cb",
- 		 peditor_enum_conv_to_widget,
- 		 "conv-from-widget-cb",
diff --git a/gnome-base/control-center/files/control-center-2.9-logout.patch b/gnome-base/control-center/files/control-center-2.9-logout.patch
deleted file mode 100644
index ea141f41ddb7..000000000000
--- a/gnome-base/control-center/files/control-center-2.9-logout.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ur control-center-2.9.4/capplets/keybindings/gnome-keybinding-properties.c control-center-2.9.4-patched/capplets/keybindings/gnome-keybinding-properties.c
---- control-center-2.9.4/capplets/keybindings/gnome-keybinding-properties.c	2004-10-17 17:17:31.000000000 +0800
-+++ control-center-2.9.4-patched/capplets/keybindings/gnome-keybinding-properties.c	2005-02-06 15:42:14.136619824 +0800
-@@ -41,13 +41,13 @@
- const KeyListEntry desktop_key_list[] =
- {
-   { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 },
--  { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 },
-   { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 },
-   { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 },
-   { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 },
-   { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 },
-   { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 },
-   { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 },
-+  { "/apps/metacity/global_keybindings/logout", ALWAYS_VISIBLE, 0 },
-   { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 },
-   { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 },
-   { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
-diff -ur control-center-2.9.4/gnome-settings-daemon/actions/acme.h control-center-2.9.4-patched/gnome-settings-daemon/actions/acme.h
---- control-center-2.9.4/gnome-settings-daemon/actions/acme.h	2004-03-24 10:54:33.000000000 +0800
-+++ control-center-2.9.4-patched/gnome-settings-daemon/actions/acme.h	2005-02-06 15:42:39.995688648 +0800
-@@ -29,7 +29,6 @@
- 	MUTE_KEY,
- 	VOLUME_DOWN_KEY,
- 	VOLUME_UP_KEY,
--	POWER_KEY,
- 	EJECT_KEY,
- 	HOME_KEY,
- 	SEARCH_KEY,
-@@ -64,7 +63,6 @@
- 	{ MUTE_KEY, GCONF_BINDING_DIR "/volume_mute",NULL },
- 	{ VOLUME_DOWN_KEY, GCONF_BINDING_DIR "/volume_down", NULL },
- 	{ VOLUME_UP_KEY, GCONF_BINDING_DIR "/volume_up", NULL },
--	{ POWER_KEY, GCONF_BINDING_DIR "/power", NULL },
- 	{ EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL },
- 	{ HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
- 	{ SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
-diff -ur control-center-2.9.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.9.4-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c
---- control-center-2.9.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2005-01-05 11:03:10.000000000 +0800
-+++ control-center-2.9.4-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2005-02-06 15:43:33.263590696 +0800
-@@ -661,12 +661,6 @@
- }
- 
- static void
--do_exit_action (Acme *acme)
--{
--	execute ("gnome-session-save --kill", FALSE);
--}
--
--static void
- do_eject_action (Acme *acme)
- {
- 	GtkWidget *progress;
-@@ -807,9 +801,6 @@
- 	case VOLUME_UP_KEY:
- 		do_sound_action (acme, type);
- 		break;
--	case POWER_KEY:
--		do_exit_action (acme);
--		break;
- 	case EJECT_KEY:
- 		do_eject_action (acme);
- 		break;
-diff -ur control-center-2.9.4/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.9.4-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in
---- control-center-2.9.4/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2004-05-18 01:03:38.000000000 +0800
-+++ control-center-2.9.4-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2005-02-06 15:46:33.028262312 +0800
-@@ -50,18 +50,6 @@
- 
- 
-         <schema>
--            <key>/schemas/apps/gnome_settings_daemon/keybindings/power</key>
--            <applyto>/apps/gnome_settings_daemon/keybindings/power</applyto>
--            <type>string</type>
--            <default></default>
--            <locale name="C">
--                <short>Log out</short>
--                <long>Log out's shortcut.</long>
--            </locale>
--        </schema>
--
--
--        <schema>
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/eject</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/eject</applyto>
-             <type>string</type>
diff --git a/gnome-base/control-center/files/control-center-libkbdraw-fix.patch b/gnome-base/control-center/files/control-center-libkbdraw-fix.patch
deleted file mode 100644
index 8e4a2d84ed03..000000000000
--- a/gnome-base/control-center/files/control-center-libkbdraw-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- control-center-2.10.2/libkbdraw/Makefile.am	2005-02-21 11:42:41.000000000 -0500
-+++ control-center-2.10.2.new/libkbdraw/Makefile.am	2006-01-07 08:51:29.000000000 -0500
-@@ -20,6 +20,7 @@
- AM_CFLAGS = $(GTK_CFLAGS) -Wall -Werror
- 
- noinst_LIBRARIES = libkbdraw.a
-+libkbdraw_a_CFLAGS = $(PANGOXFT_CFLAGS) $(GTK_CFLAGS)
- libkbdraw_a_SOURCES = keyboard-marshal.c keyboard-marshal.h \
-                        keyboard-drawing.c keyboard-drawing.h
- 
---- control-center-2.10.2/capplets/keyboard/Makefile.am	2005-02-21 11:42:39.000000000 -0500
-+++ control-center-2.10.2.new/capplets/keyboard/Makefile.am	2006-01-07 08:52:14.000000000 -0500
-@@ -11,7 +11,8 @@
- 	../accessibility/keyboard/libaccessibility-keyboard.a 	\
- 	$(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \
- 	../../libgswitchit/libgswitchit.a \
--	../../libkbdraw/libkbdraw.a
-+	../../libkbdraw/libkbdraw.a \
-+	$(PANGOXFT_LIBS)
- 
- @INTLTOOL_DESKTOP_RULE@
- 
---- control-center-2.10.2/configure.in	2005-07-04 16:31:46.000000000 -0400
-+++ control-center-2.10.2.new/configure.in	2006-01-07 08:27:31.000000000 -0500
-@@ -104,6 +104,7 @@
- PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
- PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
- PKG_CHECK_MODULES(METACITY, libmetacity-private)
-+PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.10)
- PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 1.14,,
-     AC_MSG_ERROR([gnome-control-center depends on libxklavier.
- The latest release is available from http://prdownloads.sourceforge.net/gswitchit], 1))
diff --git a/gnome-base/control-center/files/digest-control-center-1.4.0.5-r1 b/gnome-base/control-center/files/digest-control-center-1.4.0.5-r1
deleted file mode 100644
index 0618a3039a15..000000000000
--- a/gnome-base/control-center/files/digest-control-center-1.4.0.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63e731f7c9f5fca354de5de4f881e952 control-center-1.4.0.5.tar.bz2 3382798
-RMD160 e410127108d6990f787ba502daed9d2fad6ce35d control-center-1.4.0.5.tar.bz2 3382798
-SHA256 bfefec4042b0bc64463f07c4486c5af65b20c07974b184f8a547f77ea20ced06 control-center-1.4.0.5.tar.bz2 3382798
diff --git a/gnome-base/control-center/files/digest-control-center-2.10.2 b/gnome-base/control-center/files/digest-control-center-2.10.2
deleted file mode 100644
index 5b59fbde1d2d..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.10.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 36022dcd340dac004903f5dadc8af589 control-center-2.10.2.tar.bz2 2833639
-RMD160 6c73d3c2c00fee3ee774bf0a10994af00af73625 control-center-2.10.2.tar.bz2 2833639
-SHA256 5b29e60e401dbaa76aa945d17be9b64e0052101610359199c4190dc6f251b7c9 control-center-2.10.2.tar.bz2 2833639
diff --git a/gnome-base/control-center/files/digest-control-center-2.12.3-r1 b/gnome-base/control-center/files/digest-control-center-2.12.3-r1
deleted file mode 100644
index 9c0a9841aa8a..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.12.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e8f57ec1852d08d421016732b605a615 control-center-2.12.3.tar.bz2 1787009
-RMD160 615d843d1050570a7a7ba54abfa8888608c983d9 control-center-2.12.3.tar.bz2 1787009
-SHA256 c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8 control-center-2.12.3.tar.bz2 1787009