Pull old versions.

Package-Manager: portage-2.1.1_pre1-r1

63 files changed, 76 insertions, 1050 deletions

diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index f851c85f58fc..56f6aa77067f 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libICE-1.0.0.tar.bz2 247688 RMD160 b72a37789ba06bf95a7d99dcd2278eade41aa013 SHA256 724dd3936179164128ca00d38080db29f7a836429d81b7c48d6897d79f10aa3c
 DIST libICE-1.0.1.tar.bz2 254145 RMD160 436b60c554a10581167137e5bf588b449a95defe SHA1 2b7b19c4cb46eba5e2079fb00ef223c4cdd2b341 SHA256 bb78bfb9ac08c77c5ff361f22e01cf11b1925af70c88f907f4c2506bd9c33fcd
-EBUILD libICE-1.0.0.ebuild 658 RMD160 0f1296014f5ea022ea93f83c76ff716a7bc021fa SHA1 9e5d8e94a0c2eba58dc90a94963e0ece077d9db6 SHA256 1491d50fe7d0e1b6328b5510af32311ebe2b01e1af147f716404f5db5a61886c
-MD5 dd9e80f2e34cc6f561b6f7d684eabdfe libICE-1.0.0.ebuild 658
-RMD160 0f1296014f5ea022ea93f83c76ff716a7bc021fa libICE-1.0.0.ebuild 658
-SHA256 1491d50fe7d0e1b6328b5510af32311ebe2b01e1af147f716404f5db5a61886c libICE-1.0.0.ebuild 658
 EBUILD libICE-1.0.1.ebuild 654 RMD160 84942357220909f67a5fb7c70ec97071ffd7000e SHA1 90d8dc50944ce1e2795076b5353861f3b5e5fdfd SHA256 c941676359351afe500cc982e815949aeb971cb0c5344e1f4ac18958f2770266
 MD5 93e07d1bf1021321d85134efb9e756aa libICE-1.0.1.ebuild 654
 RMD160 84942357220909f67a5fb7c70ec97071ffd7000e libICE-1.0.1.ebuild 654
 SHA256 c941676359351afe500cc982e815949aeb971cb0c5344e1f4ac18958f2770266 libICE-1.0.1.ebuild 654
-MISC ChangeLog 3028 RMD160 d61bd1dd64eb2f62ff08efbf9c10f6937af7719e SHA1 2d231a4bff1a3d9ecc07cb7fde8e86f36d14de05 SHA256 4822cdb57e8938f25323ebe2c59007379daa27161db342f883af12ffcd2a3b91
-MD5 b7e0e56dd4235ad64cd3dc2557a82296 ChangeLog 3028
-RMD160 d61bd1dd64eb2f62ff08efbf9c10f6937af7719e ChangeLog 3028
-SHA256 4822cdb57e8938f25323ebe2c59007379daa27161db342f883af12ffcd2a3b91 ChangeLog 3028
+MISC ChangeLog 3128 RMD160 141f7ce5929601f1a489206827d2859658edf0d1 SHA1 cc93ac031cd3a0daddcedea434f44eaa69a0f11d SHA256 7ebd1418dc04a86417b87f2402599edfa9bb2c72e6623cd0201506427c924777
+MD5 1a8ab01f7422461b72e45fa758e5ba8e ChangeLog 3128
+RMD160 141f7ce5929601f1a489206827d2859658edf0d1 ChangeLog 3128
+SHA256 7ebd1418dc04a86417b87f2402599edfa9bb2c72e6623cd0201506427c924777 ChangeLog 3128
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 0173f0d1d7302984af347939f6b4c1af files/digest-libICE-1.0.0 241
-RMD160 4e5cbe8679caa8ca05e38f3a837f29d9951def91 files/digest-libICE-1.0.0 241
-SHA256 8c2d0fd22d5e05c7b59c671f58959a0d9c3926d39ccc1fbe4f350e6b885dc2bf files/digest-libICE-1.0.0 241
 MD5 c9a3433b92bd9300d09c7d4cccf42479 files/digest-libICE-1.0.1 241
 RMD160 0f19f451bce79bfcdb9758ecba5123fc77ab8e83 files/digest-libICE-1.0.1 241
 SHA256 35990b4e35a6cb5d1e0118574d0325be0793e2420a7629f8dd59293561a77e78 files/digest-libICE-1.0.1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUTqkT4lNIS36YERAnI0AKCpox4jJXNEpQ174mnzxJivvroMggCgpBVW
-1YnJQr+3/ywsX2jm7WHZMBU=
-=8uNf
------END PGP SIGNATURE-----
diff --git a/x11-libs/libICE/files/digest-libICE-1.0.0 b/x11-libs/libICE/files/digest-libICE-1.0.0
deleted file mode 100644
index c31e84c9ad52..000000000000
--- a/x11-libs/libICE/files/digest-libICE-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b9c5ec4b4f5fd351f7f4a50e15248b02 libICE-1.0.0.tar.bz2 247688
-RMD160 b72a37789ba06bf95a7d99dcd2278eade41aa013 libICE-1.0.0.tar.bz2 247688
-SHA256 724dd3936179164128ca00d38080db29f7a836429d81b7c48d6897d79f10aa3c libICE-1.0.0.tar.bz2 247688
diff --git a/x11-libs/libICE/libICE-1.0.0.ebuild b/x11-libs/libICE/libICE-1.0.0.ebuild
deleted file mode 100644
index 0e8e2936abac..000000000000
--- a/x11-libs/libICE/libICE-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.0.ebuild,v 1.7 2006/03/31 19:46:34 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org ICE library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 6d0f016e75d3..ffbf3a68d4fb 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libSM-1.0.0.tar.bz2 229401 RMD160 084eb044c608bb994895b1bbedbffa9f8fff0f43 SHA256 0a849d2826867b0cd87cd4ca9a1b0194bbf375ff96ad5ab9968c6122fd26d7ff
 DIST libSM-1.0.1.tar.bz2 240562 RMD160 a19521e6c7d1fc02ab72eaea46e122d61afa47ed SHA1 1f03c03bb5fbe731ad3427e1eaa3115a7c3f2a82 SHA256 3ef4c86e02695fb3a9aeadc03e1e7e48ef9b92f118ecf47adac8d7a041cd0770
-EBUILD libSM-1.0.0.ebuild 688 RMD160 0a0897029da4228335bfac2583de2897373adffd SHA1 9f6b5dee4800af7cd7427a18af3730c079014632 SHA256 d7c693ee9ea56d8d087fb2b3f5a468f3cad14d8129f84dd87bb22cfe6f0527a5
-MD5 809ad3a4409dcae39c3e72056d9ded94 libSM-1.0.0.ebuild 688
-RMD160 0a0897029da4228335bfac2583de2897373adffd libSM-1.0.0.ebuild 688
-SHA256 d7c693ee9ea56d8d087fb2b3f5a468f3cad14d8129f84dd87bb22cfe6f0527a5 libSM-1.0.0.ebuild 688
 EBUILD libSM-1.0.1.ebuild 684 RMD160 8b9d5e799bb9e7219626634e20153687c231c7ec SHA1 cadf0ad27f93b7698dc3921593ff2da6e429d03c SHA256 b69883933a117756a8079bd82a4dde423023817a0647b7e16668af932c83032e
 MD5 8b04a906f0bbf7b4205c09e30d75340b libSM-1.0.1.ebuild 684
 RMD160 8b9d5e799bb9e7219626634e20153687c231c7ec libSM-1.0.1.ebuild 684
 SHA256 b69883933a117756a8079bd82a4dde423023817a0647b7e16668af932c83032e libSM-1.0.1.ebuild 684
-MISC ChangeLog 3590 RMD160 81218b0acb424bcaf604d703215ac2a054304d2d SHA1 271d02795a83571c50a759d912ae5b61f6c1b13d SHA256 30a68b1fb460d5743421b0435167a7d83c24c7437baf00909086f88d56d2a14a
-MD5 27cebc267c487b35f77f11569c6da810 ChangeLog 3590
-RMD160 81218b0acb424bcaf604d703215ac2a054304d2d ChangeLog 3590
-SHA256 30a68b1fb460d5743421b0435167a7d83c24c7437baf00909086f88d56d2a14a ChangeLog 3590
+MISC ChangeLog 3689 RMD160 b8ef6f8cc5f99c3e23c8ef5c124e4f155e5add1d SHA1 bf6a6fea08ea017cb42a1800d668254c2ec9f429 SHA256 f5ebc215af16aae679eaf035be3b636cd2284780cc78ee5997ba4d00648ca647
+MD5 1abab138d986b8b253e506e7029e54b8 ChangeLog 3689
+RMD160 b8ef6f8cc5f99c3e23c8ef5c124e4f155e5add1d ChangeLog 3689
+SHA256 f5ebc215af16aae679eaf035be3b636cd2284780cc78ee5997ba4d00648ca647 ChangeLog 3689
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 3b77419ad72b952d971e59b510540985 files/digest-libSM-1.0.0 238
-RMD160 c693656fdec4192e50e83eade1d3250b9d961123 files/digest-libSM-1.0.0 238
-SHA256 34b5a6e9fc24747213024cea46278a29c2ecbfa4601d0ef9603584bab704a661 files/digest-libSM-1.0.0 238
 MD5 ef64a9bda11b6bb725d59e0c8421c60d files/digest-libSM-1.0.1 238
 RMD160 22f8a20261675ae2738966b24b0d8cf50c5f34c3 files/digest-libSM-1.0.1 238
 SHA256 6d0d741be2457bfb16e54451cdba2203d314b5afafcbcc7b08ea6d0bfd1b3101 files/digest-libSM-1.0.1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUWMkT4lNIS36YERAikcAKCiuWXZlQ3AByGySlydviRkdHMbRACgxXnD
-FSDQe4V4vPuK3fcxWMJy9rI=
-=M2sy
------END PGP SIGNATURE-----
diff --git a/x11-libs/libSM/files/digest-libSM-1.0.0 b/x11-libs/libSM/files/digest-libSM-1.0.0
deleted file mode 100644
index 5a7b4958e4f3..000000000000
--- a/x11-libs/libSM/files/digest-libSM-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7cfe53ae26000062725c470da11e7659 libSM-1.0.0.tar.bz2 229401
-RMD160 084eb044c608bb994895b1bbedbffa9f8fff0f43 libSM-1.0.0.tar.bz2 229401
-SHA256 0a849d2826867b0cd87cd4ca9a1b0194bbf375ff96ad5ab9968c6122fd26d7ff libSM-1.0.0.tar.bz2 229401
diff --git a/x11-libs/libSM/libSM-1.0.0.ebuild b/x11-libs/libSM/libSM-1.0.0.ebuild
deleted file mode 100644
index aed72a4d5fab..000000000000
--- a/x11-libs/libSM/libSM-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.0.0.ebuild,v 1.7 2006/03/31 19:46:52 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org SM library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libICE
-	x11-libs/xtrans
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-IUSE="ipv6"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index ab81c17d42a5..d15f1e14d928 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,38 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libX11-1.0.1-setuid.diff 420 RMD160 ef71b233e75c840f3a9a8c6ae94518bd085b878c SHA1 6e2b6a43d394a474b8b731abb8d811625845421c SHA256 449fea81081687314061e465ce6586ad0f41d8dd5b0370dc0ab1ef318407a903
 MD5 4b14554b64e4a8b1ec3c2b85cb5199b6 files/libX11-1.0.1-setuid.diff 420
 RMD160 ef71b233e75c840f3a9a8c6ae94518bd085b878c files/libX11-1.0.1-setuid.diff 420
 SHA256 449fea81081687314061e465ce6586ad0f41d8dd5b0370dc0ab1ef318407a903 files/libX11-1.0.1-setuid.diff 420
