Version bump, drop old.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 138 insertions, 22 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 5891fc74b7bb..b3e6ad8b6107 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.326 2013/02/17 03:40:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.327 2013/05/31 13:25:45 xmw Exp $
+
+*xscreensaver-5.21 (31 May 2013)
+
+  31 May 2013; Michael Weber <xmw@gentoo.org>
+  +files/xscreensaver-5.21-gentoo.patch, +xscreensaver-5.21.ebuild,
+  -xscreensaver-5.15.ebuild:
+  Version bump, drop old.
 
   17 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> xscreensaver-5.20.ebuild:
   Remove REQUIRED_USE to prevent conflict with package.use.force of USE flags
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 4176479e9648..5f284c4a887e 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -9,20 +9,17 @@ AUX xscreensaver-5.20-conf264.patch 645 SHA256 8a06d52396c579c2ff3704eecd3635dce
 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
-DIST xscreensaver-5.15.tar.gz 5977594 SHA256 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d SHA512 2013cf627908a3fa59a3e7d3e6e03b495497113828bf6c89d477fd84dca6867ddeafd572a5f23f12bbfd98fb32acbfc2bcb5d24ef4975c3c263439dbe6fa66b2 WHIRLPOOL 186719cc301ede656fd002f4eadafcec2fe488f60bc1323ca512cb0f49398dfcb3e08da4fd0e6028287438a24b92746a1972759a18b9f9e57bc9d61b5a50c852
+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
-EBUILD xscreensaver-5.15.ebuild 3198 SHA256 890d133642f9d71ca9dfd2bf3203eaa813d3b9f90216d8e8858367cf165d8180 SHA512 3a5719e4475266ae6dc5d083a95ff52f24b51abfebcd00f207bd01482c41df15b494f54d97a4442f6919ff2e49cef9a5c31e741a5ff46a1d8db9e796ebbca8bf WHIRLPOOL 50039503a2f82e7b9a6a2b65bf7cfb64a2a6530543cd589b15ca253e53d421163bf8289cfaad7d44bdc91af1d372dbc8e1531c686dba12242cb23da1286c5fb4
+DIST xscreensaver-5.21.tar.gz 7382128 SHA256 90f9a4574880c6e6d24796b5c386405a4bbf27a7d764a00f858d43ce07788868 SHA512 3e74f786df8374d96969493094934a478a7023107efadc84ec58ebd9def6993ea069512f7850e0a2ffe65ff43dc5e251b0057246fc39a67846085d2d0990cba7 WHIRLPOOL 9241fd56b3dbd9a08741f97ab341e343b77421617d1b3febc8b185e3f4a3a2712c3f4a50e916037cb90aab7d4283628490e9b2388e99ae953c08e48ee5e7bb75
 EBUILD xscreensaver-5.20.ebuild 3512 SHA256 3e8d507246ff7f05d4f5e748ed886e64fa47c12f067ff95b34b6f4889f4ca752 SHA512 552362582414c3081389e4b31e707664f4ae722117390a8f761726bf0fb291316a669dadcdbcb3ca28dda6099ea285e335dc467a833bddf3d6ac4313470fb280 WHIRLPOOL 36fce3ec8a7340d0ba63bb6deebd7e7f3c8fc6fe5ed74285e4b39731c1fba93c8a6a402f3f4eb452caeb55bb112c887325c8568ba56bd335ed5707dfa36162b3
