Version bump (bug #148953), cleaned up old versions.
authorKrzysztof Pawlik <nelchael@gentoo.org>
Wed, 11 Oct 2006 12:46:44 +0000 (12:46 +0000)
committerKrzysztof Pawlik <nelchael@gentoo.org>
Wed, 11 Oct 2006 12:46:44 +0000 (12:46 +0000)
Package-Manager: portage-2.1.2_pre2-r8

x11-misc/xscreensaver/ChangeLog
x11-misc/xscreensaver/files/digest-xscreensaver-5.01 [new file with mode: 0644]
x11-misc/xscreensaver/files/xscreensaver-5.01-gentoo.patch [new file with mode: 0644]
x11-misc/xscreensaver/files/xscreensaver-5.01-nsfw.patch [new file with mode: 0644]
x11-misc/xscreensaver/xscreensaver-5.01.ebuild [new file with mode: 0644]

index e2a5473454860abd2606fc58c81c6e0efeb95bb4..2f1610100201ad76fce7a27854d4be3fb2266fca 100644 (file)
@@ -1,6 +1,23 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.150 2006/09/06 20:43:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.151 2006/10/11 12:46:44 nelchael Exp $
+
+*xscreensaver-5.01 (11 Oct 2006)
+
+  11 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/xscreensaver-4.16-nsfw.patch,
+  -files/xscreensaver-4.22-configure.patch,
+  -files/xscreensaver-4.22-interaggregate.patch,
+  -files/xscreensaver-4.22-nsfw-webcollage.patch,
+  -files/xscreensaver-4.22-settings.patch,
+  -files/xscreensaver-4.23-app-defaults.patch,
+  -files/xscreensaver-4.23-norpm.patch, -files/xscreensaver-4.23-nsfw.patch,
+  -files/xscreensaver-4.23-words.patch,
+  +files/xscreensaver-5.01-gentoo.patch,
+  +files/xscreensaver-5.01-nsfw.patch,
+  -files/xscreensaver-blank-screen.patch, -xscreensaver-4.22-r4.ebuild,
+  -xscreensaver-4.23-r1.ebuild, +xscreensaver-5.01.ebuild:
+  Version bump (bug #148953), cleaned up old versions.
 
   06 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   xscreensaver-5.00-r1.ebuild:
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.01 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.01
new file mode 100644 (file)
index 0000000..c9457d7
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 b60abc52b39591750f48f9c9f20c4167 xscreensaver-5.01.tar.gz 5270954
+RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b xscreensaver-5.01.tar.gz 5270954
+SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf xscreensaver-5.01.tar.gz 5270954
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.01-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.01-gentoo.patch
new file mode 100644 (file)
index 0000000..172ec7b
--- /dev/null
@@ -0,0 +1,173 @@
+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/files/xscreensaver-5.01-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.01-nsfw.patch
new file mode 100644 (file)
index 0000000..0d1d810
--- /dev/null
@@ -0,0 +1,146 @@
+diff -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in xscreensaver-5.00/driver/XScreenSaver.ad.in
+--- xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in        2006-05-24 01:01:34.000000000 +0200
++++ xscreensaver-5.00/driver/XScreenSaver.ad.in        2006-06-04 11:39:04.000000000 +0200
+@@ -302,10 +302,6 @@
+                               fiberlamp -root                             \n\
+                               boxfit -root                                \n\
+                               celtic -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 -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver_ad.h xscreensaver-5.00/driver/XScreenSaver_ad.h
+--- xscreensaver-5.00.vanilla/driver/XScreenSaver_ad.h 2006-05-24 01:01:34.000000000 +0200
++++ xscreensaver-5.00/driver/XScreenSaver_ad.h 2006-06-04 11:39:04.000000000 +0200
+@@ -203,10 +203,6 @@
+                               fiberlamp -root                             \\n\
+                               boxfit -root                                \\n\
+                               celtic -root                                \\n\
+-- default-n:                  webcollage -root                            \\n\
+-- default-n:  \"WebCollage (whacked)\"                                              \
+-                              webcollage -root -filter                      \
+-                                'vidwhacker -stdin -stdout'               \\n\
+ - default-n:                  vidwhacker -root                            \\n\
+                                                                             \
+          GL:                  gears -root                                 \\n\
+@@ -359,7 +355,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 -Nru xscreensaver-5.00.vanilla/hacks/Makefile.in xscreensaver-5.00/hacks/Makefile.in
+--- xscreensaver-5.00.vanilla/hacks/Makefile.in        2006-05-24 01:01:36.000000000 +0200
++++ xscreensaver-5.00/hacks/Makefile.in        2006-06-04 11:39:04.000000000 +0200
+@@ -102,7 +102,7 @@
+                 blaster.c bumps.c ripples.c xspirograph.c \
+                 nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \
+                 rotzoomer.c whirlygig.c speedmine.c vermiculate.c \
+-                xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \
++                xpm-pixmap.c twang.c apollonian.c \
+                 euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \
+                 anemone.c halftone.c metaballs.c eruption.c popsquares.c \
+                 barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \
+@@ -111,7 +111,7 @@
+                 fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
+                 intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
+                 boxfit.c interaggregate.c celtic.c
+-SCRIPTS               = vidwhacker webcollage ljlatest
++SCRIPTS               = vidwhacker ljlatest
+ # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
+ # but that are not shipped with xscreensaver itself.
+@@ -139,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 \
+@@ -171,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 \
+@@ -208,7 +208,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 \
+@@ -1520,7 +1520,6 @@
+ wander.o: ../config.h
+ wander.o: $(srcdir)/screenhackI.h
+ wander.o: $(srcdir)/screenhack.h
+-webcollage-helper.o: ../config.h
+ whirlwindwarp.o: ../config.h
+ whirlwindwarp.o: $(srcdir)/screenhackI.h
+ whirlwindwarp.o: $(srcdir)/screenhack.h
+diff -Nru xscreensaver-5.00.vanilla/hacks/glx/glsnake.c xscreensaver-5.00/hacks/glx/glsnake.c
+--- xscreensaver-5.00.vanilla/hacks/glx/glsnake.c      2006-05-03 21:39:21.000000000 +0200
++++ xscreensaver-5.00/hacks/glx/glsnake.c      2006-06-04 11:40:30.000000000 +0200
+@@ -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 -Nru xscreensaver-5.00.vanilla/po/POTFILES.in xscreensaver-5.00/po/POTFILES.in
+--- xscreensaver-5.00.vanilla/po/POTFILES.in   2006-05-24 01:01:41.000000000 +0200
++++ xscreensaver-5.00/po/POTFILES.in   2006-06-04 11:39:04.000000000 +0200
+@@ -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/xscreensaver-5.01.ebuild b/x11-misc/xscreensaver/xscreensaver-5.01.ebuild
new file mode 100644 (file)
index 0000000..8cad4ce
--- /dev/null
@@ -0,0 +1,180 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.01.ebuild,v 1.1 2006/10/11 12:46:44 nelchael Exp $
+
+inherit eutils flag-o-matic pam fixheadtails autotools
+
+IUSE="gnome jpeg insecure-savers new-login nls offensive opengl pam xinerama"
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+
+RDEPEND="|| ( (
+               x11-libs/libXxf86misc
+               x11-apps/xwininfo
+               x11-apps/appres
+               xinerama? ( x11-libs/libXinerama ) )
+       virtual/x11 )
+       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 )
+       !arm? ( new-login? ( gnome-base/gdm ) )"
+
+DEPEND="${RDEPEND}
+       || ( ( x11-proto/xf86vidmodeproto
+               x11-proto/xextproto
+               x11-proto/scrnsaverproto
+               x11-proto/recordproto
+               x11-proto/xf86miscproto
+               xinerama? ( x11-proto/xineramaproto ) )
+       virtual/x11 )
+       sys-devel/bc
+       dev-util/pkgconfig
+       nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+
+       if use arm && use new-login; then
+               ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
+               ewarn "available for the arm platform. please disable this use flag"
+               die "new-login USE is not supported on arm"
+       fi
+
+}
+
+src_unpack() {
+
+       unpack "${A}"
+       cd "${S}"
+
+       # Bug fixes:
+       epatch "${FILESDIR}/${P}-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-mit-ext \
+               --with-dpms-ext \
+               --with-xf86vmode-ext \
+               --with-xf86gamma-ext \
+               --with-proc-interrupts \
+               --with-xpm \
+               --with-xshm-ext \
+               --with-xdbe-ext \
+               --enable-locking \
+               --with-gtk \
+               --with-xml \
+               --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) \
+               $(use_enable nls) \
+               || die "econf failed"
+
+       emake || die "emake failed"
+
+}
+
+src_install() {
+
+       [[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
+
+       make install_prefix="${D}" install || die "make 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"
+
+       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"
+
+}
+
+pkg_postinst() {
+
+       if ! use new-login; then
+               einfo
+               einfo "You have chosen to not use the new-login USE flag."
+               einfo "This is a new USE flag which enables individuals to"
+               einfo "create new logins when the screensaver is active,"
+               einfo "allowing others to use their account, even though the"
+               einfo "screen is locked to another account. If you want this"
+               einfo "feature, please recompile with USE=\"new-login\"."
+               einfo
+       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
+
+       ewarn
+       ewarn "In XScreenSaver 5.00 API was changed. All third party screen savers"
+       ewarn "need to be ported to the new API. Until then they will not work."
+       ewarn
+       epause
+
+}