-DIST libX11-1.0.1.tar.bz2 1419629 RMD160 a4a2a1c7499ceeb29efa4357aa5b4529416e732d SHA1 af207d7eaa59c08d2e9bd8313ebc906b203c26d5 SHA256 f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294
-DIST libX11-1.0.3.tar.bz2 1449835 RMD160 285a878a8ec9ecbd86e67897ca15ce96c994f38a SHA1 ec0493d3669862a9a4f9955532e3bd73b0806be1 SHA256 fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac
-EBUILD libX11-1.0.1-r1.ebuild 1027 RMD160 4f8d9854656b3444ec84498fb9e6dba66e5e87ce SHA1 56f5e6e74f23b1af792bdce85395aef7a6c2c91b SHA256 c33467f2f0565b2358f8b892434475fb063f00dd1ad28f528813ee7e25229b8d
-MD5 ea70ef77292d541de8f0bacf741e6ebb libX11-1.0.1-r1.ebuild 1027
-RMD160 4f8d9854656b3444ec84498fb9e6dba66e5e87ce libX11-1.0.1-r1.ebuild 1027
-SHA256 c33467f2f0565b2358f8b892434475fb063f00dd1ad28f528813ee7e25229b8d libX11-1.0.1-r1.ebuild 1027
-EBUILD libX11-1.0.3.ebuild 995 RMD160 3859848a472e439800e71b0256b1bf88e4221060 SHA1 e2c068f55d2fe0701fe2e7e2805b8020e1d864c5 SHA256 16e29688e5608881f398ff2692da1a32fb9da4f52e72ca3a5f7be71d0c82bf08
-MD5 e0471821eb6f7b29f9353dc73ee01c2b libX11-1.0.3.ebuild 995
-RMD160 3859848a472e439800e71b0256b1bf88e4221060 libX11-1.0.3.ebuild 995
-SHA256 16e29688e5608881f398ff2692da1a32fb9da4f52e72ca3a5f7be71d0c82bf08 libX11-1.0.3.ebuild 995
-MISC ChangeLog 6127 RMD160 ca64df33b7818210a7a8952ffa8f801b2324014d SHA1 d7ff543c7c458c035dcaffda36c4a73ba12b5141 SHA256 70d61dc9753a5eae6b23467e442906c2ae5e579906ed31951452be7e4720aeea
-MD5 62baaa94412f7d20f9b4e45c4f79f939 ChangeLog 6127
-RMD160 ca64df33b7818210a7a8952ffa8f801b2324014d ChangeLog 6127
-SHA256 70d61dc9753a5eae6b23467e442906c2ae5e579906ed31951452be7e4720aeea ChangeLog 6127
+MISC ChangeLog 6254 RMD160 bd3779b390bb63ad75a3196cb0af90bd5b85e852 SHA1 a24e43f1f26702f640f798f8f35acfdcef887e7c SHA256 997feb7389fd5393b8b71cc68980a55b5240c7242c0e67cd821a7bc36daae906
+MD5 35212b52d5c69365f9fc5a890b5ef1ab ChangeLog 6254
+RMD160 bd3779b390bb63ad75a3196cb0af90bd5b85e852 ChangeLog 6254
+SHA256 997feb7389fd5393b8b71cc68980a55b5240c7242c0e67cd821a7bc36daae906 ChangeLog 6254
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 dfa73e9e4b863d6db666ddf22afaef08 files/digest-libX11-1.0.1-r1 244
-RMD160 cceba69433549eb9f3a6efff56b9b8f747629656 files/digest-libX11-1.0.1-r1 244
-SHA256 383a58011d7a56f6beda376134a47cb5e5a9791d62285351190c5b7813d63b9b files/digest-libX11-1.0.1-r1 244
-MD5 c2605996befd61bca63d1e5086050b82 files/digest-libX11-1.0.3 244
-RMD160 94a7b21c7a2ee6f64f727e6717fee436c2c488f0 files/digest-libX11-1.0.3 244
-SHA256 01a16adda21f478b9664fa0c138e6bcce7e0fbbe8e27237874f7f340f7b3ee7b files/digest-libX11-1.0.3 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUWwkT4lNIS36YERAvlSAJ0YsGBTnKEwMysvsyobmfWzyVJ2IQCfYD0F
-5gV2Z0G1BaFrSXh9qMIBhhs=
-=2c4V
------END PGP SIGNATURE-----
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.1-r1 b/x11-libs/libX11/files/digest-libX11-1.0.1-r1
deleted file mode 100644
index fe5d45da915a..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58f0537f21183e27149cf906a1b6bef9 libX11-1.0.1.tar.bz2 1419629
-RMD160 a4a2a1c7499ceeb29efa4357aa5b4529416e732d libX11-1.0.1.tar.bz2 1419629
-SHA256 f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294 libX11-1.0.1.tar.bz2 1419629
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.3 b/x11-libs/libX11/files/digest-libX11-1.0.3
deleted file mode 100644
index 12c8959efbd3..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60b787a812c92d33f71860e4e19cb59d libX11-1.0.3.tar.bz2 1449835
-RMD160 285a878a8ec9ecbd86e67897ca15ce96c994f38a libX11-1.0.3.tar.bz2 1449835
-SHA256 fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac libX11-1.0.3.tar.bz2 1449835
diff --git a/x11-libs/libX11/libX11-1.0.1-r1.ebuild b/x11-libs/libX11/libX11-1.0.1-r1.ebuild
deleted file mode 100644
index e9eaf965ac65..000000000000
--- a/x11-libs/libX11/libX11-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.0.1-r1.ebuild,v 1.5 2006/06/30 15:39:23 wolf31o2 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org X11 library"
-RESTRICT="mirror"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-proto/kbproto
-	x11-proto/inputproto
-	!>=x11-proto/xproto-7.0.6"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-0.99.0_p20051007"
-
-PATCHES="${FILESDIR}/${P}-setuid.diff"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)
-
-src_install() {
-	x-modular_src_install
-
-	local ENVD="10libx11"
-	echo "LDPATH=\"/usr/lib\"" > ${T}/${ENVD}
-	doenvd ${T}/${ENVD}
-}
diff --git a/x11-libs/libX11/libX11-1.0.3.ebuild b/x11-libs/libX11/libX11-1.0.3.ebuild
deleted file mode 100644
index d527bc801deb..000000000000
--- a/x11-libs/libX11/libX11-1.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.0.3.ebuild,v 1.1 2006/06/30 04:42:41 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org X11 library"
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-RDEPEND=">=x11-libs/xtrans-1.0.1
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-proto/kbproto
-	x11-proto/inputproto
-	>=x11-proto/xproto-7.0.6"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-0.99.0_p20051007"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)
-
-src_install() {
-	x-modular_src_install
-
-	local ENVD="10libx11"
-	echo "LDPATH=\"/usr/lib\"" > ${T}/${ENVD}
-	doenvd ${T}/${ENVD}
-}
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 113b9148e973..2f390eda6ab7 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libXau-1.0.0.tar.bz2 218003 RMD160 bdf9ede8b258ba3fd4b8e43e9c9360a1a176373a SHA256 71741bb6bcdb65ab6a9e5fd12647c6e6d355f2c239bd86e815ed325cecffce3b
 DIST libXau-1.0.1.tar.bz2 231634 RMD160 3d500258d6b13c05a36b0b1bc843bcba5504fcb2 SHA1 01fbd40d5435b896306fc9d64f7ef6a8e7ecdb0c SHA256 c690fdb0f65e31bc144ff7272d4b9d305e7572be612a660f5b533a48997169c0
-EBUILD libXau-1.0.0.ebuild 605 RMD160 e6f15a1abe38e3d2163f29edb47406ef83c7038d SHA1 5f004fb8b6992b3a15c16a90736e43c7d27838fb SHA256 a2f1c030c40f1f115ba49d22a4349eaa475d35513ec8eeaf6611e0df2c369d25
-MD5 92960a5384455e29be47b663966f6ffb libXau-1.0.0.ebuild 605
-RMD160 e6f15a1abe38e3d2163f29edb47406ef83c7038d libXau-1.0.0.ebuild 605
-SHA256 a2f1c030c40f1f115ba49d22a4349eaa475d35513ec8eeaf6611e0df2c369d25 libXau-1.0.0.ebuild 605
 EBUILD libXau-1.0.1.ebuild 601 RMD160 7219698c3d740941670c28a09a3d400b1caebc57 SHA1 ac162b8df27b06d60f2ea3576ff5589c21269fed SHA256 ddfb084fc46fa37644838e03266a9e399c610cfaed258195ae5c1aa58d11277f
 MD5 26a9e56b7d34f4541d69ffce60b37a1a libXau-1.0.1.ebuild 601
 RMD160 7219698c3d740941670c28a09a3d400b1caebc57 libXau-1.0.1.ebuild 601
 SHA256 ddfb084fc46fa37644838e03266a9e399c610cfaed258195ae5c1aa58d11277f libXau-1.0.1.ebuild 601
-MISC ChangeLog 2826 RMD160 b5bc2e7a1ada63ffd90979f46bb5da0854c0eadf SHA1 9078a30448fe54b9590200c2fb5b64e8b940c8c8 SHA256 1488c4597fde830bc376803b580caaf43471261c9a1426a7cc4dd9a5129459e1
-MD5 30c729c43c13059b81b5e712d309c9ee ChangeLog 2826
-RMD160 b5bc2e7a1ada63ffd90979f46bb5da0854c0eadf ChangeLog 2826
-SHA256 1488c4597fde830bc376803b580caaf43471261c9a1426a7cc4dd9a5129459e1 ChangeLog 2826
+MISC ChangeLog 2926 RMD160 5796457b82aaa453d513ec5aecd40cd3f1c6f50e SHA1 36459be526c1052fa3554f81165a1235208ccf5b SHA256 06950356b56d145979a1df1d34a86610ca42266ee0da974b09d2a94e55e1bcb3
+MD5 3d8736c0d6e59e60a6244bc8f6635845 ChangeLog 2926
+RMD160 5796457b82aaa453d513ec5aecd40cd3f1c6f50e ChangeLog 2926
+SHA256 06950356b56d145979a1df1d34a86610ca42266ee0da974b09d2a94e55e1bcb3 ChangeLog 2926
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 bd890271ab4766380b64d3b60f967d39 files/digest-libXau-1.0.0 241
-RMD160 17610804fd7b2283380c68bb5b31ffa575f9a6ff files/digest-libXau-1.0.0 241
-SHA256 400396102aad4e1575bdcabfcb63c690bc868de2c46bbe24652667d8064e144c files/digest-libXau-1.0.0 241
 MD5 ca57e0f3859e91254ccf6970e4c125ed files/digest-libXau-1.0.1 241
 RMD160 d9913f6dfbc9fdd60150f5cb565285780a19f5a9 files/digest-libXau-1.0.1 241
 SHA256 a94078f9e7e2d67e899607285a08483cde4375b9b775e5489a25f080819fe880 files/digest-libXau-1.0.1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUXOkT4lNIS36YERAqZvAKCWuXdHQscSbst00zbgvmMea6CPDACfZq2n
-ZSVW1m3lGVFH4Lq6D6XsxBY=
-=GmKi
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXau/files/digest-libXau-1.0.0 b/x11-libs/libXau/files/digest-libXau-1.0.0
deleted file mode 100644
index 4ef47e4d458d..000000000000
--- a/x11-libs/libXau/files/digest-libXau-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8b0f208b55d5c05d63ae75d6f6ed5c0c libXau-1.0.0.tar.bz2 218003
-RMD160 bdf9ede8b258ba3fd4b8e43e9c9360a1a176373a libXau-1.0.0.tar.bz2 218003
-SHA256 71741bb6bcdb65ab6a9e5fd12647c6e6d355f2c239bd86e815ed325cecffce3b libXau-1.0.0.tar.bz2 218003
diff --git a/x11-libs/libXau/libXau-1.0.0.ebuild b/x11-libs/libXau/libXau-1.0.0.ebuild
deleted file mode 100644
index 535e64602129..000000000000
--- a/x11-libs/libXau/libXau-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXau/libXau-1.0.0.ebuild,v 1.7 2006/03/31 19:31:57 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xau library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 1faf6ffaa1fd..fa19c134bf2c 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libXaw-1.0.1.tar.bz2 517750 RMD160 6b295cc2bc88cb3da54129467767e70974352afc SHA1 74f31fba659c09f3ecb7826b5787e53896d211e5 SHA256 f7aa0698791017efaef0260d453f34d4a74de0be37e9da5f18287d09991389ef
 DIST libXaw-1.0.2.tar.bz2 524107 RMD160 f2beb04f1edd8cdfcb1b4045e4b0b335c7d468df SHA1 d15a520d714a4125fa550cfdb391f8a03cd3e26d SHA256 579f332cb01c2bee5fc75bdfbf0e6b5c57ce3d1849936ae4c540564b2168556a
-EBUILD libXaw-1.0.1.ebuild 739 RMD160 36beb317fb4c9ed3d2309c41c15c39aba87496f3 SHA1 14c9ea4c2df04043299872e77bdd8c213c4d9ac5 SHA256 15b8da89619194d9b892f8a6802c093049020d3253cd4f810a1126c621bdc933
-MD5 ddd0aa109f55b284e41d0c2585c556e4 libXaw-1.0.1.ebuild 739
-RMD160 36beb317fb4c9ed3d2309c41c15c39aba87496f3 libXaw-1.0.1.ebuild 739
-SHA256 15b8da89619194d9b892f8a6802c093049020d3253cd4f810a1126c621bdc933 libXaw-1.0.1.ebuild 739
 EBUILD libXaw-1.0.2.ebuild 922 RMD160 a55f9463bbc36336241bacfa875ff24fe4c6815c SHA1 6a89e4ff863550430c729c9908fddf33f53eddb2 SHA256 9a0e36c177fa9492a492084f7bfa2532f75a9079388fb066b1410b48e98df73c
 MD5 fcf179bfa4b45d981534ef8502c180a8 libXaw-1.0.2.ebuild 922
 RMD160 a55f9463bbc36336241bacfa875ff24fe4c6815c libXaw-1.0.2.ebuild 922
 SHA256 9a0e36c177fa9492a492084f7bfa2532f75a9079388fb066b1410b48e98df73c libXaw-1.0.2.ebuild 922
-MISC ChangeLog 3052 RMD160 e181721acc3baf7db7fca344247cca5c18e8aa93 SHA1 c6cde36f2dee5028f7d40c0e9af5c4d0583dec6e SHA256 3819f66351b9a3ac33a485f254b4bebc26be6a83a14608d293795a138b0ef9e2
-MD5 7a675b249bab486166b27d3d4b420d4e ChangeLog 3052
-RMD160 e181721acc3baf7db7fca344247cca5c18e8aa93 ChangeLog 3052
-SHA256 3819f66351b9a3ac33a485f254b4bebc26be6a83a14608d293795a138b0ef9e2 ChangeLog 3052
+MISC ChangeLog 3152 RMD160 8674267a9c1ac69597ae340743c518348ea2ed36 SHA1 e75e368761f90d8ad2487c23453b12048faff7b7 SHA256 c8138c400146af79e15cf3c0b2cd36e05492bee97ec1a37bbf60752a3c52e4f0
+MD5 d86241670263ad3678eb56a4dd8b6aff ChangeLog 3152
+RMD160 8674267a9c1ac69597ae340743c518348ea2ed36 ChangeLog 3152
+SHA256 c8138c400146af79e15cf3c0b2cd36e05492bee97ec1a37bbf60752a3c52e4f0 ChangeLog 3152
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 5a2cc868f99fc6f9de20b595fb06581e files/digest-libXaw-1.0.1 241
-RMD160 3148a7092d3e044937663cebc6d86712684705f8 files/digest-libXaw-1.0.1 241
-SHA256 09b6b3311c4fef450fd0da6d930d2e0315b4c3831073ee5e5ed376b84269aafd files/digest-libXaw-1.0.1 241
 MD5 395c761b40e5135863aaeb3c09a5c2f7 files/digest-libXaw-1.0.2 241
 RMD160 e439dc6feba21b046dfa040125a613feb899a4bf files/digest-libXaw-1.0.2 241
 SHA256 fa070714da2535b38f900d6cf4ec8996486d603a72469a5ff534d0a6ec28fd8c files/digest-libXaw-1.0.2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUXtkT4lNIS36YERAuzuAKCgkWx/oOCa/zm6OkMz7NyM3rOsgQCgpXQ1
