Version bump.

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

5 files changed, 15 insertions, 193 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 1f834ba2d25c..c1be221fdac5 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.357 2014/06/05 21:59:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.358 2014/06/09 20:05:10 jer Exp $
+
+*xscreensaver-5.29 (09 Jun 2014)
+
+  09 Jun 2014; Jeroen Roovers <jer@gentoo.org> +xscreensaver-5.29.ebuild,
+  -files/xscreensaver-5.27-comment-style.patch, -xscreensaver-5.27.ebuild,
+  -xscreensaver-5.28.ebuild:
+  Version bump.
 
 *xscreensaver-5.28 (05 Jun 2014)
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 7c68ec68457c..511a2a9e8d61 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -6,20 +6,17 @@ AUX xscreensaver-5.20-blurb-hndl-test-passwd.patch 359 SHA256 24d7f49d51e6a6150d
 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
-AUX xscreensaver-5.27-comment-style.patch 1054 SHA256 e090114eb551ca5019f82985f36437e596c27f432e7f9df3cbd97fc1bffec673 SHA512 4ad88ab72f27ded79e7052856ce732715ce0dd7af26856467f0af32ed0917b7f37c063e225437daa4841741d7af2339c33efbf1b6f6f7783c534e34945bc60c8 WHIRLPOOL 8adf54e21c1ed76ee6c8d5ea3f4504219a65bddeb61a1c8c50520732a26ed3a2f057fd6540df00a2999b6cb081160a4b25b9ccad8d4fbb80b6f0123aa42f354e
 AUX xscreensaver-5.28-comment-style.patch 698 SHA256 d219ece42590e79f0f958312ec83fd4afbb3fdaf0a2e87a7fee85185d89a57f7 SHA512 e6c6a3200ffbec930df9cf4974f109cddae2faf43e95797336c3ad17d4867629c5b15c05dbdd547d22083da096ef55efd15c3d22c26feed92ad3b886651d740c WHIRLPOOL bdb8a8626cd7f48760be61d509b092d1f01f9e892144eb6c4569b060bb506b64080f2a77f9ad7317729e0a3022124ad61e129c3839a1b3fb1a3ebf1cad37948c
 DIST xscreensaver-5.26.tar.gz 8760550 SHA256 2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55 SHA512 2b14c7b64c13860b7cb7ca93ae5c28c787d3aa017f1d7185d93c3db0a52fea4f97fd2a79bfc0c5f657541417130587865e5f4447bd54983a59bf3db7e50a2936 WHIRLPOOL 576c21e35679356b21689dfdbcdda8538de24112767e83c0fbf85a6bca251f478acd15493a7548d6d712ba797421b16cd32759dce4a56dc9cc935f9b367f14f7
