old
authorSamuli Suominen <ssuominen@gentoo.org>
Fri, 21 Oct 2011 15:03:38 +0000 (15:03 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Fri, 21 Oct 2011 15:03:38 +0000 (15:03 +0000)
Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

x11-misc/xscreensaver/ChangeLog
x11-misc/xscreensaver/Manifest
x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch [deleted file]
x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch [deleted file]
x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch [deleted file]
x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild [deleted file]
x11-misc/xscreensaver/xscreensaver-5.12.ebuild [deleted file]
x11-misc/xscreensaver/xscreensaver-5.13.ebuild [deleted file]

index f8b27509964b2e00af43ca78f6455273ec605eeb..8c0e690cb81f7d6b735ae34e87cf283450a2eeae 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.294 2011/10/04 21:55:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.295 2011/10/21 15:03:38 ssuominen Exp $
+
+  21 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xscreensaver-5.10-gentoo.patch, -xscreensaver-5.12.ebuild,
+  -xscreensaver-5.12-r1.ebuild,
+  -files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch,
+  -files/xscreensaver-5.12-gltext-memleak.patch, -xscreensaver-5.13.ebuild:
+  old
 
   04 Oct 2011; Joseph Jezak <josejx@gentoo.org> xscreensaver-5.14.ebuild:
   Marked ppc/ppc64 stable for bug #381043.
index 56aed9d91b10a92428bd6ed78d58c8512a6cd372..a0371bb88d734041378a81bc4d636783ac4b7a34 100644 (file)
@@ -2,23 +2,19 @@
 Hash: SHA1
 
 AUX xscreensaver-5.05-interix.patch 1033 RMD160 8246ead601e80f89e535ffad6b6d3298c7f96eab SHA1 b3e5168c1cb204032c5af4a7631dc08222b0eee5 SHA256 3ddb5277929a9a3b65ba4a89cf59d3c2ffd3d51ce43f9ac83062afcd118d9f27
-AUX xscreensaver-5.10-gentoo.patch 3673 RMD160 3b70efb6ae6b4e69471e35ed4674524e8dc4a7c1 SHA1 6e35e2c874c52c08e6ec0962ed964753089e9821 SHA256 ca0f244d52e7c61e1776480ff390a152acac1f5b4b0d8018a8d12f773e233ab3
-AUX xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch 485 RMD160 96622fa4aa95bd13afe4b9dbc9b998319524c972 SHA1 85d8f5e07d08c1080e605a7cdcf9aa89ff7752fd SHA256 6bee564aa12e7533f54f52834681eea12cbee387f3875f114a7751e83e065128
-AUX xscreensaver-5.12-gltext-memleak.patch 219 RMD160 1ab5299f8b6f19fe86714d846b24b810c133f2e4 SHA1 2108fd66fbbb45cb57b31762dd3a13a99d99b579 SHA256 d59c517376c38b09bcda18eea1d61d4dfcbf8d8d6885043447a571594ed516e4
 AUX xscreensaver-5.14-gentoo.patch 2940 RMD160 ab0e0d86e4391b0f109747be94c3ae01c9778f25 SHA1 e68f018f3d0069faab5efdc489e2048237e1cd9a SHA256 141823bada0173563cf3dfe87f797ddad85abadfd3dd29abfbe14c1c80aa55c3
-DIST xscreensaver-5.12.tar.gz 5606851 RMD160 c0fbd8cfad2919b06c8479bcebfa9af81aa97ae6 SHA1 7252540b1b1853459a56453714c0974de26fa4c5 SHA256 b11da52775c895e29c312a4472187afdecffc809ef691c7ae603475072efdbce
-DIST xscreensaver-5.13.tar.gz 5923496 RMD160 97537e67bfb2d4ce0b407ea86f33e9ca69114114 SHA1 3bdac6122e5b7b0cffcc90b3b75dc7fa001c0181 SHA256 0910a9f75697512b239d863cecd644bf8302c565b08f86b9273780757a173d55
 DIST xscreensaver-5.14.tar.gz 5925175 RMD160 f3f832cf34781c68a4716298e0e5f3ad4f095106 SHA1 bfa37a9e7b2e93f54922191bb93dbc70c2f73772 SHA256 3eea040f452e17572177840566eb880b259ee5a970444f3a4ae178db18ebf023
-EBUILD xscreensaver-5.12-r1.ebuild 2771 RMD160 4422b55cdb57f845ca285ed6df121ca463edd820 SHA1 4bcfef7e18d6b4d82012f971000bc6705499e58c SHA256 3917c7fabf6fb0337e85e60f24b5552e1d27d90ad1f91f132a194885497d9234
-EBUILD xscreensaver-5.12.ebuild 2534 RMD160 0b15b7c781e429f5b4ca01d0fafa0927e3ec7522 SHA1 3b0a6c916997c9abf873617c00bb0f1ddd597c8c SHA256 ab7c83ae4a14fc1560170b1ae6708a651db558afa1ec77a8990c827449dfe1c2
-EBUILD xscreensaver-5.13.ebuild 2740 RMD160 fcbf9a51daf9a125f68f9d80639828e46573ea04 SHA1 c96ecac4546e07993ec26ac901673151aabbe310 SHA256 05222eb52214bbf23325adf18ee44864b93a50047563ae238cd26b2c5878b778
 EBUILD xscreensaver-5.14.ebuild 2762 RMD160 29bbe8f90ff624e248e4846b1337dba880fb2d15 SHA1 34cf83353d4e8f85effaa245bb8defd65720dea6 SHA256 7b840430be1fb8f585b19681d5808f2a9cddffad22153348e557b566c974e34e
-MISC ChangeLog 47432 RMD160 5635c4129162b55bd669522b30f514b6ec25aa26 SHA1 92374580fdac883b8079d002883c779a1771af27 SHA256 93ab238d1515b0bb909774cb3006d7fee8268f13eddcfa350e7add2ac830fcd9
+MISC ChangeLog 47738 RMD160 23121a56cfcb9a1a959ed3db0ecc11a94a94709e SHA1 d504a7a32f71e2ed9243c0b7fb999b11110d4caa SHA256 b784566f1b683b6df46363a82af152ec338c0bfba51a1c6abf9aac1552389edd
 MISC metadata.xml 494 RMD160 ba20404c67b1049332bae94a7a3543d33fb0579f SHA1 431f3a7cacea2e341fed0ef301f70941c9e5adb4 SHA256 b49839244c1c8d9df0ede500471c7d7e9037a8d62150c97ced979e50e68f8a10
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6LgM0ACgkQcsIHjyDViGSRzwCaA5vKanSjq50rB5iFwAr1Qxn4
-RIMAnRIc8ElxY8jDw+bbqK19/oHYw7Lh
-=gKVE
+iQEcBAEBAgAGBQJOoYmnAAoJEEdUh39IaPFNzLUH/iLh0ID468eBjkyE8NqTVt0a
+NeHC6jiVZATzgThoQNKpMW+z53kYlTPMZVmBC2hg9ANtLkWpdFrVw1qccY1hyDKi
+1oeVIYH0bxmbQvbmMHhJ1mWLn6fp2Puz3Om865Y5I6owdKP50/jBKw7p+AGvO42/
+1ZQ3bPW1gWgJa2aL9NYsWoC2gcFt7Oc4jAEpzuT3dOpcnQaaxA2jQ+mE/1FpIl+j
+42vJoNVxAuUFjDC3ybta7Y7DV1SdtKcuY9nl3TE9ccHPfGMHGZk0h5mn1iHFVAtp
+DZYVgWlyznfSkWIYz1SR+Gs7cuvcfRVGh5d3UJvCGwGDBJGbs6J5jyPHFho5sFE=
+=isI/
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch
deleted file mode 100644 (file)
index 8099fc8..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ur xscreensaver-5.10.orig/driver/XScreenSaver.ad.in xscreensaver-5.10/driver/XScreenSaver.ad.in
---- xscreensaver-5.10.orig/driver/XScreenSaver.ad.in   2009-09-08 07:53:15.000000000 +0300
-+++ xscreensaver-5.10/driver/XScreenSaver.ad.in        2009-09-10 14:08:07.000000000 +0300
-@@ -31,26 +31,26 @@
- *mode:                        random
- *timeout:             0:10:00
- *cycle:                       0:10:00
--*lockTimeout:         0:00:00
-+*lockTimeout:         0:30: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
- *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
-@@ -60,7 +60,7 @@
- *textLiteral:         XScreenSaver
- *textFile:            @DEFAULT_TEXT_FILE@
- *textProgram:         fortune
--*textURL:             http://www.livejournal.com/stats/latest-rss.bml
-+*textURL:             http://planet.gentoo.org/rss20.xml
- !*textURL:            http://twitter.com/statuses/public_timeline.atom
- *overlayTextForeground:       #FFFF00
-@@ -118,7 +118,8 @@
- ! 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
-+*dateFormat:          %x %X
-+! *dateFormat:                %d-%b-%y (%a); %I:%M %p
- ! To show the time only:
- ! *dateFormat:                %I:%M %p
- ! For 24 hour time:
-diff -ur xscreensaver-5.10.orig/hacks/barcode.c xscreensaver-5.10/hacks/barcode.c
---- xscreensaver-5.10.orig/hacks/barcode.c     2008-07-31 13:17:32.000000000 +0300
-+++ xscreensaver-5.10/hacks/barcode.c  2009-09-10 14:10:21.000000000 +0300
-@@ -131,7 +131,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -265,7 +264,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -333,8 +331,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
-diff -ur xscreensaver-5.10.orig/hacks/glx/glsnake.c xscreensaver-5.10/hacks/glx/glsnake.c
---- xscreensaver-5.10.orig/hacks/glx/glsnake.c 2008-08-11 01:45:23.000000000 +0300
-+++ xscreensaver-5.10/hacks/glx/glsnake.c      2009-09-10 14:11:41.000000000 +0300
-@@ -565,17 +565,17 @@
-       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 @@
-     { "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/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch b/x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
deleted file mode 100644 (file)
index 14a9f78..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/349512
-
---- driver/xscreensaver.c
-+++ driver/xscreensaver.c
-@@ -1382,6 +1382,7 @@
-   struct passwd *spasswd;
-   int i;
-+#if 0
- #ifdef ENABLE_NLS
-   if (!setlocale (LC_ALL, ""))
-     fprintf (stderr, "locale not supported by C library\n");
-@@ -1389,6 +1390,7 @@
-   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-   textdomain (GETTEXT_PACKAGE);
- #endif /* ENABLE_NLS */
-+#endif
-   memset(si, 0, sizeof(*si));
-   global_si_kludge = si;      /* I hate C so much... */
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch b/x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch
deleted file mode 100644 (file)
index 0a80767..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/351173
-
---- hacks/glx/tube.c
-+++ hacks/glx/tube.c
-@@ -181,6 +181,8 @@
-         glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
-       }
-+  free(array);
-+
-   return polys;
- }
diff --git a/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild
deleted file mode 100644 (file)
index 9b9ddcd..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild,v 1.2 2011/03/15 23:22:25 abcd Exp $
-
-EAPI=3
-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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-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-libs/libXi
-       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? ( virtual/jpeg )
-       opengl? ( virtual/opengl )
-       xinerama? ( x11-libs/libXinerama )
-       new-login? ( || ( gnome-base/gdm kde-base/kdm ) )"
-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}"/${PN}-5.10-gentoo.patch \
-               "${FILESDIR}"/${P}-*.patch \
-               "${FILESDIR}"/${PN}-5.05-interix.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 \
-               --x-includes="${EPREFIX}"/usr/include \
-               --x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-               --enable-locking \
-               --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-               --with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-               --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-               --with-dpms-ext \
-               $(use_with xinerama xinerama-ext) \
-               --with-xinput-ext \
-               --with-xf86vmode-ext \
-               --with-xf86gamma-ext \
-               --with-randr-ext \
-               --with-proc-interrupts \
-               $(use_with pam) \
-               --without-kerberos \
-               $(use_with new-login login-manager) \
-               --with-gtk \
-               $(use_with opengl gl) \
-               --without-gle \
-               --with-pixbuf \
-               $(use_with jpeg) \
-               --with-xshm-ext \
-               --with-xdbe-ext \
-               --with-text-file="${EPREFIX}"/etc/gentoo-release \
-               $(use_with suid setuid-hacks)
-}
-
-src_install() {
-       emake install_prefix="${D}" install || die
-       dodoc README{,.hacking}
-
-       use pam && fperms 755 /usr/bin/${PN}
-       pamd_mimic_system ${PN} auth
-
-       rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.12.ebuild b/x11-misc/xscreensaver/xscreensaver-5.12.ebuild
deleted file mode 100644 (file)
index 569330e..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.12.ebuild,v 1.6 2011/01/21 14:54:21 jer 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-libs/libXi
-       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? ( virtual/jpeg )
-       opengl? ( virtual/opengl )
-       xinerama? ( x11-libs/libXinerama )
-       new-login? ( || ( gnome-base/gdm kde-base/kdm ) )"
-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}"/${PN}-5.10-gentoo.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 \
-               --x-includes=/usr/include \
-               --x-libraries=/usr/$(get_libdir) \
-               --enable-locking \
-               --with-hackdir=/usr/$(get_libdir)/misc/${PN} \
-               --with-configdir=/usr/share/${PN}/config \
-               --with-x-app-defaults=/usr/share/X11/app-defaults \
-               --with-dpms-ext \
-               $(use_with xinerama xinerama-ext) \
-               --with-xinput-ext \
-               --with-xf86vmode-ext \
-               --with-xf86gamma-ext \
-               --with-randr-ext \
-               --with-proc-interrupts \
-               $(use_with pam) \
-               --without-kerberos \
-               $(use_with new-login login-manager) \
-               --with-gtk \
-               $(use_with opengl gl) \
-               --without-gle \
-               --with-pixbuf \
-               $(use_with jpeg) \
-               --with-xshm-ext \
-               --with-xdbe-ext \
-               --with-text-file=/etc/gentoo-release \
-               $(use_with suid setuid-hacks)
-}
-
-src_install() {
-       emake install_prefix="${D}" install || die
-       dodoc README{,.hacking}
-
-       use pam && fperms 755 /usr/bin/${PN}
-       pamd_mimic_system ${PN} auth
-
-       rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.13.ebuild b/x11-misc/xscreensaver/xscreensaver-5.13.ebuild
deleted file mode 100644 (file)
index 075dae9..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.13.ebuild,v 1.1 2011/05/18 15:04:13 ssuominen Exp $
-
-EAPI=4
-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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-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-libs/libXi
-       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? ( virtual/jpeg )
-       opengl? ( virtual/opengl )
-       xinerama? ( x11-libs/libXinerama )
-       new-login? ( || ( gnome-base/gdm kde-base/kdm ) )"
-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}"/${PN}-5.10-gentoo.patch \
-               "${FILESDIR}"/${PN}-5.05-interix.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 \
-               --x-includes="${EPREFIX}"/usr/include \
-               --x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-               --enable-locking \
-               --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-               --with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-               --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-               --with-dpms-ext \
-               $(use_with xinerama xinerama-ext) \
-               --with-xinput-ext \
-               --with-xf86vmode-ext \
-               --with-xf86gamma-ext \
-               --with-randr-ext \
-               --with-proc-interrupts \
-               $(use_with pam) \
-               --without-kerberos \
-               $(use_with new-login login-manager) \
-               --with-gtk \
-               $(use_with opengl gl) \
-               --without-gle \
-               --with-pixbuf \
-               $(use_with jpeg) \
-               --with-xshm-ext \
-               --with-xdbe-ext \
-               --with-text-file="${EPREFIX}"/etc/gentoo-release \
-               $(use_with suid setuid-hacks)
-}
-
-src_install() {
-       emake install_prefix="${D}" install
-       dodoc README{,.hacking}
-
-       use pam && fperms 755 /usr/bin/${PN}
-       pamd_mimic_system ${PN} auth
-
-       rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}