New revision and clean up old cruft

svn path=/trunk/overlay/; revision=52

21 files changed, 49 insertions, 1248 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index c7692ed..82b52bb 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -46,6 +46,10 @@ AUX gtk+-2.12.0-swt-tooltips-fix.patch 523 RMD160 0af17ef2e2813a7e927750e88dfcfa
 MD5 0b0e7e407948b9a4a4af82749a2c5cf7 files/gtk+-2.12.0-swt-tooltips-fix.patch 523
 RMD160 0af17ef2e2813a7e927750e88dfcfa3b7ef91252 files/gtk+-2.12.0-swt-tooltips-fix.patch 523
 SHA256 8529919c483c4d60adb92c38a684a76dfae42eb0d66552a542836965cd0a850f files/gtk+-2.12.0-swt-tooltips-fix.patch 523
+AUX gtk+-2.12.1-cupsutils.patch 663 RMD160 2947c516f9697fe3c83be03ef2a613910f30f0fd SHA1 aee768637e4e714fa5e1d0079f73ebb70e606800 SHA256 12b4111f284eb3e908d97909650f1d90f0dba74b47cd31a40086ad88bed745bb
+MD5 3b8e0d6907bd46617fd6aac23941117d files/gtk+-2.12.1-cupsutils.patch 663
+RMD160 2947c516f9697fe3c83be03ef2a613910f30f0fd files/gtk+-2.12.1-cupsutils.patch 663
+SHA256 12b4111f284eb3e908d97909650f1d90f0dba74b47cd31a40086ad88bed745bb files/gtk+-2.12.1-cupsutils.patch 663
 AUX gtk+-2.12.1-firefox-print-preview.patch 888 RMD160 6fedfd6e63e61ec7f7301d2d881d3e69a44176dd SHA1 5eb4779ee1a8cbfb672a2b19f15dc20b96bcda84 SHA256 eadd5a4c4084ecd39317f3eb39e7d4e35aa7d26a8b7010bdd6aeb94c69f362aa
 MD5 6d4ca4a0b23f46151a38bf245cfe2a46 files/gtk+-2.12.1-firefox-print-preview.patch 888
 RMD160 6fedfd6e63e61ec7f7301d2d881d3e69a44176dd files/gtk+-2.12.1-firefox-print-preview.patch 888
@@ -72,50 +76,18 @@ RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 files/gtkrc 627
 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 files/gtkrc 627
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
-DIST gtk+-2.10.11.tar.bz2 15031543 RMD160 2c1297ace8c6893fdf6e682e7f7faabdb1866b3a SHA1 3c68f3fa13ab72f6b190cbe958813d29955042e2 SHA256 9b1d724e39e1650ffc0719596bf1aaf140e27b924e96380020050c0cd7ae25f1
-DIST gtk+-2.10.12.tar.bz2 15137074 RMD160 d48eab088a2871d4866f25b7413b78925bb280d7 SHA1 2912aeac11628c60b653e6a4bc5919106c02e045 SHA256 58599eae374d15f2474ea2ed67b5c116f9358c05a2c6b01acb3e5910a79fce4f
-DIST gtk+-2.10.13.tar.bz2 15163566 RMD160 bd812db8b11fbca5283e04958660fd3beec23caa SHA1 8d00b928a8788ff86d97197c20c18d41f9a1b1cd SHA256 6443ecc087a7cf771406264044e3f942ca49cc5fcb84f66d700fd291d55d0b4e
 DIST gtk+-2.10.14.tar.bz2 15172170 RMD160 234d7240732b28a31a260aa9e04c34fc502acbf4 SHA1 78b819814d52caa66739ab64611e41f35e5b48c3 SHA256 d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-DIST gtk+-2.10.6.tar.bz2 14561124 RMD160 929386610a634e82b7ddb10f43930b27194fa67b SHA1 aad6e1ef964d8acb8a04942b8dd2e00a9db56450 SHA256 ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468
-DIST gtk+-2.10.7.tar.bz2 14955229 RMD160 130af39787b146166846f44b104ea0c3683d0578 SHA1 784a7ecc75767306efe1f200a1251968f944143e SHA256 3daead5f578ec2a3752997e6048eb3ecdce208cee560f7289dd9d069ca623276
-DIST gtk+-2.10.9.tar.bz2 14933330 RMD160 f415eb350edbf53965a1ec32f99c386cfd3d7df5 SHA1 aa3260d9093398445cfbecf355f4728db3e827bf SHA256 3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3
 DIST gtk+-2.12.0.tar.bz2 15732170 RMD160 226c8f38eb7895d63f81feb60152db1ca3599628 SHA1 f5ecbf73a789a8880a6b2e15279267bb113980e2 SHA256 faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
 DIST gtk+-2.12.1.tar.bz2 15856678 RMD160 3c3facd971a20178060c7e7cfe9d4cefd651250b SHA1 80114570273608251ef5acf9ee3daa4a3eb3d56b SHA256 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6
