Old.

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

4 files changed, 9 insertions, 168 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index a211fc80594a..614be982e528 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.395 2015/03/03 12:18:38 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.396 2015/03/05 08:44:37 jer Exp $
+
+  05 Mar 2015; Jeroen Roovers <jer@gentoo.org> -xscreensaver-5.30.ebuild,
+  -files/xscreensaver-5.29-pragma.patch:
+  Old.
 
   03 Mar 2015; Yixun Lan <dlan@gentoo.org> xscreensaver-5.32.ebuild:
   add arm64 support, tested on A53 board
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 0f9bf2abef00..51a742ebc5ea 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -7,28 +7,15 @@ AUX xscreensaver-5.20-test-passwd-segv-tty.patch 412 SHA256 6abe35c0a28f7cb7aa9e
 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
 AUX xscreensaver-5.28-comment-style.patch 698 SHA256 d219ece42590e79f0f958312ec83fd4afbb3fdaf0a2e87a7fee85185d89a57f7 SHA512 e6c6a3200ffbec930df9cf4974f109cddae2faf43e95797336c3ad17d4867629c5b15c05dbdd547d22083da096ef55efd15c3d22c26feed92ad3b886651d740c WHIRLPOOL bdb8a8626cd7f48760be61d509b092d1f01f9e892144eb6c4569b060bb506b64080f2a77f9ad7317729e0a3022124ad61e129c3839a1b3fb1a3ebf1cad37948c
-AUX xscreensaver-5.29-pragma.patch 504 SHA256 73363c3917a0c81e122348eccf187a15c7915904e87b8f3dc24d6c916965c2a1 SHA512 fe61bb9b9f75c850f9f53f8b2891630ca1017ba8ad8ffce5ad05719f4a02081c48abe7c4874abc6b9fa5f2737787563ef8e704dd12df06089b99b79d7d9ea522 WHIRLPOOL c33d396db5a8a644a1f342c4f293ba8ff86d4f2b9f51db41a38b115f1217cc37bea4eda902f6df4ef0563183eedb5392e6e538ee0ea9f1182358310a78e5a7a0
 AUX xscreensaver-5.31-pragma.patch 442 SHA256 ee39c6a23c7452aafac4b001c157ae915c316028f6db2e739ee9ef78c5b4f157 SHA512 9aecda422bc0f22bab5eb0de22f1c861b9ed1a2ff4fff2327bec134fafc5e3116156d80a70e81b67e9ce7ce05eb6f842614b2e939cb91a618dd0b10e1d443557 WHIRLPOOL af5f5364cd24b501cbbf24a1add0941af518392f670c0ca5e0d014edd71ced036fcd804a33ddd55c3f0f787bdae12fde840c3b979eb66e78908e7139ba1749d9
-DIST xscreensaver-5.30.tar.gz 9555281 SHA256 3771176876a402738e0f91dcb3654b57cfa430cf90d3413a6bad5daf1d085d52 SHA512 50c0d2f8598bd84130d277a7fe43f2d1e48fd093767a97029e8c91d262e00b49520f4c94820ae0b7a80ae301cd12eb2e39c9197020c594f374b80b8881fe6a6e WHIRLPOOL 8bce2c8b6d1577859635bcf94b7256a05f803b0f0bb9571f5737f2ed78eee428dfefc494c76784e61f0c2c81d1e38ba78f8eb5a5078c139ff545e0de659bebda
 DIST xscreensaver-5.32.tar.gz 10571502 SHA256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd SHA512 0d7f3d283998cdb2aec10c8f5e94c9cc6e28a72785c36759cee988f3592a5f8aae20ba593c8363eab8fe61f7caf325376a887cac42ecf300c60894bf20d2f75b WHIRLPOOL 1a99e36ac89cf7f3121d499da6bf06e02808465b7b500e0fc371a97df0d8e1b729bc20c57cd7fe560e151e1051e46dafc0b034cf72c343a185b1fddcf8fdb749
-EBUILD xscreensaver-5.30.ebuild 3560 SHA256 139a7e3cdf285162e35f56ea0be0e6c4a91e2374278ab8605ba877e44bd80354 SHA512 d55db399ab474e39992ad0b49508b4841ceccb316ba0167978584e30b25b2eb8652cfca33d0bcb4d28b44191361a052386c4fd431e3ed7b5198967a72ec6a63f WHIRLPOOL 16f5e166132ba38988b37a7fd4ef9cf1daae70f1cc5ccd8a5cc36be217437c1f8f036f47693795fe178f7498a1a41bff8521bcec4b511545f2c2c1b7afaa8b59
 EBUILD xscreensaver-5.32.ebuild 3582 SHA256 7669b2829fc6f26f90fa9d5c1567bf356f731019935776ad11141a2b27f4c98c SHA512 3cc6eb6699098e06e183a4be79676aca34bdfbe63f361d133a64677fbf81637dab35911c41510482a5475c8ea44616f83fa4d84960ff2bc755d4630942ea8249 WHIRLPOOL acd67526647ad56df7769ce8ee58e904ec3151e91627376a0b432eb66cb92f6a27899b16c9230a29cea4c55c6c5b17e3575119def6374a9a06b4abd224ee86f2
