#100362: dropped gtk USE flag. gtk is now *mandatory* since all non-gtk versions are woefully unmaintained and broken. this is still experimental, so please don't mark -r3 stable or any such sillyness

Package-Manager: portage-2.0.51.22-r2

8 files changed, 187 insertions, 314 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index bd35abe4521b..06d2df2d54c9 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.96 2005/07/25 23:51:03 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.97 2005/07/26 19:47:06 smithj Exp $
+
+*xscreensaver-4.22-r3 (26 Jul 2005)
+
+  26 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  -files/xscreensaver-4.14-analogtv_tmp.patch,
+  -files/xscreensaver-4.14-icc.patch, -files/xscreensaver-4.21-norpm.patch,
+  -files/xscreensaver-4.21-settings.patch, +xscreensaver-4.22-r3.ebuild:
+  #100362: dropped gtk USE flag. gtk is now *mandatory* since all non-gtk
+  versions are woefully unmaintained and broken. this is still experimental,
+  so please don't mark -r3 stable or any such sillyness
 
   25 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
   xscreensaver-4.22-r2.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ed8da9a2eb5b..e493f18360b4 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 f05834cd11ef916b0264edb02403c5a9 ChangeLog 17410
+MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 33275facc867a5741d735c061c4456b1 xscreensaver-4.22-r3.ebuild 4949
 MD5 30baa75aa8ad6b15fa87c15cce9d3f40 xscreensaver-4.20.ebuild 4842
-MD5 8fb8ce398d7f5be215918a0c2549fee9 ChangeLog 16918
 MD5 3ad663b1382db497f19d2c540eb91ff8 xscreensaver-4.22-r2.ebuild 5474
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r3 70
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
-MD5 deb323da3671e7d537a7d3973e7304ba files/xscreensaver-4.20-norpm.patch 1287
-MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 1592
-MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
-MD5 8bd9730fb1f84b69efac29fab28d0db2 files/xscreensaver-4.14-analogtv_tmp.patch 419
-MD5 a719b7c6d25874293342a3f22d69d8e4 files/xscreensaver-4.21-norpm.patch 1290
-MD5 d51a7f89b409fa5d58c228856b927993 files/xscreensaver-4.21-settings.patch 1162
-MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
-MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
 MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r2 70
+MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 1592
 MD5 23c5d8085eb70d6dc6168857a31cc284 files/xscreensaver-4.14-fortune.patch 348
 MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