-DIST gtk+-2.8.17.tar.bz2 12261085 RMD160 ff4d34eef948cd98c81d852a111d716b9cead94f SHA1 a6c62ec016bc076a9938ba962f0dd4bcc1e74e16 SHA256 d9dea2c9777ab22dfaefed169b2d9b8a8fd914aec8937e723ae029df1aaf19be
-DIST gtk+-2.8.18.tar.bz2 12258449 RMD160 f9b41fc90e16158ccc87872f07dc4eb269903e84 SHA1 e4f0231b943418d8bb17b3bf9d79aa902ab3eb13 SHA256 c685da334c88c0dac5a5c8d23e08fed23a74b6bc981c345e351a1574ccf52f5b
 DIST gtk+-2.8.20.tar.bz2 12247295 RMD160 d20254de9e5b37b19f432758fbd78fff4c6baf1e SHA1 8ea2449ff139b8bc457f8b5bcdcad93b02cfba9e SHA256 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79
 EBUILD gtk+-1.2.10-r11.ebuild 2195 RMD160 7102968da6cf0876667f950e0c97ffc91f4c49cc SHA1 7850e61f82ffe5b38482e2d866647cd9f84b1d74 SHA256 243efd996cae9c2f21478a5ebbc9e6b310fbe767f1ac64d3f41434a36cc08e41
 MD5 43c2f19d86e3e940cccd9d1b6ad61717 gtk+-1.2.10-r11.ebuild 2195
 RMD160 7102968da6cf0876667f950e0c97ffc91f4c49cc gtk+-1.2.10-r11.ebuild 2195
 SHA256 243efd996cae9c2f21478a5ebbc9e6b310fbe767f1ac64d3f41434a36cc08e41 gtk+-1.2.10-r11.ebuild 2195
-EBUILD gtk+-2.10.11.ebuild 4465 RMD160 ca094080d083baa12901ab95eb07d9c66de9475b SHA1 42217b0863968c0e6a6c42d5dc812d3a8627a593 SHA256 c60acce7ca82fcfaafcbd4d9af88c29dbfbea8b5152436e33c61668587f279e3
-MD5 46544d312c97b9fa72a8996eede21647 gtk+-2.10.11.ebuild 4465
-RMD160 ca094080d083baa12901ab95eb07d9c66de9475b gtk+-2.10.11.ebuild 4465
-SHA256 c60acce7ca82fcfaafcbd4d9af88c29dbfbea8b5152436e33c61668587f279e3 gtk+-2.10.11.ebuild 4465
-EBUILD gtk+-2.10.12.ebuild 4154 RMD160 c6c82bb03c56ba3130d4027a9e335a32ba9ed55c SHA1 3977b6df7963dec57b14ac9c008a4ba0b1206f1f SHA256 822a3f5dc58f20037b5ecad5f8fc5e039e306e4004a29739e1172a1810fa556d
-MD5 a1d0bdb01cb423ad11816d4e27571876 gtk+-2.10.12.ebuild 4154
-RMD160 c6c82bb03c56ba3130d4027a9e335a32ba9ed55c gtk+-2.10.12.ebuild 4154
-SHA256 822a3f5dc58f20037b5ecad5f8fc5e039e306e4004a29739e1172a1810fa556d gtk+-2.10.12.ebuild 4154
-EBUILD gtk+-2.10.13.ebuild 4278 RMD160 61030d48c630c3ee90108980a3ea47f80ff34c93 SHA1 dfc6f5c014fc40f68daee2b25414621f9b5ba26e SHA256 daccfe095933093da37bba37c54348a117708844497dd5894fc78b3a45625ad7
-MD5 a715b6839b727fd8b948f5f4de381ddf gtk+-2.10.13.ebuild 4278
-RMD160 61030d48c630c3ee90108980a3ea47f80ff34c93 gtk+-2.10.13.ebuild 4278
-SHA256 daccfe095933093da37bba37c54348a117708844497dd5894fc78b3a45625ad7 gtk+-2.10.13.ebuild 4278
 EBUILD gtk+-2.10.14.ebuild 4256 RMD160 929b6725f7ea0db569f913765a71717245910d7f SHA1 40afd6f1ce1aae42bb03329747d69026aca7fede SHA256 3d0429a98338d709e30e9a060900c607cf3712f0865efc68e4593b3e952b2702
 MD5 bac9a5193c4360cc1c09399f0356fafc gtk+-2.10.14.ebuild 4256
 RMD160 929b6725f7ea0db569f913765a71717245910d7f gtk+-2.10.14.ebuild 4256
 SHA256 3d0429a98338d709e30e9a060900c607cf3712f0865efc68e4593b3e952b2702 gtk+-2.10.14.ebuild 4256