-DIST xscreensaver-5.27.tar.gz 8786914 SHA256 54bbb1f2e57271b388fe585d56ef85c974c0bef8d133012ed63cd1da1b450d12 SHA512 72f25ac30b13a7c416744f1b99366c0408e8b32a3e790f17b129cc4e9092c77b31f07080c096876ddaca98e12dcaa07388f69e9645ed5757d8c19ab589ffd68d WHIRLPOOL 4f7f0bdbd45c4a2a8cdf3bfd763693a1eb61ff9efc054a5591c60d0f4cfc7c25caa879029096e3269cbc62b008badd6bffa4f6565004b8c8a96c818be5073bd5
-DIST xscreensaver-5.28.tar.gz 8774211 SHA256 99c4cc8e66ecc4cb7e9be92bf3f38b045538d58a9ff8b7c30ac1f0cd793dc1c9 SHA512 4301486f2788efdab2306016cff070b5ed9448bcc6fce75561089868840f4e8ea43dd68c1b1b984f464ea243e7a10441ad4132dce871709a5625e65b68a151ac WHIRLPOOL 88db20a90cd49a26fbbd05e86b1b3a108ac1507ead99c6c614ffef200b30f69da62e5f5c259ffe75caa6af1694e0ab46b1bb04e18ac392c1d9cbd07edf0ce7bf
+DIST xscreensaver-5.29.tar.gz 8774562 SHA256 c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294 SHA512 4eff49f58f9159d86ef765a6e5c3355d1d337237cd938fa5c486cb2b019acdf231047e8f51425b9658e7447023d2a71d8d790ee8205f9faa0c7525a2e3af320e WHIRLPOOL 7f635083ee040af26bc2b1b6aa333b4fb3f0413dcec62f25466c76a3d0ccdc1dbcbd86250fe669cb0af5681a233d81cb536f6fc01081eb99969bb333f2d33951
 EBUILD xscreensaver-5.26.ebuild 3441 SHA256 a0745469d64b423b034476aa11c06c6de2c5681572ca1fc0c55a77dbf6ca10d1 SHA512 2f8a0e753dab303f8aca2376da7e004339c55e2084767090d0317fd1bb42ecf4958321925751a1b2282575bf6f3b7d826a99afb5d0ded5ee35829a5d5d254714 WHIRLPOOL fd7ecc3854e4e0684ed70927a512bef4fdf942174e55c5d2b7dbcb6e7db2ae96f4b6f3efbca536063b3f90a1f7278ffd242e93a0a632b17c13f9de50f4f5c79c
-EBUILD xscreensaver-5.27.ebuild 3671 SHA256 6c14d737ad8c7e59190107f78880ffc5b3002fa89c510414fbab47448f256cae SHA512 3053983333a05b57bbe1c1b638effe5ec6f86c084c270a17c968c133c0c380fc7f94471ae72882dfc5d31ce76e683e79faff575a0c62dfb0e14304c83cc759d8 WHIRLPOOL 99e043b949da7d6b044da0e62d56d1d4f7b57644822ee60546ac66b28986ccfaa3b785f5724e1a109fe946c6da9f6977fb39108e75fe78ca0308a4182c52745b
-EBUILD xscreensaver-5.28.ebuild 3671 SHA256 f3e1542e4bf3c9f2354740e79a2268d1b424e4594c2d220fd40f194b5a3b088a SHA512 43e101047de6e30cdc02e53dd9ea979914e4b033f69f181ff6deb53c4796c951158426b7a0561bb171c04935211fb681d147ebbcc43e37375e0894bafd320797 WHIRLPOOL 89ca3103436524b6d3be0216a79a9e4b9db12818c0530a7c52985306c6b6864d2e994f7f051fd642607dc53e5a65f295fe0c182b422794a18fad9d825645a266
-MISC ChangeLog 56484 SHA256 0055ce6e6aac27f2f3dcef931102fd719f92ff71068921b194ead027e63848e9 SHA512 e8d783689562dace53132172f41f0314b22d62ca79616fa1dae32958df4739b5493f44a3cc2683dc82bb5c12186409774c39da856be98a0fe1ad493d099cb797 WHIRLPOOL a636af830e17c2e406b0b334bf459ece2cd1d9f53d3fb4293932c6237a497efbe4385aa492367afb71d799206d3d9adf528819fe697deb7fd00a5b4e05215a64
+EBUILD xscreensaver-5.29.ebuild 3522 SHA256 1ad4fe7be5a7d1291a27761b2a039b5477a680173243114aca8ba5a194f7794d SHA512 6fa4545bc78fb32c6750e7da6aeac122c3c12a85af3e5c46aac39faa98ebb098fffb6161c03f949ee6132e1599b6cc8a681f3b42c99ce0c6b583de3253e55d62 WHIRLPOOL 81d83d29b1a33e8397d4f59e158902d62de4f6f01d1f9f52b1f40cfcc5cb5d27770ec319225020ccfcf37979ffcdc1fb42a998b0a4986632c93595270b243a4d
+MISC ChangeLog 56713 SHA256 9f8463b49660a1cbad7368e7e8e9ea19143b1a2b2e98f2f6e1707cabba7c5c44 SHA512 5e6e7ad7a731badcf94b4cce9054e1ce31a9b81cfd609d4e46b14e936506ea04338d07c132e762bd1243d4a7182ec6968aa59e7739e7f77304daaa387a2c3203 WHIRLPOOL 24562cf1cfa77a434a5d527a166fb728f311aaac827f11619b11b20ac56c476f3fac1856b84dc3c8f0d3e96f8ee28d359ef94345c23f530d62a6528bc15c599a
 MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOQ6FwACgkQVWmRsqeSphMNUgCeJAh9WDqhu0mmT9A33a5sC4Dm
