old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

7 files changed, 16 insertions, 470 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index f40046f17a33..80679c51460f 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.339 2013/11/23 13:31:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.340 2013/11/23 13:34:43 ssuominen Exp $
+
+  23 Nov 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xscreensaver-5.15-gentoo.patch,
+  -files/xscreensaver-5.20-check-largefile-support.patch,
+  -files/xscreensaver-5.20-parallel-build.patch, -xscreensaver-5.20.ebuild,
+  -xscreensaver-5.21.ebuild:
+  old
 
   23 Nov 2013; Samuli Suominen <ssuominen@gentoo.org> xscreensaver-5.22.ebuild:
   x86 stable wrt #480990; thanks to Galym Kerimbekov and Myckel Habets for
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 6f4882093921..8161fc2b93af 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -2,30 +2,23 @@
 Hash: SHA256
 
 AUX xscreensaver-5.05-interix.patch 1033 SHA256 3ddb5277929a9a3b65ba4a89cf59d3c2ffd3d51ce43f9ac83062afcd118d9f27 SHA512 61201dba2e4a1332db179f619452dedd67a6576f6002184d35109d25079c7a9b8a71267a0713c1c2d32a59c08867d2642edd9a1c22a39dd324b0be3fa3d13dd0 WHIRLPOOL e613cf264a4941d96bb7904fc42b44593cc28f9110c89e24d172965ad5d715c1a313aeae8c92188cf585d3490e224ebb7bbf1d3458b97e1f1ce30425136e3efe
-AUX xscreensaver-5.15-gentoo.patch 3002 SHA256 f81bde587499a82778fd396220eb4b4c8453213a7ba94dd4255624b9fd8d45a9 SHA512 52106a0503325a5f669cfcd5316e789815f084587127d7f5574aa1dbd350f8f5cbc62690d55bec365104039d1229aeef1a816700cbe43ecdafb8f562d836978b WHIRLPOOL 1f06576380fd44295416fe9e591c2f586767c6a5abaa9e1ed965f7af21edecad650764b443d91c903192bb64272a999ffaaa4055874f3a60dfede2dcd935f5f9
 AUX xscreensaver-5.20-blurb-hndl-test-passwd.patch 359 SHA256 24d7f49d51e6a6150ded1fc4a3918df2555cea11938e26b677d1b7eb31f01c54 SHA512 546d899c49ad84d4552becc8a2a3237d8a62eff8408fc3daa97067805474431cc0cea0dfc2c2315deb560dacb310c94d4b6cbd455d783643df05bf438cc21de8 WHIRLPOOL ab66956eca22c7309562ea72ae2727ef41edbb388aba821e7a8a74beac10870af27a43b779b30dcc39704ae450f7991cf7585468bedc74c143733158704865b0
-AUX xscreensaver-5.20-check-largefile-support.patch 398 SHA256 b1cd3508a39d9ad0dce55aab3a373dd2c9e2e5146a1596894a6e4d12b3fdfa5d SHA512 da150af0c5874507966f6e386c6a9c35fed9e38169d8fa5e7d1a24bcf0473eab97c0206978157b863c45d415a6d5ba972ff04609c18cf0164fb4b1d29b1cc628 WHIRLPOOL 8c6842d13a8b3becd3bf685fa0bc598d5058a4c8abc2b956bee5196e981645017c6d029b9b1abeccc2b86f5a16b32d377905a2d1be2916defa36f2a67f12239e
 AUX xscreensaver-5.20-conf264.patch 645 SHA256 8a06d52396c579c2ff3704eecd3635dcee488de740aa1bdb6a677cf564b0bf0d SHA512 53765feea44e9044368b98db9c57eff390e1f51a4581d417da58ffa1571ea7b14ecaabf5bdaff15b6add15042d8d116ce64df5245211e11a45a72941ec3d0df5 WHIRLPOOL 538174704008dc9cc50a58addaa8e668930f19c3935a5faa2b2c7104f2c678cb76f8b7c93ad0c4280756838d4d474493c18573f1fe723b3232da7c2fda61f298
