new version

10 files changed, 143 insertions, 73 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index a8051258f857..2d9da2b3ed9c 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/rss-glx
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.6 2003/06/12 23:19:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.7 2003/08/17 22:55:28 vapier Exp $
+
+*rss-glx-0.7.5 (17 Aug 2003)
+
+  17 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + fix auto-removing of xscreensaver stuff from config file.
+
+*rss-glx-0.7.4-r1 (04 Jun 2003)
 
   13 Jun 2003; Alastair Tse <liquidx@gentoo.org> rss-glx-0.7.4-r1.ebuild:
   added kde symlink for kxs* things
@@ -8,8 +15,6 @@
   07 Jun 2003; Alastair Tse <liquidx@gentoo.org> rss-glx-0.7.4-r1.ebuild:
   added sed-4 deps
 
-*rss-glx-0.7.4-r1 (04 Jun 2003)
-
   03 Jun 2003; Alastair Tse <liquidx@gentoo.org> rss-glx-0.7.4-r1.ebuild,
   files/rss-glx-0.7.4-gcc33.patch, files/rss-glx-0.7.4-kdedesktop.patch:
   - added gcc3.3 patch, thanks to Jason Rhinelander (#22034).
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.7.3 b/x11-misc/rss-glx/files/digest-rss-glx-0.7.3
deleted file mode 100644
index 335121f4fd73..000000000000
--- a/x11-misc/rss-glx/files/digest-rss-glx-0.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 696aba255429b2d7424b30d030afb2b3 rss_glx-0.7.3.tar.bz2 4885914
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.7.4 b/x11-misc/rss-glx/files/digest-rss-glx-0.7.4
deleted file mode 100644
index faccd7ff1115..000000000000
--- a/x11-misc/rss-glx/files/digest-rss-glx-0.7.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c3dfd7da7bed6af053febae860a09fc rss_glx-0.7.4.tar.bz2 4886147
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.7.5 b/x11-misc/rss-glx/files/digest-rss-glx-0.7.5
new file mode 100644
index 000000000000..2ed08a60a88e
--- /dev/null
+++ b/x11-misc/rss-glx/files/digest-rss-glx-0.7.5
@@ -0,0 +1 @@
+MD5 af386802465f0d369d02740efe9a2514 rss_glx-0.7.5.tar.bz2 4977844
diff --git a/x11-misc/rss-glx/files/rss-glx-0.7.5-kdedesktop.patch b/x11-misc/rss-glx/files/rss-glx-0.7.5-kdedesktop.patch
new file mode 100644
index 000000000000..d8f082eca346
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.7.5-kdedesktop.patch
@@ -0,0 +1,11 @@
+--- rss_glx-0.7.4/reallyslick/cpp_src/Makefile.in	2003-06-02 15:38:07.000000000 +0100
++++ rss_glx-0.7.4/reallyslick/cpp_src/Makefile.in	2003-06-02 15:38:34.000000000 +0100
+@@ -139,7 +139,7 @@
+ 
+ @INSTALL_XSCREENSAVER_CONFIG_FILES_TRUE@dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml plasma.xml skyrocket.xml solarwinds.xml
+ 
+-@INSTALL_XSCREENSAVER_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop plasma.desktop skyrocket.desktop solarwinds.desktop
++@INSTALL_KDE_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop plasma.desktop skyrocket.desktop solarwinds.desktop
+ 
+ man_MANS = cyclone.1 fieldlines.1 flocks.1 flux.1 helios.1 plasma.1 skyrocket.1 solarwinds.1
+ 
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
index 76b9f6f406d5..c0cab6b096bc 100644
--- a/x11-misc/rss-glx/metadata.xml
+++ b/x11-misc/rss-glx/metadata.xml
@@ -3,4 +3,5 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer><email>liquidx@gentoo.org</email></maintainer>
+<maintainer><email>vapier@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/x11-misc/rss-glx/rss-glx-0.7.3.ebuild b/x11-misc/rss-glx/rss-glx-0.7.3.ebuild
deleted file mode 100644
index da3a64b25b74..000000000000
--- a/x11-misc/rss-glx/rss-glx-0.7.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.7.3.ebuild,v 1.2 2003/05/29 09:10:25 seemant Exp $
-
-MY_P=${PN/-/_}-${PV}
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="OpenGL screensavers, ported to GLX.  Suitable for use with xscreensaver"
-HOMEPAGE="http://rss-glx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="x11-base/xfree"
-
-src_compile() {
-	econf --bindir=/usr/lib/xscreensaver || die
-	emake || die
-}
-
-src_install() {
-	einstall bindir="${D}/usr/lib/xscreensaver"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README README.xscreensaver
-}
-
-pkg_postinst() {
-	echo
-	einfo "Read /usr/share/doc/${PF}/README.xscreensaver.gz for"
-	einfo "entries to add to your ~/.xscreensaver file to enable these hacks"
-	echo
-}
diff --git a/x11-misc/rss-glx/rss-glx-0.7.4-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.7.4-r1.ebuild
index 4f2800f6f5bf..3ce464ca4ff3 100644
--- a/x11-misc/rss-glx/rss-glx-0.7.4-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.7.4-r1.ebuild,v 1.3 2003/06/12 23:19:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.7.4-r1.ebuild,v 1.4 2003/08/17 22:55:28 vapier Exp $
 
 use kde && inherit kde
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/rss-glx/${MY_P}.tar.bz2"
 IUSE="kde sse 3dnow"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/x11
 	virtual/opengl
diff --git a/x11-misc/rss-glx/rss-glx-0.7.4.ebuild b/x11-misc/rss-glx/rss-glx-0.7.4.ebuild
deleted file mode 100644
index d920154a89dd..000000000000
--- a/x11-misc/rss-glx/rss-glx-0.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.7.4.ebuild,v 1.1 2003/05/30 14:20:37 seemant Exp $
-
-MY_P=${PN/-/_}-${PV}
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="OpenGL screensavers, ported to GLX.  Suitable for use with xscreensaver"
-HOMEPAGE="http://rss-glx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rss-glx/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="x11-base/xfree"
-
-src_compile() {
-	econf --bindir=/usr/lib/xscreensaver || die
-	emake || die
-}
-
-src_install() {
-	einstall bindir="${D}/usr/lib/xscreensaver"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README README.xscreensaver
-}
-
-pkg_postinst() {
-	echo
-	einfo "Read /usr/share/doc/${PF}/README.xscreensaver.gz for"
-	einfo "entries to add to your ~/.xscreensaver file to enable these hacks"
-	echo
-}
diff --git a/x11-misc/rss-glx/rss-glx-0.7.5.ebuild b/x11-misc/rss-glx/rss-glx-0.7.5.ebuild
new file mode 100644
index 000000000000..a2b4a6444bb7
--- /dev/null
+++ b/x11-misc/rss-glx/rss-glx-0.7.5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.7.5.ebuild,v 1.1 2003/08/17 22:55:28 vapier Exp $
+
+use kde && inherit kde
+
+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/rss-glx/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="kde sse 3dnow"
+
+DEPEND="virtual/x11
+	virtual/opengl
+	>=sys-apps/sed-4
+	kde? ( kde-base/kdeartwork ) : ( x11-misc/xscreensaver )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-kdedesktop.patch
+}
+
+src_compile() {
+	local myconf
+	
+	myconf="${myconf} --bindir=/usr/lib/xscreensaver" \
+	myconf="${myconf} --with-configdir=/usr/share/control-center/screensavers/" \
+
+	if [ -n "`use kde`" ]; then
+		find . -name '*.desktop' -exec \
+			sed -i \
+				-e 's:Exec=kxsrun \(.*\):Exec=kxsrun /usr/lib/xscreensaver/\1:g' \
+				-e 's:Exec=kxsconfig \(.*\):Exec=kxsconfig /usr/lib/xscreensaver/\1:g' \
+				'{}' \
+			\; \
+			|| die "couldnt sed desktop files"
+		[ -n "${KDEDIR}" ] \
+			&& myconf="${myconf} --with-kdessconfigdir=${KDEDIR}/share/applnk/System/ScreenSavers"
+	fi			
+
+	econf \
+		`use_enable sse` \
+		`use_enable 3dnow` \
+		${myconf} || die
+	emake || die
+}
+
+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() {
+	if [ -f ${ROOT}/usr/X11R6/lib/X11/app-defaults/XScreenSaver ]; then
+		[ -n "`grep 'euphoria --root' /usr/X11R6/lib/X11/app-defaults/XScreenSaver`" ] && return 0
+		einfo "Adding Really Slick Screensavers to XScreenSaver"
+
+		sed -i '/*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:       \"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\\' \
+	${ROOT}/usr/X11R6/lib/X11/app-defaults/XScreenSaver
+
+	else
+		einfo "Unable to add these to XScreenSaver configuration"
+		einfo "Read /usr/share/doc/${PF}/README.xscreensaver.gz for"
+		einfo "entries to add to your ~/.xscreensaver file to enable these hacks"
+	fi
+}
+
+pkg_postrm() {
+	has_version rss-glx && return 0
+	if [ -f ${ROOT}/usr/X11R6/lib/X11/app-defaults/XScreenSaver ]; 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 '/\"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 \
+			${ROOT}/usr/X11R6/lib/X11/app-defaults/XScreenSaver
+	fi
+}