Clean up

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

28 files changed, 0 insertions, 1874 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
deleted file mode 100644
index 82b52bb..0000000
--- a/x11-libs/gtk+/Manifest
+++ /dev/null
@@ -1,114 +0,0 @@
-AUX gtk+-1.2-link.patch 1088 RMD160 426707880ee158d5f68281831b61d64cf37f39c8 SHA1 3985c4c17dec3928648c7bcf732b6b37795c2a73 SHA256 5f43fa95ca7a71d30c748e4b173806721a4bb2225431e0a2341675751ca14ede
-MD5 60b2dfec739a036eea58fd73ca47f7d3 files/gtk+-1.2-link.patch 1088
-RMD160 426707880ee158d5f68281831b61d64cf37f39c8 files/gtk+-1.2-link.patch 1088
-SHA256 5f43fa95ca7a71d30c748e4b173806721a4bb2225431e0a2341675751ca14ede files/gtk+-1.2-link.patch 1088
-AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
-MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a files/gtk+-1.2-locale_fix.patch 419
-SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb files/gtk+-1.2-locale_fix.patch 419
-AUX gtk+-1.2.10-m4.patch 220 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 SHA1 898e6846de5d4c57ecc2e2503ed56355324fd2ee SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324
-MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
-RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 files/gtk+-1.2.10-m4.patch 220
-SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324 files/gtk+-1.2.10-m4.patch 220
-AUX gtk+-2.10.11-update-icon-subdirs.patch 3756 RMD160 60c3abb77f6484b8700a5f42ffa5b0784503fea0 SHA1 ffb3d5b1d1d346d3a38899d93883874232e86baf SHA256 41d31835a5feaaf5eafdd0ab173be30c8d9579c4d08824105db2a12ad765436e
-MD5 be90a759af580f4ce2103b8138237b5f files/gtk+-2.10.11-update-icon-subdirs.patch 3756
-RMD160 60c3abb77f6484b8700a5f42ffa5b0784503fea0 files/gtk+-2.10.11-update-icon-subdirs.patch 3756
-SHA256 41d31835a5feaaf5eafdd0ab173be30c8d9579c4d08824105db2a12ad765436e files/gtk+-2.10.11-update-icon-subdirs.patch 3756
-AUX gtk+-2.10.7-mozilla-dnd-fix.patch 2899 RMD160 2cc33847d78fe0c207bc79f514546113d740ca2c SHA1 5f385f6fcd05cb21c33e0fbbbaa98389ee24019e SHA256 9ec24dbe7e652aaee7d6118adffb4919ee0b3d7887587649cb475f3e69f5d729
-MD5 ffd8534d7546dad5d54fd70be4af97f7 files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899
-RMD160 2cc33847d78fe0c207bc79f514546113d740ca2c files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899
-SHA256 9ec24dbe7e652aaee7d6118adffb4919ee0b3d7887587649cb475f3e69f5d729 files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899
-AUX gtk+-2.10.7-textview-fix.patch 937 RMD160 32e9a321151742e29dc15f891c91218bfd94fe49 SHA1 adeb81cfde35424e107a04250d58dcb413adfd57 SHA256 9f251fe7d50a7e9280d331bece4956ceb12044ac64a01cc6effcb28ec672baae
-MD5 4af2fc5215284f8bf11c5fe9f71c3c9c files/gtk+-2.10.7-textview-fix.patch 937
-RMD160 32e9a321151742e29dc15f891c91218bfd94fe49 files/gtk+-2.10.7-textview-fix.patch 937
-SHA256 9f251fe7d50a7e9280d331bece4956ceb12044ac64a01cc6effcb28ec672baae files/gtk+-2.10.7-textview-fix.patch 937
-AUX gtk+-2.12.0-flash-workaround.patch 532 RMD160 24d6d96f11c1fd8c8d6fe3702de2dc4d824d7ee5 SHA1 7db980e782a5b04d27bffb55e3dc0190ad22e118 SHA256 da2ce04a400e45cc5e5cf78547699006e70e91e6620b4232a8fd7eea4de90007
-MD5 36c2cd86437f1d35de3f559a87da6bc2 files/gtk+-2.12.0-flash-workaround.patch 532
-RMD160 24d6d96f11c1fd8c8d6fe3702de2dc4d824d7ee5 files/gtk+-2.12.0-flash-workaround.patch 532
-SHA256 da2ce04a400e45cc5e5cf78547699006e70e91e6620b4232a8fd7eea4de90007 files/gtk+-2.12.0-flash-workaround.patch 532
-AUX gtk+-2.12.0-icon-cache-speedup.patch 969 RMD160 822ebb9e3b59eab5cda16ca3ff9cfffa04df3671 SHA1 2b199886215bb4bb0372e11665dab72d494e3077 SHA256 cb117bf1bbfc1e9509c614ba3c2d4a193f7b486fad9d7922208134749793e5ec
-MD5 1edb4111800bb328c4b04a98d20a2adc files/gtk+-2.12.0-icon-cache-speedup.patch 969
-RMD160 822ebb9e3b59eab5cda16ca3ff9cfffa04df3671 files/gtk+-2.12.0-icon-cache-speedup.patch 969
-SHA256 cb117bf1bbfc1e9509c614ba3c2d4a193f7b486fad9d7922208134749793e5ec files/gtk+-2.12.0-icon-cache-speedup.patch 969
-AUX gtk+-2.12.0-libtracker_so.patch 585 RMD160 c8d857b5bb7398f34f9f84fd59ed3b1247964375 SHA1 a1da145b30e2346fa3536a16c132be53450c8699 SHA256 5c922a06bbacc20df5e8ea9c22656236a0d780e55cb955a261fb604628b4b56f
-MD5 e61c470b1296b6f7e3deb79673d0ab2f files/gtk+-2.12.0-libtracker_so.patch 585
-RMD160 c8d857b5bb7398f34f9f84fd59ed3b1247964375 files/gtk+-2.12.0-libtracker_so.patch 585
-SHA256 5c922a06bbacc20df5e8ea9c22656236a0d780e55cb955a261fb604628b4b56f files/gtk+-2.12.0-libtracker_so.patch 585
-AUX gtk+-2.12.0-openoffice-freeze-workaround.patch 363 RMD160 40ee74aece5ce7a24d9e091bafddd880a8589a02 SHA1 783920d179ba0755ccab9186b6bff9f293828a96 SHA256 4c8d1873c8f972d8d840f1eb12a175931ecb47fb102fe701c965b38c2f35ecce
-MD5 c49046f7a1e7b35414a6f5312ac0e05b files/gtk+-2.12.0-openoffice-freeze-workaround.patch 363
-RMD160 40ee74aece5ce7a24d9e091bafddd880a8589a02 files/gtk+-2.12.0-openoffice-freeze-workaround.patch 363
-SHA256 4c8d1873c8f972d8d840f1eb12a175931ecb47fb102fe701c965b38c2f35ecce files/gtk+-2.12.0-openoffice-freeze-workaround.patch 363
-AUX gtk+-2.12.0-searchenginesimple-crash-fix.patch 2666 RMD160 b90b97d47b57ff2a3cef565d74ab047aa29b6fd7 SHA1 1ae3ab211722e57dd4aaa8494657c97ed1beec55 SHA256 0010cd6307c16ead6c7726861700141055f209907c6a39cf4abf84d66ed01a84
-MD5 eaff892372995dea5985e7f3783d9573 files/gtk+-2.12.0-searchenginesimple-crash-fix.patch 2666
-RMD160 b90b97d47b57ff2a3cef565d74ab047aa29b6fd7 files/gtk+-2.12.0-searchenginesimple-crash-fix.patch 2666
-SHA256 0010cd6307c16ead6c7726861700141055f209907c6a39cf4abf84d66ed01a84 files/gtk+-2.12.0-searchenginesimple-crash-fix.patch 2666
-AUX gtk+-2.12.0-swt-tooltips-fix.patch 523 RMD160 0af17ef2e2813a7e927750e88dfcfa3b7ef91252 SHA1 83bbb52d3b724e32432799773675f9896c534ed9 SHA256 8529919c483c4d60adb92c38a684a76dfae42eb0d66552a542836965cd0a850f
-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
-SHA256 eadd5a4c4084ecd39317f3eb39e7d4e35aa7d26a8b7010bdd6aeb94c69f362aa files/gtk+-2.12.1-firefox-print-preview.patch 888
-AUX gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 SHA1 5be2ba7cdac1bf48fdca5dc49d2adf96480452f0 SHA256 f4b916c7d26ba60b5d5af63ff694a5203f0dcd31b7310fb375c324fc1df72e05
-MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-SHA256 f4b916c7d26ba60b5d5af63ff694a5203f0dcd31b7310fb375c324fc1df72e05 files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
-MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
-RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 files/gtk+-2.8.0-multilib.patch 2456
-SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd files/gtk+-2.8.0-multilib.patch 2456
-AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d14512f7 SHA1 7817e3c2bbec1058192d524d68e78635fa48beca SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d
-MD5 8289aa1fb556b38e9fb2f9201a065755 files/gtk+-2.8.10-xinerama.patch 1083
-RMD160 499801f3be2289bdc656563bb5c96797d14512f7 files/gtk+-2.8.10-xinerama.patch 1083
-SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d files/gtk+-2.8.10-xinerama.patch 1083
-AUX gtk+-2.8.11-filechooser.patch 594 RMD160 2825a07857ed487a5855ea0e9f2a01db254d2f56 SHA1 40d39082ac640d3a1bcfc236f1b2e5abf5e6f9a2 SHA256 b0df921477ee89a807f35012e81774287092d929f3b5382690cb9c57ff48aae5
-MD5 b68a5076dd09ac48212ceca30978b2db files/gtk+-2.8.11-filechooser.patch 594
-RMD160 2825a07857ed487a5855ea0e9f2a01db254d2f56 files/gtk+-2.8.11-filechooser.patch 594
-SHA256 b0df921477ee89a807f35012e81774287092d929f3b5382690cb9c57ff48aae5 files/gtk+-2.8.11-filechooser.patch 594
-AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-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.14.tar.bz2 15172170 RMD160 234d7240732b28a31a260aa9e04c34fc502acbf4 SHA1 78b819814d52caa66739ab64611e41f35e5b48c3 SHA256 d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-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.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.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.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
-SHA256 5db05ed4d7dc339222ee16cc9df045ff8a1976193c906ccbb13616ab6e98b194 gtk+-2.12.0-r2.ebuild 5204
-EBUILD gtk+-2.12.0.ebuild 4318 RMD160 588e665cbe20b4894dce301ef5addce5ce0a4547 SHA1 bf96b4c8b55cf37b0966277dc9ce64b7eff48956 SHA256 a88c6e3983d589d429f283da8a6802845e9133e3021246552dde8c6f1075065b
-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.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
-SHA256 f92ea4a455c179bc246123894d232be2542f201616238fefa78c2fb9cc4c659a gtk+-2.8.20-r1.ebuild 4286
-MISC NOTES 82 RMD160 58293858cde627b688c697e076d2d45f005007b2 SHA1 2f0647b873ce5d273d6492ce390a9c882db26046 SHA256 6878454f7bf28d1c462b4e213724c88d89eac6694d3323e0f372d227cdbb5f34
-MD5 61f1935636c8a7927b7a2deecd6ed127 NOTES 82
-RMD160 58293858cde627b688c697e076d2d45f005007b2 NOTES 82
-SHA256 6878454f7bf28d1c462b4e213724c88d89eac6694d3323e0f372d227cdbb5f34 NOTES 82
diff --git a/x11-libs/gtk+/NOTES b/x11-libs/gtk+/NOTES
deleted file mode 100644
index f2f567f..0000000
--- a/x11-libs/gtk+/NOTES
+++ /dev/null
@@ -1,2 +0,0 @@
-A version that includes a patch that keeps the file save dialog open by 
-default.
diff --git a/x11-libs/gtk+/files/gtk+-1.2-link.patch b/x11-libs/gtk+/files/gtk+-1.2-link.patch
deleted file mode 100644
index f34a4e5..0000000
--- a/x11-libs/gtk+/files/gtk+-1.2-link.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- gtk+-1.2.10.orig/gtk/Makefile.am	2006-08-06 15:25:48.000000000 +0200
-+++ gtk+-1.2.10/gtk/Makefile.am	2006-08-06 15:29:53.000000000 +0200
-@@ -31,8 +31,8 @@
- 	@x_ldflags@						\
- 	@x_libs@ 						\
- 	-lm							\
-+	-Wl,-L$(top_builddir)/gdk/ -Wl,-lgdk				\
- @STRIP_END@
--#	$(top_builddir)/gdk/libgdk.la
- 
- 
- #
---- gtk+-1.2.10.orig/gtk/Makefile.in	2001-04-02 05:14:13.000000000 +0200
-+++ gtk+-1.2.10/gtk/Makefile.in	2006-08-06 16:01:21.000000000 +0200
-@@ -135,7 +135,7 @@
- 
- # libtool stuff: set version and export symbols for resolving
- libgtkincludedir = $(includedir)/gtk-1.2/gtk
--libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
-+libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm	-Wl,-L$(top_builddir)/gdk -Wl,-lgdk		@STRIP_END@
- 
- #	$(top_builddir)/gdk/libgdk.la
- 
diff --git a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch b/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
deleted file mode 100644
index a3fd198..0000000
--- a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk/gtkrc.c.~1.40.2.17.~	2001-07-10 20:06:35.000000000 +0200
-+++ gtk/gtkrc.c	2003-03-05 16:56:10.000000000 +0100
-@@ -453,7 +453,7 @@
- 
-   if (!initted)
-     {
--      char *locale = setlocale (LC_CTYPE, NULL);
-+      char *locale = g_strdup (setlocale (LC_CTYPE, NULL));
-       char *p;
-       
-       initted = TRUE;
-@@ -558,6 +558,7 @@
- 
- 	  if (tmp) g_free (tmp);
- 	}
-+      g_free (locale);
-     }
-   
-   i = 0;
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch b/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
deleted file mode 100644
index 37fb7c2..0000000
--- a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warnings:
-/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
---- gtk+-1.2.10/gtk.m4
-+++ gtk+-1.2.10/gtk.m4
-@@ -6,3 +6,3 @@
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl 
diff --git a/x11-libs/gtk+/files/gtk+-2.10.11-update-icon-subdirs.patch b/x11-libs/gtk+/files/gtk+-2.10.11-update-icon-subdirs.patch
deleted file mode 100644
index 64cbb0f..0000000
--- a/x11-libs/gtk+/files/gtk+-2.10.11-update-icon-subdirs.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gtk+-2.10.11.orig/gtk/updateiconcache.c gtk+-2.10.11/gtk/updateiconcache.c
---- gtk+-2.10.11.orig/gtk/updateiconcache.c	2007-03-14 00:07:02.000000000 -0400
-+++ gtk+-2.10.11/gtk/updateiconcache.c	2007-05-01 17:01:46.000000000 -0400
-@@ -43,6 +43,7 @@ static gboolean force_update = FALSE;
- static gboolean ignore_theme_index = FALSE;
- static gboolean quiet = FALSE;
- static gboolean index_only = FALSE;
-+static gboolean check_subdirs = FALSE;
- static gchar *var_name = "-";
- 
- #define CACHE_NAME "icon-theme.cache"
-@@ -61,8 +62,82 @@ static gchar *var_name = "-";
- #define ALIGN_VALUE(this, boundary) \
-   (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
- 
-+/* returns >0 if dir is newer than time, 0 if dir is older than time,
-+ * <0 if stat fails */
-+int
-+dir_check (const gchar *path, time_t cache_time)
-+{
-+  struct stat path_stat;
-+
-+	if (g_stat (path, &path_stat) < 0)
-+		{
-+			return -1;
-+		}
-+  return cache_time < path_stat.st_mtime;
-+}
-+
-+/* Check the subdirectories of the cache dir to see if the cache is up-to-date
-+ * We check first and second level subdirs. */
-+gboolean
-+is_cache_up_to_date_subdirs (const gchar *toppath, time_t cache_time)
-+{
-+	GDir *topdir, *subdir;
-+	const gchar *name, *subname;
-+	gchar *path, *subpath;
-+	int dir_state;
-+
-+	topdir = g_dir_open (toppath, 0, NULL);
-+	if (!topdir)
-+		{
-+			/* we can't open dir, assume updated cache */
-+			return TRUE;
-+		}
-+
-+	while ((name = g_dir_read_name (topdir)))
-+		{
-+			path = g_build_filename (toppath, name, NULL);
-+			dir_state = dir_check (path, cache_time);
-+			if (dir_state < 0)
-+				{
-+					/* cannot stat dir, for some reason; skip */
-+					g_free (path);
-+					continue;
-+				}
-+			else if (dir_state > 0)
-+				{
-+					/* cache is out of date */
-+					g_free (path);
-+					return FALSE;
-+				}
-+
-+			subdir = g_dir_open (path, 0, NULL);
-+			if (!subdir)
-+				{
-+					/* Cannot open subdir; skip */
-+					g_free (path);
-+					continue;
-+				}
-+			while ((subname = g_dir_read_name (subdir)))
-+				{
-+					subpath = g_build_filename (path, subname, NULL);
-+					dir_state = dir_check (subpath, cache_time);
-+					g_free (subpath);
-+
-+					if (dir_state > 0)
-+						{
-+							/* Cache out of date */
-+							return FALSE;
-+						}
-+				}
-+			g_free (path);
-+		}
-+
-+	/* If we get here, the cache is up to date */
-+	return TRUE;
-+}
-+
- gboolean
--is_cache_up_to_date (const gchar *path)
-+is_cache_up_to_date (const gchar *path, gboolean check_subdirs)
- {
-   struct stat path_stat, cache_stat;
-   gchar *cache_path;
-@@ -88,7 +163,18 @@ is_cache_up_to_date (const gchar *path)
-     }
- 
-   /* Check mtime */
--  return cache_stat.st_mtime >= path_stat.st_mtime;
-+  if (cache_stat.st_mtime < path_stat.st_mtime)
-+		{
-+			/* Cache is out of date */
-+			return FALSE;
-+		}
-+	if (check_subdirs)
-+		{
-+			return is_cache_up_to_date_subdirs (path, cache_stat.st_mtime);
-+		}
-+
-+	/* Cache is up to date */
-+	return TRUE;
- }
- 
- gboolean
-@@ -1284,6 +1370,7 @@ static GOptionEntry args[] = {
-   { "index-only", 'i', 0, G_OPTION_ARG_NONE, &index_only, N_("Don't include image data in the cache"), NULL },
-   { "source", 'c', 0, G_OPTION_ARG_STRING, &var_name, N_("Output a C header file"), "NAME" },
-   { "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Turn off verbose output"), NULL },
-+  { "check-subdirs", 's', 0, G_OPTION_ARG_NONE, &check_subdirs, N_("Check subdirectories when determining if cache is up-to-date"), NULL },
-   { NULL }
- };
- 
-@@ -1316,7 +1403,7 @@ main (int argc, char **argv)
-       return 1;
-     }
-   
--  if (!force_update && is_cache_up_to_date (path))
-+  if (!force_update && is_cache_up_to_date (path, check_subdirs))
-     return 0;
- 
-   g_type_init ();
diff --git a/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch b/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch
deleted file mode 100644
index 9188972..0000000
--- a/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-This patch is applied upstream to fix http://bugzilla.gnome.org/show_bug.cgi?id=122688
-As this regresses mozilla products drag-and-drop (bug 162362) we are reverse applying
-it as what it fixed is a corner case while mozilla case is a big problem.
-The real problem is inside mozilla code, see http://bugzilla.gnome.org/show_bug.cgi?id=394525
-but we can't fix this for binary thunderbird/firefox/seamonkey packages
-
---- /branches/gtk-2-10/gtk/gtkdnd.c	2006/11/05 08:55:47	16711
-+++ branches/gtk-2-10/gtk/gtkdnd.c	2006/11/06 17:16:37	16712
-@@ -285,6 +285,9 @@
- static gboolean gtk_drag_grab_broken_event_cb  (GtkWidget          *widget,
- 						GdkEventGrabBroken *event,
- 						gpointer            data);
-+static void     gtk_drag_grab_notify_cb        (GtkWidget         *widget,
-+						gboolean           was_grabbed,
-+						gpointer           data);
- static gboolean gtk_drag_button_release_cb     (GtkWidget         *widget, 
- 					        GdkEventButton    *event, 
- 					        gpointer           data);
-@@ -2331,6 +2334,8 @@
- 
-   g_signal_connect (info->ipc_widget, "grab_broken_event",
- 		    G_CALLBACK (gtk_drag_grab_broken_event_cb), info);
-+  g_signal_connect (info->ipc_widget, "grab_notify",
-+		    G_CALLBACK (gtk_drag_grab_notify_cb), info);
-   g_signal_connect (info->ipc_widget, "button_release_event",
- 		    G_CALLBACK (gtk_drag_button_release_cb), info);
-   g_signal_connect (info->ipc_widget, "motion_notify_event",
-@@ -3762,6 +3767,9 @@
- 					gtk_drag_grab_broken_event_cb,
- 					info);
-   g_signal_handlers_disconnect_by_func (info->ipc_widget,
-+					gtk_drag_grab_notify_cb,
-+					info);
-+  g_signal_handlers_disconnect_by_func (info->ipc_widget,
- 					gtk_drag_button_release_cb,
- 					info);
-   g_signal_handlers_disconnect_by_func (info->ipc_widget,
-@@ -3926,6 +3934,9 @@
- 					gtk_drag_grab_broken_event_cb,
- 					info);
-   g_signal_handlers_disconnect_by_func (info->ipc_widget,
-+					gtk_drag_grab_notify_cb,
-+					info);
-+  g_signal_handlers_disconnect_by_func (info->ipc_widget,
- 					gtk_drag_button_release_cb,
- 					info);
-   g_signal_handlers_disconnect_by_func (info->ipc_widget,
-@@ -4117,6 +4128,24 @@
-   return TRUE;
- }
- 
-+static void
-+gtk_drag_grab_notify_cb (GtkWidget        *widget,
-+			 gboolean          was_grabbed,
-+			 gpointer          data)
-+{
-+  GtkDragSourceInfo *info = (GtkDragSourceInfo *)data;
-+
-+  if (!was_grabbed)
-+    {
-+      /* We have to block callbacks to avoid recursion here, because
-+	 gtk_drag_cancel calls gtk_grab_remove (via gtk_drag_end) */
-+      g_signal_handlers_block_by_func (widget, gtk_drag_grab_notify_cb, data);
-+      gtk_drag_cancel (info, gtk_get_current_event_time ());
-+      g_signal_handlers_unblock_by_func (widget, gtk_drag_grab_notify_cb, data);
-+    }
-+}
-+
-+
- /*************************************************************
-  * gtk_drag_button_release_cb:
-  *     "button_release_event" callback during drag.
diff --git a/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch b/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch
deleted file mode 100644
index b6ff18f..0000000
--- a/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't crash in GtkSourceView/gedit with "Display line numbers"
-http://bugzilla.gnome.org/show_bug.cgi?id=393813
-
---- /trunk/gtk/gtktextview.c	2007/01/07 05:34:40	17100
-+++ trunk/gtk/gtktextview.c	2007/01/07 07:19:07	17101
-@@ -8182,7 +8182,7 @@
-                                    width, 0);
-           /* if the widget is already realized we need to realize the child manually */
-           if (GTK_WIDGET_REALIZED (text_view))
--            text_window_realize (*winp, GTK_WIDGET (text_view)->window);
-+            text_window_realize (*winp, GTK_WIDGET (text_view));
-         }
-       else
-         {
-@@ -8222,7 +8222,7 @@
- 
-           /* if the widget is already realized we need to realize the child manually */
-           if (GTK_WIDGET_REALIZED (text_view))
--            text_window_realize (*winp, GTK_WIDGET (text_view)->window);
-+            text_window_realize (*winp, GTK_WIDGET (text_view));
-         }
-       else
-         {
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch b/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch
deleted file mode 100644
index 7beccc3..0000000
--- a/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
-===================================================================
---- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c	2007-08-31 16:52:48.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkclipboard.c	2007-08-31 16:53:16.000000000 +0200
-@@ -287,6 +287,7 @@
- gtk_clipboard_get_for_display (GdkDisplay *display, 
- 			       GdkAtom     selection)
- {
-+  g_return_val_if_fail (display != NULL, NULL);
-   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-   g_return_val_if_fail (!display->closed, NULL);
- 
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch b/x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch
deleted file mode 100644
index 99311df..0000000
--- a/x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.12.0.orig/gtk/gtkiconcache.c gtk+-2.12.0/gtk/gtkiconcache.c
---- gtk+-2.12.0.orig/gtk/gtkiconcache.c	2007-09-13 16:35:41.000000000 -0400
-+++ gtk+-2.12.0/gtk/gtkiconcache.c	2007-09-14 15:33:01.000000000 -0400
-@@ -127,14 +127,19 @@ _gtk_icon_cache_new_for_path (const gcha
-   info.n_directories = 0;
-   info.flags = CHECK_OFFSETS|CHECK_STRINGS;
- 
--  if (!_gtk_icon_cache_validate (&info))
-+#ifdef G_ENABLE_DEBUG
-+  if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
-     {
--      g_mapped_file_free (map);
--      g_warning ("Icon cache '%s' is invalid\n", cache_filename);
-+      if (!_gtk_icon_cache_validate (&info))
-+        {
-+          g_mapped_file_free (map);
-+          g_warning ("Icon cache '%s' is invalid\n", cache_filename);
- 
--      goto done;
-+          goto done;
-+        }
-     }
--  
-+#endif 
-+
-   GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
- 
-   cache = g_new0 (GtkIconCache, 1);
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-libtracker_so.patch b/x11-libs/gtk+/files/gtk+-2.12.0-libtracker_so.patch
deleted file mode 100644
index d5f3fdd..0000000
--- a/x11-libs/gtk+/files/gtk+-2.12.0-libtracker_so.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gtk/gtksearchenginetracker.c	2007/06/22 14:32:22	18219
-+++ gtk/gtksearchenginetracker.c	2007/09/18 21:48:01	18846
-@@ -71,10 +71,16 @@
-     {
-       int i;
-       GModule *tracker;
-+      GModuleFlags flags;
-       
-       done = TRUE;
-- 
--      tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-+      flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
-+
-+      tracker = g_module_open ("libtrackerclient.so.0", flags);
-+
-+      if (!tracker)
-+        tracker = g_module_open ("libtracker.so.0", flags);
-+
-       if (!tracker)
- 	return;
-       
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch b/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch
deleted file mode 100644
index 453bd5d..0000000
--- a/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdk/gdkscreen.c.orig	2007-09-13 23:36:09.000000000 +0300
-+++ gdk/gdkscreen.c	2007-09-25 18:16:53.000000000 +0300
-@@ -417,6 +417,7 @@
- const cairo_font_options_t *
- gdk_screen_get_font_options (GdkScreen *screen)
- {
-+    g_return_val_if_fail (screen != NULL, NULL);
-     g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- 
-     return screen->font_options;
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-searchenginesimple-crash-fix.patch b/x11-libs/gtk+/files/gtk+-2.12.0-searchenginesimple-crash-fix.patch
deleted file mode 100644
index af9aeb1..0000000
--- a/x11-libs/gtk+/files/gtk+-2.12.0-searchenginesimple-crash-fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: gtk/gtksearchenginesimple.c
-===================================================================
---- gtk/gtksearchenginesimple.c	(revision 18864)
-+++ gtk/gtksearchenginesimple.c	(working copy)
-@@ -72,19 +72,27 @@ struct _GtkSearchEngineSimplePrivate 
- G_DEFINE_TYPE (GtkSearchEngineSimple, _gtk_search_engine_simple, GTK_TYPE_SEARCH_ENGINE);
- 
- static void
--finalize (GObject *object)
-+gtk_search_engine_simple_dispose (GObject *object)
- {
-   GtkSearchEngineSimple *simple;
-+  GtkSearchEngineSimplePrivate *priv;
-   
-   simple = GTK_SEARCH_ENGINE_SIMPLE (object);
-+  priv = simple->priv;
-   
--  if (simple->priv->query) 
-+  if (priv->query) 
-+    {
-+      g_object_unref (priv->query);
-+      priv->query = NULL;
-+    }
-+
-+  if (priv->active_search)
-     {
--      g_object_unref (simple->priv->query);
--      simple->priv->query = NULL;
-+      priv->active_search->cancelled = TRUE;
-+      priv->active_search = NULL;
-     }
-   
--  G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object);
-+  G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->dispose (object);
- }
- 
- static SearchThreadData *
-@@ -131,12 +139,10 @@ search_thread_done_idle (gpointer user_d
- 
-   data = user_data;
-   
--  if (!data->cancelled) 
--    {
--      _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
--      data->engine->priv->active_search = NULL;
--    }
--  
-+  if (!data->cancelled)
-+    _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-+     
-+  data->engine->priv->active_search = NULL;
-   search_thread_data_free (data);
-   
-   return FALSE;
-@@ -181,6 +187,7 @@ send_batch (SearchThreadData *data)
-       hits = g_new (SearchHits, 1);
-       hits->uris = data->uri_hits;
-       hits->thread_data = data;
-+      
-       gdk_threads_add_idle (search_thread_add_hits_idle, hits);
-     }
-   data->uri_hits = NULL;
-@@ -349,7 +356,7 @@ _gtk_search_engine_simple_class_init (Gt
-   GtkSearchEngineClass *engine_class;
-   
-   gobject_class = G_OBJECT_CLASS (class);
--  gobject_class->finalize = finalize;
-+  gobject_class->dispose = gtk_search_engine_simple_dispose;
-   
-   engine_class = GTK_SEARCH_ENGINE_CLASS (class);
-   engine_class->set_query = gtk_search_engine_simple_set_query;
-Index: gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk/gtkfilechooserdefault.c	(revision 18864)
-+++ gtk/gtkfilechooserdefault.c	(working copy)
-@@ -8994,6 +8994,8 @@ search_stop_searching (GtkFileChooserDef
-   
-   if (impl->search_engine)
-     {
-+      _gtk_search_engine_stop (impl->search_engine);
-+      
-       g_object_unref (impl->search_engine);
-       impl->search_engine = NULL;
-     }
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-swt-tooltips-fix.patch b/x11-libs/gtk+/files/gtk+-2.12.0-swt-tooltips-fix.patch
deleted file mode 100644
index 8277cdf..0000000
--- a/x11-libs/gtk+/files/gtk+-2.12.0-swt-tooltips-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix http://bugzilla.gnome.org/show_bug.cgi?id=460194
-Patch from http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtktooltips.c?view=patch&r1=18864&r2=18863&pathrev=18864
-Will be part of gtk+-2.12.1
-
---- trunk/gtk/gtktooltips.c	2007/09/24 17:13:40	18863
-+++ trunk/gtk/gtktooltips.c	2007/09/24 18:23:01	18864
-@@ -230,6 +230,7 @@
-     }
-   
-   if (tooltips->active_tips_data 
-+      && tooltipsdata
-       && tooltips->active_tips_data->widget == widget
-       && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
-     {
diff --git a/x11-libs/gtk+/files/gtk+-2.12.1-cupsutils.patch b/x11-libs/gtk+/files/gtk+-2.12.1-cupsutils.patch
deleted file mode 100644
index 660cdc8..0000000
--- a/x11-libs/gtk+/files/gtk+-2.12.1-cupsutils.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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+/files/gtk+-2.12.1-firefox-print-preview.patch b/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch
deleted file mode 100644
index f474c2a..0000000
--- a/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugzilla.gnome.org/show_bug.cgi?id=482531 - firefox crashed on print preview [@IA__gdk_window_get_toplevel] [@gdk_window_is_toplevel_frozen]
-
-Index: gtk+/gdk/gdkwindow.c
-===================================================================
---- gtk+/gdk/gdkwindow.c	(revision 18802)
-+++ gtk+/gdk/gdkwindow.c	(working copy)
-@@ -615,7 +615,11 @@ gdk_window_get_toplevel (GdkWindow *wind
- 
-   obj = (GdkWindowObject *)window;
-   while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD)
--    obj = (GdkWindowObject *)obj->parent;
-+    {
-+      obj = (GdkWindowObject *)obj->parent;
-+      if (!obj)
-+	return NULL;
-+    }
-   
-   return GDK_WINDOW (obj);
- }
-@@ -2297,6 +2301,9 @@ gdk_window_is_toplevel_frozen (GdkWindow
- 
-   toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window);
- 
-+  if (!toplevel)
-+    return FALSE;
-+
-   return toplevel->update_and_descendants_freeze_count > 0;
- }
- 
diff --git a/x11-libs/gtk+/files/gtk+-2.2.1-disable_icons_smooth_alpha.patch b/x11-libs/gtk+/files/gtk+-2.2.1-disable_icons_smooth_alpha.patch
deleted file mode 100644
index 063f594..0000000
--- a/x11-libs/gtk+/files/gtk+-2.2.1-disable_icons_smooth_alpha.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru gtk+-2.2.1/gtk/gtkstyle.c gtk+-2.2.1.patch/gtk/gtkstyle.c
---- gtk+-2.2.1/gtk/gtkstyle.c	2003-01-31 05:42:34.000000000 +0100
-+++ gtk+-2.2.1.patch/gtk/gtkstyle.c	2003-02-07 19:16:04.000000000 +0100
-@@ -1988,6 +1988,36 @@
-     }
- }
- 
-+static void 
-+set_pixbuf_alpha (GdkPixbuf *src)
-+{
-+  int width, wb;
-+  int height;
-+  int rowstride;
-+  gboolean has_alpha;
-+  guchar *pixels, *p;
-+  int i, j;
-+
-+  width = gdk_pixbuf_get_width (src);
-+  height = gdk_pixbuf_get_height (src);
-+  rowstride = gdk_pixbuf_get_rowstride (src);
-+  has_alpha = gdk_pixbuf_get_has_alpha (src);
-+
-+  if (has_alpha == FALSE)
-+    return;
-+
-+  pixels = gdk_pixbuf_get_pixels (src);
-+
-+  wb = width << 2;
-+  for (i = 0; i < height; i ++)
-+    {
-+      p = pixels + (i * rowstride);
-+    
-+      for (j = 0; j < wb; j += 4)
-+        p[j + 3] = p[j + 3] >> 1;
-+    }
-+}
-+
- static GdkPixbuf *
- gtk_default_render_icon (GtkStyle            *style,
-                          const GtkIconSource *source,
-@@ -2054,8 +2084,8 @@
-           stated = gdk_pixbuf_copy (scaled);      
-           
-           gdk_pixbuf_saturate_and_pixelate (scaled, stated,
--                                            0.8, TRUE);
--          
-+                                            0.0, FALSE);
-+          set_pixbuf_alpha (stated);
-           g_object_unref (scaled);
-         }
-       else if (state == GTK_STATE_PRELIGHT)
diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch b/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch
deleted file mode 100644
index 4a1b73d..0000000
--- a/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am gtk+-2.8.0/gdk-pixbuf/Makefile.am
---- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am	2005-07-09 01:10:11.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/Makefile.am	2005-08-17 17:59:20.000000000 +0100
-@@ -271,6 +271,7 @@
- 	-I$(top_srcdir)/gdk-pixbuf 		\
- 	-I$(top_builddir)/gdk-pixbuf 		\
- 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
-+	-DHOST=\"$(host_triplet)\"		\
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DG_DISABLE_DEPRECATED			\
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in gtk+-2.8.0/gdk-pixbuf/Makefile.in
---- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in	2005-08-17 17:38:06.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/Makefile.in	2005-08-17 17:59:35.000000000 +0100
-@@ -504,6 +504,7 @@
- 	-I$(top_srcdir)/gdk-pixbuf 		\
- 	-I$(top_builddir)/gdk-pixbuf 		\
- 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
-+	-DHOST=\"$(host_triplet)\"		\
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DG_DISABLE_DEPRECATED			\
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c
---- gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c	2005-07-22 16:34:32.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c	2005-08-17 17:44:48.000000000 +0100
-@@ -276,8 +276,15 @@
-   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
- 
-   if (!result)
--	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
--
-+  {
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", HOST, "gdk-pixbuf.loaders", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	  {
-+		  g_free (result);
-+
-+		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
-+	  }
-+  }
-   return result;
- }
- 
-diff -urN gtk+-2.8.0.orig/gtk/gtkrc.c gtk+-2.8.0/gtk/gtkrc.c
---- gtk+-2.8.0.orig/gtk/gtkrc.c	2005-04-06 14:49:28.000000000 +0100
-+++ gtk+-2.8.0/gtk/gtkrc.c	2005-08-17 17:54:36.000000000 +0100
-@@ -364,7 +364,15 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	{
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	    {
-+	      g_free (result);
-+	      
-+	      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	    }
-+	}
-     }
- 
-   return result;
diff --git a/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch b/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch
deleted file mode 100644
index 429e083..0000000
--- a/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: gtk+-2.8.9/configure.in
-===================================================================
---- gtk+-2.8.9.orig/configure.in
-+++ gtk+-2.8.9/configure.in
-@@ -195,6 +195,10 @@ AC_ARG_ENABLE(shm,
-               [AC_HELP_STRING([--enable-shm],
-                               [support shared memory if available [default=yes]])],,
-               [enable_shm="yes"])
-+AC_ARG_ENABLE(xinerama,
-+              [AC_HELP_STRING([--enable-xinerama],
-+	                      [support xinerama extension if available [default=yes]])],,
-+              [enable_xinerama="yes"])
- AC_ARG_ENABLE(xkb,
-               [AC_HELP_STRING([--enable-xkb],
-                               [support XKB [default=maybe]])],,
-@@ -1193,7 +1197,7 @@ if test "x$gdktarget" = "xx11"; then
-   fi
- 
-   # Check for Xinerama extension (Solaris impl or Xfree impl)
--
-+  if test "x$enable_xinerama" = "xyes"; then
-   gtk_save_cppflags="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $x_cflags"
-   
-@@ -1241,6 +1245,7 @@ if test "x$gdktarget" = "xx11"; then
-          fi
-          ;;
-   esac
-+  fi
- 
-   # set up things for XInput
- 
diff --git a/x11-libs/gtk+/files/gtk+-2.8.11-filechooser.patch b/x11-libs/gtk+/files/gtk+-2.8.11-filechooser.patch
deleted file mode 100644
index d0e1d8b..0000000
--- a/x11-libs/gtk+/files/gtk+-2.8.11-filechooser.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.8.11/gtk/gtkfilechooserdefault.c.orig	2006-02-17 16:32:56.000000000 +0100
-+++ gtk+-2.8.11/gtk/gtkfilechooserdefault.c	2006-02-17 16:35:34.000000000 +0100
-@@ -4074,6 +4074,7 @@
-   gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
- 
-   impl->save_expander = gtk_expander_new_with_mnemonic (_("_Browse for other folders"));
-+  gtk_expander_set_expanded( GTK_EXPANDER (impl->save_expander), TRUE);
-   gtk_container_add (GTK_CONTAINER (alignment), impl->save_expander);
-   g_signal_connect (impl->save_expander, "notify::expanded",
- 		    G_CALLBACK (expander_changed_cb),
diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc
deleted file mode 100644
index 8d17834..0000000
--- a/x11-libs/gtk+/files/gtkrc
+++ /dev/null
@@ -1,39 +0,0 @@
-style "default"
-
-{
- font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
-}
-
-style "button" = "default"
-
-{ 
- bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
-}
-
-style "treeitem"
-{
-bg[ACTIVE] = { 0.7, 0.7, 0.9 }
-}
-
-style "scrollbar" = "button" 
-{
- bg[ACTIVE] = {0.6, 0.6, 0.6 }
-}
-
-style "status" {
- bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
-}
-
-style "gtk-tooltips" {
- bg[NORMAL] = "#ffff60"
-}
-
-class "GtkWidget" style "default" 
-class "GtkButton" style "button"
-class "GtkItem" style "button"
-class "GtkProgressBar" style "status"
-class "GtkScrollbar" style "scrollbar"
-class "GtkTreeItem" style "treeitem"
-widget "gtk-tooltips" style "gtk-tooltips"
-
-
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
deleted file mode 100644
index 7b5b4e6..0000000
--- a/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
+++ /dev/null
@@ -1,100 +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+-1.2.10-r11.ebuild,v 1.25 2006/07/05 05:22:45 vapier Exp $
-
-GNOME_TARBALL_SUFFIX="gz"
-inherit gnome.org eutils libtool toolchain-funcs
-
-DESCRIPTION="The GIMP Toolkit"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh ~sparc x86 ~x86-fbsd"
-IUSE="nls debug"
-
-RDEPEND="||	(
-				(
-					x11-libs/libXi
-					x11-libs/libXt
-				)
-				virtual/x11
-			)
-		 =dev-libs/glib-1.2*"
-DEPEND="${RDEPEND}
-		||	(
-				(
-					x11-proto/inputproto
-					x11-proto/xextproto
-				)
-				virtual/x11
-			)
-		nls? ( sys-devel/gettext dev-util/intltool )
-		sys-devel/autoconf
-		sys-devel/libtool"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-
-	cd "${S}"/..
-	epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2
-
-	# locale fix by sbrabec@suse.cz
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
-
-	epatch "${FILESDIR}"/gtk+-1.2-link.patch
-	
-	elibtoolize
-	
-	einfo "Copying in a recent libtool"
-	cp `which libtool` "${S}"/libtool.copy
-	libtoolize --force
-}
-
-src_compile() {
-	local myconf=
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use debug ; then
-		myconf="${myconf} --enable-debug=yes"
-	else
-		myconf="${myconf} --enable-debug=minimum"
-	fi
-
-	econf \
-		--sysconfdir=/etc \
-		--with-xinput=xfree \
-		--with-x \
-		${myconf} || die
-
-	cp libtool.copy libtool
-
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	dodoc AUTHORS ChangeLog* HACKING
-	dodoc NEWS* README* TODO
-	docinto docs
-	cd docs
-	dodoc *.txt *.gif text/*
-	dohtml -r html
-
-	#install nice, clean-looking gtk+ style
-	insinto /usr/share/themes/Gentoo/gtk
-	doins "${FILESDIR}"/gtkrc
-}
-
-pkg_postinst() {
-	ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for"
-	ewarn "all themes it seems.  Please remove it manually as it will not due"
-	ewarn "to /env protection."
-	echo ""
-	einfo "The old gtkrc is available through the new Gentoo gtk theme."
-}
diff --git a/x11-libs/gtk+/gtk+-2.10.14.ebuild b/x11-libs/gtk+/gtk+-2.10.14.ebuild
deleted file mode 100644
index 8d541fc..0000000
--- a/x11-libs/gtk+/gtk+-2.10.14.ebuild
+++ /dev/null
@@ -1,155 +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.13.ebuild,v 1.1 2007/06/14 02:42:37 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
-		 )"
-
-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"
-
-	# 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"
-
-	# -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.12.0-r2.ebuild b/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild
deleted file mode 100644
index 83b1eee..0000000
--- a/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild
+++ /dev/null
@@ -1,172 +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.12.0-r2.ebuild,v 1.1 2007/09/25 23:00:34 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="cups debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	xinerama? ( x11-libs/libXinerama )
-	>=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
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/damageproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.6
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		eerror "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
-
-	# 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"
-
-	# http://bugzilla.gnome.org/show_bug.cgi?id=476342
-	epatch "${FILESDIR}/${P}-icon-cache-speedup.patch"
-
-	# http://bugzilla.gnome.org/show_bug.cgi?id=478173
-	epatch "${FILESDIR}/${PN}-2.12.0-libtracker_so.patch"
-
-	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
-	epatch "${FILESDIR}/${P}-flash-workaround.patch"
-
-	# Gtk tooltips + swt crash at a later point, upstream has committed this by now - http://bugzilla.gnome.org/show_bug.cgi?id=460194
-	# Seems to also fix a weird behaviour where GtkTreeView rows got a tooltip that shouldn't be there
-	epatch "${FILESDIR}/${P}-swt-tooltips-fix.patch"
-
-	# OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513
-	epatch "${FILESDIR}/${P}-openoffice-freeze-workaround.patch"
-
-	# Fix for crashes with simple search engine (the one used when neither beagle nor tracker are available) when cancelling dialog
-	# before the search is finished - http://bugzilla.gnome.org/show_bug.cgi?id=480123
-	epatch "${FILESDIR}/${P}-searchenginesimple-crash-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() {
-	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"
-
-	# 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*
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${D}/etc/gtk-2.0/gtk.immodules"
-}
-
-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.12.0.ebuild b/x11-libs/gtk+/gtk+-2.12.0.ebuild
deleted file mode 100644
index e41d54f..0000000
--- a/x11-libs/gtk+/gtk+-2.12.0.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.12.0.ebuild,v 1.3 2007/09/22 23:51:35 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="cups debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	xinerama? ( x11-libs/libXinerama )
-	>=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
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/damageproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.6
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-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
-
-	# 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"
-
-	# http://bugzilla.gnome.org/show_bug.cgi?id=476342
-	epatch "${FILESDIR}"/${P}-icon-cache-speedup.patch
-
-	# http://bugzilla.gnome.org/show_bug.cgi?id=478173
-	epatch "${FILESDIR}/${PN}-2.12.0-libtracker_so.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() {
-	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
-
-	# 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*
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm ${D}/etc/gtk-2.0/gtk.immodules
-}
-
-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.12.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.12.1-r1.ebuild
deleted file mode 100644
index 2d51fd7..0000000
--- a/x11-libs/gtk+/gtk+-2.12.1-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.12.1.ebuild,v 1.1 2007/10/20 05:44:35 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="cups debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	xinerama? ( x11-libs/libXinerama )
-	>=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
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/damageproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.6
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		eerror "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
-
-	# 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"
-
-	# 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
-	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() {
-	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"
-
-	# 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*
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${D}/etc/gtk-2.0/gtk.immodules"
-}
-
-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.12.1.ebuild b/x11-libs/gtk+/gtk+-2.12.1.ebuild
deleted file mode 100644
index a01c0f4..0000000
--- a/x11-libs/gtk+/gtk+-2.12.1.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.12.1.ebuild,v 1.1 2007/10/20 05:44:35 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="cups debug doc jpeg tiff xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	xinerama? ( x11-libs/libXinerama )
-	>=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
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/damageproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.6
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		eerror "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
-
-	# 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"
-
-	# 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"
-
-	# -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() {
-	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"
-
-	# 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*
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${D}/etc/gtk-2.0/gtk.immodules"
-}
-
-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.8.20-r1.ebuild b/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
deleted file mode 100644
index 1e57b74..0000000
--- a/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
+++ /dev/null
@@ -1,166 +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.20-r1.ebuild,v 1.1 2006/07/18 19:13:57 allanonjl 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 ) )
-		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*
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			xinerama? ( 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
-	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 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}
-
-	# # 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
-
-	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."
-
-}