allows user-cflags for #89963; installs all screensavers for #89908; fixed hackdir so that it works with xscreensaver 4.22-r1

Package-Manager: portage-2.0.51.22-r1

5 files changed, 179 insertions, 6 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 2364a77c8330..a178d9e65041 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/rss-glx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.31 2005/06/25 12:29:57 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.32 2005/06/25 16:40:23 smithj Exp $
+
+*rss-glx-0.8.0-r1 (25 Jun 2005)
+
+  25 Jun 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/rss-glx-0.8.0-configure.in.patch, +rss-glx-0.8.0-r1.ebuild:
+  allows user-cflags for #89963; installs all screensavers for #89908; fixed
+  hackdir so that it works with xscreensaver 4.22-r1
 
   25 Jun 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml:
   removed vapier and liquidx as maintainer
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index df075e3439c7..139876bbfa41 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 503c247c3675ae80a971018cc4660df5 ChangeLog 5574
 MD5 d455ab02ea8f01213b3bbabc80cec72b rss-glx-0.7.6-r1.ebuild 4490
 MD5 3881c6c924d1b00291fb9c15455fe0b9 rss-glx-0.7.6.ebuild 4046
 MD5 2b2bf7730af496e4eee5da98c390868d rss-glx-0.8.0.ebuild 4635
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 d37cf2a8b33927e7e4bd4167720bdf83 ChangeLog 5857
+MD5 c9bd51f1a08343044d47e7ec3cd5e83d rss-glx-0.8.0-r1.ebuild 4724
 MD5 c569bd57d6615d7b3d0d66db78c86bb9 files/digest-rss-glx-0.7.6 67
 MD5 c569bd57d6615d7b3d0d66db78c86bb9 files/digest-rss-glx-0.7.6-r1 67
 MD5 6c580284e5773f292a32a5a30fcf539a files/digest-rss-glx-0.8.0 67
-MD5 4dbe321921028a106a05564a14b2f814 files/jwz-vroot.h 6234
 MD5 2f47a2d4b9947332e2817ec81f2ec0d7 files/rss-glx-0.7.4-kdedesktop.patch 833
 MD5 2ef57cb76733985320d72f9ca147f109 files/rss-glx-0.8.0-assert.patch 553
 MD5 9b4404f02157380acbe80165fb4b7bf2 files/rss-glx-0.8.0-kdedesktop.patch 854