-v0kzIjNEycjBJ0ddZNz8teY=
-=fIVh
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXaw/files/digest-libXaw-1.0.1 b/x11-libs/libXaw/files/digest-libXaw-1.0.1
deleted file mode 100644
index 276da0df0b0e..000000000000
--- a/x11-libs/libXaw/files/digest-libXaw-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e8ccc66aa3cc06bec6c23a18678a037 libXaw-1.0.1.tar.bz2 517750
-RMD160 6b295cc2bc88cb3da54129467767e70974352afc libXaw-1.0.1.tar.bz2 517750
-SHA256 f7aa0698791017efaef0260d453f34d4a74de0be37e9da5f18287d09991389ef libXaw-1.0.1.tar.bz2 517750
diff --git a/x11-libs/libXaw/libXaw-1.0.1.ebuild b/x11-libs/libXaw/libXaw-1.0.1.ebuild
deleted file mode 100644
index a3fff88e2afe..000000000000
--- a/x11-libs/libXaw/libXaw-1.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.1.ebuild,v 1.6 2006/03/31 19:48:28 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xaw library"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xprint"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-proto/xproto
-	xprint? ( x11-libs/libXp )"
-DEPEND="${RDEPEND}
-	sys-apps/ed"
-
-CONFIGURE_OPTIONS="`use_enable xprint xaw8`"
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index a114beb52605..01fa40e341f7 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,42 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libXcursor-1.1.5.2.tar.bz2 236046 RMD160 07de0d9d33d00e7a7ffc5981347fe1c4db09cda8 SHA256 0f8305113c33bcc057d058832bf7ae116abf339216608c83a67d3f06b096db54
-DIST libXcursor-1.1.6.tar.bz2 245250 RMD160 2988b3abc976891dea554798271b79ced18932f9 SHA1 41f7d058165c7ca2929ab0c848a0d7ff7a4839ad SHA256 b78c45a239947841bd0db6ccad9cfcbd28fb782356a1ff5a8ba606a294b21301
 DIST libXcursor-1.1.7.tar.bz2 224251 RMD160 945fa948e58a36256eb56980f78ff3929dc50e9e SHA1 22e8ceeea2b6a22898c6b6427e1a9a3bcb6fab27 SHA256 43571d93d7d59092e07d89fcc06572a06175e7a6f0d3d966558e7f9f5b0f8102
-EBUILD libXcursor-1.1.5.2-r1.ebuild 890 RMD160 60e0a58159ffc54be6a4a193b51eb68637a05c1d SHA1 e1bc3c7f487bff4f72d827ba04e44ea10a3f0a59 SHA256 a4667c90e23c960fcaab30c7ca276c4515ded00ca5984d47d548194b47b4a0b8
-MD5 3b75f6280a21664fc1cdfe3be61941be libXcursor-1.1.5.2-r1.ebuild 890
-RMD160 60e0a58159ffc54be6a4a193b51eb68637a05c1d libXcursor-1.1.5.2-r1.ebuild 890
-SHA256 a4667c90e23c960fcaab30c7ca276c4515ded00ca5984d47d548194b47b4a0b8 libXcursor-1.1.5.2-r1.ebuild 890
-EBUILD libXcursor-1.1.6.ebuild 890 RMD160 d5927222b72c03f3b6628146023e3b76e0c7e64d SHA1 9c905f2a5d8d23f55dbdbb2554a0a9be21e6dda5 SHA256 55cbee9fe71c5bad28745e73ff9fc8913048990d056fc69df685478d46f217e4
-MD5 e1158e22a4d630281c3370d5de7f8f70 libXcursor-1.1.6.ebuild 890
-RMD160 d5927222b72c03f3b6628146023e3b76e0c7e64d libXcursor-1.1.6.ebuild 890
-SHA256 55cbee9fe71c5bad28745e73ff9fc8913048990d056fc69df685478d46f217e4 libXcursor-1.1.6.ebuild 890
 EBUILD libXcursor-1.1.7.ebuild 863 RMD160 a7f4836a01acffc59d4faed0e47efa5f989a4e63 SHA1 0d7ab53d20aae2cd479f4dca69154f4595abb656 SHA256 e573cd6c664a98bdf28466ac95319773f04280dc7876020b0cfe6de3d9a49b22
 MD5 acf19b7f30a599a50a4542df699435ee libXcursor-1.1.7.ebuild 863
 RMD160 a7f4836a01acffc59d4faed0e47efa5f989a4e63 libXcursor-1.1.7.ebuild 863
 SHA256 e573cd6c664a98bdf28466ac95319773f04280dc7876020b0cfe6de3d9a49b22 libXcursor-1.1.7.ebuild 863
-MISC ChangeLog 4765 RMD160 993d094da41b72e73cbfba1aa6d119f0cb5c9610 SHA1 ba8d49facd176ce25ed7ee66e917b9a05ec7b5e0 SHA256 804a118a4a105cfb16b2725e346fbbe5799cd505933c8694c2bf947d5e6e4b16
-MD5 3a4e177d29283134f3ef4d4b6913b30f ChangeLog 4765
-RMD160 993d094da41b72e73cbfba1aa6d119f0cb5c9610 ChangeLog 4765
-SHA256 804a118a4a105cfb16b2725e346fbbe5799cd505933c8694c2bf947d5e6e4b16 ChangeLog 4765
+MISC ChangeLog 4902 RMD160 150f4b5dbc75a730f2d4eb331d66da2812338cf2 SHA1 4630b29d92e58c2eec7520de9b10504f0b41069f SHA256 53b6dc1c39ad13a748f14d7694d1f684c17db7ce6078e855712d12cef7590075
+MD5 475e9140fd10962a04a78f979a61c7c2 ChangeLog 4902
+RMD160 150f4b5dbc75a730f2d4eb331d66da2812338cf2 ChangeLog 4902
+SHA256 53b6dc1c39ad13a748f14d7694d1f684c17db7ce6078e855712d12cef7590075 ChangeLog 4902
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 cb08c33c5890ce6c9a1be08d51ccef53 files/digest-libXcursor-1.1.5.2-r1 259
-RMD160 04ae8b5072a075e438a77e623350c36caa67496d files/digest-libXcursor-1.1.5.2-r1 259
-SHA256 c576d626e91521256780de6a58b5fea4d8a78b579454a154c1b260e9a4b0a15c files/digest-libXcursor-1.1.5.2-r1 259
-MD5 7b60798617b28d7fb754a47448a40c42 files/digest-libXcursor-1.1.6 253
-RMD160 af01c45d593f27c8f42798abf34f34cb95cdf565 files/digest-libXcursor-1.1.6 253
-SHA256 404ac7ae28cfeffd010e47fe6d26e952002d75504dbdee5cda04274690a8e56a files/digest-libXcursor-1.1.6 253
 MD5 029ed97ff10227742bed9dd08aa8243d files/digest-libXcursor-1.1.7 253
 RMD160 209bc2ecab698e7a64554b1dd3593717689a5661 files/digest-libXcursor-1.1.7 253
 SHA256 97dc7249698d3e1ab0e4c9ab7d866ec575883ad9f22c3ac7eb8332f3cbb6e5ee files/digest-libXcursor-1.1.7 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUYskT4lNIS36YERAoYgAKCVXLFYcs9bQb3EJe2UNCsvFVkbOwCdFwku
-76hBlOlJ7Iw+JtXcX72lZns=
-=a8lP
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXcursor/files/digest-libXcursor-1.1.5.2-r1 b/x11-libs/libXcursor/files/digest-libXcursor-1.1.5.2-r1
deleted file mode 100644
index a9ef3e4c4c6e..000000000000
--- a/x11-libs/libXcursor/files/digest-libXcursor-1.1.5.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df4c922947d0d74791f9d492ee9e9865 libXcursor-1.1.5.2.tar.bz2 236046
-RMD160 07de0d9d33d00e7a7ffc5981347fe1c4db09cda8 libXcursor-1.1.5.2.tar.bz2 236046
-SHA256 0f8305113c33bcc057d058832bf7ae116abf339216608c83a67d3f06b096db54 libXcursor-1.1.5.2.tar.bz2 236046
diff --git a/x11-libs/libXcursor/files/digest-libXcursor-1.1.6 b/x11-libs/libXcursor/files/digest-libXcursor-1.1.6
deleted file mode 100644
index acb0200f4fb1..000000000000
--- a/x11-libs/libXcursor/files/digest-libXcursor-1.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1ac683d0ff22f1b6b21cbe5ead1d7899 libXcursor-1.1.6.tar.bz2 245250
-RMD160 2988b3abc976891dea554798271b79ced18932f9 libXcursor-1.1.6.tar.bz2 245250
-SHA256 b78c45a239947841bd0db6ccad9cfcbd28fb782356a1ff5a8ba606a294b21301 libXcursor-1.1.6.tar.bz2 245250
diff --git a/x11-libs/libXcursor/libXcursor-1.1.5.2-r1.ebuild b/x11-libs/libXcursor/libXcursor-1.1.5.2-r1.ebuild
deleted file mode 100644
index 2b7e9d4edc6c..000000000000
--- a/x11-libs/libXcursor/libXcursor-1.1.5.2-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.5.2-r1.ebuild,v 1.5 2006/04/01 03:12:20 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xcursor library"
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND="x11-libs/libXrender
-	x11-libs/libXfixes
-	x11-libs/libX11
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="--with-icondir=/usr/share/cursors/xorg-x11
-	--with-cursorpath=~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps"
diff --git a/x11-libs/libXcursor/libXcursor-1.1.6.ebuild b/x11-libs/libXcursor/libXcursor-1.1.6.ebuild
deleted file mode 100644
index 6032422d76d9..000000000000
--- a/x11-libs/libXcursor/libXcursor-1.1.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.6.ebuild,v 1.2 2006/04/29 15:29:20 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xcursor library"
-#RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND="x11-libs/libXrender
-	x11-libs/libXfixes
-	x11-libs/libX11
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="--with-icondir=/usr/share/cursors/xorg-x11
-	--with-cursorpath=~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps"
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index 639f8ad0fd70..ad2bee9e03c1 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libXdamage-1.0.2.2.tar.bz2 211331 RMD160 78d1fd86f8f4e59ce83b86f82d7ae405ad641ad1 SHA256 6c9cfcad4382b9496f3934801a4c6b1d23706363c437f57cd1d933b85c8f6987
 DIST libXdamage-1.0.3.tar.bz2 223597 RMD160 70c3ea1b587634c3f2fd7a2e93099410636f6f60 SHA1 be9513ffe0429b2872b20eae7a8315df186a712a SHA256 a076bd8e5834655d6ea06a770b33d0acc59de82b63c4e87e720c8065bdefb441
-EBUILD libXdamage-1.0.2.2.ebuild 679 RMD160 38495834be8e54d8019c36aeb9a91333177a6ee6 SHA1 6b5e3bbe4377622ecce8d9b7cde4eae155c398d3 SHA256 e7368bed536c39edf2070cbf1e2c1fdf85247aa83855962fd30c0119a429bb70
-MD5 e3cb0873643e520bed5d4ec2149bcb6c libXdamage-1.0.2.2.ebuild 679
-RMD160 38495834be8e54d8019c36aeb9a91333177a6ee6 libXdamage-1.0.2.2.ebuild 679
-SHA256 e7368bed536c39edf2070cbf1e2c1fdf85247aa83855962fd30c0119a429bb70 libXdamage-1.0.2.2.ebuild 679
 EBUILD libXdamage-1.0.3.ebuild 674 RMD160 958be69cadfee2b5ce50a9c4c58fd692e66e85d9 SHA1 1f73716aabf7ad1059186f194dd6dbafe9518e75 SHA256 0ad7234ef2cf00c98f81571286e1e51b2f4159b9dbe2602e3a08dd9473a3d232
 MD5 2ae022c290c881b1abeb7c97e4f17a6d libXdamage-1.0.3.ebuild 674
 RMD160 958be69cadfee2b5ce50a9c4c58fd692e66e85d9 libXdamage-1.0.3.ebuild 674
 SHA256 0ad7234ef2cf00c98f81571286e1e51b2f4159b9dbe2602e3a08dd9473a3d232 libXdamage-1.0.3.ebuild 674
-MISC ChangeLog 2884 RMD160 346946324747eb4a2ce9e009852bd798113af9c3 SHA1 2cde38ac5171f593a513de08d633bc5a7e3f7177 SHA256 804681258cdde6b87eefd3c5f8572b3e97c79bb5154f914659ca985e39a6b06e
-MD5 0e35b2d6470d577bb0d20881075c7659 ChangeLog 2884
-RMD160 346946324747eb4a2ce9e009852bd798113af9c3 ChangeLog 2884
-SHA256 804681258cdde6b87eefd3c5f8572b3e97c79bb5154f914659ca985e39a6b06e ChangeLog 2884
+MISC ChangeLog 2992 RMD160 140c77d52aa23b951070d507cf6738ac14b43fa6 SHA1 23e9767895c51cbb5cadc89de2573aeff7e2671e SHA256 87ee2b50f70474017f2c01000d35ce8612e3c92c9267d0e6ad13003ffbf7bf4c
+MD5 b29d5756b60329abc3b5bac0783dd068 ChangeLog 2992
+RMD160 140c77d52aa23b951070d507cf6738ac14b43fa6 ChangeLog 2992
+SHA256 87ee2b50f70474017f2c01000d35ce8612e3c92c9267d0e6ad13003ffbf7bf4c ChangeLog 2992
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 831b07256668267ed5ed830dd768b58b files/digest-libXdamage-1.0.2.2 259
-RMD160 3cef214dc074f338c89bedccf5ed94cef5e13c17 files/digest-libXdamage-1.0.2.2 259
-SHA256 ce4695283783167e8876933b8c936dbe0572c6009896f1ac7ac9fe7de6d22c1c files/digest-libXdamage-1.0.2.2 259
 MD5 0fd853617d626ff1a4363e4a71d2d661 files/digest-libXdamage-1.0.3 253
 RMD160 5efc44192dc2031a520ce27ef87c1a5fbcb07813 files/digest-libXdamage-1.0.3 253
 SHA256 b5cb5ad85db45a9d8c8de0de8be745fd1b3b523261967006f0a48ce2268c987a files/digest-libXdamage-1.0.3 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUZKkT4lNIS36YERAlBQAJ4u66rCYXZxYNMVD3fHVBs9kP+XlQCgrqKH
-3dXfVp50YTg+V/ce40Se74A=
-=Af0Q
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXdamage/files/digest-libXdamage-1.0.2.2 b/x11-libs/libXdamage/files/digest-libXdamage-1.0.2.2
deleted file mode 100644
index 81d9d0851a51..000000000000
--- a/x11-libs/libXdamage/files/digest-libXdamage-1.0.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d8a367fe34feb3a7a3314137ff3e9c18 libXdamage-1.0.2.2.tar.bz2 211331
-RMD160 78d1fd86f8f4e59ce83b86f82d7ae405ad641ad1 libXdamage-1.0.2.2.tar.bz2 211331
-SHA256 6c9cfcad4382b9496f3934801a4c6b1d23706363c437f57cd1d933b85c8f6987 libXdamage-1.0.2.2.tar.bz2 211331
diff --git a/x11-libs/libXdamage/libXdamage-1.0.2.2.ebuild b/x11-libs/libXdamage/libXdamage-1.0.2.2.ebuild
deleted file mode 100644
index bf6967d2de2b..000000000000
--- a/x11-libs/libXdamage/libXdamage-1.0.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdamage/libXdamage-1.0.2.2.ebuild,v 1.8 2006/04/13 13:27:54 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xdamage library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXfixes
-	x11-proto/damageproto
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index a24a4fb8fc08..050f6a699454 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libXdmcp-1.0.0.tar.bz2 220589 RMD160 ec3100dfecda7d7016a027e38adeb7c130ffb4e6 SHA256 5079b6aae38e458f22631fffe5760f545e3cf7712b2988deab2e3d41eda8d91f
 DIST libXdmcp-1.0.1.tar.bz2 232303 RMD160 0ead2a8692ed8dfd9dd76205936455198f59de8b SHA1 623c6126a085a036845094124fd66857be1d1522 SHA256 594e6e18bd26bc6ebc194be5bc6b06b195084dab8e7540233c4f908a93209da9
