diff options
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch | 137 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch | 12 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch | 57 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild | 104 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.06.ebuild | 105 |
6 files changed, 8 insertions, 416 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 8614ea842877..456659d6727b 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.240 2008/11/16 11:56:15 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.241 2008/11/16 13:03:17 loki_val Exp $ + + 16 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> + -files/5.06/01_all_default_settings.patch, + -files/5.06/03_all_no_intltool.patch, + -files/5.06/02_all_xinerama_function.patch, -xscreensaver-5.05-r1.ebuild, + -xscreensaver-5.06.ebuild: + Punting old... 16 Nov 2008; Raúl Porcel <armin76@gentoo.org> xscreensaver-5.07.ebuild: alpha/arm/ia64/sh/sparc/x86 stable wrt #246717 diff --git a/x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch b/x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch deleted file mode 100644 index 6c41cc8bd26b..000000000000 --- a/x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -ur xscreensaver-5.06.orig/driver/screensaver-properties.desktop.in xscreensaver-5.06/driver/screensaver-properties.desktop.in ---- xscreensaver-5.06.orig/driver/screensaver-properties.desktop.in 2008-01-27 01:16:59.000000000 +0200 -+++ xscreensaver-5.06/driver/screensaver-properties.desktop.in 2008-08-05 00:07:25.000000000 +0300 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Exec=xscreensaver-demo --Icon=xscreensaver -+Icon=/usr/share/pixmaps/xscreensaver.xpm - Terminal=false - _Name=Screensaver - _Comment=Change screensaver properties -diff -ur xscreensaver-5.06.orig/driver/XScreenSaver.ad.in xscreensaver-5.06/driver/XScreenSaver.ad.in ---- xscreensaver-5.06.orig/driver/XScreenSaver.ad.in 2008-07-17 00:03:56.000000000 +0300 -+++ xscreensaver-5.06/driver/XScreenSaver.ad.in 2008-08-05 00:00:15.000000000 +0300 -@@ -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 -ur xscreensaver-5.06.orig/hacks/barcode.c xscreensaver-5.06/hacks/barcode.c ---- xscreensaver-5.06.orig/hacks/barcode.c 2006-04-06 09:40:32.000000000 +0300 -+++ xscreensaver-5.06/hacks/barcode.c 2008-08-05 00:00: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.06.orig/hacks/glx/glsnake.c xscreensaver-5.06/hacks/glx/glsnake.c ---- xscreensaver-5.06.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 -+++ xscreensaver-5.06/hacks/glx/glsnake.c 2008-08-05 00:00:21.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/5.06/02_all_xinerama_function.patch b/x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch deleted file mode 100644 index fdb13ae0399c..000000000000 --- a/x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xscreensaver-5.06.orig/driver/screens.c xscreensaver-5.06/driver/screens.c ---- xscreensaver-5.06.orig/driver/screens.c 2008-07-07 12:03:00.000000000 +0300 -+++ xscreensaver-5.06/driver/screens.c 2008-08-05 00:49:54.000000000 +0300 -@@ -563,7 +563,7 @@ - if (! monitors) monitors = vidmode_scan_monitors (si->dpy); - # endif - --# ifdef HAVE_XF86VMODE -+# ifdef HAVE_XINERAMA - if (! monitors) monitors = xinerama_scan_monitors (si->dpy); - # endif - diff --git a/x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch b/x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch deleted file mode 100644 index f5fb645c8c09..000000000000 --- a/x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -ur xscreensaver-5.07_old/configure.in xscreensaver-5.07/configure.in ---- xscreensaver-5.07_old/configure.in 2008-10-16 02:15:57.761938178 +0200 -+++ xscreensaver-5.07/configure.in 2008-10-16 02:11:43.311971411 +0200 -@@ -1172,7 +1172,7 @@ - # - ############################################################################### - --AC_PROG_INTLTOOL -+# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958 - GETTEXT_PACKAGE=xscreensaver - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", - [This is the name of the gettext package to use.]) -diff -ur xscreensaver-5.07_old/driver/Makefile.in xscreensaver-5.07/driver/Makefile.in ---- xscreensaver-5.07_old/driver/Makefile.in 2008-10-16 02:15:57.835271514 +0200 -+++ xscreensaver-5.07/driver/Makefile.in 2008-10-16 03:16:51.678244563 +0200 -@@ -22,7 +22,7 @@ - mansuffix = 1 - manNdir = $(mandir)/man$(mansuffix) - --INTLTOOL_MERGE = @INTLTOOL_MERGE@ -+#INTLTOOL_MERGE = @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958 - - GTK_DATADIR = @GTK_DATADIR@ - GTK_APPDIR = $(GTK_DATADIR)/applications -@@ -492,20 +492,19 @@ - - # screensaver-properties.desktop - # into /usr/share/applications/ --install-gnome:: screensaver-properties.desktop -+install-gnome:: - @if [ "$(GTK_DATADIR)" != "" ]; then \ - if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ - fi ;\ - name2=xscreensaver-properties.desktop ;\ -- echo $(INSTALL_DATA) screensaver-properties.desktop \ -+ echo $(INSTALL_DATA) screensaver-properties.desktop.in \ - $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ -- $(INSTALL_DATA) screensaver-properties.desktop \ -+ $(INSTALL_DATA) screensaver-properties.desktop.in \ - $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ - fi - -- - # xscreensaver.xpm - # into /usr/share/pixmaps/ - install-gnome:: $(LOGO) -@@ -764,7 +763,7 @@ - XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad - $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h - --@INTLTOOL_DESKTOP_RULE@ -+# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958 - - # The executables linked in this directory. - # diff --git a/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild deleted file mode 100644 index 50caeba12a8d..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild +++ /dev/null @@ -1,104 +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.05-r1.ebuild,v 1.1 2008/05/07 19:03:33 drac Exp $ - -inherit autotools eutils flag-o-matic multilib pam - -DESCRIPTION="A modular screen saver and locker for the X Window System" -SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" -HOMEPAGE="http://www.jwz.org/xscreensaver" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="jpeg new-login opengl pam suid xinerama" - -RDEPEND="x11-libs/libXmu - x11-libs/libXxf86vm - x11-libs/libXrandr - x11-libs/libXxf86misc - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXext - x11-apps/xwininfo - x11-apps/appres - media-libs/netpbm - >=dev-libs/libxml2-2.5 - >=x11-libs/gtk+-2 - >=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_SUFFIX="patch" epatch "${FILESDIR}"/${PV} - eautoreconf # bug 113681 -} - -src_compile() { - if use ppc || use ppc64; then - # Still fails to build "flurry" screensaver. - filter-flags -mabi=altivec - filter-flags -maltivec - append-flags -U__VEC__ - fi - - 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-randr-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) - - emake -j1 || die "emake failed." # bug 155049 -} - -src_install() { - emake install_prefix="${D}" install || die "emake install failed." - - dodoc README{,.hacking} - - use pam && fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - - # bug 135549 - rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml - dodir /usr/share/man/man6x - mv "${D}"/usr/share/man/man6/worm.6 \ - "${D}"/usr/share/man/man6x/worm.6x -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.06.ebuild b/x11-misc/xscreensaver/xscreensaver-5.06.ebuild deleted file mode 100644 index eeddc0467f49..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.06.ebuild +++ /dev/null @@ -1,105 +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.06.ebuild,v 1.1 2008/08/04 21:59:51 drac Exp $ - -inherit autotools eutils flag-o-matic multilib pam - -DESCRIPTION="A modular screen saver and locker for the X Window System" -SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" -HOMEPAGE="http://www.jwz.org/xscreensaver" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="jpeg new-login opengl pam suid xinerama" - -RDEPEND="x11-libs/libXmu - x11-libs/libXxf86vm - x11-libs/libXrandr - x11-libs/libXxf86misc - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXext - x11-apps/xwininfo - x11-apps/appres - media-libs/netpbm - >=dev-libs/libxml2-2.5 - >=x11-libs/gtk+-2 - >=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_SUFFIX="patch" epatch "${FILESDIR}"/${PV} - eautoreconf # bug 113681 -} - -src_compile() { - if use ppc || use ppc64; then - # Still fails to build "flurry" screensaver. - filter-flags -mabi=altivec - filter-flags -maltivec - append-flags -U__VEC__ - fi - - 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-randr-ext \ - --with-proc-interrupts \ - --with-xpm \ - --with-xshm-ext \ - --with-xdbe-ext \ - --enable-locking \ - --without-kerberos \ - --without-gle \ - --with-gtk \ - --with-pixbuf \ - $(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) - - emake -j1 || die "emake failed." # bug 155049 -} - -src_install() { - emake install_prefix="${D}" install || die "emake install failed." - - dodoc README{,.hacking} - - use pam && fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - - # bug 135549 - rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml - dodir /usr/share/man/man6x - mv "${D}"/usr/share/man/man6/worm.6 \ - "${D}"/usr/share/man/man6x/worm.6x -} |