-AUX xscreensaver-5.20-parallel-build.patch 2794 SHA256 2235a8720b80f16420ec9d960970eb20af7b25f56817e8030cfc1bfe0a6926ae SHA512 1a92b7bd6a2d2dfa29ee87a713d0765ec8852f24950420c9a6458913228a01d6b23325bdc42f0be12fbba3bc92cb77eefbdafc56710aefd84f8a88eede676f64 WHIRLPOOL c669f816b3c7d3c49caca23e5b07ea35b3e1f9113f87128fa8bb1528ec553c26eebc59360b9587b1708249d2686406b25284b165df586b11e12c7aa13698d49d
 AUX xscreensaver-5.20-test-passwd-segv-tty.patch 412 SHA256 6abe35c0a28f7cb7aa9eca8f16d96130690b6fe20fdcf2dbf55ecd4da40ea8cb SHA512 5744b2669f3409cc690e7b3a7f365418e72cac0f7ba7496efbc41c3284ef9095531e1394a35740f8cdaff336d5fa0511690ab392352fc13acf9c0a259b4b843c WHIRLPOOL cea55d03b72c7dc35b901850cc490ad80073d2859ed3d1097c32c7a6a455fbcbaf1db032f9ffab55484c6780d49d48986d4a76e0e3a18abbf6ec855e595bc666
 AUX xscreensaver-5.20-tests-miscfix.patch 784 SHA256 3cbc3af757f4ea362e7059ebf696aec155681684ecb1498cb0bf09892e905ec3 SHA512 ad1bea7367d548b5b8600bcfc5399c575d467135a327d303ca88b7cdd8572767001c690a9644b0df099086f80b2c946a9b3d742c9f1030f1d710c500c08057a2 WHIRLPOOL df8684942655e66c49ab127580aa2324b785c80afb7c76625f7101621daeca593dba0624bb487af57f204395ab72e4dfde165f643ebf09d5c70d4998d404a42a
 AUX xscreensaver-5.21-gentoo.patch 3109 SHA256 05edd9c8a57c441afd317fd4c40dbfc763c11831c1696505c67d1efab737afeb SHA512 13a1beae2812dc30855c3fb0a5fbce126969c7caa44d19dcff3a4ccf18a2f282faebc2c73f4ec9c4bac07b30097b942ee4cb8beadb3a315a4fef5b167ffb11da WHIRLPOOL 03a0fdf456fdd9599d94652ff61a8e0170d36429de4d0f2f03509910748b09627d22c9b62c467bb18eb583c315597db05736d48397c9f98a09354f3031e1cc05
-DIST xscreensaver-5.20.tar.gz 7380256 SHA256 a9cf9f745c6319db175d7e1e36545b01b9e099a89fd5c239689c982e0c10bcb1 SHA512 2867e081154e53c3d7e16bda1226c9682b296461f93b7565cbb0a267ac81489abefd947e0795f04e77632e108f428c7421e14fdd95894297a8a8da375914db74 WHIRLPOOL e3ffbb2dfbfabfa669276c9e624f9a88dfd4808533dcaa7b57b12cbe16e3da83c8d1ab38a19a370f2309a1ed7d266666ace5c65ed9357707fb9850d4f4ab290d
-DIST xscreensaver-5.21.tar.gz 7382128 SHA256 90f9a4574880c6e6d24796b5c386405a4bbf27a7d764a00f858d43ce07788868 SHA512 3e74f786df8374d96969493094934a478a7023107efadc84ec58ebd9def6993ea069512f7850e0a2ffe65ff43dc5e251b0057246fc39a67846085d2d0990cba7 WHIRLPOOL 9241fd56b3dbd9a08741f97ab341e343b77421617d1b3febc8b185e3f4a3a2712c3f4a50e916037cb90aab7d4283628490e9b2388e99ae953c08e48ee5e7bb75
 DIST xscreensaver-5.22.tar.gz 7411666 SHA256 47b703ed22dce46a08f11ddd7d67d52e4f7ad8df844bdf956431069a0db36797 SHA512 d78cc42d5ce792a43870f2186f0b842e3bdf01a0871b449f84287d81835ca3b62708f0e1bebb5e4fa1403009786b9a271f4ac36c2d4169e7456ce46639549ca7 WHIRLPOOL c454a5af3efdd9e19e61324be6c9e94e882608cbb4e64a6783a870d6a3a9178ff0962e75addc35c49ac02b66acfe06ea5c693e4e1c7a874754f0e638ba0e69e0
