Version bump.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 237 insertions, 2 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 2578168dd405..9e8b918141a8 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.260 2009/08/25 11:57:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.261 2009/09/10 11:19:03 ssuominen Exp $
+
+*xscreensaver-5.10 (10 Sep 2009)
+
+  10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +xscreensaver-5.10.ebuild, +files/xscreensaver-5.10-gentoo.patch,
+  +files/xscreensaver-5.10-xfce.patch:
+  Version bump.
 
   25 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   xscreensaver-5.08-r2.ebuild, +files/xscreensaver-5.08-X-XFCE.patch:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index c0eb64f4ea1f..99a67196b5c8 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -4,7 +4,11 @@ AUX xscreensaver-5.08-X-XFCE.patch 529 RMD160 b77648721ef6c03470462b26b6a392f268
 AUX xscreensaver-5.08-phosphor-segv.patch 568 RMD160 605a433c613f6bd24537f1c755299b54db3699e2 SHA1 f28df04cd5ad42199b3c1fef3bcfa3a31667184b SHA256 3558ae7747b7e09b07020127526740888674d86a9f1820b1703c3a9acaeff45a
 AUX xscreensaver-5.08-po-recreate.patch 2604 RMD160 d70209d52fbb278ed4831b3d0669ce232be8f778 SHA1 40b8377e2c8244b626e0cc2ad18827c38e04906f SHA256 2626e32a48027fb511db4d047cb7bfe7abf07d3fd4619e590c5db9497adc22c1
 AUX xscreensaver-5.08-randr12.patch 580 RMD160 8ba5997ad2473e1c8dbe052a8c4c259fd2de97d6 SHA1 196069592f790ac061658c0294557bc26b2b0d26 SHA256 f7b8005910c6830309ab34ee8fd7f4b209a381bfe3ee9cc14589ac0f570fa018
+AUX xscreensaver-5.10-gentoo.patch 3673 RMD160 3b70efb6ae6b4e69471e35ed4674524e8dc4a7c1 SHA1 6e35e2c874c52c08e6ec0962ed964753089e9821 SHA256 ca0f244d52e7c61e1776480ff390a152acac1f5b4b0d8018a8d12f773e233ab3
+AUX xscreensaver-5.10-xfce.patch 529 RMD160 1fa42bad327eb50100f4be900a0c51d8eabc61e0 SHA1 fa65dcaeb7bd14d55c1b1af93764ab108502d1a3 SHA256 f45927eb89f0d5b83e8cefe11fcb427aaeebd9fc434160422c79f55d551471c4
 DIST xscreensaver-5.08.tar.gz 5466460 RMD160 f37ba887a656a4ffd14f3809de3269806271352d SHA1 4e6889d7171eaf18b856c484a87d5701787e5dc6 SHA256 638cb1455cd5fe0c95f53cf048b9b46f5b0ccce026c39246d0dc65ebb09ca9dd
+DIST xscreensaver-5.10.tar.gz 5561162 RMD160 6c437ef89969a0bf886f27b2430b53a431146b20 SHA1 d8379928de2e6e86cc7b17d75150daafe57e93c4 SHA256 54edda032f9d1e0737fdc34a74c9f40ba9be944f687be6f155ec71cc4f09fe1f
 EBUILD xscreensaver-5.08-r2.ebuild 2776 RMD160 90bea025d9e91c7bdb4dca19a413d7210c24f75d SHA1 27cab7a11986e5342b00a161afc29b7d3c4d7d9a SHA256 2c1631a73067f20a94296ddcebd0efc3764494a7a54936b9bb1a1d7ff703b396
