summaryrefslogtreecommitdiff
path: root/x11-misc
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/Manifest4
-rw-r--r--x11-misc/xscreensaver/files/5.07/01_all_default_settings.patch137
-rw-r--r--x11-misc/xscreensaver/files/5.07/02_all_no_intltool.patch57
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.07-r1.ebuild105
4 files changed, 303 insertions, 0 deletions
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
new file mode 100644
index 0000000..729dee4
--- /dev/null
+++ b/x11-misc/xscreensaver/Manifest
@@ -0,0 +1,4 @@
+AUX 5.07/01_all_default_settings.patch 4478 RMD160 07abe8dddfb615b302db1d1e693e3fe08f93ed45 SHA1 380989245e9008c5ebe1ea02992dc82ceaf81f64 SHA256 5514cde38e59cdafd4be55213dc5cc7d22885ca417276b39ae2860ed9e8ef276
+AUX 5.07/02_all_no_intltool.patch 2277 RMD160 a24cef7922cd1cfa1a01aece5536d98ebdb28ccc SHA1 2c1e221a789d9cda9fc64346503d2d305637e1aa SHA256 e6aff6454346b5811fb9da5d626efaca8af2329e0ab92af8e547b7492c96b19d
+DIST xscreensaver-5.07.tar.gz 5513131 RMD160 d2fee54c3138c717433f5a6ca9a098028082af95 SHA1 82c611ab271807ad871aa46a3a7f6b95706d31aa SHA256 8c50a74c07b1fffcbb20bd79e3ee92f1f52191e5a187433bb49964ccf94badb6
+EBUILD xscreensaver-5.07-r1.ebuild 2678 RMD160 5c7bcf658deb57aba2bf22e16cd8611ee778d847 SHA1 087918517b1cfc355cc02dd75bbdacc3cf19aa40 SHA256 84e0f792b444354fe54819e011d7b025c0d79d4653b63a3b5e08e0e5a0b4675d
diff --git a/x11-misc/xscreensaver/files/5.07/01_all_default_settings.patch b/x11-misc/xscreensaver/files/5.07/01_all_default_settings.patch
new file mode 100644
index 0000000..6c41cc8
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.07/01_all_default_settings.patch
@@ -0,0 +1,137 @@
+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.07/02_all_no_intltool.patch b/x11-misc/xscreensaver/files/5.07/02_all_no_intltool.patch
new file mode 100644
index 0000000..f5fb645
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.07/02_all_no_intltool.patch
@@ -0,0 +1,57 @@
+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.07-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.07-r1.ebuild
new file mode 100644
index 0000000..1f652d5
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.07-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvs/lportage/x11-misc/xscreensaver/xscreensaver-5.07-r1.ebuild,v 1.1 2008-11-18 23:53:37 randomdan 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
+}