x86 stable. other archs, please read bug #100298 before marking stable

(Portage version: 2.0.51.22-r2)

7 files changed, 7 insertions, 310 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 960385fb29a7..ad185ebabcce 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,10 @@
 # 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.33 2005/07/01 13:08:26 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.34 2005/07/25 22:21:54 smithj Exp $
+
+  25 Jul 2005; Jonathan Smith <smithj@gentoo.org> -rss-glx-0.7.6-r1.ebuild,
+  -rss-glx-0.8.0.ebuild, rss-glx-0.8.0-r2.ebuild:
+  x86 stable. other archs, please read bug #100298 before marking stable
 
 *rss-glx-0.8.0-r2 (01 Jul 2005)
 
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 59a24e9c22f8..e69de29bb2d1 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,27 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6a688fa0a67abe0f6168d4f950ea3e5a ChangeLog 6122
-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 6c580284e5773f292a32a5a30fcf539a files/digest-rss-glx-0.8.0-r2 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 9ffedb9bb790a6ff0bb9b3e64c6c6675 files/rss-glx-0.8.0-configure.in.patch 642
-MD5 b50c007842cc6ee24f667e1755b2bb6c files/rss-glx-0.8.0-hyperspace-install-fix.patch 1574
-MD5 9b4404f02157380acbe80165fb4b7bf2 files/rss-glx-0.8.0-kdedesktop.patch 854
-MD5 643bf4d6986ea275bc5b21a5626657c2 files/rss-glx-0.8.0-r2-kdedesktop.patch 1413
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 3ba497b620d92e7ac9d108b51631b81b rss-glx-0.7.6-r1.ebuild 4501
-MD5 f0cd42c6c25e1e81ff8e16105f59cd2d rss-glx-0.7.6.ebuild 4057
-MD5 e8865e44a512cea6c5f89456ecfc4a79 rss-glx-0.8.0-r2.ebuild 4791
-MD5 9cbe82e454920a33dbdb673c8372816d rss-glx-0.8.0.ebuild 4646
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1SZ7I1lqEGTUzyQRAvT7AKDbamSeGBLZpUFneFqrb5gUUow9kgCghfGi
-rI76kDIeLkivTLhcSA/uwdE=
-=Jnlo
------END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.7.6-r1 b/x11-misc/rss-glx/files/digest-rss-glx-0.7.6-r1
deleted file mode 100644
index b51e11ba19ed..000000000000
--- a/x11-misc/rss-glx/files/digest-rss-glx-0.7.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c896bd55e9ffdfad69bda4422b42e03b rss-glx_0.7.6.tar.bz2 4978215
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.8.0 b/x11-misc/rss-glx/files/digest-rss-glx-0.8.0
deleted file mode 100644
index 8ecb6e1faf3b..000000000000
--- a/x11-misc/rss-glx/files/digest-rss-glx-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d04e909521626a27f9f6d9b5f8a24d6c rss-glx_0.8.0.tar.bz2 5239207
diff --git a/x11-misc/rss-glx/rss-glx-0.7.6-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.7.6-r1.ebuild
deleted file mode 100644
index 33fbc8904580..000000000000
--- a/x11-misc/rss-glx/rss-glx-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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.7.6-r1.ebuild,v 1.3 2005/07/13 14:34:12 swegener 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/kscreensaver kde-base/kdeartwork ) )
-	!kde? ( x11-misc/xscreensaver )
-	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"
-			eerror "emerge kscreensaver 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}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.7.4-kdedesktop.patch
-}
-
-src_compile() {
-	filter-flags -fPIC
-
-	local myconf
-
-	myconf="${myconf} --bindir=/usr/lib/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
-	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() {
-	local XSCREENSAVER_CONF="${ROOT}/usr/X11R6/lib/X11/app-defaults/XScreenSaver"
-
-	if [ -f ${XSCREENSAVER_CONF} -a -z "`grep 'Euphoria' ${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:       \"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 "Read /usr/share/doc/${PF}/README.xscreensaver.gz for"
-		einfo "entries to add to your ~/.xscreensaver file to enable these hacks"
-	fi
-}
-
-pkg_postrm() {
-	local XSCREENSAVER_CONF="${ROOT}/usr/X11R6/lib/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 '/\"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
-}
diff --git a/x11-misc/rss-glx/rss-glx-0.8.0-r2.ebuild b/x11-misc/rss-glx/rss-glx-0.8.0-r2.ebuild
index 8b69cd253a1e..36920e78892b 100644
--- a/x11-misc/rss-glx/rss-glx-0.8.0-r2.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2005/07/13 14:34:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.0-r2.ebuild,v 1.3 2005/07/25 22:21:54 smithj Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="kde sse 3dnow openal xscreensaver"
 
 DEPEND="virtual/x11
diff --git a/x11-misc/rss-glx/rss-glx-0.8.0.ebuild b/x11-misc/rss-glx/rss-glx-0.8.0.ebuild
deleted file mode 100644
index da8696d59ffc..000000000000
--- a/x11-misc/rss-glx/rss-glx-0.8.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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.ebuild,v 1.4 2005/07/13 14:34:12 swegener 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 )
-	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
-	cp ${FILESDIR}/jwz-vroot.h ${S}/include/vroot.h
-}
-
-src_compile() {
-	filter-flags -fPIC
-
-	local myconf
-
-	myconf="${myconf} --bindir=/usr/lib/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
-	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() {
-	local XSCREENSAVER_CONF="${ROOT}/usr/X11R6/lib/X11/app-defaults/XScreenSaver"
-
-	if [ -f ${XSCREENSAVER_CONF} -a -z "`grep 'Euphoria' ${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:       \"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 "Read /usr/share/doc/${PF}/README.xscreensaver.gz for"
-		einfo "entries to add to your ~/.xscreensaver file to enable these hacks"
-	fi
-}
-
-pkg_postrm() {
-	local XSCREENSAVER_CONF="${ROOT}/usr/X11R6/lib/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 '/\"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
-}