-EBUILD libXdmcp-1.0.0.ebuild 611 RMD160 c6be9e1556adeb6bc96f5fb3d089f6ec5c0350ec SHA1 f64934eb58dad988c6dd3b1d2b1ed08d7487f078 SHA256 c60f3fdd0f236c8cf77b4292eb65925a179993859e7ae8e03dcee91791bb77bc
-MD5 377aa40a0ffb0d5a119190831b099756 libXdmcp-1.0.0.ebuild 611
-RMD160 c6be9e1556adeb6bc96f5fb3d089f6ec5c0350ec libXdmcp-1.0.0.ebuild 611
-SHA256 c60f3fdd0f236c8cf77b4292eb65925a179993859e7ae8e03dcee91791bb77bc libXdmcp-1.0.0.ebuild 611
 EBUILD libXdmcp-1.0.1.ebuild 608 RMD160 be2011f6a617fcc680de07b40effc666c2a48359 SHA1 ebb7c76457eb3ec2062b4cbb320902d6bebe5c35 SHA256 9bdf9ef8f9075d52e548ce6d07695bb270c6a1f92330b9e9ad8e438fac5c1d9d
 MD5 2724a8d86c6acae7bb742458ed516b86 libXdmcp-1.0.1.ebuild 608
 RMD160 be2011f6a617fcc680de07b40effc666c2a48359 libXdmcp-1.0.1.ebuild 608
 SHA256 9bdf9ef8f9075d52e548ce6d07695bb270c6a1f92330b9e9ad8e438fac5c1d9d libXdmcp-1.0.1.ebuild 608
-MISC ChangeLog 3146 RMD160 fee31412e70c19a1e1cbad99893f0216042a9736 SHA1 21013a74d155cfcd974849b049c688694de4c95a SHA256 057c51d4a784ce65014fdce06483cc9c5e8c4f7473687500f000660bfd1be393
-MD5 cb4a1be8b19cad66b1ecdc91157b3ec5 ChangeLog 3146
-RMD160 fee31412e70c19a1e1cbad99893f0216042a9736 ChangeLog 3146
-SHA256 057c51d4a784ce65014fdce06483cc9c5e8c4f7473687500f000660bfd1be393 ChangeLog 3146
+MISC ChangeLog 3250 RMD160 036c6aa55bf0a86a1aac3838810233c79f63ea89 SHA1 5c6559dc3d2cf4b1ad9d7410a65bf1bea6bb93cb SHA256 40edd5e6d44b775dfaf9e0ffe8821131abfae545e9805d2df23d5ee8e320262d
+MD5 8bf04bc145747b218da15d3ac154686e ChangeLog 3250
+RMD160 036c6aa55bf0a86a1aac3838810233c79f63ea89 ChangeLog 3250
+SHA256 40edd5e6d44b775dfaf9e0ffe8821131abfae545e9805d2df23d5ee8e320262d ChangeLog 3250
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 99730ef7396e929b7cde783ca35beea6 files/digest-libXdmcp-1.0.0 247
-RMD160 4637736f8d1ba0686949441a23b57cc51b3a703a files/digest-libXdmcp-1.0.0 247
-SHA256 f9d61c8e24c7b650152eebb3f5cf7de3ecff31b1d68adf195cb11c795ff4c103 files/digest-libXdmcp-1.0.0 247
 MD5 b46cc346cdadd662989c83261954a93b files/digest-libXdmcp-1.0.1 247
 RMD160 8928ab04b035cc3b554f1265b2ac3daab83af106 files/digest-libXdmcp-1.0.1 247
 SHA256 bae4e24c975d297b821ccb3242919e58d49fe51453a60161b23a777143f31af2 files/digest-libXdmcp-1.0.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUZokT4lNIS36YERAkWkAJ9xc+Zq/cFAt5A7td+TzY9zZNyFUQCeKrh/
-cPusxdnTW4t6LAmf2oJO6y8=
-=h7mP
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXdmcp/files/digest-libXdmcp-1.0.0 b/x11-libs/libXdmcp/files/digest-libXdmcp-1.0.0
deleted file mode 100644
index b4938ef882e5..000000000000
--- a/x11-libs/libXdmcp/files/digest-libXdmcp-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c26c2b2320565824e271758096d10743 libXdmcp-1.0.0.tar.bz2 220589
-RMD160 ec3100dfecda7d7016a027e38adeb7c130ffb4e6 libXdmcp-1.0.0.tar.bz2 220589
-SHA256 5079b6aae38e458f22631fffe5760f545e3cf7712b2988deab2e3d41eda8d91f libXdmcp-1.0.0.tar.bz2 220589
diff --git a/x11-libs/libXdmcp/libXdmcp-1.0.0.ebuild b/x11-libs/libXdmcp/libXdmcp-1.0.0.ebuild
deleted file mode 100644
index 64a42a8f328c..000000000000
--- a/x11-libs/libXdmcp/libXdmcp-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdmcp/libXdmcp-1.0.0.ebuild,v 1.7 2006/03/31 19:34:08 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xdmcp library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXevie/Manifest b/x11-libs/libXevie/Manifest
index a272c8ab0071..a318dc55adbd 100644
--- a/x11-libs/libXevie/Manifest
+++ b/x11-libs/libXevie/Manifest
@@ -1,38 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fix_shadow_manpages.patch 569 RMD160 72ba679fafd03304876c356893a3e34bbbcd402d SHA1 c493b2a7c8748fc109c7f6872c9856be38373591 SHA256 90423c19273a28b6fc01c323c5c91ca9e110e89211257f24b8f5a20d79dda38e
 MD5 8793a6b95aa23754e0dca0c67b86e9d8 files/fix_shadow_manpages.patch 569
 RMD160 72ba679fafd03304876c356893a3e34bbbcd402d files/fix_shadow_manpages.patch 569
 SHA256 90423c19273a28b6fc01c323c5c91ca9e110e89211257f24b8f5a20d79dda38e files/fix_shadow_manpages.patch 569
-DIST libXevie-1.0.0.tar.bz2 212802 RMD160 8adf867e0d93b64122710e812b32f04bfe7990a2 SHA256 c4e5fd85ef5592959384ebd6e68b6db8195bae520903ab4d0bac06aff343df3c
 DIST libXevie-1.0.1.tar.bz2 224715 RMD160 294f6b2a293d3c495549e4426a1e7a785c47c274 SHA1 4f8603d227a1c6739044c1b7159da64ff6b504a8 SHA256 4ee20b86a4a23533f082976e1b69b31e725333e61f2559f6a8079cbf3e342f07
-EBUILD libXevie-1.0.0-r1.ebuild 727 RMD160 642039f532e63dd6598cff70769e21751468cd25 SHA1 7115081ba1ef04e0b7e3a7c849828be81a88e58e SHA256 dcf222d0817965cc95756dab8da5cd9355ece21d6e9c8a785d809f3fa80b13a6
-MD5 02c0d76f515bad23fa5b26705fea3986 libXevie-1.0.0-r1.ebuild 727
-RMD160 642039f532e63dd6598cff70769e21751468cd25 libXevie-1.0.0-r1.ebuild 727
-SHA256 dcf222d0817965cc95756dab8da5cd9355ece21d6e9c8a785d809f3fa80b13a6 libXevie-1.0.0-r1.ebuild 727
 EBUILD libXevie-1.0.1.ebuild 673 RMD160 e95652de17bad1b9fd95ce4a724d60ca1f036948 SHA1 e9da66477255b3c858c4011c86e2c67f92b3c30a SHA256 cb8af59e44b5e9129c7e5fa89eed7a4905b46bb31c02a53239f43816d90c708b
 MD5 f91552b8727fb4d3b578aeaab0d8d800 libXevie-1.0.1.ebuild 673
 RMD160 e95652de17bad1b9fd95ce4a724d60ca1f036948 libXevie-1.0.1.ebuild 673
 SHA256 cb8af59e44b5e9129c7e5fa89eed7a4905b46bb31c02a53239f43816d90c708b libXevie-1.0.1.ebuild 673
-MISC ChangeLog 2940 RMD160 e7c00347b8f077fe8d4772853a3f0e54a9709399 SHA1 23f09df4e088da3b14df4a58dd6a254b378ce52d SHA256 6b184e9cda9412e48e843003f7fd3d9256ffe93bc225ce932e2e03af5926e727
-MD5 aca482f745fea056899736722627d34d ChangeLog 2940
-RMD160 e7c00347b8f077fe8d4772853a3f0e54a9709399 ChangeLog 2940
-SHA256 6b184e9cda9412e48e843003f7fd3d9256ffe93bc225ce932e2e03af5926e727 ChangeLog 2940
+MISC ChangeLog 3047 RMD160 fc5dcded0652088e753143bc00eb6a9440b5ad9e SHA1 9d9799a0f05d28db5bd91107718e5b0aee1a9f31 SHA256 0066bdbf180a5216d9aac5e6ae06de9b2f1218c85028426240739460eef45515
+MD5 370f2b2bbda65b656f3365ae7c25a9b3 ChangeLog 3047
+RMD160 fc5dcded0652088e753143bc00eb6a9440b5ad9e ChangeLog 3047
+SHA256 0066bdbf180a5216d9aac5e6ae06de9b2f1218c85028426240739460eef45515 ChangeLog 3047
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 936fbbdf04e03710546ae9ab66a83769 files/digest-libXevie-1.0.0-r1 247
-RMD160 188ade23f2939eb3ed1213b67f73f6420995e5ef files/digest-libXevie-1.0.0-r1 247
-SHA256 2402976eeb2833f1b2a34b28d7d0a7844fe7ca4158a6663c03e1b0a810ed4740 files/digest-libXevie-1.0.0-r1 247
 MD5 ddd0e6cf1e7ce1ebd2d41695a9dce874 files/digest-libXevie-1.0.1 247
 RMD160 e96a3c0d56a3f5676378949f7cf4ce8e62612a4c files/digest-libXevie-1.0.1 247
 SHA256 91029d0bdcd5f104615d8cc6d0dedac143e1ffbbbf3b9bf2a9579c50fee37041 files/digest-libXevie-1.0.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUaFkT4lNIS36YERAitBAJoDmElQo2Q2rtZ6VqqtmD7VYAOVQQCgl8O+
-CPx0rVq4sisS/BqGSwUBq4o=
-=fLPB
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXevie/files/digest-libXevie-1.0.0-r1 b/x11-libs/libXevie/files/digest-libXevie-1.0.0-r1
deleted file mode 100644
index 2c1303041611..000000000000
--- a/x11-libs/libXevie/files/digest-libXevie-1.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 05903385dd79c1d77fa5d3edc17c6555 libXevie-1.0.0.tar.bz2 212802
-RMD160 8adf867e0d93b64122710e812b32f04bfe7990a2 libXevie-1.0.0.tar.bz2 212802
-SHA256 c4e5fd85ef5592959384ebd6e68b6db8195bae520903ab4d0bac06aff343df3c libXevie-1.0.0.tar.bz2 212802
diff --git a/x11-libs/libXevie/libXevie-1.0.0-r1.ebuild b/x11-libs/libXevie/libXevie-1.0.0-r1.ebuild
deleted file mode 100644
index 56c59ef8f308..000000000000
--- a/x11-libs/libXevie/libXevie-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXevie/libXevie-1.0.0-r1.ebuild,v 1.4 2006/03/26 07:12:30 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xevie library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/xproto
-	x11-proto/evieext"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-PATCHES="${FILESDIR}/fix_shadow_manpages.patch"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index c631eff6ddf8..70c840bf1072 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,38 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fix_shadow_manpages.patch 963 RMD160 eeaf67384683f8ad6a216c46dda6c6b008e64930 SHA1 5614b48c907713f61fdd0b4e712ea96b1f881a2f SHA256 05b5baecb158c1710782ee89c7203455d23c6184b193e80771706d6e19f58987
 MD5 68769b5f5ffd78e38ebd2c58e4653649 files/fix_shadow_manpages.patch 963
 RMD160 eeaf67384683f8ad6a216c46dda6c6b008e64930 files/fix_shadow_manpages.patch 963
 SHA256 05b5baecb158c1710782ee89c7203455d23c6184b193e80771706d6e19f58987 files/fix_shadow_manpages.patch 963
-DIST libXext-1.0.0.tar.bz2 259489 RMD160 34965d43f970e0eae9fe32e982b94792941c9541 SHA256 e381555e03a56b546f3dc5ca0f93edcfcef3e740235b2afd1a32c38f86ab105c
 DIST libXext-1.0.1.tar.bz2 260729 RMD160 32e1e6b7f66e0ff19d9e2e8b9a152e5bc4d47ad9 SHA1 844daf20f799bec10e6da20b66eaed13276be8fc SHA256 9a87876f23492255330bdc185c12b78081d023f740a6fb6bf16816c27882306d
-EBUILD libXext-1.0.0-r1.ebuild 697 RMD160 52d946f1b98f35a46a9db864ea2d294439576352 SHA1 e2b9c1265dea69bc7cc1a229d64c0f629317ded2 SHA256 1b9b5d639fe96a857db3f4c2d2eb85ad03936c8fee5562b92e3cd8f476679945
-MD5 327a008ab91635476b6e424734fd29fa libXext-1.0.0-r1.ebuild 697
-RMD160 52d946f1b98f35a46a9db864ea2d294439576352 libXext-1.0.0-r1.ebuild 697
-SHA256 1b9b5d639fe96a857db3f4c2d2eb85ad03936c8fee5562b92e3cd8f476679945 libXext-1.0.0-r1.ebuild 697
 EBUILD libXext-1.0.1.ebuild 643 RMD160 eb7d9ccb798dc1a0ed67e1889924ecdcf73f00bb SHA1 d60b04c6e15b10afc3cb3952bf447290eb914503 SHA256 92aaa94a1a03804ab2cec79a35a37d15c155cc116012f66f1f5de45d240a227d
 MD5 550ed1393f5e0440572739916dddceb1 libXext-1.0.1.ebuild 643
 RMD160 eb7d9ccb798dc1a0ed67e1889924ecdcf73f00bb libXext-1.0.1.ebuild 643
 SHA256 92aaa94a1a03804ab2cec79a35a37d15c155cc116012f66f1f5de45d240a227d libXext-1.0.1.ebuild 643
