old

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

3 files changed, 5 insertions, 211 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 1a1f52961c07..f8a0b0c2e894 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.306 2012/01/28 06:24:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.307 2012/01/28 06:27:07 ssuominen Exp $
+
+  28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xscreensaver-5.14.ebuild, -files/xscreensaver-5.14-gentoo.patch:
+  old
 
   28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> xscreensaver-5.15.ebuild:
   ppc64 stable wrt #395765
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.14-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.14-gentoo.patch
deleted file mode 100644
index 8859ec57e11b..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.14-gentoo.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,20 +31,20 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -61,7 +61,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		http://www.livejournal.com/stats/latest-rss.bml
-+*textURL:		http://planet.gentoo.org/rss20.xml
- !*textURL:		http://twitter.com/statuses/public_timeline.atom
- 
- *overlayTextForeground:	#FFFF00
-@@ -120,7 +120,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:		%x %X
-+! *dateFormat:		%d-%b-%y (%a); %I:%M %p
- ! To show the time only:
- ! *dateFormat:		%I:%M %p
- ! For 24 hour time:
---- a/hacks/barcode.c
-+++ b/hacks/barcode.c
-@@ -131,7 +131,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -265,7 +264,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -333,8 +331,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- a/hacks/glx/glsnake.c
-+++ b/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "flaccid anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/xscreensaver-5.14.ebuild b/x11-misc/xscreensaver/xscreensaver-5.14.ebuild
deleted file mode 100644
index 07383a4cd085..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.14.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.14.ebuild,v 1.8 2011/10/04 21:55:20 josejx Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver"
-
-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="jpeg new-login opengl pam suid xinerama"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libXxf86vm
-	x11-libs/libXrandr
-	x11-libs/libXxf86misc
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-apps/xwininfo
-	x11-apps/appres
-	media-libs/netpbm
-	>=dev-libs/libxml2-2.5
-	>=x11-libs/gtk+-2:2
-	>=gnome-base/libglade-1.99
-	pam? ( virtual/pam )
-	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/opengl )
-	xinerama? ( x11-libs/libXinerama )
-	new-login? ( || ( gnome-base/gdm kde-base/kdm ) )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	x11-proto/xextproto
-	x11-proto/scrnsaverproto
-	x11-proto/recordproto
-	x11-proto/xf86miscproto
-	sys-devel/bc
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	xinerama? ( x11-proto/xineramaproto )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch
-
-	eautoconf
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -mabi=altivec
-		filter-flags -maltivec
-		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
-}