+MD5 9ffedb9bb790a6ff0bb9b3e64c6c6675 files/rss-glx-0.8.0-configure.in.patch 642
+MD5 4dbe321921028a106a05564a14b2f814 files/jwz-vroot.h 6234
+MD5 6c580284e5773f292a32a5a30fcf539a files/digest-rss-glx-0.8.0-r1 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCvU/Fl5AvwDPiUowRArYjAJ49NSAU3qac7ungX/eh83mWLYOadQCfXs9D
-2TGTAsuLPJ/a5TTXvuFJmwo=
-=FJqW
+iD8DBQFCvYkyl5AvwDPiUowRAgCEAKCTO+OZfyObmuWyGYjAT7gQLixI9gCgiBW0
+ihedXaZnc4YQJFRzrZOgO58=
+=+orm
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r1 b/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r1
new file mode 100644
index 000000000000..8ecb6e1faf3b
--- /dev/null
+++ b/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r1
@@ -0,0 +1 @@
+MD5 d04e909521626a27f9f6d9b5f8a24d6c rss-glx_0.8.0.tar.bz2 5239207
diff --git a/x11-misc/rss-glx/files/rss-glx-0.8.0-configure.in.patch b/x11-misc/rss-glx/files/rss-glx-0.8.0-configure.in.patch
new file mode 100644
index 000000000000..67aaacbf60a6
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.0-configure.in.patch
@@ -0,0 +1,18 @@
+diff -aur rss-glx_0.8.0-orig/configure.in rss-glx_0.8.0/configure.in
+--- rss-glx_0.8.0-orig/configure.in	2005-04-10 04:45:45.000000000 +0200
++++ rss-glx_0.8.0/configure.in	2005-04-21 21:34:27.000000000 +0200
+@@ -7,14 +7,12 @@
+ AC_PROG_AWK
+ 
+ AC_PROG_CC
+-CFLAGS=-g
+ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
+     [build with debugging information default=yes])],
+     [test "$enableval" = "no" && CFLAGS="-O2"])
+ CFLAGS="$CFLAGS -Wall"
+ 
+ AC_PROG_CXX
+-CXXFLAGS=-g
+ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
+     [build with debugging information default=yes])],
+     [test "$enableval" = "no" && CXXFLAGS="-O2"])
diff --git a/x11-misc/rss-glx/rss-glx-0.8.0-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..69a63230f002
--- /dev/null
+++ b/x11-misc/rss-glx/rss-glx-0.8.0-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.0-r1.ebuild,v 1.1 2005/06/25 16:40:23 smithj Exp $
+
+inherit flag-o-matic eutils
+
+MY_P=${PN}_${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Really Slick Screensavers using OpenGL for XScreenSaver"
+HOMEPAGE="http://rss-glx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="kde sse 3dnow openal xscreensaver"
+
+DEPEND="virtual/x11
+	virtual/opengl
+	>=media-gfx/imagemagick-5.5.7
+	kde? ( || ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork ) )
+	!kde? ( >=x11-misc/xscreensaver-4.22-r1 )
+	xscreensaver? ( >=x11-misc/xscreensaver-4.22-r1 )
+	openal? ( media-libs/openal )"
+
+pkg_setup() {
+	if use kde && use xscreensaver ; then
+		if ! built_with_use kde-base/kdeartwork-kscreensaver xscreensaver && \
+		   ! built_with_use kde-base/kdeartwork xscreensaver ; then
+			eerror "rss-glx wont work nicely with kde unless you emerge"
+			eerror "kde-base/kdeartwork or kde-base/kdeartwork-kscreensaver"
+			eerror "with USE=xscreensaver."
+			eerror "See http://bugs.gentoo.org/show_bug.cgi?id=88212"
+			die "Please re-emerge your KDE with USE=xscreensaver"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.8.0-kdedesktop.patch
+	epatch ${FILESDIR}/${PN}-0.8.0-assert.patch
+	epatch ${FILESDIR}/${PN}-0.8.0-configure.in.patch
+	cp ${FILESDIR}/jwz-vroot.h ${S}/include/vroot.h
+}
+
+src_compile() {
+	filter-flags -fPIC
+
+	local myconf
+
+	myconf="${myconf} --bindir=/usr/lib/misc/xscreensaver" \
+	myconf="${myconf} --with-configdir=/usr/share/control-center/screensavers/" \
+
+	if use kde; then
+		find . -name '*.desktop' -exec \
+			sed -i \
+				-e 's:Exec=kxsrun \(.*\):Exec=kxsrun \1:g' \
+				-e 's:Exec=kxsconfig \(.*\):Exec=kxsconfig \1:g' \
+				'{}' \
+			\; \
+			|| die "couldnt sed desktop files"
+		myconf="${myconf} --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers"
+	fi
+
+	econf \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable openal sound) \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc COPYING INSTALL README README.xscreensaver
+
+	# symlink to satisfy kde's kxs*
+	use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
+}
+
+pkg_postinst() {
+	local XSCREENSAVER_CONF="${ROOT}/etc/X11/app-defaults/XScreenSaver"
+
+	if [ -f ${XSCREENSAVER_CONF} ]; then
+		einfo "Adding Really Slick Screensavers to XScreenSaver"
+		sed -e '/*programs:/a\
+	GL:       \"Cyclone\"  cyclone --root     \\n\\\
+	GL:      \"Euphoria\"  euphoria --root    \\n\\\
+	GL:    \"Fieldlines\"  fieldlines --root  \\n\\\
+	GL:        \"Flocks\"  flocks --root      \\n\\\
+	GL:          \"Flux\"  flux --root        \\n\\\
+	GL:        \"Helios\"  helios --root      \\n\\\
+	GL:    \"hyperspace\"  hyperspace --root  \\n\\\
+	GL:       \"Lattice\"  lattice --root     \\n\\\
+	GL:        \"Plasma\"  plasma --root      \\n\\\
+	GL:     \"Skyrocket\"  skyrocket --root   \\n\\\
+	GL:    \"Solarwinds\"  solarwinds --root  \\n\\\
+	GL:     \"Colorfire\"  colorfire --root   \\n\\\
+	GL:   \"Hufos Smoke\"  hufo_smoke --root  \\n\\\
+	GL:  \"Hufos Tunnel\"  hufo_tunnel --root \\n\\\
+	GL:    \"Sundancer2\"  sundancer2 --root  \\n\\\
+	GL:          \"BioF\"  biof --root        \\n\\\
+	GL:    \"MatrixView\"  matrixview --root  \\n\\\
+	GL:   \"Spirographx\"  spirographx --root \\n\\\
+	GL:   \"BusySpheres\"  busyspheres --root \\n\\' \
+		-i ${XSCREENSAVER_CONF}
+
+	else
+		einfo "Unable to add these to XScreenSaver configuration"
+		einfo "This should not happen. Please file a bug"
+	fi
+}
+
+pkg_postrm() {
+	local XSCREENSAVER_CONF="${ROOT}/etc/X11/app-defaults/XScreenSaver"
+
+	has_version rss-glx && return 0
+	if [ -f ${XSCREENSAVER_CONF} ]; then
+		einfo "Removing Really Slick Screensavers from XScreenSaver configuration."
+		sed \
+			-e '/\"Cyclone\"  cyclone/d' \
+			-e '/\"Euphoria\"  euphoria/d' \
+			-e '/\"Fieldlines\"  fieldlines/d' \
+			-e '/\"Flocks\"  flocks/d' \
+			-e '/\"Flux\"  flux/d' \
+			-e '/\"Helios\"  helios/d' \
+			-e '/\"Hyperspace\"  hyperspace/d' \
+			-e '/\"Lattice\"  lattice/d' \
+			-e '/\"Plasma\"  plasma/d' \
+			-e '/\"Skyrocket\"  skyrocket/d' \
+			-e '/\"Solarwinds\"  solarwinds/d' \
+			-e '/\"Colorfire\"  colorfire/d' \
+			-e '/\"Hufos Smoke\"  hufo_smoke/d' \
+			-e '/\"Hufos Tunnel\"  hufo_tunnel/d' \
+			-e '/\"Sundancer2\"  sundancer2/d' \
+			-e '/\"BioF\"  biof/d' \
+			-e '/\"MatrixView\"  matrixview/d' \
+			-e '/\"Spirographx\"  spirographx/d' \
+			-e '/\"BusySpheres\"  busyspheres/d' \
+			-i ${XSCREENSAVER_CONF}
+	fi
+}