-MISC ChangeLog 42854 RMD160 34884791359451d95b020466ad1d3f15b58df78f SHA1 4383b8869f74e62c9c0d1db68a784ce09e23e3a4 SHA256 77fd68cdec6341941fb3a4c4dfb88423920b378725df6b1a34898240c152ef8d
+EBUILD xscreensaver-5.10.ebuild 2523 RMD160 55c320407a6b4e90fe036863ebb3f0cd6339fa84 SHA1 2e3a9c5b3306cc081804230719be2b3f88aef186 SHA256 858db250e6d7f1034b34f01b38303558102ca828cb4139ac1d2f18111e071d52
+MISC ChangeLog 43066 RMD160 ac4d0c374ad152ddc9e44bf0f9a83febc329fe16 SHA1 83a7bf562b0c644743887d0a788a0689b9f5900e SHA256 4050c3d1c99d21c2f40ec39922b2652446c193876700560b2a505f5f7a475c9f
 MISC metadata.xml 448 RMD160 53a59f7e462fa8a90b1756a85659855c53402e9d SHA1 7cea2f7e7ef26fd4b9598164efab077cf2c606cd SHA256 dd68ded20236cd8fd643730ffe54b297a64a971442d1d4d842cd12c1168dbc73
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch
new file mode 100644
index 000000000000..8099fc89d0b1
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch
@@ -0,0 +1,115 @@
+diff -ur xscreensaver-5.10.orig/driver/XScreenSaver.ad.in xscreensaver-5.10/driver/XScreenSaver.ad.in
+--- xscreensaver-5.10.orig/driver/XScreenSaver.ad.in	2009-09-08 07:53:15.000000000 +0300
++++ xscreensaver-5.10/driver/XScreenSaver.ad.in	2009-09-10 14:08:07.000000000 +0300
+@@ -31,26 +31,26 @@
+ *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
+ *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
+ *unfade:		False
+ *fadeSeconds:		0:00:03
+ *fadeTicks:		20
+-*splash:		True
++*splash:		False
+ *splashDuration:	0:00:05
+ *visualID:		default
+ *captureStderr: 	True
+@@ -60,7 +60,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
+@@ -118,7 +118,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:
+diff -ur xscreensaver-5.10.orig/hacks/barcode.c xscreensaver-5.10/hacks/barcode.c
+--- xscreensaver-5.10.orig/hacks/barcode.c	2008-07-31 13:17:32.000000000 +0300
++++ xscreensaver-5.10/hacks/barcode.c	2009-09-10 14:10:21.000000000 +0300
+@@ -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",
+diff -ur xscreensaver-5.10.orig/hacks/glx/glsnake.c xscreensaver-5.10/hacks/glx/glsnake.c
+--- xscreensaver-5.10.orig/hacks/glx/glsnake.c	2008-08-11 01:45:23.000000000 +0300
++++ xscreensaver-5.10/hacks/glx/glsnake.c	2009-09-10 14:11:41.000000000 +0300
+@@ -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/files/xscreensaver-5.10-xfce.patch b/x11-misc/xscreensaver/files/xscreensaver-5.10-xfce.patch
new file mode 100644
index 000000000000..fd527eca87d9
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.10-xfce.patch
@@ -0,0 +1,9 @@
+diff -ur xscreensaver-5.10.orig/driver/screensaver-properties.desktop.in xscreensaver-5.10/driver/screensaver-properties.desktop.in
+--- xscreensaver-5.10.orig/driver/screensaver-properties.desktop.in	2008-01-27 01:16:59.000000000 +0200
++++ xscreensaver-5.10/driver/screensaver-properties.desktop.in	2009-09-10 14:18:48.000000000 +0300
+@@ -5,4 +5,4 @@
+ _Name=Screensaver
+ _Comment=Change screensaver properties
+ Type=Application
+-Categories=Settings;DesktopSettings;Security;
++Categories=Settings;DesktopSettings;Security;X-XFCE;
diff --git a/x11-misc/xscreensaver/xscreensaver-5.10.ebuild b/x11-misc/xscreensaver/xscreensaver-5.10.ebuild
new file mode 100644
index 000000000000..de86770d2386
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.10.ebuild,v 1.1 2009/09/10 11:19:03 ssuominen Exp $
+
+EAPI=2
+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"
+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-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? ( media-libs/jpeg )
+	opengl? ( virtual/opengl )
+	xinerama? ( x11-libs/libXinerama )
+	new-login? ( gnome-base/gdm )"
+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}"/${P}-xfce.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
+
+	econf \
+		--x-includes=/usr/include \
+		--x-libraries=/usr/$(get_libdir) \
+		--enable-locking \
+		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir=/usr/share/${PN}/config \
+		--with-x-app-defaults=/usr/share/X11/app-defaults \
+		--with-dpms-ext \
+		$(use_with xinerama xinerama-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=/etc/gentoo-release \
+		$(use_with suid setuid-hacks)
+}
+
+src_install() {
+	emake install_prefix="${D}" install || die
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}