-MISC ChangeLog 3296 RMD160 6fcbdca8af9e95a5211260f188020259926628f8 SHA1 9cc221b39477eb8dc7943565da9ebcc8b41f9714 SHA256 126056456a01d81a2655d7504cfc40b0d6b0f73d56969f6039cd7ede0bf048e7
-MD5 ec478bcd51740089a38e116a44715e0d ChangeLog 3296
-RMD160 6fcbdca8af9e95a5211260f188020259926628f8 ChangeLog 3296
-SHA256 126056456a01d81a2655d7504cfc40b0d6b0f73d56969f6039cd7ede0bf048e7 ChangeLog 3296
+MISC ChangeLog 3402 RMD160 576a044027447448f4e846fd75251b443070afc8 SHA1 fd9e8d9616dd0ff1c4eb5d1d3b09bf3b7fd62fdf SHA256 ccb87c8cc05ce6ba56159642b80fa8a3f29963b85908a4339c0eb708c4e46d1b
+MD5 1c2cd5a93fd0f25f8a1a74e8a4f73229 ChangeLog 3402
+RMD160 576a044027447448f4e846fd75251b443070afc8 ChangeLog 3402
+SHA256 ccb87c8cc05ce6ba56159642b80fa8a3f29963b85908a4339c0eb708c4e46d1b ChangeLog 3402
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 2dae9efa4b208714f3211ec41893b0d7 files/digest-libXext-1.0.0-r1 244
-RMD160 c28f59e389000c9d1b569dca87a10b5f21b03ff0 files/digest-libXext-1.0.0-r1 244
-SHA256 4c960842d06e21e963619060ef1244f5bac67eb5ab28b3b6abe8caae693e16ae files/digest-libXext-1.0.0-r1 244
 MD5 9033e48158691e97a548366b5b175c25 files/digest-libXext-1.0.1 244
 RMD160 b07475f71c42067a6fa39e50253ca6a6023ab218 files/digest-libXext-1.0.1 244
 SHA256 de2ce594445f6696794225f42c915ca93321dca7ccf9f0041aa32800b954b3a8 files/digest-libXext-1.0.1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUakkT4lNIS36YERAvXnAKC8oIUWcdcgue7AwdBpsUaKFMkRQgCglTGs
-HSxDOW2fntF3ZhPdmsj680c=
-=nF23
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXext/files/digest-libXext-1.0.0-r1 b/x11-libs/libXext/files/digest-libXext-1.0.0-r1
deleted file mode 100644
index 9b97e1b7be76..000000000000
--- a/x11-libs/libXext/files/digest-libXext-1.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ee00e206adde27814b8832aa769f55ed libXext-1.0.0.tar.bz2 259489
-RMD160 34965d43f970e0eae9fe32e982b94792941c9541 libXext-1.0.0.tar.bz2 259489
-SHA256 e381555e03a56b546f3dc5ca0f93edcfcef3e740235b2afd1a32c38f86ab105c libXext-1.0.0.tar.bz2 259489
diff --git a/x11-libs/libXext/libXext-1.0.0-r1.ebuild b/x11-libs/libXext/libXext-1.0.0-r1.ebuild
deleted file mode 100644
index 7d7bdefa357a..000000000000
--- a/x11-libs/libXext/libXext-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.0.0-r1.ebuild,v 1.4 2006/03/31 19:36:23 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xext library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-PATCHES="${FILESDIR}/fix_shadow_manpages.patch"
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index c166576488e4..e7e6cb7caa2d 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libXfixes-3.0.1.2.tar.bz2 216246 RMD160 6822804b5e9b8faaa71ecfc297d04a8e1e48f460 SHA256 2edbdd1f05ecaa2ddfe6e04101b70c572555a5e68d9bfb35763ddcd1d92eab00
 DIST libXfixes-4.0.1.tar.bz2 227707 RMD160 4349ea0d586f07ba34fc46141354d9a1136c638f SHA1 5a37df7aacde815f70c8efb47adadfa7da4857ed SHA256 0f6117672c9fea63f933c11127f1d552e7b91c33079d8fa14299f927c9624da4
-EBUILD libXfixes-3.0.1.2.ebuild 655 RMD160 2d51986d0ea69ddef112a711894ec402638f88c2 SHA1 b136d5c3009422bce035c23462d77303d9c36412 SHA256 86424c4d25b9722410d1d92d12ed0d33d4086a60a2fd24d02f1338782e4303d1
-MD5 5257b63e8dd7f3b2ae2be94bc456f80e libXfixes-3.0.1.2.ebuild 655
-RMD160 2d51986d0ea69ddef112a711894ec402638f88c2 libXfixes-3.0.1.2.ebuild 655
-SHA256 86424c4d25b9722410d1d92d12ed0d33d4086a60a2fd24d02f1338782e4303d1 libXfixes-3.0.1.2.ebuild 655
 EBUILD libXfixes-4.0.1.ebuild 674 RMD160 31990a070466f0657f366b6c2fc28d7c4cef58be SHA1 60c85628da4036d76b993f2552024dcf1b5197de SHA256 7b7d61f30e76e4f1f5c1e831a7a1d3519ae576ee0ad069012127c2a103560907
 MD5 e4917de9a474c1d161c33a1248603f7c libXfixes-4.0.1.ebuild 674
 RMD160 31990a070466f0657f366b6c2fc28d7c4cef58be libXfixes-4.0.1.ebuild 674
 SHA256 7b7d61f30e76e4f1f5c1e831a7a1d3519ae576ee0ad069012127c2a103560907 libXfixes-4.0.1.ebuild 674
-MISC ChangeLog 3609 RMD160 c7446cc6132324ae27dba0482a28e83378208610 SHA1 9f324a5c0d44f56947399ed9646282ab1cf921c4 SHA256 32d0f41a1a293d37ddc2974c3af48cb937f1224ed0e76fb461a5583ef346d689
-MD5 eca22f598daede65d16d7bd329dbc287 ChangeLog 3609
-RMD160 c7446cc6132324ae27dba0482a28e83378208610 ChangeLog 3609
-SHA256 32d0f41a1a293d37ddc2974c3af48cb937f1224ed0e76fb461a5583ef346d689 ChangeLog 3609
+MISC ChangeLog 3716 RMD160 de7babcb70a9ef97cd807db1d8496f5ed5f83540 SHA1 8205197cff62a4ed558724d2d49c9e0b94834391 SHA256 9bc81ff68cef2292c08b740819272a116cdc81197c89fd7fc311f8ec0d27800b
+MD5 1d87fab483b835e870270346193d92d3 ChangeLog 3716
+RMD160 de7babcb70a9ef97cd807db1d8496f5ed5f83540 ChangeLog 3716
+SHA256 9bc81ff68cef2292c08b740819272a116cdc81197c89fd7fc311f8ec0d27800b ChangeLog 3716
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 6a3975c903d96ce99d48f5cf67f0efad files/digest-libXfixes-3.0.1.2 256
-RMD160 eb4315383535756d0af6040995b77536f6d0e686 files/digest-libXfixes-3.0.1.2 256
-SHA256 a64702a9431569bd596734168ab9dd99a1179fe0b9be66a9caf24082374483fd files/digest-libXfixes-3.0.1.2 256
 MD5 d267237e6da0babfe0bea1b189fe3598 files/digest-libXfixes-4.0.1 250
 RMD160 2cefd844ea09958bab207e5e94ee4cf006b620a5 files/digest-libXfixes-4.0.1 250
 SHA256 302c59565d32bafd57625b3394e818d605451975d519f84f827d794033b7c60b files/digest-libXfixes-4.0.1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUbDkT4lNIS36YERAgeJAKC2oAtnyMMKXAIoiN+HBjWUUFD7ZgCfdGHD
-R1DoEwiohTIv/kT2GW39qFs=
-=EKpI
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXfixes/files/digest-libXfixes-3.0.1.2 b/x11-libs/libXfixes/files/digest-libXfixes-3.0.1.2
deleted file mode 100644
index 6a235eb953ec..000000000000
--- a/x11-libs/libXfixes/files/digest-libXfixes-3.0.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cdf276ef5e155222cd7f70c5ae555fa0 libXfixes-3.0.1.2.tar.bz2 216246
-RMD160 6822804b5e9b8faaa71ecfc297d04a8e1e48f460 libXfixes-3.0.1.2.tar.bz2 216246
-SHA256 2edbdd1f05ecaa2ddfe6e04101b70c572555a5e68d9bfb35763ddcd1d92eab00 libXfixes-3.0.1.2.tar.bz2 216246
diff --git a/x11-libs/libXfixes/libXfixes-3.0.1.2.ebuild b/x11-libs/libXfixes/libXfixes-3.0.1.2.ebuild
deleted file mode 100644
index 6c71afcee493..000000000000
--- a/x11-libs/libXfixes/libXfixes-3.0.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfixes/libXfixes-3.0.1.2.ebuild,v 1.7 2006/04/01 03:02:41 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xfixes library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libX11
-	x11-proto/fixesproto
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfontcache/Manifest b/x11-libs/libXfontcache/Manifest
index 06f06fea1403..3c4f367b17a7 100644
--- a/x11-libs/libXfontcache/Manifest
+++ b/x11-libs/libXfontcache/Manifest
@@ -1,38 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fix_shadow_manpages.patch 572 RMD160 505a9c4178e7feda97c4d52d8dbbdb3d8fb83510 SHA1 f28c8e012fae37fd61602f8f24898b9793f1c5f6 SHA256 b372c2afb884784a443c5f7201aac1d3e06e8057943fe38c63d9bd0949635864
 MD5 a60f2eda770d155b36e44c97b8a59cf9 files/fix_shadow_manpages.patch 572
 RMD160 505a9c4178e7feda97c4d52d8dbbdb3d8fb83510 files/fix_shadow_manpages.patch 572
 SHA256 b372c2afb884784a443c5f7201aac1d3e06e8057943fe38c63d9bd0949635864 files/fix_shadow_manpages.patch 572
-DIST libXfontcache-1.0.1.tar.bz2 209276 RMD160 85f3064f65f63e0c2f9c0a5d7894fa3609d18279 SHA256 8bcf249ea00e0cfac623597dc36eb027bb367ff6ccb5f478cd0dc1b9702acd48
 DIST libXfontcache-1.0.2.tar.bz2 221935 RMD160 cb4f0123b19cc4d8484a29bf8a6f5610c125cbbb SHA256 f43414d3cd62cf543f46ada41a75732e504551fc3cf852130ee92155020a945e
-EBUILD libXfontcache-1.0.1-r1.ebuild 694 RMD160 c343f98f74943f615783c4771561afe0c5898b30 SHA1 568f65f4cc7634f13e36e00a54682990a5fd1b76 SHA256 a1e8ac3ff75437446c1b48d39ef5f307409d8763cc57ea8b6a5011722163cd95
-MD5 4187df475c34647537ea06f41bd97893 libXfontcache-1.0.1-r1.ebuild 694
-RMD160 c343f98f74943f615783c4771561afe0c5898b30 libXfontcache-1.0.1-r1.ebuild 694
-SHA256 a1e8ac3ff75437446c1b48d39ef5f307409d8763cc57ea8b6a5011722163cd95 libXfontcache-1.0.1-r1.ebuild 694
 EBUILD libXfontcache-1.0.2.ebuild 635 RMD160 144afe1c1c24d9f457cb81ba789b8ad62acc34bc SHA1 70940f92918b9938b9a9ee63bf8fceefb9efcfe6 SHA256 ec52ed3f4bbd8dd4ab4e4b5d630a11e6d7e67f88fe79dfa46c0c5f8a82d2ae41
 MD5 daf83634eba174b92e4c0934c0f034c5 libXfontcache-1.0.2.ebuild 635
 RMD160 144afe1c1c24d9f457cb81ba789b8ad62acc34bc libXfontcache-1.0.2.ebuild 635
 SHA256 ec52ed3f4bbd8dd4ab4e4b5d630a11e6d7e67f88fe79dfa46c0c5f8a82d2ae41 libXfontcache-1.0.2.ebuild 635
-MISC ChangeLog 2511 RMD160 1b63af2b25acdbc04224f77bcd91a1860b1499fe SHA1 7b3f7c47c92eb2e8afd14cb40fb18e80171f9885 SHA256 4aa1d3e536013cd1d2c510c9d0794d15f01602b13632c63e752c75510ebebafe
-MD5 0e090d3dbd36b46d1e3b0de8dafcf03f ChangeLog 2511
-RMD160 1b63af2b25acdbc04224f77bcd91a1860b1499fe ChangeLog 2511
-SHA256 4aa1d3e536013cd1d2c510c9d0794d15f01602b13632c63e752c75510ebebafe ChangeLog 2511
+MISC ChangeLog 2623 RMD160 f1db0d10ca24de4c75f2fd60e80c78b6ebd605d0 SHA1 42705664c3fb25d48feaf7ca7e3b0fdf35f15c0b SHA256 8813877d0954bf0e8fb4178748d9554608c569e54052dc1142508f83944a2eb5
+MD5 55ba6c7d5dae125d6e185105a972fc7b ChangeLog 2623
+RMD160 f1db0d10ca24de4c75f2fd60e80c78b6ebd605d0 ChangeLog 2623
+SHA256 8813877d0954bf0e8fb4178748d9554608c569e54052dc1142508f83944a2eb5 ChangeLog 2623
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 da4e5d347c244e9e251f36fe363b86d0 files/digest-libXfontcache-1.0.1-r1 262
-RMD160 f946c3b606039cfffe598e65bfa1d83b95502aec files/digest-libXfontcache-1.0.1-r1 262
-SHA256 e840b39e0019af3792b11ac319ab50448757c234a62d9bb3944d744950377fc3 files/digest-libXfontcache-1.0.1-r1 262
 MD5 c156983c8f0ecc65bd4f8a904d30b324 files/digest-libXfontcache-1.0.2 262
 RMD160 353ec6883a92c84ef182b440e14f996425c70b7d files/digest-libXfontcache-1.0.2 262
 SHA256 9107ae07a9cb97e033ca6ea14a45251f2b46482b867283d5d01381e10b06d24a files/digest-libXfontcache-1.0.2 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUb/kT4lNIS36YERAoKQAKCOetLKwEc3OTGxBpbtqxlzFFQkZgCfdNuS
