# 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.380 2014/11/11 10:47:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.381 2014/11/17 12:19:38 jer Exp $
+
+*xscreensaver-5.31 (17 Nov 2014)
+
+ 17 Nov 2014; Jeroen Roovers <jer@gentoo.org> +xscreensaver-5.31.ebuild,
+ +files/xscreensaver-5.31-pragma.patch,
+ +files/xscreensaver-5.31-uint32_t.patch:
+ Version bump.
11 Nov 2014; Agostino Sarubbo <ago@gentoo.org> xscreensaver-5.30.ebuild:
Stable for ia64, wrt bug #525680
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
+AUX xscreensaver-5.31-uint32_t.patch 197 SHA256 61d82c993baafcbfdd848320b12b937c1642b96ba902097984844519ebbafd82 SHA512 b73da3151b7ccb21c6de536142c454680483030a64effeffc6df037ed2743887a2fe7f04917bfdebb7abd08a11b9a9ee7b3b6c7d37cf5d9ede1c0cfa778bc76e WHIRLPOOL fe07d98c7bf9580ce9313be860e5dc4a54ecaf4f4ffb51dabcda33d345e3319f45a87c75d1570327d4239803c2a70098dce9e144f9049b1e1138fc991a7413cb
DIST xscreensaver-5.29.tar.gz 8774562 SHA256 c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294 SHA512 4eff49f58f9159d86ef765a6e5c3355d1d337237cd938fa5c486cb2b019acdf231047e8f51425b9658e7447023d2a71d8d790ee8205f9faa0c7525a2e3af320e WHIRLPOOL 7f635083ee040af26bc2b1b6aa333b4fb3f0413dcec62f25466c76a3d0ccdc1dbcbd86250fe669cb0af5681a233d81cb536f6fc01081eb99969bb333f2d33951
DIST xscreensaver-5.30.tar.gz 9555281 SHA256 3771176876a402738e0f91dcb3654b57cfa430cf90d3413a6bad5daf1d085d52 SHA512 50c0d2f8598bd84130d277a7fe43f2d1e48fd093767a97029e8c91d262e00b49520f4c94820ae0b7a80ae301cd12eb2e39c9197020c594f374b80b8881fe6a6e WHIRLPOOL 8bce2c8b6d1577859635bcf94b7256a05f803b0f0bb9571f5737f2ed78eee428dfefc494c76784e61f0c2c81d1e38ba78f8eb5a5078c139ff545e0de659bebda
+DIST xscreensaver-5.31.tar.gz 10569562 SHA256 3fdcdec0002825fe5f1941d064b1ed91ffecfef4b43a09cb82dcd75d8212bb67 SHA512 d06e8d1b6b8393c7d3f285ee5ad3accb7961fa19c6a9d4719aca9c1f42dc67dd8c06bd0423fab535ce7819eb8566377fcba4c521acec0f3ba21e5ba05d241dd8 WHIRLPOOL 09ee886d399809fb5e37beb7addb5488bbf042ecf9501b7a75a0aa93c9b191bf39b323e6bca29cd4e654314ac91d70f9c9f1c362e33fdf86a312493cc08feee7
EBUILD xscreensaver-5.29.ebuild 3549 SHA256 90bca61b71472f85e104f07624ae0d367780d6ff3ff6ff56fadaffc3dd76f543 SHA512 9c6d006e5f1fc4efc98916171d63c25e7f8c1562fe0bb96077e0bdfb0ce68272022905dccafbd44587046759c37d8a5829759c8a85a3ca439ccbff95d041afd4 WHIRLPOOL 5975d01b05dcc4e4686437566d1c8cb9e67d2abe3bea1e70ca8e24bb477a920955a275e63b46c564fa24128a240cea0f517c6de01582238bcf919bc4fad8787f
EBUILD xscreensaver-5.30.ebuild 3558 SHA256 926dce56b76146192c62dccca826f6810950b8048de024c2d56a080581d18ca2 SHA512 b63c5175e42031cf6a4a35f9f34c2af8e00d4ba1f975f1cd6c49b82476b3d747fa6065b0d09799b6f0ffe787d3265d739713a9c8f1486ebe7e55bd826c06664b WHIRLPOOL 933d86975a94bab5a63b1cefe4e8819b3a1c228b9a386fa5861f6c53781f46822c8ca1e57c98cadf3e6a2d3635a67de00f58ca9ce3c50cc005974a90acaf726c
-MISC ChangeLog 59290 SHA256 92255741e8884d787d57440aba5442c093ef577081e8ebb8f1b3bffb0b92359e SHA512 6a82a8dcd86fc524d248dc9afdfa98b5ba5b4ac08d0458dfafd7ba561c2acd8c50f0b3d61aaeacc6be625330ede81b871c32115c51ba93b1fc5afa57b137d56a WHIRLPOOL fd34fc2fae82c69f4fb894d2d1562d3a9d2a2e7f5901a828bdb9abeac775989ce52db87d2dd76dafb44eea8c007364abc43798e6b65ccc99b8fc930ca25205e2
+EBUILD xscreensaver-5.31.ebuild 3609 SHA256 87f06e4188701e0706fccc3e773dc7018265695229e80cab2b4616948f4cc44c SHA512 6f131d696a416e645b7a945fee1f284ee7001f43565ce150bfd23c5c188067fe61991f60026bd7317af3a3d3945b38d37c3f80c37838922377675ff6639a705e WHIRLPOOL 9a42d15fe562102dfe43d5cdaa18624c9ee5be8255b46e7310c7c72abce2d5432a1387fc78cfca57f619f3a13c91fca2313a30ed166dd207afe5bae56881c189
+MISC ChangeLog 59499 SHA256 9929bb39210df8f2e6ad10d814f4b8b5b995fd962abd0488dcde3a6cd1594244 SHA512 9a0cac5defa9f86379c7d49477b4c26eac4152bd752c6952241f8c3f031ca8e86a7dafa0b4c2d92cb13f17eacff3d01ad8015327ca1596a1e699480cc9f9345b WHIRLPOOL d79e4a6910f9f6a8a92da0692ab7a0f6e72ae03f92fdff6041ddf3aca35e1e04709b4d4360f734bf590a08d14aa191d28c2000cf5f9f4b6bd8625b248c2094a0
MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUYek5AAoJELp701BxlEWfRnkQAJ1s6fecU/yAPxuPEsclj8eQ
-QDNq7gW1Za4SZQ0KtslMuJqonyfZuwNz6k80wtNLDru05Su2sOlKUng/cAGGe26/
-hmnP+9ci4yaKx3Po4axGv9gl8sYQ3asV1MHEd0vV8Ubchls2iBXoEBI/sEGWIn51
-GMEvS0C1lnEpqeO/KNs03tlnAeCkWxu9uvwBgtgQ5yBiJqX2PpcTizzPfIX3Bwhw
-JxFnDVyb3rga//2VYqyaa/4iE2D+i6BgPBrCrJfva2IWvR3pCch8nBwIZRyym559
-ifMBldT7mmqdtnX6I8i9g3n1g93rUshqEe7PSG31+oM3zuQGUSEInPlREbZJ+p90
-urocXPQOJVFm8NF84+IijE1rxhja745axOWgHdNUggFbMUvyXB74aY5bE8sNlW11
-UIxxCcxG8FLhPKiTnHonKKLawqd5h3qny90qOBRyZcaq7Ni89dAZVktHWYV2PYMF
-KgzI1yOOEjlKrl2Phb3W8hOZwqqPpXEPATSLJ3ViKheQobwBGm9QSAMNrc1QT8I1
-66N+GIfPy6WFljT6PpCmNspa1wHo0a9/xLZTpGh5ubfLtFM8xEHYAYXUrGVwXnFc
-F8KI+l8zAlVdcKPFQDiFNkYgolLpxW0UtsrJxnDsi1O29Orv3/+muqoAV0uWagf9
-ISVwBXW377pGcszZKz/q
-=EmRI
+iEYEAREIAAYFAlRp59wACgkQVWmRsqeSphPLkQCfUpk03lGnFp3MuVg7Q1LoYa1W
+eGgAn2y4I7nGgEXlo/4kNS17qOAhlvyT
+=wy6m
-----END PGP SIGNATURE-----
--- /dev/null
+--- a/hacks/memscroller.c
++++ b/hacks/memscroller.c
+@@ -307,7 +307,7 @@
+ -- sbrk(2) man page on BSD systems, as of 1995 or so.
+ */
+ #ifdef HAVE_SBRK
+-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
++# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) /* gcc >= 4.6 */
+ /* Don't print "warning: 'sbrk' is deprecated". */
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ # endif
--- /dev/null
+--- a/hacks/binaryring.c
++++ b/hacks/binaryring.c
+@@ -23,6 +23,7 @@
+ * implied warranty.
+ */
+
++#include <stdint.h> /* uint32_t */
+ #include "screenhack.h"
+ #include "colors.h"
+ #include "hsv.h"
--- /dev/null
+# 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.31.ebuild,v 1.1 2014/11/17 12:19:38 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="
+ >=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.31-pragma.patch \
+ "${FILESDIR}"/${PN}-5.31-uint32_t.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
+}