Change location of XScreenSaver file for >=xscreensaver-5. Remove virtual/x11 usage.

Package-Manager: portage-2.1.2-r9

4 files changed, 166 insertions, 5 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index c313eb2f3340..51b54bdc99f7 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/rss-glx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.52 2007/01/03 13:32:24 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.53 2007/02/19 20:52:27 drac Exp $
+
+*rss-glx-0.8.1-r4 (19 Feb 2007)
+
+  19 Feb 2007; Samuli Suominen <drac@gentoo.org> +rss-glx-0.8.1-r4.ebuild:
+  Change location of XScreenSaver file for >=xscreensaver-5. Remove
+  virtual/x11 usage.
 
   03 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
   rss-glx-0.8.1-r3.ebuild:
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 3eba1dfc5ff5..032741b867dc 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -36,10 +36,14 @@ EBUILD rss-glx-0.8.1-r3.ebuild 4682 RMD160 d94de81f37057cf0f0f633d9bb9cd83d4f25b
 MD5 254aef357b837b85e79ac0178cfec379 rss-glx-0.8.1-r3.ebuild 4682
 RMD160 d94de81f37057cf0f0f633d9bb9cd83d4f25b1f5 rss-glx-0.8.1-r3.ebuild 4682
 SHA256 23fde9fb7822cbbe81c1b707c2d532db879a8ea20d27f3df6a69f8794dd1f4c4 rss-glx-0.8.1-r3.ebuild 4682
-MISC ChangeLog 9027 RMD160 089a1eb4b611f50b3ae8c48455fc75c416ca7439 SHA1 d254cce6fb38d288647935aa09e5b20664dcf73c SHA256 5288e761cfb18d343084f5e753514333fa4d8fea3c78942feb9bce067d9746ff
-MD5 18fece616edd8ef1391c3b4bd4c0afb8 ChangeLog 9027
-RMD160 089a1eb4b611f50b3ae8c48455fc75c416ca7439 ChangeLog 9027
-SHA256 5288e761cfb18d343084f5e753514333fa4d8fea3c78942feb9bce067d9746ff ChangeLog 9027
+EBUILD rss-glx-0.8.1-r4.ebuild 4649 RMD160 01f3f5239f58b3140acf10623b8af77429a15a1b SHA1 611fcbca8c1262f32f3bafdbc18671d12a5f2474 SHA256 74cefa00f945f5bcb1c0af57206c08d0740fc927cdba9b6c26512f391c359c15
+MD5 b2adc2ccce67472bf4e30bb35112faf6 rss-glx-0.8.1-r4.ebuild 4649
+RMD160 01f3f5239f58b3140acf10623b8af77429a15a1b rss-glx-0.8.1-r4.ebuild 4649
+SHA256 74cefa00f945f5bcb1c0af57206c08d0740fc927cdba9b6c26512f391c359c15 rss-glx-0.8.1-r4.ebuild 4649
+MISC ChangeLog 9223 RMD160 fe7c786c99f9dd36f94d1d01919cf864b4ee0357 SHA1 a5714c31960d3c6c5ad2036eaee2a7053bf1a1e9 SHA256 b7d33cd11c1e8d48d9fd002a81048bc6805ac3ff557a094d80d2894746b744b7
+MD5 5e1c820a96b74554da46a78766303062 ChangeLog 9223
+RMD160 fe7c786c99f9dd36f94d1d01919cf864b4ee0357 ChangeLog 9223
+SHA256 b7d33cd11c1e8d48d9fd002a81048bc6805ac3ff557a094d80d2894746b744b7 ChangeLog 9223
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -50,3 +54,6 @@ SHA256 583edb2d1568928863a9a8958d9e91edc54696609c34cd1f3c71fc0a48131e09 files/di
 MD5 bd54653bfe4eecf0c187a2c2c49fe0ec files/digest-rss-glx-0.8.1-r3 247
 RMD160 3096c08f814aebf19bd75bb6c8aeb9996d03fd8c files/digest-rss-glx-0.8.1-r3 247
 SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/digest-rss-glx-0.8.1-r3 247
+MD5 bd54653bfe4eecf0c187a2c2c49fe0ec files/digest-rss-glx-0.8.1-r4 247
+RMD160 3096c08f814aebf19bd75bb6c8aeb9996d03fd8c files/digest-rss-glx-0.8.1-r4 247
+SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/digest-rss-glx-0.8.1-r4 247
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r4 b/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r4
new file mode 100644
index 000000000000..415a06809df0
--- /dev/null
+++ b/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r4
@@ -0,0 +1,3 @@
+MD5 a2bdf0e10ee4e89c8975f313c5c0ba6f rss-glx_0.8.1.tar.bz2 5248755
+RMD160 c12e91be3505129ca1e4d877309e53505b4a8f4e rss-glx_0.8.1.tar.bz2 5248755
+SHA256 cf03409ed82f167b39a37b25d21a2de065bb728afeda561bdb2626e7b7ea42bb rss-glx_0.8.1.tar.bz2 5248755
diff --git a/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild b/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild
new file mode 100644
index 000000000000..0cd0063b029c
--- /dev/null
+++ b/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2007 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.1-r4.ebuild,v 1.1 2007/02/19 20:52:27 drac 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="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="kde sse 3dnow openal xscreensaver"
+
+RDEPEND="${RDEPEND}
+	virtual/opengl
+	media-libs/glew
+	>=media-gfx/imagemagick-5.5.7
+	kde? ( || ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork ) )
+	!kde? ( >=x11-misc/xscreensaver-5 )
+	xscreensaver? ( >=x11-misc/xscreensaver-5 )
+	openal? ( media-libs/openal )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use kde && use xscreensaver ; then
+		for pkg in kde-base/kdeartwork-kscreensaver kde-base/kdeartwork ; do
+			if has_version ${pkg} && ! built_with_use ${pkg} xscreensaver ; then
+				eerror "rss-glx wont work nicely with kde unless you"
+				eerror "emerge ${pkg} with USE=xscreensaver."
+				eerror "See http://bugs.gentoo.org/show_bug.cgi?id=88212"
+				die "Please re-emerge ${pkg} with USE=xscreensaver"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-r1-gentoo.patch
+	epatch ${FILESDIR}/${PN}-0.8.1-hyperspace-viewport.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/xscreensaver/config/" \
+
+	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/applications/"
+	fi
+
+	econf \
+		$(use_enable openal sound) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc 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}/usr/share/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}/usr/share/X11/app-defaults/XScreenSaver"
+
+	has_version x11-misc/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
+}