Old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 5 insertions, 155 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 004ebea6d152..763b44fe8328 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.351 2014/03/19 13:52:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.352 2014/03/19 16:18:16 jer Exp $
+
+  19 Mar 2014; Jeroen Roovers <jer@gentoo.org> -xscreensaver-5.22.ebuild,
+  -files/xscreensaver-5.20-conf264.patch:
+  Old.
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> xscreensaver-5.26.ebuild:
   Stable for alpha, wrt bug #499990
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch
deleted file mode 100644
index 77c5521bcb23..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/xscreensaver-5.22.ebuild b/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
deleted file mode 100644
index ad9c9ecaa6dc..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.22.ebuild,v 1.12 2013/11/23 13:31:33 ssuominen 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-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 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
-}