-EBUILD gtk+-2.10.6.ebuild 4312 RMD160 bff1e56662419171795cab9a1d1e180806b74802 SHA1 53609f463ede97722955b3cd0c2f70e2cae1cb61 SHA256 ea96ea8aa8cf0c4571f9cb615536638c85a9c84fdce393fa20358b85e2b4b4fe
-MD5 82eb5870ab6220537029a90840f79476 gtk+-2.10.6.ebuild 4312
-RMD160 bff1e56662419171795cab9a1d1e180806b74802 gtk+-2.10.6.ebuild 4312
-SHA256 ea96ea8aa8cf0c4571f9cb615536638c85a9c84fdce393fa20358b85e2b4b4fe gtk+-2.10.6.ebuild 4312
-EBUILD gtk+-2.10.7-r1.ebuild 4573 RMD160 cbfc7073b15308685753526e3529688c3bcf0f87 SHA1 c6dd8c88edcead2a9bc41130ae134161825f40ad SHA256 13b780898291f5fa03078c1e9fd179032975691ee5cd01c2c4e8d21c581f3a36
-MD5 1a0f7bfdbd9b1764eb4e5ea7304a3b19 gtk+-2.10.7-r1.ebuild 4573
-RMD160 cbfc7073b15308685753526e3529688c3bcf0f87 gtk+-2.10.7-r1.ebuild 4573
-SHA256 13b780898291f5fa03078c1e9fd179032975691ee5cd01c2c4e8d21c581f3a36 gtk+-2.10.7-r1.ebuild 4573
-EBUILD gtk+-2.10.9.ebuild 4465 RMD160 ca094080d083baa12901ab95eb07d9c66de9475b SHA1 42217b0863968c0e6a6c42d5dc812d3a8627a593 SHA256 c60acce7ca82fcfaafcbd4d9af88c29dbfbea8b5152436e33c61668587f279e3
-MD5 46544d312c97b9fa72a8996eede21647 gtk+-2.10.9.ebuild 4465
-RMD160 ca094080d083baa12901ab95eb07d9c66de9475b gtk+-2.10.9.ebuild 4465
-SHA256 c60acce7ca82fcfaafcbd4d9af88c29dbfbea8b5152436e33c61668587f279e3 gtk+-2.10.9.ebuild 4465
 EBUILD gtk+-2.12.0-r2.ebuild 5204 RMD160 6cb034c9442f6b45cff6230394839caab5cfa01d SHA1 1886af88f93a4026ea5929ef1e8d158308f93e50 SHA256 5db05ed4d7dc339222ee16cc9df045ff8a1976193c906ccbb13616ab6e98b194
 MD5 c37e5bee66fada9548147edbad30a142 gtk+-2.12.0-r2.ebuild 5204
 RMD160 6cb034c9442f6b45cff6230394839caab5cfa01d gtk+-2.12.0-r2.ebuild 5204
@@ -124,18 +96,14 @@ EBUILD gtk+-2.12.0.ebuild 4318 RMD160 588e665cbe20b4894dce301ef5addce5ce0a4547 S
 MD5 761e581e26ca0cf169689d11d4ecd063 gtk+-2.12.0.ebuild 4318
 RMD160 588e665cbe20b4894dce301ef5addce5ce0a4547 gtk+-2.12.0.ebuild 4318
 SHA256 a88c6e3983d589d429f283da8a6802845e9133e3021246552dde8c6f1075065b gtk+-2.12.0.ebuild 4318
+EBUILD gtk+-2.12.1-r1.ebuild 4631 RMD160 7d25a74280873fd389fcf4c8afa5e1ef4e9eee3f SHA1 51ad71512928bae07a598f799c6db0b30233be59 SHA256 cdd8364f2d6cd5dd10ae6f7699977023fb221ac15e1e85301e1ce5bd605c5669
+MD5 ad03c7428c30b08b4707351c68ea04d4 gtk+-2.12.1-r1.ebuild 4631
+RMD160 7d25a74280873fd389fcf4c8afa5e1ef4e9eee3f gtk+-2.12.1-r1.ebuild 4631
+SHA256 cdd8364f2d6cd5dd10ae6f7699977023fb221ac15e1e85301e1ce5bd605c5669 gtk+-2.12.1-r1.ebuild 4631
 EBUILD gtk+-2.12.1.ebuild 4548 RMD160 703d3dcfce329effe86ec7fca4e66f644c723647 SHA1 b5a344534dd952bcfc0a317878882160d59c70eb SHA256 6346172ce9747a09c7a126d5356c4f1f3c0e3d00ec12d608ba5842db3e0dcc5e
 MD5 059a1d6a9b457d14a5ad6aaeaf496151 gtk+-2.12.1.ebuild 4548
 RMD160 703d3dcfce329effe86ec7fca4e66f644c723647 gtk+-2.12.1.ebuild 4548
 SHA256 6346172ce9747a09c7a126d5356c4f1f3c0e3d00ec12d608ba5842db3e0dcc5e gtk+-2.12.1.ebuild 4548
