Added back patch. See bug #138900.

Package-Manager: portage-2.1.1_pre2-r2

4 files changed, 18 insertions, 198 deletions

diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index f398613ba8f5..19cf93bfc53c 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -21,10 +21,10 @@ AUX rss-glx-0.8.0-r2-kdedesktop.patch 1413 RMD160 6afc5aa295f82bf28127f03546a7e4
 MD5 643bf4d6986ea275bc5b21a5626657c2 files/rss-glx-0.8.0-r2-kdedesktop.patch 1413
 RMD160 6afc5aa295f82bf28127f03546a7e49b04c830fc files/rss-glx-0.8.0-r2-kdedesktop.patch 1413
 SHA256 c9ad654b2e02887c9b9c528f75f20710f7923853fe10b1fe08d1a6157c7c5fad files/rss-glx-0.8.0-r2-kdedesktop.patch 1413
-AUX rss-glx-0.8.1-gentoo.patch 1067 RMD160 3328591bd63829679df27e893470493b9aeaffea SHA1 d9aa015e866b1bef6725a8a8eb317158aa7df253 SHA256 1f7484603ae381c6768cc495a2c41a986b23754c6b5c94b2dbde688470149b69
-MD5 584cb8d2cc92fc8bbc1a29e4668472c7 files/rss-glx-0.8.1-gentoo.patch 1067
-RMD160 3328591bd63829679df27e893470493b9aeaffea files/rss-glx-0.8.1-gentoo.patch 1067
-SHA256 1f7484603ae381c6768cc495a2c41a986b23754c6b5c94b2dbde688470149b69 files/rss-glx-0.8.1-gentoo.patch 1067
+AUX rss-glx-0.8.1-r1-gentoo.patch 3102 RMD160 651afdc76112048a2491c557a3ed3821d55fdd72 SHA1 14e99ec7c3f91a331e7c4ead63881102faaf20e5 SHA256 02192c8ad644e567ee457c348d94ff4218240b8004cae2e34e6bd0201c4db593
+MD5 a7eba0c876574e935fa4645c61ce32be files/rss-glx-0.8.1-r1-gentoo.patch 3102
+RMD160 651afdc76112048a2491c557a3ed3821d55fdd72 files/rss-glx-0.8.1-r1-gentoo.patch 3102
+SHA256 02192c8ad644e567ee457c348d94ff4218240b8004cae2e34e6bd0201c4db593 files/rss-glx-0.8.1-r1-gentoo.patch 3102
 DIST rss-glx_0.8.0.tar.bz2 16384 RMD160 a8ea97ccbc325424cd0b84ac07f1caaa2acca63f SHA1 b7d874bebfeafeca5143796973358b6d057a8f90 SHA256 22d3726903002c15ffd649476d17217cf86c18800285c7229ecf608051043051
 DIST rss-glx_0.8.1.tar.bz2 5248755 RMD160 c12e91be3505129ca1e4d877309e53505b4a8f4e SHA1 188871d7940de8a7c3f9e622ddc131e46567eab5 SHA256 cf03409ed82f167b39a37b25d21a2de065bb728afeda561bdb2626e7b7ea42bb
 EBUILD rss-glx-0.8.0-r2.ebuild 4919 RMD160 073fe08010695f8b2329a0adb78cbfbc41d3b198 SHA1 43c0a410dc1a5dddace7436f15a7499a51ffc685 SHA256 10c043b4434a0fce4ad2e3f32fe9862ccd076659a1e6c37bef67ef638dd6154a
@@ -35,14 +35,14 @@ EBUILD rss-glx-0.8.0-r3.ebuild 4973 RMD160 174c7f1d372be4e65b29ebdd5c68ae155f087
 MD5 5c09890f21778542e98e63e906be2031 rss-glx-0.8.0-r3.ebuild 4973
 RMD160 174c7f1d372be4e65b29ebdd5c68ae155f087006 rss-glx-0.8.0-r3.ebuild 4973
 SHA256 3e51cd7ebaaef026967fbfea31ff438a1f03b7a18294b30badfd935bd02557f8 rss-glx-0.8.0-r3.ebuild 4973