-0LyfDs7uqLZXpqtx6MuHkO4=
-=mvPc
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.1-r1 b/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.1-r1
deleted file mode 100644
index 137650f5ffa9..000000000000
--- a/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8ce62afe8400cb19b4ea91c1aab2607b libXfontcache-1.0.1.tar.bz2 209276
-RMD160 85f3064f65f63e0c2f9c0a5d7894fa3609d18279 libXfontcache-1.0.1.tar.bz2 209276
-SHA256 8bcf249ea00e0cfac623597dc36eb027bb367ff6ccb5f478cd0dc1b9702acd48 libXfontcache-1.0.1.tar.bz2 209276
diff --git a/x11-libs/libXfontcache/libXfontcache-1.0.1-r1.ebuild b/x11-libs/libXfontcache/libXfontcache-1.0.1-r1.ebuild
deleted file mode 100644
index 3f36539a4d47..000000000000
--- a/x11-libs/libXfontcache/libXfontcache-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfontcache/libXfontcache-1.0.1-r1.ebuild,v 1.1 2006/02/22 04:30:37 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xfontcache library"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/fontcacheproto"
-
-PATCHES="${FILESDIR}/fix_shadow_manpages.patch"
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index bb520e0b5c53..a2c1dc4c567e 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST libXft-2.1.10.tar.bz2 252786 RMD160 41fa35fff3ff5c8e9d9402c73b2b9971283acbc3 SHA1 a5d661544c5605c44d22ccd76383344dee03254b SHA256 14144bfcbdf2514fcf439c3290c094197ebb80ea2c44aa4ca7aa08f1c9849774
-DIST libXft-2.1.8.2.tar.bz2 254184 RMD160 337aa89e466d973eb993f74e33a66f529539503e SHA1 2f0141e25ac82ce672f2b10e4f60e5d1f9bb8622 SHA256 c8b3d1103c7e5cde2c1fa710935cdbe2c63ea24b17d42e238869e52d71dc3b48
 EBUILD libXft-2.1.10.ebuild 778 RMD160 24c160895543160d8afbad97404cfa65e57fe7b1 SHA1 094f438dfcd74744e5397a4c134562af4f645a3d SHA256 329e607829dd51e9dc4c0a8403f7d017284a178229364e918bcdcbf8e27e9da2
 MD5 5079c683437c96cb39178ef41b3c26b5 libXft-2.1.10.ebuild 778
 RMD160 24c160895543160d8afbad97404cfa65e57fe7b1 libXft-2.1.10.ebuild 778
 SHA256 329e607829dd51e9dc4c0a8403f7d017284a178229364e918bcdcbf8e27e9da2 libXft-2.1.10.ebuild 778
-EBUILD libXft-2.1.8.2.ebuild 802 RMD160 a84e93589d231a0617645e206598e7b67c0d7799 SHA1 959e2952a0c54c5fe79eaee494e83e93bfba0e33 SHA256 f405443702e424f807e6f9b0bba10314b8b1cdc1dd24ef5212007ec5a9401a3b
-MD5 b6e242821b9447aba41eea935ddcd767 libXft-2.1.8.2.ebuild 802
-RMD160 a84e93589d231a0617645e206598e7b67c0d7799 libXft-2.1.8.2.ebuild 802
-SHA256 f405443702e424f807e6f9b0bba10314b8b1cdc1dd24ef5212007ec5a9401a3b libXft-2.1.8.2.ebuild 802
-MISC ChangeLog 3345 RMD160 4880faa20509c413c8fe2569284762968cb8a3ca SHA1 69f7e5991f1bb39fd3f66f8e33616f2e98f25ea4 SHA256 81c5aa1c25a5b950ac551c5c06a1927def2c2785b13d078657296e94042d2e90
-MD5 48041325b8c76d6d247da95eb1d4152a ChangeLog 3345
-RMD160 4880faa20509c413c8fe2569284762968cb8a3ca ChangeLog 3345
-SHA256 81c5aa1c25a5b950ac551c5c06a1927def2c2785b13d078657296e94042d2e90 ChangeLog 3345
+MISC ChangeLog 3449 RMD160 192e201db86c009a4f6e7db30438cb1ea5668740 SHA1 8011bda9825c07c62516f91c55c2f2c7dbcf97cd SHA256 c85a6d7424cfcb037d9738dcc52a3f18e5f7a5dec8aa8567b8bd9ea3de3e1669
+MD5 7b07f55919716d9c5cf740ebe788e646 ChangeLog 3449
+RMD160 192e201db86c009a4f6e7db30438cb1ea5668740 ChangeLog 3449
+SHA256 c85a6d7424cfcb037d9738dcc52a3f18e5f7a5dec8aa8567b8bd9ea3de3e1669 ChangeLog 3449
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -22,13 +14,3 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 04b799b0f007568e55142752e3b5505d files/digest-libXft-2.1.10 244
 RMD160 21e916d19076bb9e1f380e47b08c6b5b8f52bc4e files/digest-libXft-2.1.10 244
 SHA256 a20dd4c18f0d66ac41a32fce09a73045bd3c761bd862060432ff93e1c3fa6fcb files/digest-libXft-2.1.10 244
-MD5 26db1910869f9501e8a85e5f31deb3e3 files/digest-libXft-2.1.8.2 247
-RMD160 dd80fe155e26f0ff72ca2ea0389c35863dfaefe9 files/digest-libXft-2.1.8.2 247
-SHA256 031f405786eace401019123881dc997188bbb7f705aeddf1d2de25906339c5a7 files/digest-libXft-2.1.8.2 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUcekT4lNIS36YERAvh0AJ0abXtitlWsnAAJKjz/BPLUzl/qswCfQxcj
-OfNyq49inPXBPvTIqnh86dI=
-=wksN
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXft/files/digest-libXft-2.1.8.2 b/x11-libs/libXft/files/digest-libXft-2.1.8.2
deleted file mode 100644
index ff75e125260b..000000000000
--- a/x11-libs/libXft/files/digest-libXft-2.1.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 03f27b29ec11c8f9436c63fde62367b9 libXft-2.1.8.2.tar.bz2 254184
-RMD160 337aa89e466d973eb993f74e33a66f529539503e libXft-2.1.8.2.tar.bz2 254184
-SHA256 c8b3d1103c7e5cde2c1fa710935cdbe2c63ea24b17d42e238869e52d71dc3b48 libXft-2.1.8.2.tar.bz2 254184
diff --git a/x11-libs/libXft/libXft-2.1.8.2.ebuild b/x11-libs/libXft/libXft-2.1.8.2.ebuild
deleted file mode 100644
index 2598db59b795..000000000000
--- a/x11-libs/libXft/libXft-2.1.8.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.1.8.2.ebuild,v 1.10 2006/04/28 20:22:23 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xft library"
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/xproto
-	media-libs/freetype
-	>=media-libs/fontconfig-2.2"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# No such function yet
-	# x-modular_pkg_setup
-
-	# (#125465) Broken with Bdirect support
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index f1b9a195c317..1b64e994e726 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,38 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fix_shadow_manpages.patch 3751 RMD160 84d36fe0d749efe56f9eaf6da7ffd054609afb29 SHA1 e111339bd8f5aa5b42521947c7c9c70ae9b252d0 SHA256 93d516a32e39cf19088668b610cd3346069f1b86d4ebb6950fb94d4d5eae7418
 MD5 a02c539f25bad42159c70d35be2637c5 files/fix_shadow_manpages.patch 3751
 RMD160 84d36fe0d749efe56f9eaf6da7ffd054609afb29 files/fix_shadow_manpages.patch 3751
 SHA256 93d516a32e39cf19088668b610cd3346069f1b86d4ebb6950fb94d4d5eae7418 files/fix_shadow_manpages.patch 3751
-DIST libXi-1.0.0.tar.bz2 245848 RMD160 855b782280cdabcdc0c955dab62da7458d3bf62d SHA256 70b3b7a74ede3b994fe7b21d4224d4d844e36d69f201ce8fc2c921b465f6449f
 DIST libXi-1.0.1.tar.bz2 246058 RMD160 29e67e44b91ce16d11741b5e053bfacf7e78be1e SHA1 d27fd822ee29ff5ccf4339ca78e4d91abdb73415 SHA256 d08fb359d827d5ec89caa103bc4c679c713e98c9e02da0cfd9149e12a4adda8f
-EBUILD libXi-1.0.0-r1.ebuild 731 RMD160 5f0386bd7608a89c6bd04e778ecf4cfaf8a59891 SHA1 27d144c95b5ccb728e3a106bbe50c5e27f77c302 SHA256 42460229494c10c62402f27dbbacbe4ddb98537334bd279bc7ddcc8147f020f9
-MD5 eadb4d0461a6f4ea5188e87241569b97 libXi-1.0.0-r1.ebuild 731
-RMD160 5f0386bd7608a89c6bd04e778ecf4cfaf8a59891 libXi-1.0.0-r1.ebuild 731
-SHA256 42460229494c10c62402f27dbbacbe4ddb98537334bd279bc7ddcc8147f020f9 libXi-1.0.0-r1.ebuild 731
 EBUILD libXi-1.0.1.ebuild 677 RMD160 0e77b4c4c427406d12678e69dbf915171feb9117 SHA1 9ab2168fa9d0b4fd0da6fe11117180731312deb1 SHA256 b30de2f30d71a3243e3c7b48f4897b45813d0db9c078ac58cab335aac6158111
 MD5 fac5206257fb80281dc0654e1f70f968 libXi-1.0.1.ebuild 677
 RMD160 0e77b4c4c427406d12678e69dbf915171feb9117 libXi-1.0.1.ebuild 677
 SHA256 b30de2f30d71a3243e3c7b48f4897b45813d0db9c078ac58cab335aac6158111 libXi-1.0.1.ebuild 677
-MISC ChangeLog 2916 RMD160 bb66db8d3a977f495395adfbc033798e12a004e6 SHA1 ba7bf7aa27019e4ed0fb4f72b2112adb7bdefba2 SHA256 2f76a8d5342c76985ba9cb368abc0c8e1899d696233bbdfb4d64bec501a5c30f
-MD5 9e41f0eca3c1fea1bc9fca72f606b375 ChangeLog 2916
-RMD160 bb66db8d3a977f495395adfbc033798e12a004e6 ChangeLog 2916
-SHA256 2f76a8d5342c76985ba9cb368abc0c8e1899d696233bbdfb4d64bec501a5c30f ChangeLog 2916
+MISC ChangeLog 3020 RMD160 0dda20a4711926d39a3bb86e7b583080ab1b6371 SHA1 7aa4f9bf9c7eeb7426721a8504bd2b5db3efc0bb SHA256 59fc6e74d998c27bcc450b0bf8b445a835faacad24901c4d3bf0233024e52ba6
+MD5 0167a5f635da24360417382c8743986c ChangeLog 3020
+RMD160 0dda20a4711926d39a3bb86e7b583080ab1b6371 ChangeLog 3020
+SHA256 59fc6e74d998c27bcc450b0bf8b445a835faacad24901c4d3bf0233024e52ba6 ChangeLog 3020
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 023ed9fcd4971caf219ff70a5fd54b29 files/digest-libXi-1.0.0-r1 238
-RMD160 682be4cf7a1fa749848bf29fb7db94852ce8665c files/digest-libXi-1.0.0-r1 238
-SHA256 d237033076b5008e546eb881599d8d87e60f5df756e268a18b4c993ff1881d3c files/digest-libXi-1.0.0-r1 238
 MD5 1752c814b94f155cc9dc2f45f018702d files/digest-libXi-1.0.1 238
 RMD160 cfbfc1151d8f872461dff87fd7dbe0b79b7d0d20 files/digest-libXi-1.0.1 238
 SHA256 255b558c971cc9e308198ee3608ad5c0d39d7fb7d871eab7f1b5a153f9ab4601 files/digest-libXi-1.0.1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUc9kT4lNIS36YERAlNRAJ9fxBT3sJfC6el7sAE3paN9nW0OUQCgkPDk
-Do/mlEALqBPD2x83wyCHNEk=
-=WYg6
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXi/files/digest-libXi-1.0.0-r1 b/x11-libs/libXi/files/digest-libXi-1.0.0-r1
deleted file mode 100644
index c53061e411b9..000000000000
--- a/x11-libs/libXi/files/digest-libXi-1.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d952f57daa10135db64c53fa0e204cc6 libXi-1.0.0.tar.bz2 245848
-RMD160 855b782280cdabcdc0c955dab62da7458d3bf62d libXi-1.0.0.tar.bz2 245848
-SHA256 70b3b7a74ede3b994fe7b21d4224d4d844e36d69f201ce8fc2c921b465f6449f libXi-1.0.0.tar.bz2 245848
diff --git a/x11-libs/libXi/libXi-1.0.0-r1.ebuild b/x11-libs/libXi/libXi-1.0.0-r1.ebuild
deleted file mode 100644
index 2c2bb6d7641f..000000000000
--- a/x11-libs/libXi/libXi-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.0.0-r1.ebuild,v 1.4 2006/03/31 20:01:37 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xi library"
-RESTRICT="mirror"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	x11-proto/inputproto"
-
-PATCHES="${FILESDIR}/fix_shadow_manpages.patch"
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 580129047c2c..fccee924bb4c 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libdmx-1.0.1.tar.bz2 219464 RMD160 f8048d0de3356fc7e2f32801d54a132478e53e5d SHA256 68522847c416e401c0295af0107bf8c5e8e946d0a32c78bd880273c444f5c056
 DIST libdmx-1.0.2.tar.bz2 231083 RMD160 579b5e376c69c9b858cee5763912ee1361529711 SHA1 cafa14a5eb60ff4397dcb03af1197a43036fab54 SHA256 fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4
