Old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 9 insertions, 172 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 004ebea6d152..763b44fe8328 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.351 2014/03/19 13:52:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.352 2014/03/19 16:18:16 jer Exp $
+
+  19 Mar 2014; Jeroen Roovers <jer@gentoo.org> -xscreensaver-5.22.ebuild,
+  -files/xscreensaver-5.20-conf264.patch:
+  Old.
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> xscreensaver-5.26.ebuild:
   Stable for alpha, wrt bug #499990
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index d67e686faef7..7d5ec8820242 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -3,30 +3,17 @@ Hash: SHA256
 
 AUX xscreensaver-5.05-interix.patch 1033 SHA256 3ddb5277929a9a3b65ba4a89cf59d3c2ffd3d51ce43f9ac83062afcd118d9f27 SHA512 61201dba2e4a1332db179f619452dedd67a6576f6002184d35109d25079c7a9b8a71267a0713c1c2d32a59c08867d2642edd9a1c22a39dd324b0be3fa3d13dd0 WHIRLPOOL e613cf264a4941d96bb7904fc42b44593cc28f9110c89e24d172965ad5d715c1a313aeae8c92188cf585d3490e224ebb7bbf1d3458b97e1f1ce30425136e3efe
 AUX xscreensaver-5.20-blurb-hndl-test-passwd.patch 359 SHA256 24d7f49d51e6a6150ded1fc4a3918df2555cea11938e26b677d1b7eb31f01c54 SHA512 546d899c49ad84d4552becc8a2a3237d8a62eff8408fc3daa97067805474431cc0cea0dfc2c2315deb560dacb310c94d4b6cbd455d783643df05bf438cc21de8 WHIRLPOOL ab66956eca22c7309562ea72ae2727ef41edbb388aba821e7a8a74beac10870af27a43b779b30dcc39704ae450f7991cf7585468bedc74c143733158704865b0
-AUX xscreensaver-5.20-conf264.patch 645 SHA256 8a06d52396c579c2ff3704eecd3635dcee488de740aa1bdb6a677cf564b0bf0d SHA512 53765feea44e9044368b98db9c57eff390e1f51a4581d417da58ffa1571ea7b14ecaabf5bdaff15b6add15042d8d116ce64df5245211e11a45a72941ec3d0df5 WHIRLPOOL 538174704008dc9cc50a58addaa8e668930f19c3935a5faa2b2c7104f2c678cb76f8b7c93ad0c4280756838d4d474493c18573f1fe723b3232da7c2fda61f298
 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.22.tar.gz 7411666 SHA256 47b703ed22dce46a08f11ddd7d67d52e4f7ad8df844bdf956431069a0db36797 SHA512 d78cc42d5ce792a43870f2186f0b842e3bdf01a0871b449f84287d81835ca3b62708f0e1bebb5e4fa1403009786b9a271f4ac36c2d4169e7456ce46639549ca7 WHIRLPOOL c454a5af3efdd9e19e61324be6c9e94e882608cbb4e64a6783a870d6a3a9178ff0962e75addc35c49ac02b66acfe06ea5c693e4e1c7a874754f0e638ba0e69e0
 DIST xscreensaver-5.26.tar.gz 8760550 SHA256 2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55 SHA512 2b14c7b64c13860b7cb7ca93ae5c28c787d3aa017f1d7185d93c3db0a52fea4f97fd2a79bfc0c5f657541417130587865e5f4447bd54983a59bf3db7e50a2936 WHIRLPOOL 576c21e35679356b21689dfdbcdda8538de24112767e83c0fbf85a6bca251f478acd15493a7548d6d712ba797421b16cd32759dce4a56dc9cc935f9b367f14f7
-EBUILD xscreensaver-5.22.ebuild 3490 SHA256 87fffcb672f16f1f00d754857b0bed10aed7f82534b8c0b0f49d394bb6cfef3e SHA512 83ee32fd7e36a0b58c096d85967c1be6a0b9a9301f2a08b6602c9f4c0eef426ac981044b1d57f8388bd823403b56a357c25125abccef9ee7adc6c3425b18bbab WHIRLPOOL 6be7dc588d174e2c1bbe3810c95850e0ca95e9fec83a6c64baeaa5ba305a8490782449b47d1b3eb99d368084752bd0a348642ad44425a799cb842da798b72b02
 EBUILD xscreensaver-5.26.ebuild 3441 SHA256 a0745469d64b423b034476aa11c06c6de2c5681572ca1fc0c55a77dbf6ca10d1 SHA512 2f8a0e753dab303f8aca2376da7e004339c55e2084767090d0317fd1bb42ecf4958321925751a1b2282575bf6f3b7d826a99afb5d0ded5ee35829a5d5d254714 WHIRLPOOL fd7ecc3854e4e0684ed70927a512bef4fdf942174e55c5d2b7dbcb6e7db2ae96f4b6f3efbca536063b3f90a1f7278ffd242e93a0a632b17c13f9de50f4f5c79c