-EBUILD rss-glx-0.8.1.ebuild 4799 RMD160 62f4dea8e5e22f7076ddd382024c1f5b11255f59 SHA1 4042985d005b749cafce281c47b109f1a05e272f SHA256 46e1c582b36b707494f2dbc2e632f4f683618ca0512b8ae6af1e2a5d8504c504
-MD5 3b807ab5e9f61480fb9219fda6a0b88b rss-glx-0.8.1.ebuild 4799
-RMD160 62f4dea8e5e22f7076ddd382024c1f5b11255f59 rss-glx-0.8.1.ebuild 4799
-SHA256 46e1c582b36b707494f2dbc2e632f4f683618ca0512b8ae6af1e2a5d8504c504 rss-glx-0.8.1.ebuild 4799
-MISC ChangeLog 7606 RMD160 65fd99db044d7f12bd8b55d288507dff41a15f54 SHA1 07d9175cb3804b1adbc4600d6c13a9c0ff825d7b SHA256 0e2d18ff7a620208f63db9f963e17cc8f73777cac27705c633f5d962093b4b6f
-MD5 31ca92158a5239f5644286c05574b247 ChangeLog 7606
-RMD160 65fd99db044d7f12bd8b55d288507dff41a15f54 ChangeLog 7606
-SHA256 0e2d18ff7a620208f63db9f963e17cc8f73777cac27705c633f5d962093b4b6f ChangeLog 7606
+EBUILD rss-glx-0.8.1-r1.ebuild 4803 RMD160 eddd5600137493770b57abeafb4de79fd1c81b70 SHA1 c5d1cf2a8875ecf7b1db879a9b64cbcd1397c67f SHA256 d690ac9bf6431dc50742ee207a1b054965090faf0f96dbd6eda7d5b89590a4a4
+MD5 507e74e3dbee52e7cae50cd22916d1ed rss-glx-0.8.1-r1.ebuild 4803
+RMD160 eddd5600137493770b57abeafb4de79fd1c81b70 rss-glx-0.8.1-r1.ebuild 4803
+SHA256 d690ac9bf6431dc50742ee207a1b054965090faf0f96dbd6eda7d5b89590a4a4 rss-glx-0.8.1-r1.ebuild 4803
+MISC ChangeLog 7892 RMD160 ea1ad1d0f5527e4560ef7e1cc4f3123448ea2cf5 SHA1 07b60cde48cb7bfa98ecc5845dd3d372151f224a SHA256 2041070250195103c66d06794cc2fd11cb94f486c022e7e8a11c42ec0acbd4a1
+MD5 e10f250b6ea77db891e9a652f6bc9533 ChangeLog 7892
+RMD160 ea1ad1d0f5527e4560ef7e1cc4f3123448ea2cf5 ChangeLog 7892
+SHA256 2041070250195103c66d06794cc2fd11cb94f486c022e7e8a11c42ec0acbd4a1 ChangeLog 7892
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -53,13 +53,13 @@ SHA256 4935913cd201a31d1bd8ba9bca1ea1ea4551f5ee4c0f887e91c2e69b5a468b01 files/di
 MD5 3c6a91ea22349651294ff33f1a7200a4 files/digest-rss-glx-0.8.0-r3 241
 RMD160 05c892c474f0c6df910beb5ce55e4612906216a6 files/digest-rss-glx-0.8.0-r3 241
 SHA256 4935913cd201a31d1bd8ba9bca1ea1ea4551f5ee4c0f887e91c2e69b5a468b01 files/digest-rss-glx-0.8.0-r3 241
-MD5 bd54653bfe4eecf0c187a2c2c49fe0ec files/digest-rss-glx-0.8.1 247
-RMD160 3096c08f814aebf19bd75bb6c8aeb9996d03fd8c files/digest-rss-glx-0.8.1 247
-SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/digest-rss-glx-0.8.1 247
+MD5 bd54653bfe4eecf0c187a2c2c49fe0ec files/digest-rss-glx-0.8.1-r1 247
+RMD160 3096c08f814aebf19bd75bb6c8aeb9996d03fd8c files/digest-rss-glx-0.8.1-r1 247
+SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/digest-rss-glx-0.8.1-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEpuAHgo/w9rxVVVERAls6AJ900h7fVYtjt0u17fXFAYlrUED9lwCgo+hR
-3rA3QNV6uniNYv0Ovn6ta/s=
-=7gBD
+iD8DBQFEqOzTgo/w9rxVVVERAkwYAKCm1E4A/g/0YwCFEhKS4Qv+q3KyBgCfTMTi
+v+jndiP204NgwBpECSGYtso=
+=XTPq
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.8.1 b/x11-misc/rss-glx/files/digest-rss-glx-0.8.1
deleted file mode 100644
index 415a06809df0..000000000000
--- a/x11-misc/rss-glx/files/digest-rss-glx-0.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/rss-glx-0.8.1-gentoo.patch b/x11-misc/rss-glx/files/rss-glx-0.8.1-gentoo.patch
deleted file mode 100644
index 99e8952b7b3c..000000000000
--- a/x11-misc/rss-glx/files/rss-glx-0.8.1-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nru rss-glx_0.8.1.vanilla/configure.in rss-glx_0.8.1/configure.in
---- rss-glx_0.8.1.vanilla/configure.in	2006-07-01 22:42:05.000000000 +0200
-+++ rss-glx_0.8.1/configure.in	2006-07-01 22:43:26.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 -Nru rss-glx_0.8.1.vanilla/reallyslick/cpp_src/skyrocket.cpp rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp
---- rss-glx_0.8.1.vanilla/reallyslick/cpp_src/skyrocket.cpp	2006-07-01 22:42:05.000000000 +0200
-+++ rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp	2006-07-01 22:42:53.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <GL/gl.h>
- #include <GL/glu.h>
- 
-+#include <cassert>
- #include <list>
- 
- #include "driver.h"
diff --git a/x11-misc/rss-glx/rss-glx-0.8.1.ebuild b/x11-misc/rss-glx/rss-glx-0.8.1.ebuild
deleted file mode 100644
index 4df239321af6..000000000000
--- a/x11-misc/rss-glx/rss-glx-0.8.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/07/01 20:50:07 nelchael 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="|| ( x11-libs/libXt virtual/x11 )"
-DEPEND="${RDEPEND}
-	virtual/opengl
-	>=media-gfx/imagemagick-5.5.7
-	kde? ( || ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork ) )
-	!kde? ( >=x11-misc/xscreensaver-4.22-r2 )
-	xscreensaver? ( >=x11-misc/xscreensaver-4.22-r2 )
-	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}/${P}-gentoo.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/applnk/System/ScreenSavers"
-	fi
-
-	# Hardenable SIMD extensions on amd64
-	if use amd64 ; then
-		myconf="${myconf} --enable-sse --enable-3dnow"
-	elif use x86 ; then
-		myconf="${myconf} $(use_enable sse) $(use_enable 3dnow)"
-	fi
-
-	econf \
-		$(use_enable openal sound) \
-		${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}/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 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
-}