-EBUILD gtk+-2.8.17.ebuild 4116 RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a SHA1 ef6842fba1851bab8bf9e0f9b0c2ee3944f79f97 SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae
-MD5 d837775fe059b430a256182912b5b365 gtk+-2.8.17.ebuild 4116
-RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a gtk+-2.8.17.ebuild 4116
-SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae gtk+-2.8.17.ebuild 4116
-EBUILD gtk+-2.8.18.ebuild 4116 RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a SHA1 ef6842fba1851bab8bf9e0f9b0c2ee3944f79f97 SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae
-MD5 d837775fe059b430a256182912b5b365 gtk+-2.8.18.ebuild 4116
-RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a gtk+-2.8.18.ebuild 4116
-SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae gtk+-2.8.18.ebuild 4116
 EBUILD gtk+-2.8.20-r1.ebuild 4286 RMD160 15249534bf6a0bb5e655535803c4bba5e37284cc SHA1 b360015b45dc16705bc68251e971260c11d4ae98 SHA256 f92ea4a455c179bc246123894d232be2542f201616238fefa78c2fb9cc4c659a
 MD5 6a450607e995194d117aea212704ba4d gtk+-2.8.20-r1.ebuild 4286
 RMD160 15249534bf6a0bb5e655535803c4bba5e37284cc gtk+-2.8.20-r1.ebuild 4286
@@ -144,36 +112,3 @@ MISC NOTES 82 RMD160 58293858cde627b688c697e076d2d45f005007b2 SHA1 2f0647b873ce5
 MD5 61f1935636c8a7927b7a2deecd6ed127 NOTES 82
 RMD160 58293858cde627b688c697e076d2d45f005007b2 NOTES 82
 SHA256 6878454f7bf28d1c462b4e213724c88d89eac6694d3323e0f372d227cdbb5f34 NOTES 82