-MISC ChangeLog 52455 SHA256 a96420f6458e9eda350be2789d7635b57fb9937cb921190a55f044326058c5e8 SHA512 f3590bec2332dcbd01db7a1b17b28dd5b2d0b8ed7f54e5e2010e7cba2f697feeaf1055b929b79ee1459b1d737ea775eeb35045c4f11eba89dffc7d5e086224aa WHIRLPOOL 7562bbd3acaca16245ee9ae231f12a4877e725ed2d457cc9463ef9b408e260df4ddf5a504224efb2593fac88555719e9348f42ca9ec52f2abff339dfef9cb466
+EBUILD xscreensaver-5.21.ebuild 3406 SHA256 c59f7149bb083f6f7d067549d329ae6720d5d68843bec8c29161b1998503fd2b SHA512 53bab8fd29f414b42bf34b7642322771f59b2cc6f37bd8122958b84c16af4268d9b44fb39b6657bada52fcc6c19510cba6749846b64f22f0e56dc98e9252ab50 WHIRLPOOL a7273cb40a0277269d37d64a46ca591e02272a542a754d2f189d9e3603716ed4ecb9f5270c04f36a4b0924f55edb754e25d4cdc20b6fe9cb81a78bc843bb5231
+MISC ChangeLog 52653 SHA256 3cdfe28fde3e6062246f0027908279380554e6c2530fbdc1d4fd6d0366a6975f SHA512 9ddb526a26252e63b6171817b7f3969cc20de794313474f8885c9750b48c46691d56fbb7fd6c5441fb0c2785371eae2343b6fd681cac62b009eb8891352fe8b6 WHIRLPOOL 46902cd25ccc5142da34c4b03d7535e19fee32fa40848fc098116da726a28221f9caf9e7df30c3e77ca02962d7f9fcdc4047a63e74b1f74fdc29dc9aa3708c64
 MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRIFEqAAoJEEdUh39IaPFN8skH/1WR2KJwF8S4l5PHRLoA8Va6
-a1+rclcOfmBiu9VW9eIzUBZ851gPRp9wgiuW8BFn8KmgcCb/AEv1KSFL9bCZnhmT
-DNxopy7FKCi583M1JQ2ZpRZEt/gZcrT90uUjb8+AxdjDaSS/SBt/si6o9s4aWUn7
-FxNiQ3Z3MwUm3ZNDwxKnEFzSqTSuXjc2u//xnbcsqfE1xdtuNOLcc2FIUX6naDPQ
-16HzaBqt5j6Rb06HhZqrzlHhhf5hYBbNdIoX/VGbEpir8+YlhyOaa74qP4vqAvmi
-4lqSqc8vw/khcV6DMSfhdQ9as3hf5XcrNW1RTM6ftIjUzyO+hDBpB843Pvcjf34=
-=hSM6
+iF4EAREIAAYFAlGopNwACgkQknrdDGLu8JA/bQEAkz4gq1eAMrpnP2KYUHhEaR5C
+yAlKnc7GtDy+ClviuS8A/3KDJKzENi3RlsaYZake6JX0vDRdpOdAtNWbw35CyfWa
+=Chk8
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
new file mode 100644
index 000000000000..b69e19783200
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
@@ -0,0 +1,106 @@
+--- xscreensaver-5.21/driver/XScreenSaver.ad.in
++++ xscreensaver-5.21/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://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
++*textURL:		http://planet.gentoo.org/rss20.xml
+ 
+ *overlayTextForeground:	#FFFF00
+ *overlayTextBackground:	#000000
+@@ -122,7 +122,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:		%d-%b-%y (%a); %I:%M %p
++*dateFormat:           %x %X
+ ! To show the time only:
+ ! *dateFormat:		%I:%M %p
+ ! For 24 hour time:
+--- xscreensaver-5.21/hacks/barcode.c
++++ xscreensaver-5.21/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",
+--- xscreensaver-5.21/hacks/glx/glsnake.c
++++ xscreensaver-5.21/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/xscreensaver-5.15.ebuild b/x11-misc/xscreensaver/xscreensaver-5.21.ebuild
index 6b539d63a9da..30656fc9072c 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.15.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.15.ebuild,v 1.14 2012/07/23 15:29:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.21.ebuild,v 1.1 2013/05/31 13:25:45 xmw Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic multilib pam
@@ -11,8 +11,8 @@ 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="jpeg new-login opengl pam +perl selinux suid xinerama"
+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
@@ -29,7 +29,10 @@ COMMON_DEPEND="dev-libs/libxml2
 	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	jpeg? ( virtual/jpeg )
-	new-login? ( || ( x11-misc/lightdm gnome-base/gdm kde-base/kdm ) )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+		)
 	opengl? ( virtual/opengl )
 	pam? ( virtual/pam )
 	selinux? ( sec-policy/selinux-xscreensaver )
@@ -53,20 +56,23 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xf86vidmodeproto
 	xinerama? ( x11-proto/xineramaproto )"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_prepare() {
-	if use new-login && has_version x11-misc/lightdm; then #392967
+	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.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() {