Version bump (bug #148953), cleaned up old versions.

(Portage version: 2.1.2_pre2-r8)
 (Signed Manifest commit)

15 files changed, 23 insertions, 964 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 13cf82b09049..609f27d80815 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -5,42 +5,6 @@ AUX desktop_entries/screensaver-properties.desktop 1000 RMD160 9e331cdba7b943c9e
 MD5 51377e1938cf119bd11972b3c30c0a25 files/desktop_entries/screensaver-properties.desktop 1000
 RMD160 9e331cdba7b943c9e5dc076c3a60e32bf0340111 files/desktop_entries/screensaver-properties.desktop 1000
 SHA256 b2a5d44a6a6463beab7cb1d3b9d9f5613c765b48ce319232517b6097afad1fbd files/desktop_entries/screensaver-properties.desktop 1000
-AUX xscreensaver-4.16-nsfw.patch 1586 RMD160 9c7634d3a1b4a737411f6cc68bdd86e120ea8451 SHA1 de4bc10f7a1b84ec0a679246a3845afb20dac727 SHA256 630d0822873cdcfc6c07ab0a4b8f7e4800452764c934eba4f4ffca923b40d4ac
-MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
-RMD160 9c7634d3a1b4a737411f6cc68bdd86e120ea8451 files/xscreensaver-4.16-nsfw.patch 1586
-SHA256 630d0822873cdcfc6c07ab0a4b8f7e4800452764c934eba4f4ffca923b40d4ac files/xscreensaver-4.16-nsfw.patch 1586
-AUX xscreensaver-4.22-configure.patch 1592 RMD160 bf43f032b44a8efdab24da59b491400972a61e96 SHA1 ec71c067c3752dee0f1dcaee81beb261d93d32b0 SHA256 9be3c8e8d73752b5922a050e0769384854fdf14b5b20b24f23ed589d7dd3e042
-MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 1592
-RMD160 bf43f032b44a8efdab24da59b491400972a61e96 files/xscreensaver-4.22-configure.patch 1592
-SHA256 9be3c8e8d73752b5922a050e0769384854fdf14b5b20b24f23ed589d7dd3e042 files/xscreensaver-4.22-configure.patch 1592
-AUX xscreensaver-4.22-interaggregate.patch 542 RMD160 81cfadad2781ee597582a3e24a4ed099160aad36 SHA1 d97433f7f89bbcc37d052c57ba6530af9503ef7b SHA256 cc684fee40a5b81d3fcf838c06bfb944b5c06fd4d80dd53dcad8386943cc87a7
-MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
-RMD160 81cfadad2781ee597582a3e24a4ed099160aad36 files/xscreensaver-4.22-interaggregate.patch 542
-SHA256 cc684fee40a5b81d3fcf838c06bfb944b5c06fd4d80dd53dcad8386943cc87a7 files/xscreensaver-4.22-interaggregate.patch 542
-AUX xscreensaver-4.22-nsfw-webcollage.patch 5029 RMD160 586d02cc9b9249015d359d3b4124f85ca9b6d151 SHA1 5090379a83f9187e2a3352bc4b8fe46d4335e3d8 SHA256 a4e63f020646ad5007646225e84b563966bf5c84e4cb87da450684f440c63f5f
-MD5 cab8a426e9f99c0b49f598983b896b80 files/xscreensaver-4.22-nsfw-webcollage.patch 5029
-RMD160 586d02cc9b9249015d359d3b4124f85ca9b6d151 files/xscreensaver-4.22-nsfw-webcollage.patch 5029
-SHA256 a4e63f020646ad5007646225e84b563966bf5c84e4cb87da450684f440c63f5f files/xscreensaver-4.22-nsfw-webcollage.patch 5029
-AUX xscreensaver-4.22-settings.patch 1766 RMD160 5a89a757715263a2f37df35c30868f72a0ce22a9 SHA1 437e36413f495b6ab877e640c1fa53e74bf4c04c SHA256 f4c3229eca0ab9b055f1970c66fcb4488ef8f5095d57f0ce11e193a88380dae4
-MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
-RMD160 5a89a757715263a2f37df35c30868f72a0ce22a9 files/xscreensaver-4.22-settings.patch 1766
-SHA256 f4c3229eca0ab9b055f1970c66fcb4488ef8f5095d57f0ce11e193a88380dae4 files/xscreensaver-4.22-settings.patch 1766
-AUX xscreensaver-4.23-app-defaults.patch 1080 RMD160 76ef9f99d5f8479621fc4c7a2ea62dad96173804 SHA1 03c9c1cd5cdce50cdda756c8af000cee3b656e1a SHA256 02b36425c8c1adda652995ea168db054df7e7cdc78e9a520df47914f2213f95c
-MD5 bd61d24250fdc129cf9b86e154c8c27a files/xscreensaver-4.23-app-defaults.patch 1080
-RMD160 76ef9f99d5f8479621fc4c7a2ea62dad96173804 files/xscreensaver-4.23-app-defaults.patch 1080
-SHA256 02b36425c8c1adda652995ea168db054df7e7cdc78e9a520df47914f2213f95c files/xscreensaver-4.23-app-defaults.patch 1080
-AUX xscreensaver-4.23-norpm.patch 1775 RMD160 57cdbe407659219da8a66b59f22695d621f1e338 SHA1 f7342ca1af3db37d33db19e20dcfc21975be86e7 SHA256 bae37d855e92d48a69e472e450a7aae479e821c45ec05bc91a01a9efe3ef59e4
-MD5 0ed894eebbc461f9523539a8d273535e files/xscreensaver-4.23-norpm.patch 1775
-RMD160 57cdbe407659219da8a66b59f22695d621f1e338 files/xscreensaver-4.23-norpm.patch 1775
-SHA256 bae37d855e92d48a69e472e450a7aae479e821c45ec05bc91a01a9efe3ef59e4 files/xscreensaver-4.23-norpm.patch 1775
-AUX xscreensaver-4.23-nsfw.patch 6634 RMD160 2ae760d79f6cbb8c885afca945a7d2c2eff17d3c SHA1 f04e96ad5306f6045b39d4829f36e06c62f6ffd5 SHA256 73b01bd257d459399a94f4b31d8fdef281d217452c56dffef95aa5c9d75bce1c
-MD5 e24f49eb6b4473a5fd9f0869065cfe85 files/xscreensaver-4.23-nsfw.patch 6634
-RMD160 2ae760d79f6cbb8c885afca945a7d2c2eff17d3c files/xscreensaver-4.23-nsfw.patch 6634
-SHA256 73b01bd257d459399a94f4b31d8fdef281d217452c56dffef95aa5c9d75bce1c files/xscreensaver-4.23-nsfw.patch 6634
-AUX xscreensaver-4.23-words.patch 530 RMD160 6931bf3662838f04aa707a70702717bd91954067 SHA1 74a4f23e8dc98e780a0285248a210ce8166e5763 SHA256 bb7adab082f070c1db62cd40db7d563b48bd75e60f29bf628f6650023fdc37eb
-MD5 5fbeadbcc85608ca9993c2f7d51292cf files/xscreensaver-4.23-words.patch 530
-RMD160 6931bf3662838f04aa707a70702717bd91954067 files/xscreensaver-4.23-words.patch 530
-SHA256 bb7adab082f070c1db62cd40db7d563b48bd75e60f29bf628f6650023fdc37eb files/xscreensaver-4.23-words.patch 530
 AUX xscreensaver-4.24-app-defaults.patch 1086 RMD160 2d4b08c64957460d48fb24c3626c96c48ecf07b5 SHA1 3851aef77fad5772b6649d48e882411196ed7027 SHA256 4a05d7ccd748b6c0519dd72aa02fa9c46dfd8dadd5660172b1ff6197d733e05c
 MD5 1d60de421a7c7ec9810bcc7242b1ca92 files/xscreensaver-4.24-app-defaults.patch 1086
 RMD160 2d4b08c64957460d48fb24c3626c96c48ecf07b5 files/xscreensaver-4.24-app-defaults.patch 1086
@@ -77,22 +41,17 @@ AUX xscreensaver-5.00-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d5451
 MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.00-nsfw.patch 6673
 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.00-nsfw.patch 6673
 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d files/xscreensaver-5.00-nsfw.patch 6673
-AUX xscreensaver-blank-screen.patch 487 RMD160 304dd508a11972ac06ea157effa7bf11fe9f5154 SHA1 6f383f9797797fb1478328632340c6d14031610e SHA256 166ba0d6283e262886230439dc69dc5e746fec0c779727a6e2aec4b40d6f7de8
-MD5 7528066fa9a88bd1b6d46224d118dd7b files/xscreensaver-blank-screen.patch 487
-RMD160 304dd508a11972ac06ea157effa7bf11fe9f5154 files/xscreensaver-blank-screen.patch 487
-SHA256 166ba0d6283e262886230439dc69dc5e746fec0c779727a6e2aec4b40d6f7de8 files/xscreensaver-blank-screen.patch 487
-DIST xscreensaver-4.22.tar.gz 4620066 RMD160 bf93e368d5e6f98ba383a908708a59f1a428aece SHA1 f40db41ef221f7ed42c39e77007ce05b4f846306 SHA256 d0a4a6a60a1cad27aebc23580acdce442d3c6d8eae782883c7df08b3fc3184a1
-DIST xscreensaver-4.23.tar.gz 4939070 RMD160 b18c2e45fca132e017bd24e6e8fca91154fa03db SHA1 b7d3f0b4a94d879a2450a268ae941b92ca4fc39e SHA256 9ac90aba624d2c39b62ac72815b16d404eec43d232feadea940c4c705ebb3dd7
+AUX xscreensaver-5.01-gentoo.patch 6361 RMD160 39a88128072ce5a16e14ef92ceb8a5b106e92eef SHA1 6854525b9ecd12062d860d8c62e40dcbba192cd6 SHA256 f8398a05d1b17a35a4247e2c24ea36d90b63f0772e2bcacc3482879c15073fe2
+MD5 ace9e196f6ff547af4d792225ad50597 files/xscreensaver-5.01-gentoo.patch 6361
+RMD160 39a88128072ce5a16e14ef92ceb8a5b106e92eef files/xscreensaver-5.01-gentoo.patch 6361
+SHA256 f8398a05d1b17a35a4247e2c24ea36d90b63f0772e2bcacc3482879c15073fe2 files/xscreensaver-5.01-gentoo.patch 6361
+AUX xscreensaver-5.01-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad SHA1 eb2465eb92bc8ad696cb6413cfd0d8c211ad1df6 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d
+MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.01-nsfw.patch 6673
+RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.01-nsfw.patch 6673
+SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d files/xscreensaver-5.01-nsfw.patch 6673
 DIST xscreensaver-4.24.tar.gz 4936993 RMD160 a7cb8262991d6783bd0da843bc6dbdce6976e287 SHA1 9573a5c561422fed2845d37f3ad43fa3e2b62247 SHA256 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474
 DIST xscreensaver-5.00.tar.gz 5263478 RMD160 7630ff42cfd24557cf1459902ddc6256004fc938 SHA1 631eb0414112b2db2e62e2ab5a984726d61696d2 SHA256 976e888bead1185ce3116a92df2829f9fe93061d0539f5d8036ca0ddc016d80f
-EBUILD xscreensaver-4.22-r4.ebuild 5925 RMD160 645998e76565b5312f54c2b42370e939693c9d01 SHA1 3a34dab6799a66911547d3c63d63d047d604c11c SHA256 4c50692463a571da6f202164685e5d03041d0128d845f7c0d2b59f868d10f34d
-MD5 8aedd938f60f21ddc79041c13bb3b8f6 xscreensaver-4.22-r4.ebuild 5925
-RMD160 645998e76565b5312f54c2b42370e939693c9d01 xscreensaver-4.22-r4.ebuild 5925
-SHA256 4c50692463a571da6f202164685e5d03041d0128d845f7c0d2b59f868d10f34d xscreensaver-4.22-r4.ebuild 5925
-EBUILD xscreensaver-4.23-r1.ebuild 5468 RMD160 e757d6e397d226d73511b6febf745c1646f7ff16 SHA1 6e52a8c4e19d6b6c1623bf3d4ff2e1ba02c56c0f SHA256 9fd4fe2737c37652f7023cd54222eb0468894688da648f2eb6c85c32f20e938e
-MD5 594e29f68c0fc9f930f028320e1ba8ab xscreensaver-4.23-r1.ebuild 5468
-RMD160 e757d6e397d226d73511b6febf745c1646f7ff16 xscreensaver-4.23-r1.ebuild 5468
-SHA256 9fd4fe2737c37652f7023cd54222eb0468894688da648f2eb6c85c32f20e938e xscreensaver-4.23-r1.ebuild 5468
+DIST xscreensaver-5.01.tar.gz 5270954 RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b SHA1 c371241c54f4c4cc2dd670852e39f212da3ca991 SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf
 EBUILD xscreensaver-4.24.ebuild 5253 RMD160 034e4788a769b5d295d35083f68cbd7cb4b27d8b SHA1 5b1aed27e2799b60e64b4bf7d4285bff3326e59b SHA256 58dc88326d98568f9b6ff07844a874f68af8c0ce87e18430bbb56dc0564151d1
 MD5 bf40c225d204b320ed0564c7c1d5cdbb xscreensaver-4.24.ebuild 5253
 RMD160 034e4788a769b5d295d35083f68cbd7cb4b27d8b xscreensaver-4.24.ebuild 5253
@@ -101,30 +60,31 @@ EBUILD xscreensaver-5.00-r1.ebuild 4847 RMD160 66a8ec3df5da074ae618770bb5072367b
 MD5 e4dc0d10bf97c08e306263846801d2f9 xscreensaver-5.00-r1.ebuild 4847
 RMD160 66a8ec3df5da074ae618770bb5072367bab4f245 xscreensaver-5.00-r1.ebuild 4847
 SHA256 10f5880546afee938cf4dc0f9d09baaf6eb025dfec1f9ba96ff2a54c6cd36076 xscreensaver-5.00-r1.ebuild 4847
-MISC ChangeLog 25241 RMD160 d9993f6b97ca3d4916f37dc1dd156ac68e862d24 SHA1 258ca1e90b55a0893960962c9a4f54f14a9486fe SHA256 e8954b136549f348d031f23a0b0f35234e022cee367ae9da30a2adf6b85bea9e
-MD5 a1444862964341e10ebb4cb045c40315 ChangeLog 25241
-RMD160 d9993f6b97ca3d4916f37dc1dd156ac68e862d24 ChangeLog 25241
-SHA256 e8954b136549f348d031f23a0b0f35234e022cee367ae9da30a2adf6b85bea9e ChangeLog 25241
+EBUILD xscreensaver-5.01.ebuild 4722 RMD160 d55d210314082217179898319ff10e28a88f7bfb SHA1 c0a05a5b7b72076610880abc7c5fa5bd75c47041 SHA256 bdf0a59bb6378f6cf264a5e7897aa5fd16c196c9d2c1f96602a1dce72e943795
+MD5 8ab5163d2b35e6aa26a4775c57593249 xscreensaver-5.01.ebuild 4722
+RMD160 d55d210314082217179898319ff10e28a88f7bfb xscreensaver-5.01.ebuild 4722
+SHA256 bdf0a59bb6378f6cf264a5e7897aa5fd16c196c9d2c1f96602a1dce72e943795 xscreensaver-5.01.ebuild 4722
+MISC ChangeLog 25983 RMD160 7e8f94c696263afdf1b84013f15f9acc149ace7d SHA1 4747af352906ae39ad180afa5460160ea29d12ef SHA256 2112d85d54fb565f06afba6223aed1c09159b30abd8a11dc2947a5bad72586ea
+MD5 ff1ef30263aac9373fa30bb040a81479 ChangeLog 25983
+RMD160 7e8f94c696263afdf1b84013f15f9acc149ace7d ChangeLog 25983
+SHA256 2112d85d54fb565f06afba6223aed1c09159b30abd8a11dc2947a5bad72586ea ChangeLog 25983
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata.xml 166
-MD5 22fe803be70c499fd98d2b9cb55d433e files/digest-xscreensaver-4.22-r4 256
-RMD160 178e9a51fa582a5e74529062e3fdacaa81f0368e files/digest-xscreensaver-4.22-r4 256
-SHA256 1603566c6d1b92a0c5224e2bb1103acbc5c7ca2f45c595e9992429cdb94c7a8d files/digest-xscreensaver-4.22-r4 256
-MD5 2dec78c3103e6a62dbcace7dc2d16bf1 files/digest-xscreensaver-4.23-r1 256
-RMD160 b205bfc06fbb52feebef73a04f8771a1d37e9f58 files/digest-xscreensaver-4.23-r1 256
-SHA256 23a3e679d7a3b3ba20e1f2d3ccd27b6a0a6930b1df53fe3b70ffc01e5cd7a1e9 files/digest-xscreensaver-4.23-r1 256
 MD5 99d549469ab8a46ee2eb889208d1fb3c files/digest-xscreensaver-4.24 256
 RMD160 3a41fe3bf7d8364e1940c2496bee84bfc0892f38 files/digest-xscreensaver-4.24 256
 SHA256 9988ae848a4dcb14ec369659a6ca2c7c682a9b35f7ee79edff88f8abff434b5d files/digest-xscreensaver-4.24 256
 MD5 25589d3b5c32825b66ba9676e0d2ad01 files/digest-xscreensaver-5.00-r1 256
 RMD160 b132ef56665cf2e1c437724a4d908d0457210ab6 files/digest-xscreensaver-5.00-r1 256
 SHA256 d8690348f22d988fb3f25fc858fd7c83a1be057c7a4feda8ba9114a6d0aa0f5f files/digest-xscreensaver-5.00-r1 256
+MD5 89fc92ae4e5d4497f70455ee093619f0 files/digest-xscreensaver-5.01 256
+RMD160 53c251e5b5844a380105b5fdb5a61bab05723fa2 files/digest-xscreensaver-5.01 256
+SHA256 373fdb9ab0176f3509fbeeffdb25e3b2266e496475024636029574913943f921 files/digest-xscreensaver-5.01 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/zMTAiZjviIA2XgRAsVeAJ4tgjs0WSVR18hJqPsPkzG+Nf8yCgCeILHe
-YP4Ybl/4/OrAXlZiulOd9gQ=
-=63i1
+iD8DBQFFLOfYgo/w9rxVVVERApGrAJ4/7PHQ3CNqrDHWlgKzGj8vF10H0ACffLMd
+MkF1n1z8TfvfujUQCjnemTU=
+=JHp8
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r4 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r4
deleted file mode 100644
index 6e748bf24b9b..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9f37c428f034e581026e243445378195 xscreensaver-4.22.tar.gz 4620066
-RMD160 bf93e368d5e6f98ba383a908708a59f1a428aece xscreensaver-4.22.tar.gz 4620066
-SHA256 d0a4a6a60a1cad27aebc23580acdce442d3c6d8eae782883c7df08b3fc3184a1 xscreensaver-4.22.tar.gz 4620066
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r1
deleted file mode 100644
index 53fe2665124c..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz 4939070
-RMD160 b18c2e45fca132e017bd24e6e8fca91154fa03db xscreensaver-4.23.tar.gz 4939070
-SHA256 9ac90aba624d2c39b62ac72815b16d404eec43d232feadea940c4c705ebb3dd7 xscreensaver-4.23.tar.gz 4939070
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.16-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-4.16-nsfw.patch
deleted file mode 100644
index 54b143f43ae9..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.16-nsfw.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-*** hacks/glx/glsnake.c	Sun Sep 28 02:33:57 2003
---- hacks/glx/glsnakepatched.c	Tue Mar 30 13:52:54 2004
-***************
-*** 559,579 ****
-  	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
-  	ZERO, PIN, ZERO }
-      },
--     { "erect penis",     /* thanks benno */
--       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
-- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
-- 	ZERO, ZERO }
--     },
--     { "flaccid penis",
--       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
-- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
-- 	ZERO, ZERO }
--     },
--     { "vagina",
--       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
-- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
-- 	PIN, RIGHT, ZERO }
--     },
-      { "mask",
-        { ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN,
-  	ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO,
---- 559,564 ----
-***************
-*** 985,993 ****
-      { "Parrot",
-          { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN }
-      },
--     { "Penis",
--         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN }
--     },
-      { "PictureCommingSoon",
-          { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT }
-      },
---- 970,975 ----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.22-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-4.22-configure.patch
deleted file mode 100644
index 3212c43fa949..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.22-configure.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.orig	2005-06-23 15:47:02.000000000 -0500
-+++ configure	2005-06-23 16:41:34.000000000 -0500
-@@ -14728,7 +14728,7 @@
- # Check for the various Gnome help and URL loading programs.
- #
- if test "$have_gtk" = yes; then
--  for ac_prog in gnome-open
-+  for ac_prog in gnome-terminal
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -21519,34 +21519,6 @@
- 
-   # M4 sucks!!
- 
--  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
--        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
--        head -1`
--
--
--  if test \! -z "$rpmv" ; then
--    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
--    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'`
--
--    warning=no
--    warnL "There is already an installed RPM of xscreensaver $rpmv"
--    warn2 'on this system.  You might want to remove it ("rpm -ve")'
--    warn2 'before running "make install" in this directory.'
--    echo ""
--    warn2 "Alternately, you could build this version of xscreensaver"
--    warn2 'as an RPM, and then install that.  An "xscreensaver.spec"'
--    warn2 'file is included.  Try "rpmbuild -v -ba xscreensaver.spec".'
--    warn2 "See the RPM documentation for more info."
--    echo ""
--
--    if test "$rpmbdir" = "$rpmhdir" ; then
--      warn2 "The RPM version was installed in $rpmbdir/."
--      do_dir_warning=yes
--    else
--      warn2 "The RPM version was installed in $rpmbdir/,"
--      warn2 "with demos in $rpmhdir/."
--    fi
--  fi
- fi
- 
- if test "${bindir}" = "${HACKDIR}" ; then
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.22-interaggregate.patch b/x11-misc/xscreensaver/files/xscreensaver-4.22-interaggregate.patch
deleted file mode 100644
index 867e9aed47da..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.22-interaggregate.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hacks/config/interaggregate.xml.orig	2005-06-21 21:16:01.000000000 -0500
-+++ hacks/config/interaggregate.xml	2005-06-23 16:22:12.000000000 -0500
-@@ -7,7 +7,7 @@
-   <number id="init" type="spinbutton" arg="-num-discs %"
-           _label="Number of Discs" low="50" high="400" default="85"/>
- 
--  <number id="speed" type="slider" arg="-draw-delay %"
-+  <number id="speed" type="slider" arg="-growth-delay %"
-           _label="Speed" _low-label="Slow" _high-label="Fast"
-           low="0" high="60000" default="30000" convert="invert"/>
- 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.22-nsfw-webcollage.patch b/x11-misc/xscreensaver/files/xscreensaver-4.22-nsfw-webcollage.patch
deleted file mode 100644
index 5c8b05d91c18..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.22-nsfw-webcollage.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -Nru xscreensaver-4.22.old/driver/XScreenSaver.ad.in xscreensaver-4.22/driver/XScreenSaver.ad.in
---- xscreensaver-4.22.old/driver/XScreenSaver.ad.in	2005-10-01 10:02:59.000000000 +0200
-+++ xscreensaver-4.22/driver/XScreenSaver.ad.in	2005-10-01 10:20:23.000000000 +0200
-@@ -318,10 +318,6 @@
- 				fireworkx -root				    \n\
- 				fiberlamp -root				    \n\
- 				boxfit -root				    \n\
--- default-n:			webcollage -root			    \n\
--- default-n:  "WebCollage (whacked)"					      \
--				webcollage -root -filter		      \
--				  'vidwhacker -stdin -stdout'		    \n\
- - default-n:			vidwhacker -root			    \n\
- 									      \
- @GL_KLUDGE@ GL:			gears -root				    \n\
-@@ -504,7 +500,6 @@
- *hacks.xanalogtv.name:      XAnalogTV
- *hacks.xspirograph.name:    XSpiroGraph
- *hacks.nerverot.name:       NerveRot
--*hacks.webcollage.name:     WebCollage
- *hacks.vidwhacker.name:     VidWhacker
- *hacks.morph3d.name:        Morph3D
- *hacks.bubble3d.name:       Bubble3D
-diff -Nru xscreensaver-4.22.old/driver/XScreenSaver_ad.h xscreensaver-4.22/driver/XScreenSaver_ad.h
---- xscreensaver-4.22.old/driver/XScreenSaver_ad.h	2005-10-01 10:02:59.000000000 +0200
-+++ xscreensaver-4.22/driver/XScreenSaver_ad.h	2005-10-01 10:20:41.000000000 +0200
-@@ -219,10 +219,6 @@
- 				fireworkx -root				    \\n\
- 				fiberlamp -root				    \\n\
- 				boxfit -root				    \\n\
--- default-n:			webcollage -root			    \\n\
--- default-n:  \"WebCollage (whacked)\"					      \
--				webcollage -root -filter		      \
--				  'vidwhacker -stdin -stdout'		    \\n\
- - default-n:			vidwhacker -root			    \\n\
- 									      \
- 	   GL:			gears -root				    \\n\
-@@ -375,7 +371,6 @@
- "*hacks.xanalogtv.name:      XAnalogTV",
- "*hacks.xspirograph.name:    XSpiroGraph",
- "*hacks.nerverot.name:       NerveRot",
--"*hacks.webcollage.name:     WebCollage",
- "*hacks.vidwhacker.name:     VidWhacker",
- "*hacks.morph3d.name:        Morph3D",
- "*hacks.bubble3d.name:       Bubble3D",
-diff -Nru xscreensaver-4.22.old/hacks/Makefile.in xscreensaver-4.22/hacks/Makefile.in
---- xscreensaver-4.22.old/hacks/Makefile.in	2005-10-01 10:02:59.000000000 +0200
-+++ xscreensaver-4.22/hacks/Makefile.in	2005-10-01 10:19:20.000000000 +0200
-@@ -100,7 +100,7 @@
- 		  blaster.c bumps.c ripples.c xteevee.c xspirograph.c \
- 		  nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \
- 		  rotzoomer.c whirlygig.c speedmine.c vermiculate.c \
--		  xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \
-+		  xpm-pixmap.c twang.c apollonian.c \
- 		  euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \
- 		  anemone.c halftone.c metaballs.c eruption.c popsquares.c \
- 		  barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \
-@@ -109,7 +109,7 @@
- 		  fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
- 		  intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
- 		  boxfit.c interaggregate.c
--SCRIPTS		= vidwhacker webcollage ljlatest
-+SCRIPTS		= vidwhacker ljlatest
- 
- OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
- 		  bubbles-default.o decayscreen.o deco.o drift.o flag.o \
-@@ -130,7 +130,7 @@
- 		  blaster.o bumps.o ripples.o xteevee.o xspirograph.o \
- 		  nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \
- 		  rotzoomer.o whirlygig.o speedmine.o vermiculate.o \
--		  xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \
-+		  xpm-pixmap.o twang.o apollonian.o \
- 		  euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \
- 		  anemone.o halftone.o metaballs.o eruption.o popsquares.o \
- 		  barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \
-@@ -161,7 +161,7 @@
- 		  intermomentary fireworkx fiberlamp boxfit interaggregate \
- 		  @JPEG_EXES@
- SEXES		= sonar
--JPEG_EXES	= webcollage-helper
-+JPEG_EXES	= 
- EXES		= $(NEXES) $(SEXES)
- 
- HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
-@@ -197,7 +197,7 @@
- 	          spotlight.man squiral.man starfish.man strange.man \
- 	          swirl.man t3d.man thornbird.man triangle.man truchet.man \
- 	          twang.man vermiculate.man vidwhacker.man vines.man \
--	          wander.man webcollage.man whirlwindwarp.man whirlygig.man \
-+	          wander.man whirlwindwarp.man whirlygig.man \
- 	          worm.man xflame.man xjack.man xlyap.man xmatrix.man \
- 	          xrayswarm.man xspirograph.man xsublim.man xteevee.man \
- 	          zoom.man halftone.man eruption.man metaballs.man \
-@@ -1461,7 +1461,6 @@
- vines.o: $(srcdir)/xlockmore.h
- wander.o: ../config.h
- wander.o: $(srcdir)/screenhack.h
--webcollage-helper.o: ../config.h
- whirlwindwarp.o: ../config.h
- whirlwindwarp.o: $(srcdir)/screenhack.h
- whirlygig.o: ../config.h
-diff -Nru xscreensaver-4.22.old/po/POTFILES.in xscreensaver-4.22/po/POTFILES.in
---- xscreensaver-4.22.old/po/POTFILES.in	2005-10-01 10:02:59.000000000 +0200
-+++ xscreensaver-4.22/po/POTFILES.in	2005-10-01 10:19:20.000000000 +0200
-@@ -195,7 +195,6 @@
- hacks/config/vidwhacker.xml
- hacks/config/vines.xml
- hacks/config/wander.xml
--hacks/config/webcollage.xml
- hacks/config/whirlwindwarp.xml
- hacks/config/whirlygig.xml
- hacks/config/worm.xml
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.22-settings.patch b/x11-misc/xscreensaver/files/xscreensaver-4.22-settings.patch
deleted file mode 100644
index 9744dbeba44b..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.22-settings.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- driver/XScreenSaver.ad.in.orig	2005-06-24 17:22:15.000000000 -0500
-+++ driver/XScreenSaver.ad.in	2005-06-24 17:43:23.000000000 -0500
-@@ -31,19 +31,19 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:20:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
--*dpmsStandby:		2:00:00
--*dpmsSuspend:		2:00:00
--*dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*dpmsEnabled:		True
-+*dpmsStandby:		1:00:00
-+*dpmsSuspend:		1:00:00
-+*dpmsOff:		2:00:00
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *lockVTs:		True
- *verbose:		False
- *timestamp:		True
-@@ -51,17 +51,17 @@
- *unfade:		False
- *fadeSeconds:		0:00:03
- *fadeTicks:		20
--*splash:		True
-+*splash:		False
- *splashDuration:	0:00:05
- *visualID:		default
- *captureStderr: 	True
- *ignoreUninstalledPrograms: False
- 
--*textMode:		file
--*textLiteral:		XScreenSaver
--*textFile:		@DEFAULT_TEXT_FILE@
--*textProgram:		fortune
--*textURL:		http://www.livejournal.com/stats/latest-rss.bml
-+*textMode:		literal
-+*textLiteral:		Gentoo Linux
-+*textFile:		/etc/gentoo-release
-+*textProgram:		/usr/bin/fortune
-+*textURL:		http://planet.gentoo.org/rss20.xml
- 
- *overlayTextForeground:	#FFFF00
- *overlayTextBackground:	#000000
-@@ -118,7 +118,10 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+! Preferred time representation for the current locale
-+*dateFormat:    %x %X
-+! Xscreensaver's default
-+! *dateFormat:		%d-%b-%y (%a); %I:%M %p
- ! To show the time only:
- ! *dateFormat:		%I:%M %p
- ! For 24 hour time:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-app-defaults.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-app-defaults.patch
deleted file mode 100644
index 0c5072b0509e..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.23-app-defaults.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nru xscreensaver-4.23.orig/configure.in xscreensaver-4.23/configure.in
---- xscreensaver-4.23.orig/configure.in	2005-10-17 03:05:49.000000000 +0200
-+++ xscreensaver-4.23/configure.in	2005-10-31 22:16:53.000000000 +0100
-@@ -715,6 +715,8 @@
-   # Look for the directory under a standard set of common directories.
-   # Check X11 before X11Rn because it's often a symlink to the current release.
-   for ac_dir in                                 \
-+    /usr/lib/X11/app-defaults                   \
-+                                                \
-     /usr/X11/lib/app-defaults                   \
-     /usr/X11R6/lib/app-defaults                 \
-     /usr/X11R6/lib/X11/app-defaults             \
-@@ -745,7 +747,6 @@
-     /usr/x386/lib/X11/app-defaults              \
-     /usr/XFree86/lib/X11/app-defaults           \
-                                                 \
--    /usr/lib/X11/app-defaults                   \
-     /usr/local/lib/X11/app-defaults             \
-     /usr/unsupported/lib/X11/app-defaults       \
-     /usr/athena/lib/X11/app-defaults            \
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-norpm.patch
deleted file mode 100644
index a7502f259118..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.23-norpm.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nru xscreensaver-4.23/configure.in xscreensaver-4.23.norpm/configure.in
---- xscreensaver-4.23/configure.in	2005-10-17 03:05:49.000000000 +0200
-+++ xscreensaver-4.23.norpm/configure.in	2006-01-14 00:21:20.000000000 +0100
-@@ -4070,41 +4070,7 @@
- # Now let's warn if there's a previous RPM version already installed.
- # But don't bother with this test if we are currently *building* an RPM.
- 
--if test -z "$RPM_PACKAGE_VERSION" ; then
--
--  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
--
--  # M4 sucks!!
--  changequote(X,Y)
--  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
--        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
--        head -1`
--  changequote([,])
--
--  if test \! -z "$rpmv" ; then
--    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
--    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'`
--
--    warning=no
--    warnL "There is already an installed RPM of xscreensaver $rpmv"
--    warn2 'on this system.  You might want to remove it ("rpm -ve")'
--    warn2 'before running "make install" in this directory.'
--    echo ""
--    warn2 "Alternately, you could build this version of xscreensaver"
--    warn2 'as an RPM, and then install that.  An "xscreensaver.spec"'
--    warn2 'file is included.  Try "rpmbuild -v -ba xscreensaver.spec".'
--    warn2 "See the RPM documentation for more info."
--    echo ""
--
--    if test "$rpmbdir" = "$rpmhdir" ; then
--      warn2 "The RPM version was installed in $rpmbdir/."
--      do_dir_warning=yes
--    else
--      warn2 "The RPM version was installed in $rpmbdir/,"
--      warn2 "with demos in $rpmhdir/."
--    fi
--  fi
--fi
-+# Nope - breaks compilation with sandbox violation
- 
- if test "${bindir}" = "${HACKDIR}" ; then
-   do_dir_warning=yes
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-nsfw.patch
deleted file mode 100644
index 890aa86eb1de..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.23-nsfw.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Nru xscreensaver-4.23/driver/XScreenSaver.ad.in xscreensaver-4.23.nsfw/driver/XScreenSaver.ad.in
---- xscreensaver-4.23/driver/XScreenSaver.ad.in	2005-10-22 06:50:00.000000000 +0200
-+++ xscreensaver-4.23.nsfw/driver/XScreenSaver.ad.in	2005-10-30 17:26:01.000000000 +0100
-@@ -318,10 +318,6 @@
- 				fiberlamp -root				    \n\
- 				boxfit -root				    \n\
- 				celtic -root				    \n\
--- default-n:			webcollage -root			    \n\
--- default-n:  "WebCollage (whacked)"					      \
--				webcollage -root -filter		      \
--				  'vidwhacker -stdin -stdout'		    \n\
- - default-n:			vidwhacker -root			    \n\
- 									      \
- @GL_KLUDGE@ GL:			gears -root				    \n\
-@@ -508,7 +504,6 @@
- *hacks.xanalogtv.name:      XAnalogTV
- *hacks.xspirograph.name:    XSpiroGraph
- *hacks.nerverot.name:       NerveRot
--*hacks.webcollage.name:     WebCollage
- *hacks.vidwhacker.name:     VidWhacker
- *hacks.morph3d.name:        Morph3D
- *hacks.bubble3d.name:       Bubble3D
-diff -Nru xscreensaver-4.23/driver/XScreenSaver_ad.h xscreensaver-4.23.nsfw/driver/XScreenSaver_ad.h
---- xscreensaver-4.23/driver/XScreenSaver_ad.h	2005-10-22 08:43:56.000000000 +0200
-+++ xscreensaver-4.23.nsfw/driver/XScreenSaver_ad.h	2005-10-30 17:26:30.000000000 +0100
-@@ -219,10 +219,6 @@
- 				fiberlamp -root				    \\n\
- 				boxfit -root				    \\n\
- 				celtic -root				    \\n\
--- default-n:			webcollage -root			    \\n\
--- default-n:  \"WebCollage (whacked)\"					      \
--				webcollage -root -filter		      \
--				  'vidwhacker -stdin -stdout'		    \\n\
- - default-n:			vidwhacker -root			    \\n\
- 									      \
- 	   GL:			gears -root				    \\n\
-@@ -379,7 +375,6 @@
- "*hacks.xanalogtv.name:      XAnalogTV",
- "*hacks.xspirograph.name:    XSpiroGraph",
- "*hacks.nerverot.name:       NerveRot",
--"*hacks.webcollage.name:     WebCollage",
- "*hacks.vidwhacker.name:     VidWhacker",
- "*hacks.morph3d.name:        Morph3D",
- "*hacks.bubble3d.name:       Bubble3D",
-diff -Nru xscreensaver-4.23/hacks/Makefile.in xscreensaver-4.23.nsfw/hacks/Makefile.in
---- xscreensaver-4.23/hacks/Makefile.in	2005-10-22 08:43:59.000000000 +0200
-+++ xscreensaver-4.23.nsfw/hacks/Makefile.in	2005-10-30 17:27:29.000000000 +0100
-@@ -100,7 +100,7 @@
- 		  blaster.c bumps.c ripples.c xteevee.c xspirograph.c \
- 		  nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \
- 		  rotzoomer.c whirlygig.c speedmine.c vermiculate.c \
--		  xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \
-+		  xpm-pixmap.c twang.c apollonian.c \
- 		  euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \
- 		  anemone.c halftone.c metaballs.c eruption.c popsquares.c \
- 		  barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \
-@@ -109,7 +109,7 @@
- 		  fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
- 		  intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
- 		  boxfit.c interaggregate.c celtic.c
--SCRIPTS		= vidwhacker webcollage ljlatest
-+SCRIPTS		= vidwhacker ljlatest
- 
- OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
- 		  bubbles-default.o decayscreen.o deco.o drift.o flag.o \
-@@ -130,7 +130,7 @@
- 		  blaster.o bumps.o ripples.o xteevee.o xspirograph.o \
- 		  nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \
- 		  rotzoomer.o whirlygig.o speedmine.o vermiculate.o \
--		  xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \
-+		  xpm-pixmap.o twang.o apollonian.o \
- 		  euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \
- 		  anemone.o halftone.o metaballs.o eruption.o popsquares.o \
- 		  barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \
-@@ -162,7 +162,7 @@
- 		  celtic \
- 		  @JPEG_EXES@
- SEXES		= sonar
--JPEG_EXES	= webcollage-helper
-+JPEG_EXES	= 
- EXES		= $(NEXES) $(SEXES)
- 
- HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
-@@ -198,7 +198,7 @@
- 	          spotlight.man squiral.man starfish.man strange.man \
- 	          swirl.man t3d.man thornbird.man triangle.man truchet.man \
- 	          twang.man vermiculate.man vidwhacker.man vines.man \
--	          wander.man webcollage.man whirlwindwarp.man whirlygig.man \
-+	          wander.man whirlwindwarp.man whirlygig.man \
- 	          worm.man xflame.man xjack.man xlyap.man xmatrix.man \
- 	          xrayswarm.man xspirograph.man xsublim.man xteevee.man \
- 	          zoom.man halftone.man eruption.man metaballs.man \
-@@ -1467,7 +1467,6 @@
- vines.o: $(srcdir)/xlockmore.h
- wander.o: ../config.h
- wander.o: $(srcdir)/screenhack.h
--webcollage-helper.o: ../config.h
- whirlwindwarp.o: ../config.h
- whirlwindwarp.o: $(srcdir)/screenhack.h
- whirlygig.o: ../config.h
-diff -Nru xscreensaver-4.23/hacks/glx/glsnake.c xscreensaver-4.23.nsfw/hacks/glx/glsnake.c
---- xscreensaver-4.23/hacks/glx/glsnake.c	2005-03-07 03:31:18.000000000 +0100
-+++ xscreensaver-4.23.nsfw/hacks/glx/glsnake.c	2005-10-30 17:24:47.000000000 +0100
-@@ -547,21 +547,6 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
--      { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
--	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
--	ZERO, ZERO }
--    },
--    { "flaccid penis",
--      { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
--	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
--	ZERO, ZERO }
--    },
--    { "vagina",
--      { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
--	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
--	PIN, RIGHT, ZERO }
--    },
-     { "mask",
-       { ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN,
- 	ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO,
-@@ -973,9 +958,6 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN }
-     },
--    { "Penis",
--        { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN }
--    },
-     { "PictureCommingSoon",
-         { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT }
-     },
-diff -Nru xscreensaver-4.23/po/POTFILES.in xscreensaver-4.23.nsfw/po/POTFILES.in
---- xscreensaver-4.23/po/POTFILES.in	2005-10-22 08:44:11.000000000 +0200
-+++ xscreensaver-4.23.nsfw/po/POTFILES.in	2005-10-30 17:27:37.000000000 +0100
-@@ -200,7 +200,6 @@
- hacks/config/vidwhacker.xml
- hacks/config/vines.xml
- hacks/config/wander.xml
--hacks/config/webcollage.xml
- hacks/config/whirlwindwarp.xml
- hacks/config/whirlygig.xml
- hacks/config/worm.xml
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-words.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-words.patch
deleted file mode 100644
index bb8512449831..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.23-words.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru xscreensaver-4.23.vanilla/hacks/webcollage xscreensaver-4.23/hacks/webcollage
---- xscreensaver-4.23.vanilla/hacks/webcollage	2006-02-07 12:52:14.000000000 +0100
-+++ xscreensaver-4.23/hacks/webcollage	2006-02-07 12:53:44.000000000 +0100
-@@ -837,7 +837,8 @@
- 
- 
- sub pick_dictionary() {
--  my @dicts = ("/usr/dict/words",
-+  my @dicts = ("/usr/share/dict/cracklib-small",
-+               "/usr/dict/words",
-                "/usr/share/dict/words",
-                "/usr/share/lib/dict/words");
-   foreach my $f (@dicts) {
diff --git a/x11-misc/xscreensaver/files/xscreensaver-blank-screen.patch b/x11-misc/xscreensaver/files/xscreensaver-blank-screen.patch
deleted file mode 100644
index 23a7c6986d23..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-blank-screen.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- driver/xscreensaver.c	2005-07-27 15:27:57.000000000 -0400
-+++ driver/xscreensaver.c	2005-07-27 15:30:08.000000000 -0400
-@@ -1641,8 +1641,11 @@
-       if (hint.res_class) XFree (hint.res_class);
-     }
- 
-+  /*
-   fprintf (stderr, "%s: %d: unrecognised ClientMessage \"%s\" received\n",
-            blurb(), screen, (str ? str : "(null)"));
-+  */
-+
-   fprintf (stderr, "%s: %d: for window 0x%lx (%s)\n",
-            blurb(), screen, (unsigned long) w, wdesc);
-   if (str) XFree (str);
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
deleted file mode 100644
index 18d883558db2..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild,v 1.15 2006/07/21 08:17:22 nelchael Exp $
-
-inherit eutils flag-o-matic pam fixheadtails
-
-IUSE="gnome jpeg kerberos krb4 insecure-savers new-login nls offensive opengl pam xinerama"
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ppc64 sparc x86"
-SLOT="0"
-
-# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't
-#       really matter if it isn't there. Maybe we should have a 'games'
-#       USE flag...
-
-# smithj says (2005-07-26):
-# MOTIF WAS REMOVED FOR A REASON! The motif version has not been maintained for
-# some time, and has problems both at build-time and run-time. This ebuild
-# (4.22-r3) is going to force gtk support and disable motif support. Hopefully
-# the users won't complain too much...
-
-RDEPEND="|| ( (
-		x11-libs/libXxf86misc
-		x11-apps/xwininfo
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
-	media-libs/netpbm
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/libxml2-2.5
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-1.99
-	>=dev-libs/glib-2
-	pam? ( virtual/pam )
-	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl
-	          >=media-libs/gle-3.0.1 )
-	!arm? ( new-login? ( gnome-base/gdm ) )"
-
-DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86vidmodeproto
-		x11-proto/xextproto
-		x11-proto/scrnsaverproto
-		x11-proto/recordproto
-		x11-proto/xf86miscproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	virtual/x11 )
-	sys-devel/bc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-# simple workaround for the flurry screensaver
-filter-flags -mabi=altivec
-filter-flags -maltivec
-append-flags -U__VEC__
-
-pkg_setup() {
-	if use kerberos && ! use krb4 ; then
-		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
-		ewarn "disabled unless kerberos 4 support has been compiled with your"
-		ewarn "kerberos libraries. To do that, you should abort now and do:"
-		ewarn
-		ewarn " USE=\"krb4\" emerge mit-krb5"
-		ewarn
-		epause
-	fi
-	if use arm && use new-login; then
-		ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
-		ewarn "available for the arm platform. please disable this use flag"
-		die "new-login USE is not supported on arm"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	# use gnome-terminal in tests rather than gnome-open (bug #94708)
-	epatch ${FILESDIR}/${PN}-4.22-configure.patch
-
-	# tweaks the default configuration (driver/XScreenSaver.ad.in)
-	epatch ${FILESDIR}/${PN}-4.22-settings.patch
-
-	# makes the blank screen REALLY blank
-	epatch ${FILESDIR}/${PN}-blank-screen.patch
-
-	# fixes wrong argument for inter-aggregate screensaver
-	epatch ${FILESDIR}/${PN}-4.22-interaggregate.patch
-
-	# disable not-safe-for-work xscreensavers
-	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
-	use offensive || epatch ${FILESDIR}/${PN}-4.22-nsfw-webcollage.patch
-
-	# change old head/tail to POSIX ones
-	#cd hacks
-	ht_fix_all
-}
-
-src_compile() {
-	local myconf
-	use kerberos && use krb4 \
-		&& myconf="${myconf} --with-kerberos" \
-		|| myconf="${myconf} --without-kerberos"
-
-	unset BC_ENV_ARGS
-	econf \
-		--with-hackdir=/usr/lib/misc/xscreensaver \
-		--with-configdir=/usr/share/xscreensaver/config \
-		--x-libraries=/usr/$(get_libdir) \
-		--x-includes=/usr/include \
-		--with-mit-ext \
-		--with-dpms-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		--with-gtk \
-		--with-xml \
-		$(use_with insecure-savers setuid-hacks) \
-		$(use_with new-login login-manager) \
-		$(use_with xinerama xinerama-ext) \
-		$(use_with pam) \
-		$(use_with opengl gl) $(use_with opengl gle) \
-		$(use_with jpeg) \
-		$(use_enable nls) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
-	make install_prefix="${D}" install || die "make install failed"
-
-	dodoc README
-
-	# install correctly in gnome, including info about configuration preferences
-	if use gnome ; then
-		dodir /usr/share/gnome/capplets
-		insinto /usr/share/gnome/capplets
-		doins driver/screensaver-properties.desktop
-
-		dodir /usr/share/pixmaps
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm
-		xscreensaver.xpm
-
-		dodir /usr/share/control-center-2.0/capplets
-		insinto /usr/share/control-center-2.0/capplets
-		newins ${FILESDIR}/desktop_entries/screensaver-properties.desktop
-	fi
-
-	# Remove "extra" capplet
-	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
-
-	use pam && fperms 755 /usr/bin/xscreensaver
-	pamd_mimic_system xscreensaver auth
-}
-
-pkg_postinst() {
-	if ! use new-login; then
-		einfo
-		einfo "You have chosen to not use the new-login USE flag."
-		einfo "This is a new USE flag which enables individuals to"
-		einfo "create new logins when the screensaver is active,"
-		einfo "allowing others to use their account, even though the"
-		einfo "screen is locked to another account. If you want this"
-		einfo "feature, please recompile with USE=\"new-login\"."
-		einfo
-	fi
-
-	if use insecure-savers;then
-		ewarn
-		ewarn "You have chosen USE=insecure-savers. While upstream"
-		ewarn "has made every effort to make sure these savers do not"
-		ewarn "abuse their setuid root status, the possibilty exists that"
-		ewarn "someone will exploit xscreensaver and will be able to gain"
-		ewarn "root privileges. You have been warned."
-		ewarn
-	fi
-
-	einfo
-	einfo "The gtk USE flag has been dropped. gtk is now required for Gentoo's"
-	einfo "xscreensaver. If this is a problem, bug upstream."
-	einfo
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.23-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-4.23-r1.ebuild
deleted file mode 100644
index 10a3ac0bb3fa..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.23-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.23-r1.ebuild,v 1.2 2006/07/21 08:17:22 nelchael Exp $
-
-inherit eutils flag-o-matic pam fixheadtails autotools
-
-IUSE="gnome jpeg kerberos krb4 insecure-savers new-login nls offensive opengl pam xinerama"
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-SLOT="0"
-
-RDEPEND="|| ( (
-		x11-libs/libXxf86misc
-		x11-apps/xwininfo
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
-	media-libs/netpbm
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/libxml2-2.5
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-1.99
-	>=dev-libs/glib-2
-	pam? ( virtual/pam )
-	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl
-	          >=media-libs/gle-3.0.1 )
-	!arm? ( new-login? ( gnome-base/gdm ) )"
-
-DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86vidmodeproto
-		x11-proto/xextproto
-		x11-proto/scrnsaverproto
-		x11-proto/recordproto
-		x11-proto/xf86miscproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	virtual/x11 )
-	sys-devel/bc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-# simple workaround for the flurry screensaver
-filter-flags -mabi=altivec
-filter-flags -maltivec
-append-flags -U__VEC__
-
-pkg_setup() {
-	if use kerberos && ! use krb4 ; then
-		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
-		ewarn "disabled unless kerberos 4 support has been compiled with your"
-		ewarn "kerberos libraries. To do that, you should abort now and do:"
-		ewarn
-		ewarn " USE=\"krb4\" emerge mit-krb5"
-		ewarn
-		epause
-	fi
-	if use arm && use new-login; then
-		ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
-		ewarn "available for the arm platform. please disable this use flag"
-		die "new-login USE is not supported on arm"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	# use gnome-terminal in tests rather than gnome-open (bug #94708)
-	# and bug 118028:
-	epatch "${FILESDIR}/${P}-norpm.patch"
-
-	# tweaks the default configuration (driver/XScreenSaver.ad.in)
-	epatch ${FILESDIR}/${PN}-4.22-settings.patch
-
-	# makes the blank screen REALLY blank
-	epatch ${FILESDIR}/${PN}-blank-screen.patch
-
-	# disable not-safe-for-work xscreensavers
-	use offensive || epatch ${FILESDIR}/${P}-nsfw.patch
-
-	# If offensive is set patch webcollage to work:
-	use offensive && epatch ${FILESDIR}/${P}-words.patch
-
-	# Fix for modular X:
-	epatch "${FILESDIR}/${P}-app-defaults.patch"
-	eautoreconf
-
-	# change old head/tail to POSIX ones
-	ht_fix_all
-}
-
-src_compile() {
-	local myconf
-	use kerberos && use krb4 \
-		&& myconf="${myconf} --with-kerberos" \
-		|| myconf="${myconf} --without-kerberos"
-
-	unset BC_ENV_ARGS
-	econf \
-		--with-hackdir=/usr/lib/misc/xscreensaver \
-		--with-configdir=/usr/share/xscreensaver/config \
-		--x-libraries=/usr/$(get_libdir) \
-		--x-includes=/usr/include \
-		--with-mit-ext \
-		--with-dpms-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		--with-gtk \
-		--with-xml \
-		$(use_with insecure-savers setuid-hacks) \
-		$(use_with new-login login-manager) \
-		$(use_with xinerama xinerama-ext) \
-		$(use_with pam) \
-		$(use_with opengl gl) $(use_with opengl gle) \
-		$(use_with jpeg) \
-		$(use_enable nls) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
-	make install_prefix="${D}" install || die "make install failed"
-
-	dodoc README
-
-	# install correctly in gnome, including info about configuration preferences
-	if use gnome ; then
-		dodir /usr/share/gnome/capplets
-		insinto /usr/share/gnome/capplets
-		doins driver/screensaver-properties.desktop
-
-		dodir /usr/share/pixmaps
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm
-		xscreensaver.xpm
-
-		dodir /usr/share/control-center-2.0/capplets
-		insinto /usr/share/control-center-2.0/capplets
-		newins ${FILESDIR}/desktop_entries/screensaver-properties.desktop
-	fi
-
-	# Remove "extra" capplet
-	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
-
-	use pam && fperms 755 /usr/bin/xscreensaver
-	pamd_mimic_system xscreensaver auth
-}
-
-pkg_postinst() {
-	if ! use new-login; then
-		einfo
-		einfo "You have chosen to not use the new-login USE flag."
-		einfo "This is a new USE flag which enables individuals to"
-		einfo "create new logins when the screensaver is active,"
-		einfo "allowing others to use their account, even though the"
-		einfo "screen is locked to another account. If you want this"
-		einfo "feature, please recompile with USE=\"new-login\"."
-		einfo
-	fi
-
-	if use insecure-savers;then
-		ewarn
-		ewarn "You have chosen USE=insecure-savers. While upstream"
-		ewarn "has made every effort to make sure these savers do not"
-		ewarn "abuse their setuid root status, the possibilty exists that"
-		ewarn "someone will exploit xscreensaver and will be able to gain"
-		ewarn "root privileges. You have been warned."
-		ewarn
-	fi
-
-	einfo
-	einfo "The gtk USE flag has been dropped. gtk is now required for Gentoo's"
-	einfo "xscreensaver. If this is a problem, bug upstream."
-	einfo
-}