-5r4AnRjDNI8aqFSXZ+UZ3dLYI46kgQU7
-=bYm4
+iEYEAREIAAYFAlOWE3cACgkQVWmRsqeSphNY8wCfYIDra0eKDWvhIvQn8x0h4sXY
+6VcAnRd/kXUHBgqnYRG8SFFQQPhUa4DF
+=CHJY
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.27-comment-style.patch b/x11-misc/xscreensaver/files/xscreensaver-5.27-comment-style.patch
deleted file mode 100644
index 229ac715be81..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.27-comment-style.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/hacks/delaunay.c
-+++ b/hacks/delaunay.c
-@@ -87,9 +87,9 @@
-   dy = yp - *yc;
-   drsqr = dx*dx + dy*dy;
- 
--  // Original
--  //return((drsqr <= *rsqr) ? TRUE : FALSE);
--  // Proposed by Chuck Morris
-+  /* Original
-+    return((drsqr <= *rsqr) ? TRUE : FALSE);
-+     Proposed by Chuck Morris */
-   return((drsqr - *rsqr) <= EPSILON ? TRUE : FALSE);
- }
- 
---- a/hacks/tessellimage.c
-+++ b/hacks/tessellimage.c
-@@ -507,15 +507,15 @@
-       out[i].p = (n > 0
-                   ? (XPoint *) calloc (out[i].npoints + 1, sizeof (*out[i].p))
-                   : 0);
--//printf("%d: ", i);
-+/*printf("%d: ", i);*/
-       for (j = 0; j < out[i].npoints; j++)
-         {
-           ITRIANGLE *tt = &v[t->tri[j]];
-           out[i].p[j].x = (p[tt->p1].x + p[tt->p2].x + p[tt->p3].x) / 3;
-           out[i].p[j].y = (p[tt->p1].y + p[tt->p2].y + p[tt->p3].y) / 3;
--//printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);
-+/*printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);*/
-         }
--//printf("\n");
-+/*printf("\n");*/
-     }
- 
-   free (vert_to_tri);
diff --git a/x11-misc/xscreensaver/xscreensaver-5.27.ebuild b/x11-misc/xscreensaver/xscreensaver-5.27.ebuild
deleted file mode 100644
index b75c23ad034e..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.27.ebuild
+++ /dev/null
@@ -1,138 +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.27.ebuild,v 1.4 2014/06/04 12:25:09 jer 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-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.27-comment-style.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
-
-	append-libs -lpthread
-
-	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_compile() {
-	default
-
-	intltool-merge po/ -d -u \
-		driver/screensaver-properties.desktop.in \
-		driver/screensaver-properties.desktop || die
-}
-
-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.28.ebuild b/x11-misc/xscreensaver/xscreensaver-5.29.ebuild
index e0cc8f55abb6..19d1af544791 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.28.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.29.ebuild
@@ -1,6 +1,6 @@
 # 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.28.ebuild,v 1.1 2014/06/05 21:59:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.29.ebuild,v 1.1 2014/06/09 20:05:10 jer Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib pam
@@ -118,14 +118,6 @@ src_configure() {
 		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
 }
 
-src_compile() {
-	default
-
-	intltool-merge po/ -d -u \
-		driver/screensaver-properties.desktop.in \
-		driver/screensaver-properties.desktop || die
-}
-
 src_install() {
 	emake install_prefix="${D}" install