-MD5 9a443de5999df036ffd6e66f5b0f83ce files/digest-gtk+-1.2.10-r11 506
-RMD160 45ddc3e7c5ca97084139787b6be318498a9965db files/digest-gtk+-1.2.10-r11 506
-SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/digest-gtk+-1.2.10-r11 506
-MD5 243331e51ce452c0613ceee64d80f77d files/digest-gtk+-2.10.11 247
-RMD160 649617bd811670f0ce9bbffd5165a400d42e7d1d files/digest-gtk+-2.10.11 247
-SHA256 d0eb86fc1575869bcad882c9bcfcf3e5dddb0ed962e7f455582824179a24e4ec files/digest-gtk+-2.10.11 247
-MD5 8cf987179b8e73e7e6e530c763d331bf files/digest-gtk+-2.10.12 247
-RMD160 ffa16a158229064a6a516741c879f263ecce2aa0 files/digest-gtk+-2.10.12 247
-SHA256 5b49ec7b0c3a64f7b7dfd594ab9c92fdcb0d7d50e495c07f6fe9670ae3842a47 files/digest-gtk+-2.10.12 247
-MD5 8ece972bd8f3c887e435824b69db36ab files/digest-gtk+-2.10.13 247
-RMD160 3fc8f24201e41870ae42b490fad96a20cb72cd97 files/digest-gtk+-2.10.13 247
-SHA256 9f0cafcfeb47855f4c2ee132d581b32e1246607906f82840a89dceb1f766becc files/digest-gtk+-2.10.13 247
-MD5 cd3140e59008423025e51bfff870eea7 files/digest-gtk+-2.10.14 247
-RMD160 1243ae7ce3a392933e4e56750945396b4cb48578 files/digest-gtk+-2.10.14 247
-SHA256 ef2f3edecff46be6433fbbf80837b1911339138e0e51d5ab5e8b5cc5dc8a198c files/digest-gtk+-2.10.14 247
-MD5 c8326ddbc6cc256207f438f1907fc185 files/digest-gtk+-2.10.6 244
-RMD160 52d7da5456f30a8fef7f96c0eca54f3c6c63a260 files/digest-gtk+-2.10.6 244
-SHA256 55bbe220e1f771910fc8c1bbaae3a8a5d984af059306f8904ed77a0e76e1947b files/digest-gtk+-2.10.6 244
-MD5 b481b67d1bae232fb2772db23a21395a files/digest-gtk+-2.10.7-r1 244
-RMD160 2d68d26bab77ff8d03c6764c0108315db2f0b8b1 files/digest-gtk+-2.10.7-r1 244
-SHA256 9e73127b8282101f4e1005e145b8eaaddcd52924f7148e3eb47ffeb894fcfc7d files/digest-gtk+-2.10.7-r1 244
-MD5 b4aa079fb9ea08921c5600a375e87078 files/digest-gtk+-2.10.9 244
-RMD160 eea9d0cbd967fd7699893edd6a362e680a8f1e66 files/digest-gtk+-2.10.9 244
-SHA256 3ff146f542f92059fbaf23e9ebb270e83ceb0327499f40350c7210238beb95da files/digest-gtk+-2.10.9 244
-MD5 bfa8801927a407aeb3fb14dc55888662 files/digest-gtk+-2.8.17 244
-RMD160 4136760f91ba6c09d5c35f9fecfcb5f9dc41ae55 files/digest-gtk+-2.8.17 244
-SHA256 b53b24818165462a5a77713bfcbb65e0d0da4474c15c19f346e595f1852e84b1 files/digest-gtk+-2.8.17 244
-MD5 947f2b8fcdf106adff2488518fd43b26 files/digest-gtk+-2.8.18 244
-RMD160 c5e50985cc890a51ab99e261389afa399ba9d05c files/digest-gtk+-2.8.18 244
-SHA256 cf80659190cc030b5606ac8eb7d7b717fbbe8f25ce18f506168f91b71e65b87f files/digest-gtk+-2.8.18 244
-MD5 5987bda64cc0a2c5d968d200029e4f26 files/digest-gtk+-2.8.20-r1 244
-RMD160 ef26312aa81fad817ff4350262c7675927298af6 files/digest-gtk+-2.8.20-r1 244
-SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/digest-gtk+-2.8.20-r1 244
diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11 b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11
deleted file mode 100644
index 899dce3..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0ae8dcec20e0fa6dbc022d5eb00dc2a3 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
-RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
-SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
-MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz 2868322
-RMD160 9b38310d2768e947c4f6173db009243dd11db288 gtk+-1.2.10.tar.gz 2868322
-SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 gtk+-1.2.10.tar.gz 2868322
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.11 b/x11-libs/gtk+/files/digest-gtk+-2.10.11
deleted file mode 100644
index c86fcf9..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3b32eab43bf5195d981867d25ba55d66 gtk+-2.10.11.tar.bz2 15031543
-RMD160 2c1297ace8c6893fdf6e682e7f7faabdb1866b3a gtk+-2.10.11.tar.bz2 15031543
-SHA256 9b1d724e39e1650ffc0719596bf1aaf140e27b924e96380020050c0cd7ae25f1 gtk+-2.10.11.tar.bz2 15031543
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.12 b/x11-libs/gtk+/files/digest-gtk+-2.10.12
deleted file mode 100644
index 11337c2..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cf969c62134c662ff07e64613ed6c11f gtk+-2.10.12.tar.bz2 15137074
-RMD160 d48eab088a2871d4866f25b7413b78925bb280d7 gtk+-2.10.12.tar.bz2 15137074
-SHA256 58599eae374d15f2474ea2ed67b5c116f9358c05a2c6b01acb3e5910a79fce4f gtk+-2.10.12.tar.bz2 15137074
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.13 b/x11-libs/gtk+/files/digest-gtk+-2.10.13
deleted file mode 100644
index 96dba50..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0af87715f3b0f05bf38a3312a528012 gtk+-2.10.13.tar.bz2 15163566
-RMD160 bd812db8b11fbca5283e04958660fd3beec23caa gtk+-2.10.13.tar.bz2 15163566
-SHA256 6443ecc087a7cf771406264044e3f942ca49cc5fcb84f66d700fd291d55d0b4e gtk+-2.10.13.tar.bz2 15163566
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.14 b/x11-libs/gtk+/files/digest-gtk+-2.10.14
deleted file mode 100644
index 7349e70..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 018d7dd0fa7de01cfdb77c7c55e7ba26 gtk+-2.10.14.tar.bz2 15172170
-RMD160 234d7240732b28a31a260aa9e04c34fc502acbf4 gtk+-2.10.14.tar.bz2 15172170
-SHA256 d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2 gtk+-2.10.14.tar.bz2 15172170
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.6 b/x11-libs/gtk+/files/digest-gtk+-2.10.6
deleted file mode 100644
index 2cfe924..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13c62b610c910255934452d0617403f7 gtk+-2.10.6.tar.bz2 14561124
-RMD160 929386610a634e82b7ddb10f43930b27194fa67b gtk+-2.10.6.tar.bz2 14561124
-SHA256 ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468 gtk+-2.10.6.tar.bz2 14561124
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.7-r1 b/x11-libs/gtk+/files/digest-gtk+-2.10.7-r1
deleted file mode 100644
index 7f6d663..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 acb0c10be4495928db68d2279e34f20c gtk+-2.10.7.tar.bz2 14955229
-RMD160 130af39787b146166846f44b104ea0c3683d0578 gtk+-2.10.7.tar.bz2 14955229
-SHA256 3daead5f578ec2a3752997e6048eb3ecdce208cee560f7289dd9d069ca623276 gtk+-2.10.7.tar.bz2 14955229
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.9 b/x11-libs/gtk+/files/digest-gtk+-2.10.9
deleted file mode 100644
index 788de2d..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 20d763198efb38263b22dee347f69da6 gtk+-2.10.9.tar.bz2 14933330
-RMD160 f415eb350edbf53965a1ec32f99c386cfd3d7df5 gtk+-2.10.9.tar.bz2 14933330
-SHA256 3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3 gtk+-2.10.9.tar.bz2 14933330
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.17 b/x11-libs/gtk+/files/digest-gtk+-2.8.17
deleted file mode 100644
index aa7a3de..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6d2deb63a5444808d2aeb7dcfffaa2f4 gtk+-2.8.17.tar.bz2 12261085
-RMD160 ff4d34eef948cd98c81d852a111d716b9cead94f gtk+-2.8.17.tar.bz2 12261085
-SHA256 d9dea2c9777ab22dfaefed169b2d9b8a8fd914aec8937e723ae029df1aaf19be gtk+-2.8.17.tar.bz2 12261085
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.18 b/x11-libs/gtk+/files/digest-gtk+-2.8.18
deleted file mode 100644
index cd97867..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d27a026428732337676d47d22e5e23c gtk+-2.8.18.tar.bz2 12258449
-RMD160 f9b41fc90e16158ccc87872f07dc4eb269903e84 gtk+-2.8.18.tar.bz2 12258449
-SHA256 c685da334c88c0dac5a5c8d23e08fed23a74b6bc981c345e351a1574ccf52f5b gtk+-2.8.18.tar.bz2 12258449
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.20-r1 b/x11-libs/gtk+/files/digest-gtk+-2.8.20-r1
deleted file mode 100644
index 18c0a05..0000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 74e7ca98194f1fadfe906e66d763d05d gtk+-2.8.20.tar.bz2 12247295
-RMD160 d20254de9e5b37b19f432758fbd78fff4c6baf1e gtk+-2.8.20.tar.bz2 12247295
-SHA256 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79 gtk+-2.8.20.tar.bz2 12247295
diff --git a/x11-libs/gtk+/files/gtk+-2.12.1-cupsutils.patch b/x11-libs/gtk+/files/gtk+-2.12.1-cupsutils.patch
new file mode 100644
index 0000000..660cdc8
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.1-cupsutils.patch
@@ -0,0 +1,11 @@
+--- gtk+-2.12.1/modules/printbackends/cups/gtkcupsutils.c.orig	2007-09-13 22:35:49.000000000 +0200
++++ gtk+-2.12.1/modules/printbackends/cups/gtkcupsutils.c	2007-10-19 12:46:28.000000000 +0200
+@@ -622,7 +622,7 @@ _post_send (GtkCupsRequest *request)
+   if (request->data_io != NULL)
+     {
+       fstat (g_io_channel_unix_get_fd (request->data_io), &data_info);
+-      sprintf (length, "%lu", (unsigned long) ippLength (request->ipp_request) + data_info.st_size);
++      sprintf (length, "%lu", (unsigned long) (ippLength (request->ipp_request) + data_info.st_size));
+     }
+   else
+     sprintf (length, "%lu", (unsigned long) ippLength (request->ipp_request));
diff --git a/x11-libs/gtk+/gtk+-2.10.11.ebuild b/x11-libs/gtk+/gtk+-2.10.11.ebuild
deleted file mode 100644
index cdec180..0000000
--- a/x11-libs/gtk+/gtk+-2.10.11.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.9.ebuild,v 1.1 2007/01/25 17:44:43 leio Exp $
-
-inherit gnome.org flag-o-matic eutils autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXfixes
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.12.1
-	>=x11-libs/pango-1.12.0
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.4
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-RESTRICT="confcache"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# By default expand the silly file chooser.
-	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	# Revert DND change that makes mozilla products DND broken
-	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-fix.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-}
-
-src_compile() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_test() {
-	Xmake check || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.10.12.ebuild b/x11-libs/gtk+/gtk+-2.10.12.ebuild
deleted file mode 100644
index ab641b0..0000000
--- a/x11-libs/gtk+/gtk+-2.10.12.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.12.ebuild,v 1.1 2007/05/03 20:46:44 compnerd Exp $
-
-inherit gnome.org flag-o-matic eutils autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXfixes
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.12.1
-	>=x11-libs/pango-1.12.0
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.4
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-RESTRICT="confcache"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# By default expand the silly file chooser.
-	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}/${PN}-2.8.10-xinerama.patch"
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
-
-	# Revert DND change that makes mozilla products DND broken
-	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-fix.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-}
-
-src_compile() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_test() {
-	Xmake check || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.10.6.ebuild b/x11-libs/gtk+/gtk+-2.10.6.ebuild
deleted file mode 100644
index 6fc1e86..0000000
--- a/x11-libs/gtk+/gtk+-2.10.6.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.6.ebuild,v 1.13 2007/01/05 04:07:43 flameeyes Exp $
-
-inherit gnome.org flag-o-matic eutils autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXfixes
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.12.1
-	>=x11-libs/pango-1.12.0
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/xineramaproto
-	doc? (
-			>=dev-util/gtk-doc-1.4
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-RESTRICT="confcache"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# By default expand the silly file chooser.
-	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-}
-
-src_compile() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_test() {
-	Xmake check || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.10.7-r1.ebuild b/x11-libs/gtk+/gtk+-2.10.7-r1.ebuild
deleted file mode 100644
index 2011d18..0000000
--- a/x11-libs/gtk+/gtk+-2.10.7-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.7-r1.ebuild,v 1.1 2007/01/16 20:51:15 leio Exp $
-
-inherit gnome.org flag-o-matic eutils autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXfixes
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.12.1
-	>=x11-libs/pango-1.12.0
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.4
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-RESTRICT="confcache"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# By default expand the silly file chooser.
-	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	# Don't crash in GtkSourceView/gedit with "Display line numbers"
-	epatch "${FILESDIR}/${P}-textview-fix.patch"
-
-	# Revert DND change that makes mozilla products DND broken
-	EPATCH_OPTS="-R" epatch "${FILESDIR}/${P}-mozilla-dnd-fix.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-}
-
-src_compile() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_test() {
-	Xmake check || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.10.9.ebuild b/x11-libs/gtk+/gtk+-2.10.9.ebuild
deleted file mode 100644
index cdec180..0000000
--- a/x11-libs/gtk+/gtk+-2.10.9.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.9.ebuild,v 1.1 2007/01/25 17:44:43 leio Exp $
-
-inherit gnome.org flag-o-matic eutils autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXfixes
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.12.1
-	>=x11-libs/pango-1.12.0
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.4
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-RESTRICT="confcache"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# By default expand the silly file chooser.
-	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	# Revert DND change that makes mozilla products DND broken
-	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-fix.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-}
-
-src_compile() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_test() {
-	Xmake check || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.10.13.ebuild b/x11-libs/gtk+/gtk+-2.12.1-r1.ebuild
index c69c52e..2d51fd7 100644
--- a/x11-libs/gtk+/gtk+-2.10.13.ebuild
+++ b/x11-libs/gtk+/gtk+-2.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.13.ebuild,v 1.1 2007/06/14 02:42:37 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.1.ebuild,v 1.1 2007/10/20 05:44:35 leio Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -10,27 +10,29 @@ HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
+IUSE="cups debug doc jpeg tiff xinerama"
 
 RDEPEND="x11-libs/libXrender
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXt
 	x11-libs/libXext
-	x11-libs/libXcursor
 	x11-libs/libXrandr
+	x11-libs/libXcursor
 	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.12.1
-	>=x11-libs/pango-1.12.0
+	>=dev-libs/glib-2.13.5
+	>=x11-libs/pango-1.17.3
 	>=dev-libs/atk-1.10.1
 	>=x11-libs/cairo-1.2.0
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
 	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7 )"
-
 DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	>=dev-util/pkgconfig-0.9
@@ -38,17 +40,16 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto
 	x11-proto/inputproto
+	x11-proto/damageproto
 	xinerama? ( x11-proto/xineramaproto )
 	doc? (
-			>=dev-util/gtk-doc-1.4
+			>=dev-util/gtk-doc-1.6
 			~app-text/docbook-xml-dtd-4.1.2
 		 )"
 
-RESTRICT="confcache"
-
 pkg_setup() {
 	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
+		eerror "Please re-emerge x11-libs/cairo with the X USE flag set"
 		die "cairo needs the X flag set"
 	fi
 }
@@ -66,18 +67,21 @@ src_unpack() {
 	# By default expand the silly file chooser.
 	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
 
-	# Optionalize xinerama support
-	epatch "${FILESDIR}/${PN}-2.8.10-xinerama.patch"
-
-	# Make gtk-update-icon-cache check subdirs in it's update check
-	epatch "${FILESDIR}"/${PN}-2.10.11-update-icon-subdirs.patch
-
 	# use an arch-specific config directory so that 32bit and 64bit versions
 	# dont clash on multilib systems
 	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
 
-	# Revert DND change that makes mozilla products DND broken
-	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-fix.patch"
+	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
+	epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
+
+	# OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513
+	epatch "${FILESDIR}/${PN}-2.12.0-openoffice-freeze-workaround.patch"
+
+	# Firefox print review crash fix, bug #195644
+	epatch "${FILESDIR}/${P}-firefox-print-preview.patch"
+
+	# Fix printing on ppc64.  Bug #197639
+	epatch "${FILESDIR}"/${P}-cupsutils.patch
 
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
@@ -89,8 +93,7 @@ src_unpack() {
 	# if you remove this, you should manually run elibtoolize
 	export WANT_AUTOMAKE=1.7
 	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
+	AT_M4DIR="." eautoreconf
 
 	epunt_cxx
 }
@@ -118,20 +121,24 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
+	einstall || die "Installation failed"
 
 	set_gtk2_confdir
 	dodir ${GTK2_CONFDIR}
 	keepdir ${GTK2_CONFDIR}
 
 	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
 
 	# Enable xft in environment as suggested by <utx@gentoo.org>
 	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
+	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
 }
 
 pkg_postinst() {
diff --git a/x11-libs/gtk+/gtk+-2.8.17.ebuild b/x11-libs/gtk+/gtk+-2.8.17.ebuild
deleted file mode 100644
index 6cb9081..0000000
--- a/x11-libs/gtk+/gtk+-2.8.17.ebuild
+++ /dev/null
@@ -1,159 +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/gtk+/gtk+-2.8.17.ebuild,v 1.1 2006/05/01 19:35:55 dang Exp $
-
-inherit gnome.org flag-o-matic eutils autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="|| ( (	x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXfixes
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
-	>=dev-libs/glib-2.10.1
-	>=x11-libs/pango-1.9
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-0.9.2
-	  media-libs/fontconfig
-	  x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	>=sys-devel/automake-1.7.9
-	|| ( (	x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/xineramaproto )
-	virtual/x11 )
-	doc? (	>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-RESTRICT="confcache"
-
-pkg_setup() {
-
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	# By default expand the silly file chooser.
-	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-
-}
-
-src_compile() {
-
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "./configure failed to run"
-
-	emake || die "gtk+ failed to compile"
-}
-
-src_test() {
-
-	Xmake check || die
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	einfo "If you experience text corruption issues, turn off RenderAccel"
-	einfo "in your xorg.conf.  NVIDIA is working on this issue. "
-	einfo "See http://bugs.gentoo.org/113123 for more information."
-
-}
diff --git a/x11-libs/gtk+/gtk+-2.8.18.ebuild b/x11-libs/gtk+/gtk+-2.8.18.ebuild
deleted file mode 100644
index 6cb9081..0000000
--- a/x11-libs/gtk+/gtk+-2.8.18.ebuild
+++ /dev/null
@@ -1,159 +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/gtk+/gtk+-2.8.17.ebuild,v 1.1 2006/05/01 19:35:55 dang Exp $
-
-inherit gnome.org flag-o-matic eutils autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="|| ( (	x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXfixes
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
-	>=dev-libs/glib-2.10.1
-	>=x11-libs/pango-1.9
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-0.9.2
-	  media-libs/fontconfig
-	  x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	>=sys-devel/automake-1.7.9
-	|| ( (	x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/xineramaproto )
-	virtual/x11 )
-	doc? (	>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-RESTRICT="confcache"
-
-pkg_setup() {
-
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	# By default expand the silly file chooser.
-	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-
-}
-
-src_compile() {
-
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "./configure failed to run"
-
-	emake || die "gtk+ failed to compile"
-}
-
-src_test() {
-
-	Xmake check || die
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	einfo "If you experience text corruption issues, turn off RenderAccel"
-	einfo "in your xorg.conf.  NVIDIA is working on this issue. "
-	einfo "See http://bugs.gentoo.org/113123 for more information."
-
-}