-EBUILD libdmx-1.0.1.ebuild 645 RMD160 a72076df696f36b2efaef2d7aac9069c99c3878c SHA1 6fd2cb924986db27dd5dc00573bafbfaeb009172 SHA256 34ad4bb87b340dcad83e91958738d217219452e0207ff78cb2eca37bab1dbb57
-MD5 db9b44629c099c737dbde22c7f9dd51b libdmx-1.0.1.ebuild 645
-RMD160 a72076df696f36b2efaef2d7aac9069c99c3878c libdmx-1.0.1.ebuild 645
-SHA256 34ad4bb87b340dcad83e91958738d217219452e0207ff78cb2eca37bab1dbb57 libdmx-1.0.1.ebuild 645
 EBUILD libdmx-1.0.2.ebuild 641 RMD160 25171275d6f9ecf60458fb3f6c2f677712d693f6 SHA1 c774acc2395ed5574321e68feb970c2972f1be79 SHA256 8c0bf2ce73b374d02ac052091c487614817f0e7e2a1639e3f5707025d3b12b08
 MD5 9d1652171745b47ac4535fc64245d412 libdmx-1.0.2.ebuild 641
 RMD160 25171275d6f9ecf60458fb3f6c2f677712d693f6 libdmx-1.0.2.ebuild 641
 SHA256 8c0bf2ce73b374d02ac052091c487614817f0e7e2a1639e3f5707025d3b12b08 libdmx-1.0.2.ebuild 641
-MISC ChangeLog 2560 RMD160 ec1d5eee333a68e8aef4a52eb5987bc89de208b9 SHA1 6bd5d8d1911624ba32830b6b59a3b1a576ce240e SHA256 5572d2efcdfe4afb7f7d3d628d2cb81eda6d993e50ab626646554dcadcc32d07
-MD5 06a7ea2e95696464b76a51ccbaa25a70 ChangeLog 2560
-RMD160 ec1d5eee333a68e8aef4a52eb5987bc89de208b9 ChangeLog 2560
-SHA256 5572d2efcdfe4afb7f7d3d628d2cb81eda6d993e50ab626646554dcadcc32d07 ChangeLog 2560
+MISC ChangeLog 2660 RMD160 5dd1833fcc2df3c1909585506a208c24bdadbc73 SHA1 2d6fc39d51cba2e71fe3b16806194cd3aae85528 SHA256 c6bf00e5315dfccd46d6b73255c680360a034bc6c95c2939254f3f0b7a72f00f
+MD5 3f23951b3fcf3399dd7f03daf7055322 ChangeLog 2660
+RMD160 5dd1833fcc2df3c1909585506a208c24bdadbc73 ChangeLog 2660
+SHA256 c6bf00e5315dfccd46d6b73255c680360a034bc6c95c2939254f3f0b7a72f00f ChangeLog 2660
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 a4396b969d6641136a9f0759eaedd0b3 files/digest-libdmx-1.0.1 241
-RMD160 38873b1f7c46033451bd524d3eadd87aa4b747f5 files/digest-libdmx-1.0.1 241
-SHA256 880a29fced5eadc4326fd945dafa6247227575b0cae3a7224dff4e2a4b4d75b6 files/digest-libdmx-1.0.1 241
 MD5 809b72aa65b57d957163278647ec65f2 files/digest-libdmx-1.0.2 241
 RMD160 788c6d0a2c0bf951486a05965fa4bc79184753ba files/digest-libdmx-1.0.2 241
 SHA256 09cb1134b4d34bd2f6d4434ce1a18388ff7321ce55fd7e1ba979a67d5812c1a6 files/digest-libdmx-1.0.2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpURzkT4lNIS36YERAvjhAKCrbLfqrOga74wAFYAb42FMzLnP9ACgvYs8
-cXGOmEbDidFQv9YHfmETlVU=
-=xAj3
------END PGP SIGNATURE-----
diff --git a/x11-libs/libdmx/files/digest-libdmx-1.0.1 b/x11-libs/libdmx/files/digest-libdmx-1.0.1
deleted file mode 100644
index 0a890946ae9f..000000000000
--- a/x11-libs/libdmx/files/digest-libdmx-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 76275f8b6ec8f75509ef7d39c14e1dbc libdmx-1.0.1.tar.bz2 219464
-RMD160 f8048d0de3356fc7e2f32801d54a132478e53e5d libdmx-1.0.1.tar.bz2 219464
-SHA256 68522847c416e401c0295af0107bf8c5e8e946d0a32c78bd880273c444f5c056 libdmx-1.0.1.tar.bz2 219464
diff --git a/x11-libs/libdmx/libdmx-1.0.1.ebuild b/x11-libs/libdmx/libdmx-1.0.1.ebuild
deleted file mode 100644
index cac62df5943c..000000000000
--- a/x11-libs/libdmx/libdmx-1.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdmx/libdmx-1.0.1.ebuild,v 1.6 2006/03/31 19:51:27 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org dmx library"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/dmxproto
-	x11-proto/xextproto"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index d7be4c6732a1..5cd066f1ec71 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,34 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libdrm-2.0.1.tar.gz 383795 RMD160 a77432e46099acf9b952d005f49369a7985e8427 SHA1 35638f9ec1b976e23fd4b1e5eac57f9b8383e430 SHA256 864d5165a8ea03326f23902e92bb4ae26cfd89b43ccc16ab5a58def019cb59b0
-DIST libdrm-2.0.tar.gz 370965 RMD160 c00bb21572c9ec843a1335f7da8a0616b985ba13 SHA256 f4b81b00465e9a58e644e9058a55f69ea7f519eddbdeb4c02f84f7d2fafe33df
-EBUILD libdrm-2.0.1.ebuild 1157 RMD160 852a3d3bce8ef77f71655664edc64bfcf4079909 SHA1 32e43e07251fbb87a1e2c99dec6921a8b773700c SHA256 f0075f52302b7dff209dd069ac2eca68ecc9407927c9ad44ca12db2329af180c
-MD5 e66577b6c73269286f8f42659c2006f4 libdrm-2.0.1.ebuild 1157
-RMD160 852a3d3bce8ef77f71655664edc64bfcf4079909 libdrm-2.0.1.ebuild 1157
-SHA256 f0075f52302b7dff209dd069ac2eca68ecc9407927c9ad44ca12db2329af180c libdrm-2.0.1.ebuild 1157
-EBUILD libdrm-2.0.ebuild 1159 RMD160 52f089008f7031a007a7687eff517f9766748dfd SHA1 bb1c238362d878ea9d6830a8102558a7252dd5f0 SHA256 92bc063ab3c99a4c522e6591171c71ad823a21ac328ae21fc4056c72ecbdfcda
-MD5 885b47449281aa8ecfe70dcd106361e5 libdrm-2.0.ebuild 1159
-RMD160 52f089008f7031a007a7687eff517f9766748dfd libdrm-2.0.ebuild 1159
-SHA256 92bc063ab3c99a4c522e6591171c71ad823a21ac328ae21fc4056c72ecbdfcda libdrm-2.0.ebuild 1159
-MISC ChangeLog 2898 RMD160 918e293e5800969d65dbeba3e9a879e68a90a0dc SHA1 37c02e6814bbab8c2323a8660628b1bbb85bd39c SHA256 30850d7ff6fec97ecdf5d75dff888acb2e186078057a3c8752265f7444d3bbdb
-MD5 11aa09fd6ae288809a28a33139464d53 ChangeLog 2898
-RMD160 918e293e5800969d65dbeba3e9a879e68a90a0dc ChangeLog 2898
-SHA256 30850d7ff6fec97ecdf5d75dff888acb2e186078057a3c8752265f7444d3bbdb ChangeLog 2898
+MISC ChangeLog 3020 RMD160 9300a7837e76e6225c57acd7799ad629d299707f SHA1 febd0677bad70d81a5353b19cb3bcbbcbb6b6dfe SHA256 e1595752495753b36a1547398318c78109afecc580d9b690c2aca583b42abee5
+MD5 fd507143849f9225c8e9fc9911df91c3 ChangeLog 3020
+RMD160 9300a7837e76e6225c57acd7799ad629d299707f ChangeLog 3020
+SHA256 e1595752495753b36a1547398318c78109afecc580d9b690c2aca583b42abee5 ChangeLog 3020
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 718d0dc528502c1df6d2c0027d490e0e files/digest-libdrm-2.0 232
-RMD160 22ae7cc1583eb8d8ee044acf3ebfd677e7ca2268 files/digest-libdrm-2.0 232
-SHA256 b805ebc8607ea33170f529b5eea0916a87f286125e507c80fb79dd6510ee380a files/digest-libdrm-2.0 232
-MD5 03d86231cd5419d4a127a3c28fabc41c files/digest-libdrm-2.0.1 238
-RMD160 c54109d292e014e3e186ed433ef553b2f299bd6b files/digest-libdrm-2.0.1 238
-SHA256 1dfd1e153d89191d4a39005158a51e81a732f803244687bc944a0ea7f0acd85c files/digest-libdrm-2.0.1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUSRkT4lNIS36YERAjXoAJ4+9GuzFn4nym166E5b/PLdsHsOhQCgs2DH
-Y4ER6jfwXXqPG0It/jRvUqA=
-=c3pX
------END PGP SIGNATURE-----
diff --git a/x11-libs/libdrm/files/digest-libdrm-2.0 b/x11-libs/libdrm/files/digest-libdrm-2.0
deleted file mode 100644
index 4a690fc04bf6..000000000000
--- a/x11-libs/libdrm/files/digest-libdrm-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9d1aab104eb757ceeb2c1a6d38d57411 libdrm-2.0.tar.gz 370965
-RMD160 c00bb21572c9ec843a1335f7da8a0616b985ba13 libdrm-2.0.tar.gz 370965
-SHA256 f4b81b00465e9a58e644e9058a55f69ea7f519eddbdeb4c02f84f7d2fafe33df libdrm-2.0.tar.gz 370965
diff --git a/x11-libs/libdrm/files/digest-libdrm-2.0.1 b/x11-libs/libdrm/files/digest-libdrm-2.0.1
deleted file mode 100644
index bf6dff782dc9..000000000000
--- a/x11-libs/libdrm/files/digest-libdrm-2.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1f4d59a4c77756b364c6f4e5665f9c27 libdrm-2.0.1.tar.gz 383795
-RMD160 a77432e46099acf9b952d005f49369a7985e8427 libdrm-2.0.1.tar.gz 383795
-SHA256 864d5165a8ea03326f23902e92bb4ae26cfd89b43ccc16ab5a58def019cb59b0 libdrm-2.0.1.tar.gz 383795
diff --git a/x11-libs/libdrm/libdrm-2.0.1.ebuild b/x11-libs/libdrm/libdrm-2.0.1.ebuild
deleted file mode 100644
index d36f43c77724..000000000000
--- a/x11-libs/libdrm/libdrm-2.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.0.1.ebuild,v 1.4 2006/06/30 15:34:36 wolf31o2 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	x-modular_pkg_preinst
-
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then
-		cp -pPR "${ROOT}"/usr/$(get_libdir)/libdrm.so.{1,1.0.0} "${IMAGE}"/usr/$(get_libdir)/
-	fi
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then
-		ewarn "You must re-compile all packages that are linked against"
-		ewarn "libdrm 1 by using revdep-rebuild from gentoolkit:"
-		ewarn "# revdep-rebuild --library libdrm.so.1"
-		ewarn "After this, you can delete /usr/$(get_libdir)/libdrm.so.1"
-		ewarn "and /usr/$(get_libdir)/libdrm.so.1.0.0 ."
-		epause
-	fi
-}
diff --git a/x11-libs/libdrm/libdrm-2.0.ebuild b/x11-libs/libdrm/libdrm-2.0.ebuild
deleted file mode 100644
index e7b233f4291a..000000000000
--- a/x11-libs/libdrm/libdrm-2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.0.ebuild,v 1.9 2006/03/31 20:02:06 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	x-modular_pkg_preinst
-
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then
-		cp -pPR "${ROOT}"/usr/$(get_libdir)/libdrm.so.{1,1.0.0} "${IMAGE}"/usr/$(get_libdir)/
-	fi
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then
-		ewarn "You must re-compile all packages that are linked against"
-		ewarn "libdrm 1 by using revdep-rebuild from gentoolkit:"
-		ewarn "# revdep-rebuild --library libdrm.so.1"
-		ewarn "After this, you can delete /usr/$(get_libdir)/libdrm.so.1"
-		ewarn "and /usr/$(get_libdir)/libdrm.so.1.0.0 ."
-		epause
-	fi
-}
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index b00cfdfda32d..a27f19ff3c89 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libfontenc-1.0.1.tar.bz2 217498 RMD160 35d1f933f437dff4012987360353e4e60b33cdcb SHA256 78ee9f7a43d2f15388714204f8bce2b99404057303ad7c3820257cbb4cae81d4
 DIST libfontenc-1.0.2.tar.bz2 229242 RMD160 e09eee80b950f45ca7cda3dfe884971132646b44 SHA1 31e694d6e8390616e6feaf98f03c627fb287eb99 SHA256 0c970ea1a729aec7c8f257c74d1c6196c48a93c7c7ccad4836c70568e900becf
-EBUILD libfontenc-1.0.1.ebuild 564 RMD160 1d87beda90b6b553bcca98941a8af7541c3f0931 SHA1 3a02650e84eb927315f9a766bc51dba92689d55a SHA256 8ccade619d385ec754e850d69f10e10acda3d2340366a0b19978cca875740095
-MD5 92d352fe68c69b66d63b94f5bf03f315 libfontenc-1.0.1.ebuild 564
-RMD160 1d87beda90b6b553bcca98941a8af7541c3f0931 libfontenc-1.0.1.ebuild 564
-SHA256 8ccade619d385ec754e850d69f10e10acda3d2340366a0b19978cca875740095 libfontenc-1.0.1.ebuild 564
 EBUILD libfontenc-1.0.2.ebuild 560 RMD160 4302935aeb3b400bddcf771f2ddc0f9540c11ad1 SHA1 daa518f245366af0755822369e8acf9ec7521b35 SHA256 374311c0cafc1420135849f3c7b7311e8e83ca5cdbbf15464b78ca80d241ed09
 MD5 d41435f63d48294b87626e55d2dae3c9 libfontenc-1.0.2.ebuild 560
 RMD160 4302935aeb3b400bddcf771f2ddc0f9540c11ad1 libfontenc-1.0.2.ebuild 560
 SHA256 374311c0cafc1420135849f3c7b7311e8e83ca5cdbbf15464b78ca80d241ed09 libfontenc-1.0.2.ebuild 560
