Revision bump.

  Bug #220825 - configure error w/ >=libtool-2
  Bug #221286 - install into /usr/lib instead of /usr/lib64
  Bug #227071 - GCC 4.3 compile error
  Should also fix bug #245415 (libtool again).
  Drop 3dnow and sse USE flags (were removed upstream in 0.8.1)
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 245 insertions, 3 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 0539e21d20f1..320d1cd8efca 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-misc/rss-glx
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.61 2008/04/04 17:54:56 je_fro Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.62 2009/02/01 05:12:54 dirtyepic Exp $
+
+*rss-glx-0.8.1-r5 (01 Feb 2009)
+
+  01 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/rss-glx-0.8.1-gcc43.patch, +files/rss-glx-0.8.1-gentoo.patch,
+  +files/rss-glx-0.8.1-imagemagick.patch, +rss-glx-0.8.1-r5.ebuild:
+  Revision bump.
+    Bug #220825 - configure error w/ >=libtool-2
+    Bug #221286 - install into /usr/lib instead of /usr/lib64
+    Bug #227071 - GCC 4.3 compile error
+    Should also fix bug #245415 (libtool again).
+    Drop 3dnow and sse USE flags (were removed upstream in 0.8.1)
 
   04 Apr 2008; Jeff Gardner <je_fro@gentoo.org>
   -files/rss-glx-0.8.1-r1-gentoo.patch,
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index c84dd4498e7b..d01c152f0d59 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jwz-vroot.h 6234 RMD160 92aabe5424720238ccf2214260c7830718414d2f SHA1 0119753211cc0b3f7a13650e4173b6b11a416d11 SHA256 fcd4b00bff5f57b739d98dae40b98137f63a478abef2fcb3e0be8b256ea27f57
+AUX rss-glx-0.8.1-gcc43.patch 479 RMD160 aa810255758f9eb916300aa2a190a211c0f186da SHA1 46f1753be0fe0993856cf437f7b7e697953cf3dc SHA256 45610d461601917348d575184669132edbba48a6d502b306b675501ba4db7228
+AUX rss-glx-0.8.1-gentoo.patch 1336 RMD160 08c7af445ddec607d9e4cb81a42634e14ba7a4c8 SHA1 fbb75f32bfe58fa03477af3bdb2d123c125a3949 SHA256 f89b50a84f141fb804d98d1b9fa3223c24767a29952606f75d6994c6e20bb9f7
 AUX rss-glx-0.8.1-hyperspace-viewport.patch 507 RMD160 40bf26af531f3dd1504da4c3aa84ebad585df162 SHA1 1b483849ae1bdac7121b57847b82db8a0ee5bebc SHA256 3652e11e15cbe8262cb8cb65426e24cbd70751940feff7423a2c0be711dd8562
+AUX rss-glx-0.8.1-imagemagick.patch 437 RMD160 016b0b6f0522293684f1fba8c3342a78272692ef SHA1 ec3d9d34e2babe568fc875db6d0f80482303b15e SHA256 c3fe7d59cdf9f97de34ebc754b170c22946ae5afe234cec1bd90ee8da079e4a2
 AUX rss-glx-0.8.1-r4-gentoo.patch 1778 RMD160 c50926bac73cf98a4b7dec217f616c2fa881c10b SHA1 4f91ba9479ba2350992c6a8d8dfc9b19970a778e SHA256 f26e780b5e7979b6c4eb97c78078e377ba6c96e46c1c9b194af9064d8c65a9ec
 AUX rss-glx-0.8.1-r4-imagemagick.patch 462 RMD160 e6a8e1d2d68d8f86c0f06564f76c87b845a138bc SHA1 69f01c027c31b6c7b0d87c66cdff2a8361be1377 SHA256 d680d2596fe724f0f1561f88947c14a313768a2e25285c1b004fe7d6347426c5
 DIST rss-glx_0.8.1.tar.bz2 5248755 RMD160 c12e91be3505129ca1e4d877309e53505b4a8f4e SHA1 188871d7940de8a7c3f9e622ddc131e46567eab5 SHA256 cf03409ed82f167b39a37b25d21a2de065bb728afeda561bdb2626e7b7ea42bb
 EBUILD rss-glx-0.8.1-r4.ebuild 4709 RMD160 230b262cb89e752c3cb38610835b470d69508a3a SHA1 9cd5501a2a2df6fd743befe0169dc961e02caaec SHA256 0f3079b89dbcadf455d4f7e30b78ae6607c224e782723ad108e98f8230c62562
