old

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

8 files changed, 0 insertions, 373 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 640833d89d31..1f7a1147f188 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,14 +1,6 @@
-AUX 5.08/01_all_default_settings.patch 3802 RMD160 cc3aa5c566349cc3d73b69b61377607b6694135a SHA1 0b6c986a3afeb0603d8d074b3722eebc7d387e06 SHA256 c69c1afda8f4fdc26f21de07012c4fb7a1f89fcd937cc82fe4162ce393f3ab53
-AUX 5.08/03_all_glforrestfire.patch 518 RMD160 29a69330d3f62c8285f3983e7e925302ed7240e3 SHA1 42af34830bb29b8013408ce0a1b5486c87f54734 SHA256 25ae6a3df4b25ad17c6af34b52927caf1bbc81439c658c4994c2f80e994f2e5f
-AUX xscreensaver-5.08-X-XFCE.patch 529 RMD160 b77648721ef6c03470462b26b6a392f268a1fe71 SHA1 e624f953b980abd897b74a688fc8a8bb08fa1b11 SHA256 afbe358bffe7b498803af8cbf49340e263dd2725c14bd31ae1ae3b7b42d63cbd
-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
 EBUILD xscreensaver-5.10.ebuild 2511 RMD160 d616a7c286aff9ca5dc664b9674d9f140197ab29 SHA1 d338963c922d029852499dcdffd6d4e7473e8db0 SHA256 23ce82e6c9147fce6a929e751f5688f20637847661ddb68ae782157cf541a381
 MISC ChangeLog 43817 RMD160 d8a515d9cf087d68dcaaa44a8872b093c14d6465 SHA1 90bc3d7fb127be720f2abf0dc4b31e909bc466c1 SHA256 abb7fad6b20f05ecd8139dd35383de91f21c6765c27ceadbad084c43952827e5
 MISC metadata.xml 448 RMD160 53a59f7e462fa8a90b1756a85659855c53402e9d SHA1 7cea2f7e7ef26fd4b9598164efab077cf2c606cd SHA256 dd68ded20236cd8fd643730ffe54b297a64a971442d1d4d842cd12c1168dbc73
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
deleted file mode 100644
index 986ba26c10bc..000000000000
--- a/x11-misc/xscreensaver/files/5.08/01_all_default_settings.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-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/03_all_glforrestfire.patch b/x11-misc/xscreensaver/files/5.08/03_all_glforrestfire.patch
deleted file mode 100644
index cca0abad0e75..000000000000
--- a/x11-misc/xscreensaver/files/5.08/03_all_glforrestfire.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xscreensaver-5.08/hacks/glx/Makefile.in	2008-12-28 09:59:21.000000000 +0200
-+++ xscreensaver-5.08/hacks/glx/Makefile.in	2009-01-24 19:39:35.000000000 +0200
-@@ -169,8 +169,8 @@
- GRAB_OBJS	= $(UTILS_BIN)/grabclient.o grab-ximage.o $(XSHM_OBJS)
- EXES		= @GL_UTIL_EXES@ $(HACK_EXES)
- 
--RETIRED_EXES	= glforestfire
--RETIRED_GL_EXES	= @RETIRED_GL_EXES@
-+RETIRED_EXES	=
-+RETIRED_GL_EXES	= glforestfire
- 
- HACK_OBJS	= $(HACK_BIN)/screenhack.o $(HACK_BIN)/fps.o \
- 		  xlockmore-gl.o xlock-gl-utils.o glxfonts.o fps-gl.o \
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.08-X-XFCE.patch b/x11-misc/xscreensaver/files/xscreensaver-5.08-X-XFCE.patch
deleted file mode 100644
index 969390bd1492..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.08-X-XFCE.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur xscreensaver-5.08.orig/driver/screensaver-properties.desktop.in xscreensaver-5.08/driver/screensaver-properties.desktop.in
---- xscreensaver-5.08.orig/driver/screensaver-properties.desktop.in	2008-01-27 01:16:59.000000000 +0200
-+++ xscreensaver-5.08/driver/screensaver-properties.desktop.in	2009-08-25 14:51:52.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/files/xscreensaver-5.08-phosphor-segv.patch b/x11-misc/xscreensaver/files/xscreensaver-5.08-phosphor-segv.patch
deleted file mode 100644
index 7cf78f9d9eaf..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.08-phosphor-segv.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xscreensaver-5.08/hacks/phosphor.c.debug	2008-07-31 19:01:00.000000000 +0900
-+++ xscreensaver-5.08/hacks/phosphor.c	2009-01-22 22:52:11.000000000 +0900
-@@ -1353,6 +1353,7 @@
- 	  if (state->pid)
- 	    {
- 	      waitpid(state->pid, NULL, 0);
-+	      state->pid = 0;
- 	      fclose (state->pipe);
- 	    }
- 	  else
-@@ -1436,7 +1437,7 @@
-   resize_grid (state);
- 
- # if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
--  if (state->pid)
-+  if (state->pid && state->pipe)
-     {
-       /* Tell the sub-process that the screen size has changed. */
-       struct winsize ws;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch b/x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch
deleted file mode 100644
index 61754db5e26b..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- xscreensaver-5.08/aclocal.m4.po	2002-05-11 10:44:33.000000000 +0900
-+++ xscreensaver-5.08/aclocal.m4	2008-12-30 04:33:01.000000000 +0900
-@@ -252,7 +252,10 @@
- 
-     AC_OUTPUT_COMMANDS(
-       [case "$CONFIG_FILES" in *po/Makefile.in*)
-+         rm -f po/stamp-it po/stamp-it.tmp
-+         > po/stamp-it.tmp
-         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+        mv po/stamp-it.tmp po/stamp-it
-       esac])
- 
-     dnl These rules are solely for the distribution goal.  While doing this
---- xscreensaver-5.08/po/Makefile.in.in.po	2007-11-11 09:44:42.000000000 +0900
-+++ xscreensaver-5.08/po/Makefile.in.in	2008-12-30 04:47:58.000000000 +0900
-@@ -190,7 +190,7 @@
- all-yes: $(CATALOGS)
- all-no:
- 
--$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
- 	@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
- 	export INTLTOOL_EXTRACT ; \
- 	echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
-@@ -274,6 +274,7 @@
- 
- distclean: clean
- 	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot
-+	rm -f stamp-it
- 
- maintainer-clean: distclean
- 	@echo "This command is intended for maintainers to use;"
-@@ -282,8 +283,8 @@
- 
- depend:
- # fuck off.  love, jwz.
--#distdepend: generate_potfiles_in update-po $(DISTFILES)
--distdepend::
-+distdepend: generate_potfiles_in update-po $(DISTFILES)
-+#distdepend::
- 
- 
- # jwz: Generates po/POTFILES.in by examining the source tree:
-@@ -292,6 +293,8 @@
- generate_potfiles_in:
- 	@tmp=po.$$$$ ;				\
- 	 file=POTFILES.in ;			\
-+	 echo "sleeping 3 seconds..." ;\
-+	 sleep 3; \
- 	 ( cd $(top_srcdir);			\
- 	   echo "# Auto-generated: `LANG=C date`" ;	\
- 	   ( grep -l '_("' driver/*.[ch] ;	\
-@@ -362,16 +365,22 @@
- 	    && (sed -e '/^#/d' 						\
- 		    -e "s/^\[.*\] +//" 					\
- 		    -e '/^[ 	]*$$/d' 				\
--		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
-+		    -e "s@.*@	$$posrcprefix& \\\\@" < $@.in	\
- 		| sed -e '$$s/\\$$//') > $@-t \
- 	    && chmod a-w $@-t \
- 	    && mv $@-t $@ )
- 
-+Makefile: stamp-it
-+	@if test ! -f $@; then \
-+		rm -f stamp-it; \
-+		$(MAKE) stamp-it; \
-+	fi
-+
- # Please to be fucking the hell off.   This breaks "make distdepend". -jwz
--#Makefile: Makefile.in.in ../config.status POTFILES
--#	cd .. \
--#	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
--#	       $(SHELL) ./config.status
-+stamp-it: Makefile.in.in ../config.status POTFILES
-+	cd .. \
-+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \
-+	       $(SHELL) ./config.status
- 
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.08-randr12.patch b/x11-misc/xscreensaver/files/xscreensaver-5.08-randr12.patch
deleted file mode 100644
index d25bebffae6f..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.08-randr12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/screens.c.orig	2009-04-30 17:59:02.000000000 -0700
-+++ driver/screens.c	2009-04-30 18:01:32.000000000 -0700
-@@ -436,7 +436,7 @@
-               XRROutputInfo *rroi = XRRGetOutputInfo (dpy, res, 
-                                                       res->outputs[k]);
-               RRCrtc crtc = (rroi->crtc  ? rroi->crtc :
--                             rroi->crtcs ? rroi->crtcs[0] : 0);
-+                             rroi->ncrtc ? rroi->crtcs[0] : 0);
-               XRRCrtcInfo *crtci = (crtc ? XRRGetCrtcInfo(dpy, res, crtc) : 0);
- 
-               monitors[j] = m;
diff --git a/x11-misc/xscreensaver/xscreensaver-5.08-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.08-r2.ebuild
deleted file mode 100644
index 91ad8cda20b9..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.08-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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-r2.ebuild,v 1.8 2009/08/25 11:57:23 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}"/${PV}/01_all_default_settings.patch \
-		"${FILESDIR}"/${PV}/03_all_glforrestfire.patch \
-		"${FILESDIR}"/${P}-phosphor-segv.patch \
-		"${FILESDIR}"/${P}-po-recreate.patch \
-		"${FILESDIR}"/${P}-randr12.patch \
-		"${FILESDIR}"/${P}-X-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 \
-		--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)
-}
-
-src_install() {
-	emake install_prefix="${D}" install || die "emake install failed."
-	dodoc README{,.hacking}
-
-	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
-}