Version bump.

(Portage version: 2.2_rc22/cvs/Linux 2.6.26-openvz.git-89451f9 i686)

4 files changed, 295 insertions, 2 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 1776ea45f939..aff4017eccfa 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.244 2008/11/24 15:55:35 ssuominen Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.245 2009/01/19 11:43:56 pva Exp $
+
+*xscreensaver-5.08 (19 Jan 2009)
+
+  19 Jan 2009; Peter Volkov <pva@gentoo.org>
+  +files/5.08/01_all_default_settings.patch,
+  +files/5.08/02_all_no_intltool.patch, +xscreensaver-5.08.ebuild:
+  Version bump.
 
   24 Nov 2008; <ssuominen@gentoo.org> metadata.xml:
   Rename my old e-mail drac at gentoo.org to ssuominen at gentoo.org.
diff --git a/x11-misc/xscreensaver/files/5.08/01_all_default_settings.patch b/x11-misc/xscreensaver/files/5.08/01_all_default_settings.patch
new file mode 100644
index 000000000000..986ba26c10bc
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.08/01_all_default_settings.patch
@@ -0,0 +1,128 @@
+diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
+index af651d7..470297c 100644
+--- a/driver/XScreenSaver.ad.in
++++ b/driver/XScreenSaver.ad.in
+@@ -31,36 +31,36 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:20:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
+-*dpmsStandby:		2:00:00
+-*dpmsSuspend:		2:00:00
+-*dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*dpmsEnabled:		True
++*dpmsStandby:		1:00:00
++*dpmsSuspend:		1:00:00
++*dpmsOff:		2:00:00
++*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
+ *ignoreUninstalledPrograms: False
+ 
+-*textMode:		file
+-*textLiteral:		XScreenSaver
++*textMode:		literal
++*textLiteral:		Gentoo Linux
+ *textFile:		@DEFAULT_TEXT_FILE@
+-*textProgram:		fortune
+-*textURL:		http://www.livejournal.com/stats/latest-rss.bml
++*textProgram:		/usr/bin/fortune
++*textURL:		http://planet.gentoo.org/rss20.xml
+ !*textURL:		http://twitter.com/statuses/public_timeline.atom
+ 
+ *overlayTextForeground:	#FFFF00
+@@ -118,7 +118,10 @@ GetViewPortIsFullOfLies: False
+ 
+ ! 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
++! Preferred time representation for the current locale
++*dateFormat:    %x %X
++! Xscreensaver's default
++! *dateFormat:		%d-%b-%y (%a); %I:%M %p
+ ! To show the time only:
+ ! *dateFormat:		%I:%M %p
+ ! For 24 hour time:
+diff --git a/hacks/barcode.c b/hacks/barcode.c
+index 61b0c23..946a6fd 100644
+--- a/hacks/barcode.c
++++ b/hacks/barcode.c
+@@ -131,7 +131,6 @@ static const char *words[] =
+   "children",
+   "chocolate",
+   "CLONE",
+-  "cock",
+   "constriction",
+   "contrition",
+   "cop",
+@@ -265,7 +264,6 @@ static const char *words[] =
+   "punishment",
+   "punk rock",
+   "punk",
+-  "pussy",
+   "quagmire",
+   "quarantine",
+   "quartz",
+@@ -333,8 +331,6 @@ static const char *words[] =
+   "vegetarian",
+   "venom",
+   "verifiability",
+-  "viagra",
+-  "vibrator",
+   "victim",
+   "vignette",
+   "villainy",
+diff --git a/hacks/glx/glsnake.c b/hacks/glx/glsnake.c
+index f2a0b5f..da2721b 100644
+--- a/hacks/glx/glsnake.c
++++ b/hacks/glx/glsnake.c
+@@ -565,17 +565,17 @@ static const struct model_s model[] = {
+ 	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 @@ static const struct model_s model[] = {
+     { "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/5.08/02_all_no_intltool.patch b/x11-misc/xscreensaver/files/5.08/02_all_no_intltool.patch
new file mode 100644
index 000000000000..f5fb645c8c09
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.08/02_all_no_intltool.patch
@@ -0,0 +1,57 @@
+diff -ur xscreensaver-5.07_old/configure.in xscreensaver-5.07/configure.in
+--- xscreensaver-5.07_old/configure.in	2008-10-16 02:15:57.761938178 +0200
++++ xscreensaver-5.07/configure.in	2008-10-16 02:11:43.311971411 +0200
+@@ -1172,7 +1172,7 @@
+ #
+ ###############################################################################
+ 
+-AC_PROG_INTLTOOL
++# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ GETTEXT_PACKAGE=xscreensaver
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ 		   [This is the name of the gettext package to use.])
+diff -ur xscreensaver-5.07_old/driver/Makefile.in xscreensaver-5.07/driver/Makefile.in
+--- xscreensaver-5.07_old/driver/Makefile.in	2008-10-16 02:15:57.835271514 +0200
++++ xscreensaver-5.07/driver/Makefile.in	2008-10-16 03:16:51.678244563 +0200
+@@ -22,7 +22,7 @@
+ mansuffix	= 1
+ manNdir		= $(mandir)/man$(mansuffix)
+ 
+-INTLTOOL_MERGE	= @INTLTOOL_MERGE@
++#INTLTOOL_MERGE	= @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ 
+ GTK_DATADIR	= @GTK_DATADIR@
+ GTK_APPDIR	= $(GTK_DATADIR)/applications
+@@ -492,20 +492,19 @@
+ 
+ # screensaver-properties.desktop
+ # into /usr/share/applications/
+-install-gnome:: screensaver-properties.desktop
++install-gnome::
+ 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
+ 	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
+ 	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 	   fi								     ;\
+ 	   name2=xscreensaver-properties.desktop			     ;\
+-	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
++	   echo $(INSTALL_DATA) screensaver-properties.desktop.in		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+-		$(INSTALL_DATA) screensaver-properties.desktop		      \
++		$(INSTALL_DATA) screensaver-properties.desktop.in		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+ 	 fi
+ 
+-
+ # xscreensaver.xpm
+ # into /usr/share/pixmaps/
+ install-gnome:: $(LOGO)
+@@ -764,7 +763,7 @@
+ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
+ 	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
+ 
+-@INTLTOOL_DESKTOP_RULE@
++# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ 
+ # The executables linked in this directory.
+ #
diff --git a/x11-misc/xscreensaver/xscreensaver-5.08.ebuild b/x11-misc/xscreensaver/xscreensaver-5.08.ebuild
new file mode 100644
index 000000000000..9b18b2a997b8
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.08.ebuild
@@ -0,0 +1,101 @@
+# 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.08.ebuild,v 1.1 2009/01/19 11:43:56 pva Exp $
+
+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
+	>=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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV}
+	eautoreconf # bug 113681
+}
+
+src_compile() {
+	if use ppc || use ppc64; then
+		# Still fails to build "flurry" screensaver.
+		filter-flags -mabi=altivec
+		filter-flags -maltivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	econf \
+		--with-x-app-defaults=/usr/share/X11/app-defaults \
+		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir=/usr/share/${PN}/config \
+		--x-libraries=/usr/$(get_libdir) \
+		--x-includes=/usr/include \
+		--with-dpms-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-randr-ext \
+		--with-proc-interrupts \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--enable-locking \
+		--without-kerberos \
+		--without-gle \
+		--with-gtk \
+		--with-pixbuf \
+		--with-text-file=/etc/gentoo-release \
+		$(use_with suid setuid-hacks) \
+		$(use_with new-login login-manager) \
+		$(use_with xinerama xinerama-ext) \
+		$(use_with pam) \
+		$(use_with opengl gl) \
+		$(use_with jpeg)
+
+	emake || die "emake failed." # bug 155049
+}
+
+src_install() {
+	emake install_prefix="${D}" install || die "emake install failed."
+	dodoc README{,.hacking} || die
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	# Collision with electricsheep, bug 135549
+	rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}