-MISC ChangeLog 61110 SHA256 59aaad70a52ba24f0acac0353805153b96f821ef1eeb712042d714d9d745b98f SHA512 67d9e3dafef89927037b0a0bdda34281d4d3734cf5b1a2b1452e8548a643740664125df1dffaa530b6618e0858b08c1686826eff76e6fc9ba943baca54eccafe WHIRLPOOL 7fb916841c3de6922e086d1744ad14e215a21bb3c0670b8d24721fdede1ed0d87a891c124155b0a6994b3a40ffe141a94291e4ae0cc4e40a2b49e3463c5a83aa
+MISC ChangeLog 61232 SHA256 1e9fee312c037b9171d0136173a9d7d76827f0217ac61129e5ae0cd943a166b9 SHA512 485dea7b041dcbd007b3607a60b23b1ed2dc8c6e4641217ec39963889797b7e86b846860d542aa626a1bd37599d521fe9f3fdf0c8bbf81e20f07dc01f42adcf9 WHIRLPOOL 17a1aed29f1d7eaa7bda2b57bb05f4ac246cf6eec356776eaa6a229bdc9df5c999c0df237a26d68975bb9ba174f2da1304f81d67734d5ea68e45c1b9c66e8ecd
 MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9TXLAAoJEJIMDbyqvv1VMf8QAJiPyWZy3dZPjYFREYn+0Nrn
-PBCUohAimsipz/rTsdtapSYPu1DPAWVcGA11HzX6h8+bMbQo9O/5yVP7ju4gTgTO
-RjOYnNZY+qKeS9V3huoN+INJy96/Tj/2bQA+Tr0tPVlaJvoSiAyQXaXHnSlDeyn0
-8Dl2JGhlA6VGKOIhuXOvKDEPn/iqBwdtnFFLhGlk0GoVHsqhpw971rAHCXtSVs8Z
-PGX/RbbGaauS1wguVCO2+asJFzBklC4saJo4u7d7osU3sfeOPpuDqaSZCmTSKEH9
-RHzQJTPIaJjF4GGnbHF/3GLmgQd2dEvdDM/j+qYZFyh6cScEL2RqZQFNWytWRLhD
-RXISXz43eI5s6hvOW4uV7c4buIaQetIYGZnIQ3I6T4Xqd+spHM3054y1c5tQ5250
-zY52W3SoTfK6qZ/XjMl1GtLe5Qigyj3zOBGC9dSvlxtapZvZFwyIi0Zldev/Jgds
-ausFecWqUi3N5Xg/gxjot1Czg+b8F9W17bH29AngxC0rbQ8wLEYvSO6IGWZC82DQ
-baOwvfPMsn2ZLwGMCxLsfQ8RJkAKGUUtps9EWjhgqZ2FRCGH2DC0L4wvz2q4RQgp
-erp8kFn/VafWRvtQ1qNcSYlAOdwH6jma9C4cv6/1OS1PyEHysGB+I/paVzL5bKuX
-/jnWq0BXbgzAkGDNMyw4
-=M7mE
+iEYEAREIAAYFAlT4F3YACgkQVWmRsqeSphNT8gCfeWZpi06h+EegEDvZCAsETvol
+moQAn35qGZxVJbebrgWytPU5jNwBGA7r
+=3mvH
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.29-pragma.patch b/x11-misc/xscreensaver/files/xscreensaver-5.29-pragma.patch
deleted file mode 100644
index c5245f0d2e03..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.29-pragma.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hacks/memscroller.c
-+++ b/hacks/memscroller.c
-@@ -349,7 +349,7 @@
-          from earlier days before the advent of virtual memory management."
-             -- sbrk(2) man page on MacOS
-        */
--#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
-+#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) /* gcc >= 4.6 */
- #   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #  endif
-       himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
diff --git a/x11-misc/xscreensaver/xscreensaver-5.30.ebuild b/x11-misc/xscreensaver/xscreensaver-5.30.ebuild
deleted file mode 100644
index 5c028c1229e2..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.30.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.30.ebuild,v 1.12 2014/11/29 19:51:32 maekke 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="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	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 )
-	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
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	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-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.29-pragma.patch
-
-	epatch_user
-
-	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
-}