old

(Portage version: 2.1.3_rc5)

3 files changed, 0 insertions, 333 deletions

diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02
deleted file mode 100644
index fdfae96d63a8..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 83937791b30f55f52011d4fee0f5dff3 xscreensaver-5.02.tar.gz 5371759
-RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 xscreensaver-5.02.tar.gz 5371759
-SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d xscreensaver-5.02.tar.gz 5371759
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.01-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.01-gentoo.patch
deleted file mode 100644
index 172ec7bdb74a..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.01-gentoo.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -ru xscreensaver-5.01.vanilla/configure.in xscreensaver-5.01/configure.in
---- xscreensaver-5.01.vanilla/configure.in	2006-10-11 14:31:26.000000000 +0200
-+++ xscreensaver-5.01/configure.in	2006-10-11 14:32:01.000000000 +0200
-@@ -724,6 +724,8 @@
-   # Look for the directory under a standard set of common directories.
-   # Check X11 before X11Rn because it's often a symlink to the current release.
-   for ac_dir in                                 \
-+    /usr/lib/X11/app-defaults                   \
-+                                                \
-     /usr/X11/lib/app-defaults                   \
-     /usr/X11R6/lib/app-defaults                 \
-     /usr/X11R6/lib/X11/app-defaults             \
-@@ -754,7 +756,6 @@
-     /usr/x386/lib/X11/app-defaults              \
-     /usr/XFree86/lib/X11/app-defaults           \
-                                                 \
--    /usr/lib/X11/app-defaults                   \
-     /usr/local/lib/X11/app-defaults             \
-     /usr/unsupported/lib/X11/app-defaults       \
-     /usr/athena/lib/X11/app-defaults            \
-@@ -4142,41 +4143,7 @@
- # Now let's warn if there's a previous RPM version already installed.
- # But don't bother with this test if we are currently *building* an RPM.
- 
--if test -z "$RPM_PACKAGE_VERSION" ; then
--
--  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
--
--  # M4 sucks!!
--  changequote(X,Y)
--  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
--        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
--        head -1`
--  changequote([,])
--
--  if test \! -z "$rpmv" ; then
--    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
--    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'`
--
--    warning=no
--    warnL "There is already an installed RPM of xscreensaver $rpmv"
--    warn2 'on this system.  You might want to remove it ("rpm -ve")'
--    warn2 'before running "make install" in this directory.'
--    echo ""
--    warn2 "Alternately, you could build this version of xscreensaver"
--    warn2 'as an RPM, and then install that.  An "xscreensaver.spec"'
--    warn2 'file is included.  Try "rpmbuild -v -ba xscreensaver.spec".'
--    warn2 "See the RPM documentation for more info."
--    echo ""
--
--    if test "$rpmbdir" = "$rpmhdir" ; then
--      warn2 "The RPM version was installed in $rpmbdir/."
--      do_dir_warning=yes
--    else
--      warn2 "The RPM version was installed in $rpmbdir/,"
--      warn2 "with demos in $rpmhdir/."
--    fi
--  fi
--fi
-+# Nope - breaks compilation with sandbox violation
- 
- if test "${bindir}" = "${HACKDIR}" ; then
-   do_dir_warning=yes
-Only in xscreensaver-5.01: configure.in.orig
-diff -ru xscreensaver-5.01.vanilla/driver/XScreenSaver.ad.in xscreensaver-5.01/driver/XScreenSaver.ad.in
---- xscreensaver-5.01.vanilla/driver/XScreenSaver.ad.in	2006-10-11 14:31:26.000000000 +0200
-+++ xscreensaver-5.01/driver/XScreenSaver.ad.in	2006-10-11 14:32:01.000000000 +0200
-@@ -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
--*textFile:		@DEFAULT_TEXT_FILE@
--*textProgram:		fortune
--*textURL:		http://www.livejournal.com/stats/latest-rss.bml
-+*textMode:		literal
-+*textLiteral:		Gentoo Linux
-+*textFile:		/etc/gentoo-release
-+*textProgram:		/usr/bin/fortune
-+*textURL:		http://planet.gentoo.org/rss20.xml
- 
- *overlayTextForeground:	#FFFF00
- *overlayTextBackground:	#000000
-@@ -117,7 +117,10 @@
- 
- ! 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 -ru xscreensaver-5.01.vanilla/driver/xscreensaver.c xscreensaver-5.01/driver/xscreensaver.c
---- xscreensaver-5.01.vanilla/driver/xscreensaver.c	2006-10-11 14:31:26.000000000 +0200
-+++ xscreensaver-5.01/driver/xscreensaver.c	2006-10-11 14:32:01.000000000 +0200
-@@ -1626,10 +1626,12 @@
-       if (hint.res_class) XFree (hint.res_class);
-     }
- 
-+  /*
-   fprintf (stderr, "%s: %d: unrecognised ClientMessage \"%s\" received\n",
-            blurb(), screen, (str ? str : "(null)"));
-   fprintf (stderr, "%s: %d: for window 0x%lx (%s)\n",
-            blurb(), screen, (unsigned long) w, wdesc);
-+		   */
-   if (str) XFree (str);
- }
- 
-diff -ru xscreensaver-5.01.vanilla/hacks/webcollage xscreensaver-5.01/hacks/webcollage
---- xscreensaver-5.01.vanilla/hacks/webcollage	2006-10-11 14:31:26.000000000 +0200
-+++ xscreensaver-5.01/hacks/webcollage	2006-10-11 14:32:01.000000000 +0200
-@@ -845,7 +845,8 @@
- 
- 
- sub pick_dictionary() {
--  my @dicts = ("/usr/dict/words",
-+  my @dicts = ("/usr/share/dict/cracklib-small",
-+               "/usr/dict/words",
-                "/usr/share/dict/words",
-                "/usr/share/lib/dict/words");
-   foreach my $f (@dicts) {
-diff -ru xscreensaver-5.01.vanilla/utils/resources.c xscreensaver-5.01/utils/resources.c
---- xscreensaver-5.01.vanilla/utils/resources.c	2006-10-11 14:31:26.000000000 +0200
-+++ xscreensaver-5.01/utils/resources.c	2006-10-11 14:32:26.000000000 +0200
-@@ -123,9 +123,9 @@
- get_float_resource (Display *dpy, char *res_name, char *res_class)
- {
-   double val;
--  char c, *s = get_string_resource (dpy, res_name, res_class);
-+  char *s = get_string_resource (dpy, res_name, res_class);
-   if (! s) return 0.0;
--  if (1 == sscanf (s, " %lf %c", &val, &c))
-+  if (1 == sscanf (s, " %lf", &val))
-     {
-       free (s);
-       return val;
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
deleted file mode 100644
index 72d01ca3cc14..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02.ebuild,v 1.12 2007/06/22 01:19:44 vapier Exp $
-
-inherit eutils flag-o-matic pam fixheadtails autotools
-
-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="gnome jpeg insecure-savers new-login offensive opengl pam xinerama"
-
-RDEPEND="x11-libs/libXxf86misc
-	x11-apps/xwininfo
-	x11-apps/appres
-	media-libs/netpbm
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/libxml2-2.5
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-1.99
-	>=dev-libs/glib-2
-	pam? ( virtual/pam )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl
-		>=media-libs/gle-3.0.1 )
-	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}"
-
-	# Bug fixes:
-	epatch "${FILESDIR}/${PN}-5.01-gentoo.patch"
-
-	# disable not-safe-for-work xscreensavers
-	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
-
-	eautoreconf
-
-	# change old head/tail to POSIX ones
-	ht_fix_all
-
-}
-
-src_compile() {
-	# simple workaround for the flurry screensaver
-	filter-flags -mabi=altivec
-	filter-flags -maltivec
-	append-flags -U__VEC__
-
-	unset BC_ENV_ARGS
-	econf \
-		--with-hackdir=/usr/lib/misc/xscreensaver \
-		--with-configdir=/usr/share/xscreensaver/config \
-		--x-libraries=/usr/$(get_libdir) \
-		--x-includes=/usr/include \
-		--with-dpms-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		--with-gtk \
-		--without-kerberos \
-		$(use_with insecure-savers setuid-hacks) \
-		$(use_with new-login login-manager) \
-		$(use_with xinerama xinerama-ext) \
-		$(use_with pam) \
-		$(use_with opengl gl) $(use_with opengl gle) \
-		$(use_with jpeg)
-
-	# bug 155049
-	emake -j1 || die "emake failed."
-}
-
-src_install() {
-	[[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
-
-	emake install_prefix="${D}" install || die "emake install failed."
-
-	dodoc README*
-
-	# install correctly in gnome, including info about configuration preferences
-	if use gnome; then
-		dodir /usr/share/gnome/capplets
-		insinto /usr/share/gnome/capplets
-		doins driver/screensaver-properties.desktop
-
-		newicon "${S}/utils/images/logo-50.xpm" xscreensaver.xpm
-
-		dodir /usr/share/control-center-2.0/capplets
-		insinto /usr/share/control-center-2.0/capplets
-		newins "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
-	fi
-
-	# Remove "extra" capplet
-	rm -f "${D}/usr/share/applications/gnome-screensaver-properties.desktop"
-
-	# Allways install Settings .desktop for enviroments following
-	# freedesktop.org standard, e.g. xfce-base/xfdesktop and rox-base/xdg-menu
-	domenu "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
-
-	use pam && fperms 755 /usr/bin/xscreensaver
-	pamd_mimic_system xscreensaver auth
-
-	# Fix bug #135549:
-	rm -f "${D}/usr/share/xscreensaver/config/electricsheep.xml"
-	rm -f "${D}/usr/share/xscreensaver/config/fireflies.xml"
-	dodir /usr/share/man/man6x
-	mv "${D}/usr/share/man/man6/worm.6" \
-		"${D}/usr/share/man/man6x/worm.6x"
-
-	# Fix bug #152250:
-	dodir "/usr/share/X11/app-defaults"
-	mv "${D}/usr/lib/X11/app-defaults/XScreenSaver" \
-		"${D}/usr/share/X11/app-defaults/XScreenSaver"
-}
-
-pkg_postinst() {
-	if ! use new-login; then
-		elog
-		elog "You have chosen to not use the new-login USE flag."
-		elog "This is a new USE flag which enables individuals to"
-		elog "create new logins when the screensaver is active,"
-		elog "allowing others to use their account, even though the"
-		elog "screen is locked to another account. If you want this"
-		elog "feature, please recompile with USE=\"new-login\"."
-		elog
-	fi
-
-	if use insecure-savers;then
-		ewarn
-		ewarn "You have chosen USE=insecure-savers. While upstream"
-		ewarn "has made every effort to make sure these savers do not"
-		ewarn "abuse their setuid root status, the possibilty exists that"
-		ewarn "someone will exploit xscreensaver and will be able to gain"
-		ewarn "root privileges. You have been warned."
-		ewarn
-	fi
-}