+MD5 deb323da3671e7d537a7d3973e7304ba files/xscreensaver-4.20-norpm.patch 1287
+MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
+MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC5Xr22G5bA0cA/ScRAisvAJ9LYGYgj7eW8o/A+lAoRTScQcxKpQCeJ1o3
-9ktmITN7JLJ5kTEKtCQFIDY=
-=YeJC
+iD8DBQFC5pNwl5AvwDPiUowRAsZbAJ9iswQRsGRhqkJT3ib+7RnGPEj02QCgkQlu
+Dj5DN6fuyu92lxlGn0PGsnc=
+=8/if
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r3 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r3
new file mode 100644
index 000000000000..6f0f6e359c66
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r3
@@ -0,0 +1 @@
+MD5 9f37c428f034e581026e243445378195 xscreensaver-4.22.tar.gz 4620066
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.14-analogtv_tmp.patch b/x11-misc/xscreensaver/files/xscreensaver-4.14-analogtv_tmp.patch
deleted file mode 100644
index 786d5a08a09c..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.14-analogtv_tmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- hacks/analogtv.c.orig	2004-02-19 10:07:05.331873912 +0000
-+++ hacks/analogtv.c	2004-02-19 10:07:21.449423672 +0000
-@@ -292,12 +292,6 @@
-   /* Scale width proportionally */
-   wlim=wlim*hlim/ohlim;
- 
--  {
--    FILE *fp=fopen("/tmp/analogtv.size","w");
--    fprintf(fp,"wlim=%d hlim=%d\n", wlim, hlim);
--    fclose(fp);
--  }
--
-   /* Most times this doesn't change */
-   if (wlim != oldwidth || hlim != oldheight) {
- 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.14-icc.patch b/x11-misc/xscreensaver/files/xscreensaver-4.14-icc.patch
deleted file mode 100644
index dfc861febf5f..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.14-icc.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- driver/Makefile.in.org	2003-12-17 14:18:31.515037306 -0500
-+++ driver/Makefile.in	2003-12-17 14:19:29.077690589 -0500
-@@ -896,10 +896,10 @@
- 	$(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS)
- 
- xscreensaver-getimage: $(GETIMG_OBJS)
--	$(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm
-+	$(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm -lsvml
- 
- pdf2jpeg: $(PDF2JPEG_OBJS)
--	$(OBJCC) $(LDFLAGS) -o $@ $(PDF2JPEG_OBJS) $(PDF2JPEG_LIBS) -lm
-+	$(OBJCC) $(LDFLAGS) -o $@ $(PDF2JPEG_OBJS) $(PDF2JPEG_LIBS) -lm -lsvml
- 
- 
- TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \
-@@ -939,7 +939,7 @@
- xdpyinfo: xdpyinfo.o
- 	$(CC) $(LDFLAGS) -o $@ xdpyinfo.o \
- 		$(LIBS) $(X_LIBS) @GL_LIBS@ \
--		$(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm
-+		$(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm -lsvml
- 
- 
- ##############################################################################
---- hacks/glx/Makefile.in.org	2003-12-17 14:18:00.067691449 -0500
-+++ hacks/glx/Makefile.in	2003-12-17 14:18:12.535449647 -0500
-@@ -47,7 +47,7 @@
- # Note: see comment in ../../driver/Makefile.in for explanation of X_LIBS, etc.
- #
- HACK_PRE	= $(LIBS) $(X_LIBS)
--HACK_POST     = $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) -lm
-+HACK_POST     = $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) -lm -lsvml
- HACK_POST2	= @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
- HACK_LIBS	= $(HACK_PRE)                       $(HACK_POST2)
- XPM_LIBS	= $(HACK_PRE)            @XPM_LIBS@ $(HACK_POST2)
---- hacks/Makefile.in.org	2003-12-17 14:17:34.705252362 -0500
-+++ hacks/Makefile.in	2003-12-17 14:17:48.963688184 -0500
-@@ -49,7 +49,7 @@
- # Note: see comment in ../driver/Makefile.in for explanation of X_LIBS, etc.
- #
- HACK_PRE	= $(LIBS) $(X_LIBS)
--HACK_POST     = $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) -lm
-+HACK_POST     = $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) -lm -lsvml
- HACK_LIBS	= $(HACK_PRE)            @HACK_LIBS@ $(HACK_POST)
- XPM_LIBS	= $(HACK_PRE) @XPM_LIBS@ @HACK_LIBS@ $(HACK_POST)
- JPEG_LIBS	= @JPEG_LIBS@
---- configure.in.org	2003-12-17 13:11:05.092684538 -0500
-+++ configure.in	2003-12-17 14:12:27.912148086 -0500
-@@ -67,7 +67,7 @@
- 
-   if test -n "$GCC"; then
-     AC_MSG_RESULT(Turning on gcc compiler warnings.)
--    CC="$CC -pedantic -Wall -Wstrict-prototypes -Wnested-externs"
-+    CC="$CC"
-     OBJCC="$OBJCC -Wall"
-     # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
-     # and then perhaps we can do without -pedantic?
-@@ -145,7 +145,7 @@
-      # before they were in the ANSI C 99 spec...  (gcc 2.96 permits //
-      # with -std=gnu89 but not with -std=c89.)
-      #
--     CC="$CC -std=c89 -U__STRICT_ANSI__"
-+     CC="$CC"
-    else
-      # The old way:
-      CC="$CC -Wp,-lang-c89"
-@@ -922,7 +922,7 @@
-                     # Note: this trick never works!  (Generally.)
-                     # We're only getting away with using AC_TRY_LINK
-                     # with X libraries because we know it's SunOS.
--                    LDFLAGS="$LDFLAGS -lXmu -lXt -lX11 -lXext -lm"
-+                    LDFLAGS="$LDFLAGS -lXmu -lXt -lX11 -lXext -lm -lsvml"
-                     AC_TRY_LINK(,,
-                                 [ac_cv_sunos_xmu_bug=no],
-                                 [ac_cv_sunos_xmu_bug=yes])
-@@ -1090,14 +1090,14 @@
-   # scrnsaver.h, but doesn't include the code in libXext.a, the idiots!
-   #
-   if test "$have_mit" = yes; then
--    AC_CHECK_X_LIB(Xext, XScreenSaverRegister, [true], [have_mit=no], -lm)
-+    AC_CHECK_X_LIB(Xext, XScreenSaverRegister, [true], [have_mit=no], -lm -lsvml)
- 
-     if test "$have_mit" = no; then
-       # Fuck!  Looks like XF86Free-3.3 actually puts it in XExExt instead
-       # of in Xext.  Thank you master, may I have another.
-       AC_CHECK_X_LIB(XExExt, XScreenSaverRegister,
-                      [have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXExExt"],
--                     [true], -lX11 -lXext -lm)
-+                     [true], -lX11 -lXext -lm -lsvml)
-     fi
- 
-     if test "$have_mit" = no; then
-@@ -1107,7 +1107,7 @@
-       #  may I have another.
-       AC_CHECK_X_LIB(Xss, XScreenSaverRegister,
-                      [have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXss"],
--                     [true], -lX11 -lXext -lm)
-+                     [true], -lX11 -lXext -lm -lsvml)
-     fi
- 
-   if test "$have_mit" = yes; then
-@@ -2570,7 +2570,7 @@
-    have_xp_ext=no
-    AC_CHECK_X_LIB(Xp, XpQueryExtension,
-                   [have_xp_ext=yes; MOTIF_LIBS="$MOTIF_LIBS -lXp"],
--                  [true], -lX11 -lXext -lm)
-+                  [true], -lX11 -lXext -lm -lsvml)
- fi
- 
- 
-@@ -2583,7 +2583,7 @@
- have_xintl=no
- if test "$have_motif" = yes ; then
-   AC_CHECK_X_LIB(Xintl, _Xsetlocale, [have_xintl=yes], [have_xintl=no],
--                 -lX11 -lXext -lm)
-+                 -lX11 -lXext -lm -lsvml)
-   if test "$have_xintl" = yes; then
-     MOTIF_LIBS="$MOTIF_LIBS -lXintl"
-   fi
-@@ -2654,14 +2654,14 @@
-       AC_CHECK_X_LIB(MesaGL, glXCreateContext, 
-                      [gl_lib_1="MesaGL"
-                       GL_LIBS="-lMesaGL -lMesaGLU $GL_LIBS"],
--                     [], -lMesaGLU $GL_LIBS -lX11 -lXext -lm)
-+                     [], -lMesaGLU $GL_LIBS -lX11 -lXext -lm -lsvml)
-     fi
- 
-     if test "$gl_lib_1" = "" ; then
-       AC_CHECK_X_LIB(GL, glXCreateContext, 
-                      [gl_lib_1="GL"
-                       GL_LIBS="-lGL -lGLU $GL_LIBS"],
--                     [], -lGLU $GL_LIBS -lX11 -lXext -lm)
-+                     [], -lGLU $GL_LIBS -lX11 -lXext -lm -lsvml)
-     fi
- 
-     if test "$gl_lib_1" = "" ; then
-@@ -2767,7 +2767,7 @@
-     # Check for OpenGL 1.1 features.
-     #
-     AC_CHECK_X_LIB($gl_lib_1, glBindTexture, [AC_DEFINE(HAVE_GLBINDTEXTURE)],
--                   [true], $GL_LIBS -lX11 -lXext -lm)
-+                   [true], $GL_LIBS -lX11 -lXext -lm -lsvml)
-   fi
- 
- elif test "$with_gl" != no; then
-@@ -2816,7 +2816,7 @@
-     gle_halfassed=yes
-     AC_CHECK_X_LIB(gle, gleCreateGC, 
-                    [have_gle=yes; gle_halfassed=no; GLE_LIBS="-lgle"],
--                   [], $GL_LIBS -lX11 -lXext -lm)
-+                   [], $GL_LIBS -lX11 -lXext -lm -lsvml)
-   fi
-   if test "$have_gle" = yes ; then
-     have_gle=no
-@@ -2830,21 +2830,21 @@
- #
- #    AC_CHECK_X_LIB(gle, uview_direction_d, 
- #                   [have_gle=yes; gle_halfassed=no],
--#                   [], $GL_LIBS -lX11 -lXext -lm)
-+#                   [], $GL_LIBS -lX11 -lXext -lm -lsvml)
- 
-     # As of GLE 3 this is in libgle, and has changed name to uview_direction!
-     # *sigh*
-     if test "$have_gle3" = yes ; then
-       AC_CHECK_X_LIB(gle, uview_direction, 
-                      [have_gle=yes; gle_halfassed=no],
--                    [], $GL_LIBS -lX11 -lXext -lm)
-+                    [], $GL_LIBS -lX11 -lXext -lm -lsvml)
-     fi
-     # if it wasn't in libgle, then look in libmatrix.
-     if test "$have_gle" = no ; then
-       AC_CHECK_X_LIB(matrix, uview_direction_d, 
-                      [have_gle=yes; gle_halfassed=no;
-                       GLE_LIBS="$GLE_LIBS -lmatrix"],
--                    [], $GL_LIBS -lX11 -lXext -lm)
-+                    [], $GL_LIBS -lX11 -lXext -lm -lsvml)
-     fi
-   fi
- 
-@@ -3079,14 +3079,14 @@
- 
-     # library A...
-     AC_CHECK_X_LIB(c, gdk_pixbuf_new_from_file, [have_gdk_pixbuf=yes],,
--                   $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm)
-+                   $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm -lsvml)
-     # library B...
-     if test "$have_gdk_pixbuf" = yes; then
-       have_gdk_pixbuf=no
-       AC_CHECK_X_LIB(c, gdk_pixbuf_xlib_init,
-                      [have_gdk_pixbuf=yes
-                       gdk_pixbuf_halfassed=no],,
--                     $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm)
-+                     $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm -lsvml)
-     fi
-   fi
- 
-@@ -3183,7 +3183,7 @@
-         have_xshm=no
-         AC_CHECK_X_LIB(XextSam, XShmQueryExtension,
-                        [have_xshm=yes; X_EXTRA_LIBS="$X_EXTRA_LIBS -lXextSam"],
--                       [true], -lX11 -lXext -lm)
-+                       [true], -lX11 -lXext -lm -lsvml)
-       fi
-     ;;
-   esac
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch
deleted file mode 100644
index 084c83a77056..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	2005-05-27 13:09:59.000000000 -0500
-+++ configure	2005-05-27 13:10:56.000000000 -0500
-@@ -21257,34 +21257,6 @@
- 
-   # M4 sucks!!
- 
--  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`
--
--
--  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
- 
- if test "${bindir}" = "${HACKDIR}" ; then
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.21-settings.patch b/x11-misc/xscreensaver/files/xscreensaver-4.21-settings.patch
deleted file mode 100644
index f300c1b83871..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.21-settings.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- driver/XScreenSaver.ad.in.orig	2005-05-27 14:10:59.000000000 -0500
-+++ driver/XScreenSaver.ad.in	2005-05-27 14:10:46.000000000 -0500
-@@ -31,19 +31,19 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:15:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *lockVTs:		True
- *verbose:		False
- *timestamp:		True
-@@ -57,11 +57,11 @@
- *captureStderr: 	True
- *ignoreUninstalledPrograms: False
- 
--*textMode:		file
--*textLiteral:		XScreenSaver
--*textFile:		/usr/X11R6/lib/X11/doc/README
--*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
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r3.ebuild
new file mode 100644
index 000000000000..3f34183b922e
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.22-r3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r3.ebuild,v 1.1 2005/07/26 19:47:06 smithj Exp $
+
+inherit eutils flag-o-matic pam
+
+IUSE="gnome jpeg kde kerberos krb4 motif 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"
+SLOT="0"
+
+# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't
+#       really matter if it isn't there. Maybe we should have a 'games'
+#       USE flag...
+
+# smithj says (2005-07-26):
+# MOTIF WAS REMOVED FOR A REASON! The motif version has not been maintained for
+# some time, and has problems both at build-time and run-time. This ebuild
+# (4.22-r3) is going to force gtk support and disable motif support. Hopefully
+# the users won't complain too much...
+
+RDEPEND="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 )
+	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl
+	          >=media-libs/gle-3.0.1 )
+	!arm? ( new-login? ( gnome-base/gdm ) )"
+
+DEPEND="${RDEPEND}
+	sys-devel/bc
+	dev-lang/perl
+	dev-util/pkgconfig
+	motif? ( virtual/motif )
+	nls? ( sys-devel/gettext )"
+
+# simple workaround for the flurry screensaver
+filter-flags -mabi=altivec
+filter-flags -maltivec
+append-flags -U__VEC__
+
+pkg_setup() {
+	if use kerberos && ! use krb4 ; then
+		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
+		ewarn "disabled unless kerberos 4 support has been compiled with your"
+		ewarn "kerberos libraries. To do that, you should abort now and do:"
+		ewarn
+		ewarn " USE=\"krb4\" emerge mit-krb5"
+		ewarn
+		epause
+	fi
+	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}
+
+	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
+	# use gnome-terminal in tests rather than gnome-open (bug #94708)
+	epatch ${FILESDIR}/${PN}-4.22-configure.patch
+	# tweaks the default configuration (driver/XScreenSaver.ad.in)
+	epatch ${FILESDIR}/${PN}-4.22-settings.patch
+	# fixes wrong argument for inter-aggregate screensaver
+	epatch ${FILESDIR}/${PN}-4.22-interaggregate.patch
+	# disable not-safe-for-work xscreensavers
+	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
+}
+
+src_compile() {
+	local myconf
+	use kerberos && use krb4 \
+		&& myconf="${myconf} --with-kerberos" \
+		|| myconf="${myconf} --without-kerberos"
+
+	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 \
+		$(use_with motif) \
+		$(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) \
+		${myconf} || 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
+	if use gnome ; then
+		dodir /usr/share/gnome/capplets
+		insinto /usr/share/gnome/capplets
+		doins driver/screensaver-properties.desktop
+	fi
+
+	# install symlink to satisfy kde
+	use kde && dosym /usr/share/xscreensaver/config /usr/$(get_libdir)/xscreensaver/config
+
+	# Remove "extra" capplet
+	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
+
+	if use gnome ; then
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	fi
+
+	use pam && fperms 755 /usr/bin/xscreensaver
+	pamd_mimic_system xscreensaver auth
+}
+
+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
+
+	einfo
+	einfo "The gtk USE flag has been dropped. gtk is now required for Gentoo's"
+	einfo "xscreensaver. If this is a problem, bug upstream."
+	einfo
+}