old

(Portage version: 2.1.5_rc4)

7 files changed, 0 insertions, 661 deletions

diff --git a/x11-misc/xscreensaver/files/desktop_entries/screensaver-properties.desktop b/x11-misc/xscreensaver/files/desktop_entries/screensaver-properties.desktop
deleted file mode 100644
index 3a52101a7739..000000000000
--- a/x11-misc/xscreensaver/files/desktop_entries/screensaver-properties.desktop
+++ /dev/null
@@ -1,33 +0,0 @@
-[Desktop Entry]
-Exec=xscreensaver-demo
-Icon=xscreensaver
-Terminal=false
-Name=Screensaver
-Name[da]=Pauseskærm
-Name[de]=Bildschirmschoner
-Name[es]=Salvapantallas
-Name[et]=Ekraanisäästja
-Name[fi]=Näytönsäästäjä
-Name[fr]=Économiseur d'écran
-Name[hu]=Képernyővédő
-Name[ja]=スクリーンセーバー
-Name[ko]=화면 보호기
-Name[nl]=Schermbeveiliging
-Name[no]=Skjermsparer
-Name[pl]=Wygaszacz ekranu
-Name[pt]=Protecção Ecrã
-Name[ru]=Хранитель экрана
-Name[sk]=Šetrič obrazovky
-Name[sv]=Skärmsläckare
-Name[vi]=Trình bảo vệ màn hình
-Name[wa]=Spårgneu di waitroûle
-Name[zh_CN]=屏幕保护程序
-Name[zh_TW]=螢幕保護程式
-Comment=Change screensaver properties
-Comment[da]=Ændr egenskaber for pauseskærm
-Comment[fi]=Muuta näytönsäästäjän ominaisuuksia
-Comment[fr]=Modifier les propriétés de l'économiseur d'écran
-Comment[nl]=Verander schermbeveiliging voorkeuren
-Type=Application
-Categories=Screensaver;Settings;
-OnlyShowIn=GNOME;KDE;ROX;XFCE;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-gentoo.patch
deleted file mode 100644
index f54cbf3c1c06..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.02-gentoo.patch
+++ /dev/null
@@ -1,158 +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 --git a/x11-misc/xscreensaver/files/xscreensaver-5.03-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.03-nsfw.patch
deleted file mode 100644
index 86d3c5da750c..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.03-nsfw.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -ur xscreensaver-5.02.orig/driver/XScreenSaver.ad.in xscreensaver-5.02/driver/XScreenSaver.ad.in
---- xscreensaver-5.02.orig/driver/XScreenSaver.ad.in	2007-04-21 06:33:17.000000000 +0300
-+++ xscreensaver-5.02/driver/XScreenSaver.ad.in	2007-05-01 21:36:47.000000000 +0300
-@@ -302,10 +302,6 @@
- 				celtic -root				    \n\
- 				cwaves -root				    \n\
- 				m6502 -root				    \n\
--- default-n:			webcollage -root			    \n\
--- default-n:  "WebCollage (whacked)"					      \
--				webcollage -root -filter		      \
--				  'vidwhacker -stdin -stdout'		    \n\
- - default-n:			vidwhacker -root			    \n\
- 									      \
- @GL_KLUDGE@ GL:			gears -root				    \n\
-@@ -488,7 +484,6 @@
- *hacks.xanalogtv.name:      XAnalogTV
- *hacks.xspirograph.name:    XSpiroGraph
- *hacks.nerverot.name:       NerveRot
--*hacks.webcollage.name:     WebCollage
- *hacks.vidwhacker.name:     VidWhacker
- *hacks.morph3d.name:        Morph3D
- *hacks.bubble3d.name:       Bubble3D
-diff -ur xscreensaver-5.02.orig/hacks/glx/glsnake.c xscreensaver-5.02/hacks/glx/glsnake.c
---- xscreensaver-5.02.orig/hacks/glx/glsnake.c	2006-05-03 22:39:21.000000000 +0300
-+++ xscreensaver-5.02/hacks/glx/glsnake.c	2007-05-01 21:35:04.000000000 +0300
-@@ -565,21 +565,6 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* 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",
--      { 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",
--      { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
--	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
--	PIN, RIGHT, ZERO }
--    },
-     { "mask",
-       { ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN,
- 	ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO,
-@@ -995,9 +980,6 @@
-     { "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",
--        { 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",
-         { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT, ZERO }
-     },
-diff -ur xscreensaver-5.02.orig/hacks/Makefile.in xscreensaver-5.02/hacks/Makefile.in
---- xscreensaver-5.02.orig/hacks/Makefile.in	2007-04-21 06:33:23.000000000 +0300
-+++ xscreensaver-5.02/hacks/Makefile.in	2007-05-01 21:33:28.000000000 +0300
-@@ -110,9 +110,8 @@
- 		  fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
- 		  intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
- 		  boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \
--		  asm6502.c \
--		  webcollage-cocoa.m webcollage-helper-cocoa.m
--SCRIPTS		= vidwhacker webcollage ljlatest
-+		  asm6502.c
-+SCRIPTS		= vidwhacker ljlatest
- 
- # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
- # but that are not shipped with xscreensaver itself.
-@@ -140,7 +139,7 @@
- 		  blaster.o bumps.o ripples.o xspirograph.o \
- 		  nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \
- 		  rotzoomer.o whirlygig.o speedmine.o vermiculate.o \
--		  xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \
-+		  xpm-pixmap.o twang.o apollonian.o \
- 		  euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \
- 		  anemone.o halftone.o metaballs.o eruption.o popsquares.o \
- 		  barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \
-@@ -148,8 +147,7 @@
- 		  mismunch.o pacman.o pacman_ai.o pacman_level.o \
- 		  fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \
- 		  intermomentary.o fireworkx.o fiberlamp.o boxfit.o \
--		  interaggregate.o celtic.o cwaves.o webcollage-cocoa.o \
--		  webcollage-helper-cocoa.o m6502.0 asm6502.o
-+		  interaggregate.o celtic.o cwaves.o m6502.0 asm6502.o
- 
- NEXES		= attraction blitspin bouboule braid bubbles decayscreen deco \
- 		  drift flag flame forest vines galaxy grav greynetic halo \
-@@ -173,7 +171,7 @@
- 		  celtic \
- 		  @JPEG_EXES@
- SEXES		= sonar
--JPEG_EXES	= webcollage-helper
-+JPEG_EXES	=
- EXES		= $(NEXES) $(SEXES)
- 
- HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
-@@ -209,7 +207,7 @@
- 	          spotlight.man squiral.man starfish.man strange.man \
- 	          swirl.man t3d.man thornbird.man triangle.man truchet.man \
- 	          twang.man vermiculate.man vidwhacker.man vines.man \
--	          wander.man webcollage.man whirlwindwarp.man whirlygig.man \
-+	          wander.man whirlwindwarp.man whirlygig.man \
- 	          worm.man xflame.man xjack.man xlyap.man xmatrix.man \
- 	          xrayswarm.man xspirograph.man xsublim.man \
- 	          zoom.man halftone.man eruption.man metaballs.man \
-@@ -978,10 +976,6 @@
- xsublim:	xsublim.o	$(HACK_OBJS_1)
- 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS_1) $(HACK_LIBS)
- 
--webcollage-helper: webcollage-helper.o
--	$(CC_HACK) -o $@ $@.o	$(XPM_LIBS) $(JPEG_LIBS)
--
--
- ##############################################################################
- #
- # DO NOT DELETE: updated by make distdepend
-@@ -2476,17 +2470,6 @@
- wander.o: $(UTILS_SRC)/usleep.h
- wander.o: $(UTILS_SRC)/visual.h
- wander.o: $(UTILS_SRC)/yarandom.h
--webcollage-cocoa.o: ../config.h
--webcollage-cocoa.o: $(srcdir)/screenhackI.h
--webcollage-cocoa.o: $(srcdir)/screenhack.h
--webcollage-cocoa.o: $(UTILS_SRC)/colors.h
--webcollage-cocoa.o: $(UTILS_SRC)/grabscreen.h
--webcollage-cocoa.o: $(UTILS_SRC)/hsv.h
--webcollage-cocoa.o: $(UTILS_SRC)/resources.h
--webcollage-cocoa.o: $(UTILS_SRC)/usleep.h
--webcollage-cocoa.o: $(UTILS_SRC)/visual.h
--webcollage-cocoa.o: $(UTILS_SRC)/yarandom.h
--webcollage-helper.o: ../config.h
- whirlwindwarp.o: ../config.h
- whirlwindwarp.o: $(srcdir)/screenhackI.h
- whirlwindwarp.o: $(srcdir)/screenhack.h
-diff -ur xscreensaver-5.02.orig/po/POTFILES.in xscreensaver-5.02/po/POTFILES.in
---- xscreensaver-5.02.orig/po/POTFILES.in	2007-04-21 06:33:29.000000000 +0300
-+++ xscreensaver-5.02/po/POTFILES.in	2007-05-01 21:35:33.000000000 +0300
-@@ -203,7 +203,6 @@
- hacks/config/vidwhacker.xml
- hacks/config/vines.xml
- hacks/config/wander.xml
--hacks/config/webcollage.xml
- hacks/config/whirlwindwarp.xml
- hacks/config/whirlygig.xml
- hacks/config/worm.xml
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-build.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-build.patch
deleted file mode 100644
index e264bbc1345b..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.04-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur xscreensaver-5.04.orig/driver/demo-Gtk.c xscreensaver-5.04/driver/demo-Gtk.c
---- xscreensaver-5.04.orig/driver/demo-Gtk.c	2007-04-10 04:56:40.000000000 +0300
-+++ xscreensaver-5.04/driver/demo-Gtk.c	2008-02-14 14:58:09.000000000 +0200
-@@ -1127,7 +1127,7 @@
-   if (!was) gtk_widget_set_sensitive (parent, True);
- #ifdef HAVE_GTK2
-   model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
--  STFU g_assert (model);
-+  g_assert (model);
-   if (gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt))
-     {
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
-diff -ur xscreensaver-5.04.orig/hacks/glx/lockward.c xscreensaver-5.04/hacks/glx/lockward.c
---- xscreensaver-5.04.orig/hacks/glx/lockward.c	2007-11-11 22:52:42.000000000 +0200
-+++ xscreensaver-5.04/hacks/glx/lockward.c	2008-02-14 14:57:01.000000000 +0200
-@@ -34,6 +34,13 @@
- /***************************************************************************
-  * #defines
-  */
-+#define int8_t   char
-+#define int16_t  short
-+#define int32_t  int
-+#define uint8_t  unsigned char
-+#define uint16_t unsigned short
-+#define uint32_t unsigned int
-+
- #ifdef USE_GL /* whole file */
- 
- #define	DEFAULTS	"*delay:	20000	\n"\
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch
deleted file mode 100644
index fd6ef5eb81bb..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur xscreensaver-5.04.orig/driver/Makefile.in xscreensaver-5.04/driver/Makefile.in
---- xscreensaver-5.04.orig/driver/Makefile.in	2007-11-13 10:39:35.000000000 +0200
-+++ xscreensaver-5.04/driver/Makefile.in	2008-02-21 20:20:55.000000000 +0200
-@@ -498,7 +498,7 @@
- 	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
- 		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
- 	   fi								     ;\
--	   name2=gnome-screensaver-properties.desktop			     ;\
-+	   name2=xscreensaver-properties.desktop			     ;\
- 	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
- 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
- 		$(INSTALL_DATA) screensaver-properties.desktop		      \
-@@ -571,7 +571,7 @@
- # into /usr/share/applications/
- uninstall-gnome::
- 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
--          f=gnome-screensaver-properties.desktop                             ;\
-+          f=xscreensaver-properties.desktop                                  ;\
-           echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f                      ;\
-                rm -f $(install_prefix)$(GTK_APPDIR)/$$f                      ;\
-         fi
-diff -ur xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in xscreensaver-5.04/driver/screensaver-properties.desktop.in
---- xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in	2003-12-15 13:16:12.000000000 +0200
-+++ xscreensaver-5.04/driver/screensaver-properties.desktop.in	2008-02-21 20:21:19.000000000 +0200
-@@ -1,8 +1,9 @@
- [Desktop Entry]
- Exec=xscreensaver-demo
--Icon=xscreensaver.xpm
-+Icon=xscreensaver
- Terminal=false
- _Name=Screensaver
- _Comment=Change screensaver properties
- Type=Application
--Categories=Application;Settings;Appearance;AdvancedSettings;
-+Categories=Settings;DesktopSettings;Security;
-+NotShowIn=GNOME;
diff --git a/x11-misc/xscreensaver/xscreensaver-5.03.ebuild b/x11-misc/xscreensaver/xscreensaver-5.03.ebuild
deleted file mode 100644
index aee9fec3d0a8..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.03.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.03.ebuild,v 1.11 2008/03/30 23:37:06 ricmm 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 )
-	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 "${FILESDIR}/xscreensaver-5.02-gentoo.patch"
-
-	# disable offensive screensavers.
-	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
-
-	eautoreconf
-
-	# change head and tail calls 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 \
-		--without-gle \
-		$(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 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
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.04-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.04-r1.ebuild
deleted file mode 100644
index 27031f18292e..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.04-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.04-r1.ebuild,v 1.8 2008/04/20 02:30:26 vapier Exp $
-
-inherit autotools eutils fixheadtails 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/libXxf86misc
-	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 "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-nsfw.patch
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	eautoreconf
-	ht_fix_all
-}
-
-src_compile() {
-	# Simple workaround for the ppc* arches flurry screensaver, needed for <=5.04
-	filter-flags -mabi=altivec
-	filter-flags -maltivec
-	append-flags -U__VEC__
-
-	unset BC_ENV_ARGS
-
-	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-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		--without-kerberos \
-		--without-gle \
-		--with-gtk \
-		$(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)
-
-	# Bug 155049.
-	emake -j1 || die "emake failed."
-}
-
-src_install() {
-	emake install_prefix="${D}" install || die "emake install failed."
-
-	dodoc README*
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	# Bug 135549.
-	rm -f "${D}"/usr/share/${PN}/config/electricsheep.xml
-	rm -f "${D}"/usr/share/${PN}/config/fireflies.xml
-	dodir /usr/share/man/man6x
-	mv "${D}"/usr/share/man/man6/worm.6 \
-		"${D}"/usr/share/man/man6x/worm.6x
-}