-MISC ChangeLog 3416 RMD160 9c2988ff7b638571ff8fa501c4375bc3aeb6a854 SHA1 71dc0b61ddf82898aa4fdfe583c9c1fd1f2ab815 SHA256 ca05c94ec575137359ea8ee93d88ceff037263fecc0aa21806dfe6afe2cf97b9
-MD5 df34e16690aa240617268ad46410358c ChangeLog 3416
-RMD160 9c2988ff7b638571ff8fa501c4375bc3aeb6a854 ChangeLog 3416
-SHA256 ca05c94ec575137359ea8ee93d88ceff037263fecc0aa21806dfe6afe2cf97b9 ChangeLog 3416
+MISC ChangeLog 3522 RMD160 0c50a2abf40e005f5f624f0264e656cb328bac24 SHA1 4b5afdff38e5afd327cb3d392fb46466ff6e02c3 SHA256 ef8b02b46501e981d7fbd6ae227353a847da18c85d5db9208960e4ceca0b2a4b
+MD5 0eb59a0497b878b573b84b25074cdbc6 ChangeLog 3522
+RMD160 0c50a2abf40e005f5f624f0264e656cb328bac24 ChangeLog 3522
+SHA256 ef8b02b46501e981d7fbd6ae227353a847da18c85d5db9208960e4ceca0b2a4b ChangeLog 3522
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 fa54024de1127aafdc2f95251c0c008d files/digest-libfontenc-1.0.1 253
-RMD160 05471a22450f42a40fc0420656c398fdb975cdbe files/digest-libfontenc-1.0.1 253
-SHA256 a4ccefcc1e76c3ccd82911010f3adacdccb06336658e7f4bf3a8c4e984106699 files/digest-libfontenc-1.0.1 253
 MD5 83892dd6d067e63a7864468ee720cd40 files/digest-libfontenc-1.0.2 253
 RMD160 2d7e06a4927d605d87f3629a9595aa31d16d4e95 files/digest-libfontenc-1.0.2 253
 SHA256 4deb33295bb818402ebfeb71137ac76e8c0752351e73fed7c91d9be1c263306c files/digest-libfontenc-1.0.2 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUSvkT4lNIS36YERAk8uAJ4tUEjOrLfDS2wtVByvrjnr+wcJjwCghwwB
-LTclJsHsGLQ6uInfR6u2rjs=
-=umU4
------END PGP SIGNATURE-----
diff --git a/x11-libs/libfontenc/files/digest-libfontenc-1.0.1 b/x11-libs/libfontenc/files/digest-libfontenc-1.0.1
deleted file mode 100644
index 14bf5e2ee887..000000000000
--- a/x11-libs/libfontenc/files/digest-libfontenc-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8623cb508fe8f45a8b693a7c6d64b6e1 libfontenc-1.0.1.tar.bz2 217498
-RMD160 35d1f933f437dff4012987360353e4e60b33cdcb libfontenc-1.0.1.tar.bz2 217498
-SHA256 78ee9f7a43d2f15388714204f8bce2b99404057303ad7c3820257cbb4cae81d4 libfontenc-1.0.1.tar.bz2 217498
diff --git a/x11-libs/libfontenc/libfontenc-1.0.1.ebuild b/x11-libs/libfontenc/libfontenc-1.0.1.ebuild
deleted file mode 100644
index 5675f945d835..000000000000
--- a/x11-libs/libfontenc/libfontenc-1.0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.0.1.ebuild,v 1.7 2006/03/31 19:54:06 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org fontenc library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-CONFIGURE_OPTIONS="--with-encodingsdir=/usr/share/fonts/encodings"
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 9c407089c9a7..a4c7ca9d3605 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libxkbfile-1.0.2.tar.bz2 254072 RMD160 d7fa3699cf72621b676a45d19daec7bcbb574238 SHA256 482b8dffe9d3342faea09fc7487e768995951ccd43d77feeed96c089adef9280
 DIST libxkbfile-1.0.3.tar.bz2 260397 RMD160 970ba0e5abde6e56e771eacfef740eae0a7c320e SHA1 f52571496ea8ea633b92b3ef34a1cce774de1c31 SHA256 6c523149eb3b110b67534465c96d2904d96cea989dbe024c31e77182be5b5727
-EBUILD libxkbfile-1.0.2.ebuild 617 RMD160 85b392ad8c441da79965a650e29fff44daaefefc SHA1 68431f69b2e20302b4ba5414ddb0bada7cfd927a SHA256 0a734521f9474c3c99d93241d5bf997b18c7cae40ef9a985659117104c29b6ff
-MD5 6ede449386f0f92b48410de171d9ac7b libxkbfile-1.0.2.ebuild 617
-RMD160 85b392ad8c441da79965a650e29fff44daaefefc libxkbfile-1.0.2.ebuild 617
-SHA256 0a734521f9474c3c99d93241d5bf997b18c7cae40ef9a985659117104c29b6ff libxkbfile-1.0.2.ebuild 617
 EBUILD libxkbfile-1.0.3.ebuild 613 RMD160 50a45e7923c864600df4e752ea1d6b8705fcc5b9 SHA1 f7b4f8fb6f3b4507d2e8e638fbe9c015babea2fe SHA256 2087400a3aafbb80c6cae871516db330265df9abea118d5c5e31e1b5d66fd083
 MD5 7fadada313f7b61ca0da3f2dddc757cf libxkbfile-1.0.3.ebuild 613
 RMD160 50a45e7923c864600df4e752ea1d6b8705fcc5b9 libxkbfile-1.0.3.ebuild 613
 SHA256 2087400a3aafbb80c6cae871516db330265df9abea118d5c5e31e1b5d66fd083 libxkbfile-1.0.3.ebuild 613
-MISC ChangeLog 3010 RMD160 412aff7fc2ec15ebb06a2c2972d31df1b2daf675 SHA1 d8924e9b3ec2ab0908a6b1e57dd825fe9486800d SHA256 904c60c603fb443f6cc51653930cdf69198ab3174402d106be5e602b4fe95dc0
-MD5 dce453f46835f8af8b9b34e0a7ca425e ChangeLog 3010
-RMD160 412aff7fc2ec15ebb06a2c2972d31df1b2daf675 ChangeLog 3010
-SHA256 904c60c603fb443f6cc51653930cdf69198ab3174402d106be5e602b4fe95dc0 ChangeLog 3010
+MISC ChangeLog 3116 RMD160 46aad187ca006e922518357a14b44ea845e7d865 SHA1 fcd7ae37bfc4155c3426fec7314f619b53e5a77a SHA256 d6fd35f8847889731185c41486886d75e5630cf0e74d6ca26e37cc7c03391e95
+MD5 6ea5eebf07ba5a9af6c841db20955093 ChangeLog 3116
+RMD160 46aad187ca006e922518357a14b44ea845e7d865 ChangeLog 3116
+SHA256 d6fd35f8847889731185c41486886d75e5630cf0e74d6ca26e37cc7c03391e95 ChangeLog 3116
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 7ddf13b3a0ab7c793c4fc1e6be2bc004 files/digest-libxkbfile-1.0.2 253
-RMD160 87d91cea28f6780ec63e793460a0290a32721caf files/digest-libxkbfile-1.0.2 253
-SHA256 48db36b6b25e80f11de866ac4a5721a1469c8ec7b668e4d170b03518e8bfffe8 files/digest-libxkbfile-1.0.2 253
 MD5 68cea93c0acdfd7378ce703df97c7f7a files/digest-libxkbfile-1.0.3 253
 RMD160 df3913173b6e9b4e7c2179cb08cd467909993dc2 files/digest-libxkbfile-1.0.3 253
 SHA256 0067b6143d6138c32b1508aef462cfcca19e76a74d1b5049228d4598a10a3d54 files/digest-libxkbfile-1.0.3 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUd3kT4lNIS36YERAhTHAJ9hf/kKmP7X7zv56SWdCK8i7snn3QCcCGLa
-QPSEj3pDdfLCrKkbNgeh378=
-=IOxb
------END PGP SIGNATURE-----
diff --git a/x11-libs/libxkbfile/files/digest-libxkbfile-1.0.2 b/x11-libs/libxkbfile/files/digest-libxkbfile-1.0.2
deleted file mode 100644
index a72c3bc12049..000000000000
--- a/x11-libs/libxkbfile/files/digest-libxkbfile-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7b2fd1eb3ccd5d1ed37cab1780b6013 libxkbfile-1.0.2.tar.bz2 254072
-RMD160 d7fa3699cf72621b676a45d19daec7bcbb574238 libxkbfile-1.0.2.tar.bz2 254072
-SHA256 482b8dffe9d3342faea09fc7487e768995951ccd43d77feeed96c089adef9280 libxkbfile-1.0.2.tar.bz2 254072
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.2.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.2.ebuild
deleted file mode 100644
index 7faf510ad744..000000000000
--- a/x11-libs/libxkbfile/libxkbfile-1.0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxkbfile/libxkbfile-1.0.2.ebuild,v 1.3 2006/03/31 19:40:17 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xkbfile library"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libX11
-	x11-proto/kbproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbui/Manifest b/x11-libs/libxkbui/Manifest
index b5f04cf0140a..22e5f4a120e5 100644
--- a/x11-libs/libxkbui/Manifest
+++ b/x11-libs/libxkbui/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libxkbui-1.0.1.tar.bz2 210237 RMD160 400ca636d33f09a781ab67e66d92dc158353fe4d SHA256 9a493681283e0ef66da9ba7aae02700bd1f688e8f8ad64059cc19fac1ecd94a0
 DIST libxkbui-1.0.2.tar.bz2 221435 RMD160 ff356dea1c93a1a94bab4df80b66f9304d827b2a SHA1 bd6f1d6fa390d3fee118f9d5b15e156315576b9f SHA256 20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214
-EBUILD libxkbui-1.0.1.ebuild 643 RMD160 16dbacc3f84e174bee4431e3434e56cae3d24171 SHA1 7d9785b3253484680de36011a9eac118e894f9ce SHA256 330c2dfb6792d316add225d9626bc1097eb5bcf68fe04ffacc30d993373f44cc
-MD5 9550f928353f3a9aab2ce52d45252ae7 libxkbui-1.0.1.ebuild 643
-RMD160 16dbacc3f84e174bee4431e3434e56cae3d24171 libxkbui-1.0.1.ebuild 643
-SHA256 330c2dfb6792d316add225d9626bc1097eb5bcf68fe04ffacc30d993373f44cc libxkbui-1.0.1.ebuild 643
 EBUILD libxkbui-1.0.2.ebuild 635 RMD160 b86a04856b9282f893714e56f6ecfa42d7a692bb SHA1 5b203e11747ad4587a5b08f321b025472333f5b6 SHA256 2220c61ff3f1c9451f8f27eff1ab7246b20b06e9770eed0a38524539934d3900
 MD5 4c254e384d392284c5960a8c76c6ab77 libxkbui-1.0.2.ebuild 635
 RMD160 b86a04856b9282f893714e56f6ecfa42d7a692bb libxkbui-1.0.2.ebuild 635
 SHA256 2220c61ff3f1c9451f8f27eff1ab7246b20b06e9770eed0a38524539934d3900 libxkbui-1.0.2.ebuild 635
-MISC ChangeLog 3323 RMD160 426ad0e4821174a624556f00cc758e96033217d5 SHA1 be8d451b08e5a032998e65803dcb1b755a628a21 SHA256 7375dc46d010110ecb184266700c35a96f2f7c100a97c27e4fe1b4d6425ba0b7
-MD5 d45fb7d0b427302029f039ff96e73b6d ChangeLog 3323
-RMD160 426ad0e4821174a624556f00cc758e96033217d5 ChangeLog 3323
-SHA256 7375dc46d010110ecb184266700c35a96f2f7c100a97c27e4fe1b4d6425ba0b7 ChangeLog 3323
+MISC ChangeLog 3427 RMD160 91b7dd126b65c202b91006873ca5f3f7e971139b SHA1 5a7b805754a5e4daae120a4e7c05662a20508b0f SHA256 18ff210fcbb6d8ee8d707a1240ce21c43ce3a625b64b086ccc652966e5aa69bb
+MD5 9f18a79a99e3d76c766b1c228b6fc256 ChangeLog 3427
+RMD160 91b7dd126b65c202b91006873ca5f3f7e971139b ChangeLog 3427
+SHA256 18ff210fcbb6d8ee8d707a1240ce21c43ce3a625b64b086ccc652966e5aa69bb ChangeLog 3427
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 8017fcdb2391e84a2e648c129cff6c20 files/digest-libxkbui-1.0.1 247
-RMD160 5f65b74e6c223849081c8955d816b26af2059f5a files/digest-libxkbui-1.0.1 247
-SHA256 95c436b5b68a35eb26f931eecba24d4a5babf4e32e3609d324c0fb9bce501d34 files/digest-libxkbui-1.0.1 247
 MD5 786c74a6ad2059571f5403907033098d files/digest-libxkbui-1.0.2 247
 RMD160 22f8bdc982eff18976a30f0905da4b47a751da3e files/digest-libxkbui-1.0.2 247
 SHA256 141b12731c90ab8c92c054a124f80f41699625f94c9e385c1820c5c08849a32f files/digest-libxkbui-1.0.2 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEpUeWkT4lNIS36YERAmtEAKCIqojTmGhPRpF4naN5AuTh1GzZWgCgqK06
-oixS8s5ZAzVY9AyCwdhLqg8=
-=Va8d
------END PGP SIGNATURE-----
diff --git a/x11-libs/libxkbui/files/digest-libxkbui-1.0.1 b/x11-libs/libxkbui/files/digest-libxkbui-1.0.1
deleted file mode 100644
index 994c2e256523..000000000000
--- a/x11-libs/libxkbui/files/digest-libxkbui-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed35b209b17fab2660cc7821d5001197 libxkbui-1.0.1.tar.bz2 210237
-RMD160 400ca636d33f09a781ab67e66d92dc158353fe4d libxkbui-1.0.1.tar.bz2 210237
-SHA256 9a493681283e0ef66da9ba7aae02700bd1f688e8f8ad64059cc19fac1ecd94a0 libxkbui-1.0.1.tar.bz2 210237
diff --git a/x11-libs/libxkbui/libxkbui-1.0.1.ebuild b/x11-libs/libxkbui/libxkbui-1.0.1.ebuild
deleted file mode 100644
index 2135b9eca6c1..000000000000
--- a/x11-libs/libxkbui/libxkbui-1.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxkbui/libxkbui-1.0.1.ebuild,v 1.7 2006/05/02 15:29:14 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xkbui library"
-#HOMEPAGE="http://foo.bar.com/"
-#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
-#LICENSE=""
-#SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="X gnome"
-RDEPEND="x11-libs/libXt
-	<=x11-libs/libxkbfile-1.0.2
-	x11-proto/kbproto"
-DEPEND="${RDEPEND}"