-EBUILD xscreensaver-5.20.ebuild 3515 SHA256 961e5606379378c60586685ffe3e876c952055a89336156b3246a3d4173eced0 SHA512 1d5cfcd3d77c7f4094802b6b80ddccb28075f2428fe2e59575cdfab251de3dad92565cbf084fd6dfdd14c5b0bfdb3d630a04c484f9de3fcb2ddb79d469c77b93 WHIRLPOOL b6bd6c277507cf3ed245ded3e5e1be210082c4ce077e92a0a76147261f2a94325d07c62f7d180d8e4443a75b37d02ab2a1a12392e2beaca945c1a11ec9ced48f
-EBUILD xscreensaver-5.21.ebuild 3415 SHA256 02d66b8ab0c15471f32272d300782fd8a2e9b6cc1eb571dd7bc45323a42794a4 SHA512 d767139fda848766a4f9c97b0cdd9cc96a8c9964cd5c8a1311f6636c64ad3c7945fcca89694af25c50e76b48b6a3af904e314184cfc8ae48e0020b44953ef811 WHIRLPOOL 11c8702eac5d039ed45e5599b425c0044714a08f1bf48aeba1198dee68ec8efcc0e158dd7631ed9d4e2bde3f6b207d42e649abcca5f2c8ebf63f6d434e87fb9f
 EBUILD xscreensaver-5.22.ebuild 3490 SHA256 87fffcb672f16f1f00d754857b0bed10aed7f82534b8c0b0f49d394bb6cfef3e SHA512 83ee32fd7e36a0b58c096d85967c1be6a0b9a9301f2a08b6602c9f4c0eef426ac981044b1d57f8388bd823403b56a357c25125abccef9ee7adc6c3425b18bbab WHIRLPOOL 6be7dc588d174e2c1bbe3810c95850e0ca95e9fec83a6c64baeaa5ba305a8490782449b47d1b3eb99d368084752bd0a348642ad44425a799cb842da798b72b02
-MISC ChangeLog 54161 SHA256 6a0cb2fe00bc485752d6c241f7359658ab757d74a6ec6b6d209cdab8aec6f3c9 SHA512 78e71ea7b2ab51190dbb35fbfe290fa14b2d5be70292ab4bf05ef2042d144aff616d63d819bded7b2a1b66edeb3d3c56d31a785ab524cfc5a519fe0c1b0d42f3 WHIRLPOOL f9cbd4008622141fb32d9f04f0319cc730a95abbe6bd97d30c11ffceb65b994ba8a227ef8c460214622784f052ea749a2b385657b8dfe5e68853bbce119b57ab
+MISC ChangeLog 54426 SHA256 f1271470295c2304586b881f0701c3221195d97a2c294d31bd40c33c4c6623c4 SHA512 b3b7740dd6adece287b495455736fea312be4e621c01129a6320fb960bf32f2f1fdf24a8e38a6138f4d16b3832cf6a14914c4a2ec3c313d008cdd8cf4181b4da WHIRLPOOL c527292d1aa0abcc32ec7bdd8af6fb1d7797caa3fb132ffaedfc664456d13cfc484302b58e3f168a03c6f30ac43a8085a8545a702d6ce8a9038f8ac745905272
 MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSkK3gAAoJEEdUh39IaPFNW/wH/0qgcjjKsZ8488FZvBlwIov0
