Version bump.

(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)

7 files changed, 227 insertions, 1 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index bf26be15586c..da12737e5c81 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.315 2012/07/27 18:27:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.316 2012/10/21 10:39:23 ssuominen Exp $
+
+*xscreensaver-5.20 (21 Oct 2012)
+
+  21 Oct 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xscreensaver-5.20.ebuild,
+  +files/xscreensaver-5.20-blurb-hndl-test-passwd.patch,
+  +files/xscreensaver-5.20-check-largefile-support.patch,
+  +files/xscreensaver-5.20-conf264.patch,
+  +files/xscreensaver-5.20-test-passwd-segv-tty.patch,
+  +files/xscreensaver-5.20-tests-miscfix.patch:
+  Version bump.
 
 *xscreensaver-5.19 (27 Jul 2012)
 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
new file mode 100644
index 000000000000..bfd48d1cc96e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
@@ -0,0 +1,12 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch
+
+--- driver/test-passwd.c
++++ driver/test-passwd.c
+@@ -66,6 +66,7 @@
+ Bool update_screen_layout (saver_info *si) { return 0; }
+ 
+ const char *blurb(void) { return progname; }
++Bool in_signal_handler_p = 0;
+ Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
+ 
+ void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch
new file mode 100644
index 000000000000..b5e3ca92cc58
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch
@@ -0,0 +1,12 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.19-check-largefile-support.patch
+
+--- configure.in
++++ configure.in
+@@ -1184,6 +1184,7 @@
+ AC_HEADER_SYS_WAIT
+ AC_HEADER_DIRENT
+ AC_GETTIMEOFDAY_ARGS
++AC_SYS_LARGEFILE
+ AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk)
+ AC_CHECK_FUNCS(sigaction syslog realpath setrlimit)
+ AC_CHECK_FUNCS(setlocale)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch
new file mode 100644
index 000000000000..77c5521bcb23
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch
@@ -0,0 +1,26 @@
+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/files/xscreensaver-5.20-test-passwd-segv-tty.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
new file mode 100644
index 000000000000..ab5deebc424a
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
@@ -0,0 +1,13 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch
+
+--- driver/passwd.c
++++ driver/passwd.c
+@@ -205,7 +205,7 @@
+ {
+ # ifdef HAVE_SYSLOG
+   struct passwd *pw = getpwuid (getuid ());
+-  char *d = DisplayString (si->dpy);
++  char *d = (si->dpy ? DisplayString (si->dpy) : 0);
+   char *u = (pw && pw->pw_name ? pw->pw_name : "???");
+   int opt = 0;
+   int fac = 0;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
new file mode 100644
index 000000000000..995b4ea89608
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
@@ -0,0 +1,23 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch
+
+--- driver/test-xdpms.c
++++ driver/test-xdpms.c
+@@ -29,7 +29,6 @@
+ 
+ #include <X11/Xproto.h>
+ #include <X11/extensions/dpms.h>
+-#include <X11/extensions/dpmsstr.h>
+ 
+ extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
+ extern Bool DPMSCapable (Display *dpy);
+--- driver/Makefile.in
++++ driver/Makefile.in
+@@ -850,7 +850,7 @@
+ test-mlstring: test-mlstring.o
+ 	$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
+ 
+-TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
++TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
+ test-fade: test-fade.o $(UTILS_BIN)/fade.o
+ 	$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
+ 
diff --git a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
new file mode 100644
index 000000000000..ebfc83624b2a
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.1 2012/10/21 10:39:23 ssuominen Exp $
+
+EAPI=4
+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 )
+	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 )"
+
+REQUIRED_USE="gdm? ( new-login )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	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.15-gentoo.patch \
+		"${FILESDIR}"/${PN}-5.05-interix.patch \
+		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
+		"${FILESDIR}"/${PN}-5.20-check-largefile-support.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 LINGUAS #113681
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-locking \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-dpms-ext \
+		$(use_with xinerama xinerama-ext) \
+		--with-xinput-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-randr-ext \
+		--with-proc-interrupts \
+		$(use_with pam) \
+		--without-kerberos \
+		$(use_with new-login login-manager) \
+		--with-gtk \
+		$(use_with opengl gl) \
+		--without-gle \
+		--with-pixbuf \
+		$(use_with jpeg) \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		$(use_with suid setuid-hacks)
+}
+
+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
+}