-MISC ChangeLog 55712 SHA256 9b4b4adafe5c6e5ac2139ab7565975a45d6ef3da8558124be697a25d3964fe8a SHA512 ebecbf0c7551976162ef6e732afa0b9b8914963f8e1142d6f561f513ac0237d892cec9f6ebd04f9ae6e79728e876e5883d361726523245c78cffee20439ff9b2 WHIRLPOOL 60d3deef1691b4b6b536a2602dec65a2af8fc4c4f834d8832aa94f80c20992d6ce7822271e1decbd716ca477caa8fd31c500c62f8abfe4b780159ee3effb6b64
+MISC ChangeLog 55836 SHA256 375b3eae6933c63cfcc2125fac5953a32705f6aed4609e4d6e02ddfed69b9c06 SHA512 f8c7d841b324bb10b9c7a71a3a49c911e74df4f8e763e5348f243872dff774bf118afef1c252f70198b085ca69d98819b0803219034c08c78361fa6b0f96b77c WHIRLPOOL ef9da43bbf3ecfdadabe86f75903ed482f1593dcff647b662b034a9c7ed85b7d92789871432a8059e3429948318d12ccd81bae026b8e901472414f374ddc3436
 MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTKaE5AAoJELp701BxlEWf2FcP/2c1kyDakfD8YwUSjrqajxdb
-1mhaV0i9e7A0VLd1aZiK/eqEmEsk7a9wJTcnocvYo63cCvExxuP9g0MJ1HNiro3A
-4psCUflvtEy2+QgTIdCCzsyVXA6xMV8iQ0PyvdWZH/JCKmwBK5MHaXurRuvVd4n3
-i3Bi7rVvlW6FiJGrdpTECHibkk9RnG6zybdcPJ3ljdLs7pu9Kqf2n0eKeQaaf1sP
-4ix7ct1aqWxC+w9VONljsr6s++N/acz1zCrI5T3FZuj/2guWMG2wwmzXtKSJZN4M
-pnBHVot3abkx+Ld/nE//HoA+EexsVbXpNknh44Pe5bu6tUHu+rOSPm5HEQYdAg86
-stQy2dwrrCclUnVUSwv+Oh3X99BOlIjLq5cQqLwlgJL7qKPYGf6kQKLz69g7Sx08
-QpBG2W7xnrYT/X7Sijz8x1BTPLDuMKk7ptklzZmXB6vgLumipivMvOAUc/jLTtCT
-0Xqxn9rdCbraIXb77r49AuxsUjnfV+f8heRAHa+hYWMK2EDQbUso7DtLC8HI6oCz
-VR37+K6zben+AGfgR77Tzz8Pc51scZK7JKFgKcKgGvYyv6LbViGFCrsozrS2WCe/
-Hj1525wyUdf061vVJGdFVTkREQENzTaOoNBs4LQI1Cdh4n2ED4eFdgFN6iaMJW7I
-9ZwpqMy/SWT18KlnK3KN
-=oU5C
+iEYEAREIAAYFAlMpw0oACgkQVWmRsqeSphOO/wCfT7keJBF81gJgIbIB+bl4XU5r
+IrMAn0qyxLDXAtN79uhAqXTybhmlJZH+
+=SUzK
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch
deleted file mode 100644
index 77c5521bcb23..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.11-conf264.patch
-
---- Makefile.in
-+++ Makefile.in
-@@ -99,8 +99,8 @@
- # or later, feel free.  Personally, I can't be bothered.
- #
- configure::
--	autoconf263
--	autoheader263
-+	autoconf
-+	autoheader
- 	@TMP=configure.$$$$ ;						     \
- 	echo "munging configure's --help message..." ;			     \
- 	( perl -e '							     \
---- configure.in
-+++ configure.in
-@@ -315,7 +315,7 @@
- ###############################################################################
- 
- AC_DEFUN(AC_PROG_CC_ANSI,
-- [AC_PROG_CC
-+ [AC_REQUIRE([AC_PROG_CC])
- 
-   if test -z "$GCC"; then
-     # not using GCC
diff --git a/x11-misc/xscreensaver/xscreensaver-5.22.ebuild b/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
deleted file mode 100644
index ad9c9ecaa6dc..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
+++ /dev/null
@@ -1,128 +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.22.ebuild,v 1.12 2013/11/23 13:31:33 ssuominen Exp $
-
-EAPI=5
-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() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	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 BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-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
-}