-ge/Uwwgx3j3PkulWpWKNAGuRuba3RAXPXtCTJa3EgzJHeZ9zlWEi360sosThhAKd
-GAwrIczMV6NFrZF/6e3SakxMLnHYhSrqJftg1vSmmy/szZorQwaCQO5bRVpEUPvp
-lBg+e1oeRvoKFPZHKr82mKnaB5ebkIR4uYgYpBR9OaTbyaDMvBNuA2iD5dHI/ut5
-N/8qWj7b9JvL33Tt1PP9QV8r5M2YdAwkcx7d9/Wt02UCAbMTvPNKNyA/PFgicapu
-ypKxt6J+RmyX2KfzEeuMcqI7mccP2ZSfg5/XVwCPycC4nahHmNYjKHgR9ZJ1BWs=
-=Aaay
+iQEcBAEBCAAGBQJSkK6eAAoJEEdUh39IaPFNhBEIAIPgCXtyby+TS+7hXvT863+0
++KcWOxF2lltJKYYg8of1zHwZL6tAGiY/Ik43tCyUgoZ+aAgLHejJq0bV2TP8k6uz
+0xCfeU/1candqHCyy+pmb2u8qPjrFmbHEmsbVri0FZeUKXNNsB9oTTjmMh+x2PA5
+10eciHDv0Cb0RkosjOZSq0jFRxt9ufcim3u2JveJM0m5+x1KtPXo2nsBT1/8xeJl
+lRiAYMdJ/L53/OBZY4juHYFmxxz5pkSY+BAZf+WqspVFX2y5pbPAIo+cJt0aXc98
+YLPy2wt7U8rozwFFNzFHutQmj4x2AI77KHt3kWj43M/CYxmSCyip9xVSiHNhs/M=
+=JCPc
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.15-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.15-gentoo.patch
deleted file mode 100644
index 987e2ed93a28..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.15-gentoo.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- driver/XScreenSaver.ad.in
-+++ driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -62,7 +62,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		http://twitter.com/statuses/public_timeline.atom
-+*textURL:		http://planet.gentoo.org/rss20.xml
- !*textURL:		http://www.livejournal.com/stats/latest-rss.bml
- 
- *overlayTextForeground:	#FFFF00
-@@ -123,7 +123,8 @@
- 
- ! 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
-+*dateFormat:		%x %X
-+! *dateFormat:		%d-%b-%y (%a); %I:%M %p
- ! To show the time only:
- ! *dateFormat:		%I:%M %p
- ! For 24 hour time:
---- hacks/barcode.c
-+++ hacks/barcode.c
-@@ -131,7 +131,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -265,7 +264,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -333,8 +331,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- hacks/glx/glsnake.c
-+++ hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* 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",
-+    { "flaccid anchor",
-       { 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",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch
deleted file mode 100644
index b5e3ca92cc58..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.19-check-largefile-support.patch
-
---- configure.in
-+++ configure.in
-@@ -1184,6 +1184,7 @@
- AC_HEADER_SYS_WAIT
- AC_HEADER_DIRENT
- AC_GETTIMEOFDAY_ARGS
-+AC_SYS_LARGEFILE
- AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk)
- AC_CHECK_FUNCS(sigaction syslog realpath setrlimit)
- AC_CHECK_FUNCS(setlocale)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch
deleted file mode 100644
index f28d663b8465..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Fix make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule
-
-https://bugs.gentoo.org/show_bug.cgi?id=259115
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -19,8 +19,8 @@ TARFILES	= README README.hacking README.VMS INSTALL \
- 
- TAR		= tar
- 
--MAKE_SUBDIR  = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
--MAKE_SUBDIR2 = for dir in $(SUBDIRS2);do (cd $$dir; $(MAKE) $@) || exit 5; done
-+MAKE_SUBDIR  = for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 5; done
-+MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done
- 
- default::
- 	@$(MAKE_SUBDIR)
-@@ -45,7 +45,7 @@ depend::
- distdepend::
- 	@$(MAKE) update_spec_version
- 	@$(MAKE_SUBDIR2)
--	@cd po ; $(MAKE) update-po
-+	@$(MAKE) -C po update-po
- 
- TAGS:: tags
- tags::
-@@ -284,7 +284,7 @@ test-tar::
-   chmod -R u+w .
- 
- dmg::
--	cd OSX ; $(MAKE) release dmg
-+	$(MAKE) -C OSX release dmg
- 
- www::
- 	@								    \
-@@ -349,8 +349,7 @@ www::
-   cat $$TMP > download.html ;						    \
-   rm -f $$TMP ;								    \
- 									    \
--  (cd ..; $(MAKE) xscreensaver/changelog.html				    \
--		  xscreensaver/screenshots/index.html );		    \
-+  $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
-   cvs diff -U0 changelog.html ;						    \
-   set +x ;								    \
- 									    \
---- a/driver/Makefile.in
-+++ b/driver/Makefile.in
-@@ -732,8 +732,7 @@ $(UTILS_BIN)/yarandom.o:	$(UTILS_SRC)/yarandom.c
- $(UTILS_BIN)/colorbars.o:	$(UTILS_SRC)/colorbars.c
- 
- $(SAVER_UTIL_OBJS):
--	cd $(UTILS_BIN) ; \
--	$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-+	$(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
- 
- # How we build object files in this directory.
- .c.o:
---- a/hacks/Makefile.in
-+++ b/hacks/Makefile.in
-@@ -517,8 +517,7 @@ $(UTILS_BIN)/xdbe.o:		$(UTILS_SRC)/xdbe.c
- $(UTILS_BIN)/textclient.o:	$(UTILS_SRC)/textclient.c
- 
- $(UTIL_OBJS):
--	cd $(UTILS_BIN) ; \
--	$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-+	$(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
- 
- # How we build object files in this directory.
- .c.o:
---- a/hacks/glx/Makefile.in
-+++ b/hacks/glx/Makefile.in
-@@ -464,11 +464,10 @@ $(UTILS_BIN)/xshm.o:		$(UTILS_SRC)/xshm.c
- $(UTILS_BIN)/textclient.o:	$(UTILS_SRC)/textclient.c
- 
- $(UTIL_OBJS):
--	cd $(UTILS_BIN) ; \
--	$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-+	$(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
- 
- $(HACK_BIN)/xlockmore.o: $(HACK_SRC)/xlockmore.c
--	cd $(HACK_BIN)  ; $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)"
-+	$(MAKE) -C $(HACK_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)"
- 
- 
- # How we build object files in this directory.
diff --git a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
deleted file mode 100644
index 733fa002b613..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.11 2013/08/27 15:05:35 kensington Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="dev-libs/libxml2
-	>=gnome-base/libglade-2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? ( virtual/opengl )
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-xscreensaver )
-	xinerama? ( x11-libs/libXinerama )"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/bc
-	sys-devel/gettext
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-src_prepare() {
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.15-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-check-largefile-support.patch \
-		"${FILESDIR}"/${PN}-5.20-conf264.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.20-parallel-build.patch
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset LINGUAS #113681
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-		--enable-locking \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-dpms-ext \
-		$(use_with xinerama xinerama-ext) \
-		--with-xinput-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-randr-ext \
-		--with-proc-interrupts \
-		$(use_with pam) \
-		--without-kerberos \
-		$(use_with new-login login-manager) \
-		--with-gtk \
-		$(use_with opengl gl) \
-		--without-gle \
-		--with-pixbuf \
-		$(use_with jpeg) \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		$(use_with suid setuid-hacks)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.21.ebuild b/x11-misc/xscreensaver/xscreensaver-5.21.ebuild
deleted file mode 100644
index e9e32de8b14f..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.21.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.21.ebuild,v 1.2 2013/08/27 15:05:35 kensington Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="dev-libs/libxml2
-	>=gnome-base/libglade-2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? ( virtual/opengl )
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-xscreensaver )
-	xinerama? ( x11-libs/libXinerama )"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/bc
-	sys-devel/gettext
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-src_prepare() {
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.21-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-conf264.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset LINGUAS #113681
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-		--enable-locking \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-dpms-ext \
-		$(use_with xinerama xinerama-ext) \
-		--with-xinput-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-randr-ext \
-		--with-proc-interrupts \
-		$(use_with pam) \
-		--without-kerberos \
-		$(use_with new-login login-manager) \
-		--with-gtk \
-		$(use_with opengl gl) \
-		--without-gle \
-		--with-pixbuf \
-		$(use_with jpeg) \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		$(use_with suid setuid-hacks)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}