-MISC ChangeLog 10340 RMD160 5d0e1ebe0cd643df7d4c187e6a2dc418fce8c531 SHA1 6e0d98fd781163bbc4af5606a8b7c5a223a29a3b SHA256 40955bfe6a80a62512fac57fd09ac9ebd1b3677bd5e82062312dca6eb9fdc8b0
+EBUILD rss-glx-0.8.1-r5.ebuild 4737 RMD160 243a3ea69aba1404420edde6debe61227d8eca14 SHA1 16a4ad53d5800a1e09bc54d76c0920470246a97b SHA256 3d19e207dcf2d4024b7d26c737c4691c067523f9729a10fc0226a31610337acc
+MISC ChangeLog 10847 RMD160 617cced8775678b96e4c29336ce70c19c6564994 SHA1 23306fc5756ab01241c362171a1e1d50577f179a SHA256 cd47424baf8f7342732a87312236393fd27c867e3554bb8127ff1eb92c0495cc
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmFL6EACgkQiqiDRvmkBmIB+gCeOhaFLUI/9gXZc/uU/MYyIIwn
++boAoKWyaeRBBqxR8Sz8JjVkvYm2IgJF
+=bSL5
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/files/rss-glx-0.8.1-gcc43.patch b/x11-misc/rss-glx/files/rss-glx-0.8.1-gcc43.patch
new file mode 100644
index 000000000000..a1c1dc129ab4
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.1-gcc43.patch
@@ -0,0 +1,20 @@
+--- rss-glx_0.8.1-orig/reallyslick/cpp_src/skyrocket_sound.cpp
++++ rss-glx_0.8.1/reallyslick/cpp_src/skyrocket_sound.cpp
+@@ -24,6 +24,7 @@
+ #include <AL/al.h>
+ #include <AL/alut.h>
+ 
++#include <cstdlib>
+ #include <list>
+ 
+ #include "loadTexture.h"
+--- rss-glx_0.8.1-orig/reallyslick/Implicit/impSurface.cpp
++++ rss-glx_0.8.1/reallyslick/Implicit/impSurface.cpp
+@@ -21,6 +21,7 @@
+ #include <Implicit/impSurface.h>
+ #include <math.h>
+ #include <iostream>
++#include <cstring>
+ 
+ 
+ 
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
new file mode 100644
index 000000000000..3febc2b7f86f
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.1-gentoo.patch
@@ -0,0 +1,40 @@
+--- rss-glx_0.8.1-orig/configure.in
++++ rss-glx_0.8.1/configure.in
+@@ -7,14 +7,14 @@ AM_CONFIG_HEADER(config.h)
+ AC_PROG_AWK
+ 
+ AC_PROG_CC
+-CFLAGS=-g
++#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
++#CXXFLAGS=-g
+ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
+     [build with debugging information default=yes])],
+     [test "$enableval" = "no" && CXXFLAGS="-O2"])
+--- rss-glx_0.8.1-orig/reallyslick/cpp_src/Makefile.am
++++ rss-glx_0.8.1/reallyslick/cpp_src/Makefile.am
+@@ -19,7 +19,7 @@ if INSTALL_XSCREENSAVER_CONFIG_FILES
+ dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml hyperspace.xml plasma.xml skyrocket.xml solarwinds.xml
+ endif
+ 
+-if INSTALL_XSCREENSAVER_CONFIG_FILES
++if INSTALL_KDE_CONFIG_FILES
+ dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.desktop plasma.desktop skyrocket.desktop solarwinds.desktop
+ endif
+ 
+--- rss-glx_0.8.1-orig/reallyslick/cpp_src/skyrocket.cpp
++++ rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp
+@@ -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/files/rss-glx-0.8.1-imagemagick.patch b/x11-misc/rss-glx/files/rss-glx-0.8.1-imagemagick.patch
new file mode 100644
index 000000000000..7cbffc721794
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.1-imagemagick.patch
@@ -0,0 +1,10 @@
+--- rss-glx_0.8.1-orig/other_src/Makefile.am
++++ rss-glx_0.8.1/other_src/Makefile.am
+@@ -23,6 +23,7 @@ EXTRA_DIST = $(man_MANS)
+ noinst_PROGRAMS = stringify
+ stringify_LDADD = @BZIP2@
+ 
++matrixview_CFLAGS = @Wand_CFLAGS@
+ matrixview_LDADD = @BZIP2@ @Wand_LIBS@
+ matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
+ 	./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
diff --git a/x11-misc/rss-glx/rss-glx-0.8.1-r5.ebuild b/x11-misc/rss-glx/rss-glx-0.8.1-r5.ebuild
new file mode 100644
index 000000000000..660628672b59
--- /dev/null
+++ b/x11-misc/rss-glx/rss-glx-0.8.1-r5.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2009 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-r5.ebuild,v 1.1 2009/02/01 05:12:54 dirtyepic Exp $
+
+inherit flag-o-matic eutils autotools multilib
+
+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 ~ppc64 ~sparc ~x86"
+IUSE="kde 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}
+	dev-util/pkgconfig"
+
+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}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-imagemagick.patch
+	epatch "${FILESDIR}"/${PN}-0.8.1-hyperspace-viewport.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	cp "${FILESDIR}"/jwz-vroot.h include/vroot.h || die
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} --bindir=/usr/$(get_libdir)/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) \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake 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
+}