Version bump.

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

3 files changed, 156 insertions, 5 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index f2e6a2428fb4..75ab33c21f19 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # 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.369 2014/08/22 18:59:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.370 2014/09/11 18:08:16 jer Exp $
+
+*xscreensaver-5.30 (11 Sep 2014)
+
+  11 Sep 2014; Jeroen Roovers <jer@gentoo.org> +xscreensaver-5.30.ebuild:
+  Version bump.
 
   22 Aug 2014; Jeroen Roovers <jer@gentoo.org> -xscreensaver-5.26.ebuild:
   Old.
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ebbb27afda06..f2747ce449f8 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -9,13 +9,16 @@ AUX xscreensaver-5.21-gentoo.patch 3109 SHA256 05edd9c8a57c441afd317fd4c40dbfc76
 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
 DIST xscreensaver-5.29.tar.gz 8774562 SHA256 c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294 SHA512 4eff49f58f9159d86ef765a6e5c3355d1d337237cd938fa5c486cb2b019acdf231047e8f51425b9658e7447023d2a71d8d790ee8205f9faa0c7525a2e3af320e WHIRLPOOL 7f635083ee040af26bc2b1b6aa333b4fb3f0413dcec62f25466c76a3d0ccdc1dbcbd86250fe669cb0af5681a233d81cb536f6fc01081eb99969bb333f2d33951
+DIST xscreensaver-5.30-demo.glade2.in.gz 9951 SHA256 7cba9dc4a226188425b41d138e5b4cb8330f31cd1b552796b72e08b49477cc52 SHA512 094aa7beb13040ad2a04662eb1db1bb707378cfb73335c9193908281dca8c99c75c3762561c17f9343e97947f7549bb08acf9c38cf875c9067d73995cd9b846a WHIRLPOOL a86820a4fff678570e6ef130293e4ef40c16befe2fc943e077b2bd6bc2cf4a5802a5c5d6ac60591d2a820fdca5e0c36f17e324336d05ead61296a15d8dc5afc1
+DIST xscreensaver-5.30.tar.gz 9546797 SHA256 aaee8cbbb4671946b0c2cc2d4ad798ec638f65e6597ee6d0acf1bed591388e8a SHA512 b888da3cb7ea5cfd80bfa60dcea116142d21cf4768529fa643442ffb7bf0efe6e73c03de6edd62ee5edee02eac78229d283b0dc78f58772d086f7234658b67f1 WHIRLPOOL b98b76489a54087968024e2db239141f1feeda0cc62e698dd0d7f7c42f75d08710375c708921528ff3b9b927619c7cbc8ff31d53e2fc5ae593a1b9d50ef4136a
 EBUILD xscreensaver-5.29.ebuild 3546 SHA256 17456efc14c12e1bad1979c914eb5fb35a1ce926138c0180bc1d77a05a8c150a SHA512 69557be098f2452db844616eb867f56f61711a3136a552d7ca0282085d4a35cfbb6a9b1469182c873f04aa692649acbbbc653bcbe8ba5a136bcd0783a8160d76 WHIRLPOOL 640762c0d24e4448ddd242973bbc57b42e41a50937408cc91ed2bc52e0c58f229fd3ec3464f5963c189daa43cccb3726a29ded842f72658ad5ef2f056dfde1bf
-MISC ChangeLog 57989 SHA256 6db8923a338db4ab72eedebc197f33045f1295435bab1cbe7dab8fb0106c5eea SHA512 7d452b1e06588c246716b5dd2936d79e035d8056132a80fdac301fee1190d14db7db3d1fec4b792a3485d7d52925b52073fa3056be71b0d3610ce8756ff3d2bd WHIRLPOOL ee35c1e5471f3fa991944a696d54e50bd0fa055b9d9d71850d652140137834b6f36861bbecb620b8d82672ecd2e59a40c58764bd997c39acf3ded0982741d3b3
+EBUILD xscreensaver-5.30.ebuild 3777 SHA256 b4c33b003118f6585866410b31610a40dbb50e80b875a731bfaa486b6ad861f2 SHA512 ef16820b85fbb4858ef0bdfe4a459b6db93db24fcf1a228bd4a75411364bada9a1d8988d126e3bd401342394f5b8126bc13a94ed2c285f821100179d7b1e5a43 WHIRLPOOL dd806f3fb56cb01e26e623459d857ef2963c9cd59fc4427a888117d360aa69cb00600b808a8f7a9a623274cce5229491bb0ead39b669d01e19edc6bb88e43012
+MISC ChangeLog 58114 SHA256 8978e9d3e513a2fb201e38708e1ccf68a8082b0b63192d44d5a17e2801c6fc8f SHA512 4488a89fb000bc5a622cb4e91de6b90aac792e854bbe569c4dcdced6674172c2b5934fe247e1175574c9e43f21aa24ae833d6cbdc8c486b0afa668038bf26c55 WHIRLPOOL 56e6ce5e11f968bb40d2634254388ee28028762384262a4b0b24259229ac5da589115dc07373c31bd47de58fc1f534f56bdea923f1d0b042b86887c0b67e287f
 MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlP3kvwACgkQVWmRsqeSphNO4ACbBGoWLYj8JQwLUTPtjOscfjPp
-+QcAn19mvf6Wvfye281CiGRJQTOKCoyd
-=U+G2
+iEYEAREIAAYFAlQR5REACgkQVWmRsqeSphPtaQCeIV1ztle6QVDYGf/5SX/uK+qW
+Uh4An1OHRpeTr8K+1aFc4fzwAiklBlAr
+=qB46
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/xscreensaver-5.30.ebuild b/x11-misc/xscreensaver/xscreensaver-5.30.ebuild
new file mode 100644
index 000000000000..8cf2cfd88260
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.30.ebuild
@@ -0,0 +1,143 @@
+# 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.1 2014/09/11 18:08:16 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
+	https://dev.gentoo.org/~jer/${P}-demo.glade2.in.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 )
+	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
+	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
+
+	# the next version should include this file, so remove this when that is fixed
+	mv "${WORKDIR}"/${P}-demo.glade2.in driver/xscreensaver-demo.glade2.in || die
+
+	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
+}