Fixing build with forced --as-needed and automagic dependency on media-libs/quesoglc wrt bug 313837

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 49 insertions, 6 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 72d626b081ff..1cef6fb4061c 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.73 2010/02/08 09:13:50 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.74 2010/05/30 10:54:44 xarthisius Exp $
+
+  30 May 2010; Kacper Kowalik <xarthisius@gentoo.org> rss-glx-0.9.1.ebuild,
+  +files/rss-glx-0.9.1-asneeded.patch, +files/rss-glx-0.9.1-quesoglc.patch,
+  metadata.xml:
+  Fixing build with forced --as-needed and automagic dependency on
+  media-libs/quesoglc wrt bug 313837. Thanks Diego for reporting.
 
 *rss-glx-0.9.1 (08 Feb 2010)
 
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-asneeded.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-asneeded.patch
new file mode 100644
index 000000000000..8fb2bbba3ce1
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-asneeded.patch
@@ -0,0 +1,12 @@
+Fixing as-needed issue
+
+http://bugs.gentoo.org/313837
+
+--- src/PixelCity/Makefile.am
++++ src/PixelCity/Makefile.am
+@@ -23,3 +23,5 @@
+ 	Texture.cpp \
+ 	Visible.cpp \
+ 	World.cpp
++libPixelCity_la_LIBADD=@quesoglc_LIBS@
++libPixelCity_la_CFLAGS=@quesoglc_CFLAGS@
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-quesoglc.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-quesoglc.patch
new file mode 100644
index 000000000000..88afe7131fc4
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-quesoglc.patch
@@ -0,0 +1,18 @@
+Removing automagic dependency on media-libs/quesoglc
+
+http://bugs.gentoo.org/313837
+
+--- configure.in
++++ configure.in
+@@ -200,7 +200,10 @@
+ 
+ AM_CONDITIONAL(INSTALL_KDE_CONFIG_FILES, test "$INSTALL_KDE_CONFIG_FILES" = "yes")
+ 
+-PKG_CHECK_MODULES(quesoglc, quesoglc >= 0.7, AC_DEFINE([HAVE_GLC], , [QuesoGLC is available for use.]), AC_DEFINE([MISSING_GLC], , [QuesoGLC not available.]))
++AC_ARG_WITH([quesoglc], AS_HELP_STRING([--with-quesoglc], [Build with QuusoGLC library (default: disabled)]))
++if test "x$with_quesoglc" == "xyes"; then
++	PKG_CHECK_MODULES(quesoglc, quesoglc >= 0.7, AC_DEFINE([HAVE_GLC], , [QuesoGLC is available for use.]), AC_DEFINE([MISSING_GLC], , [QuesoGLC not available.]))
++fi
+ 
+ AC_OUTPUT([
+ 	Makefile
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
index 731225048652..b0ceccd24453 100644
--- a/x11-misc/rss-glx/metadata.xml
+++ b/x11-misc/rss-glx/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<use>
+		<flag name='quesoglc'>Enable support for OpenGL Character Renderer</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
index 631f1004ebe2..e8989aef5c97 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 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.9.1.ebuild,v 1.1 2010/02/08 09:13:50 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.9.1.ebuild,v 1.2 2010/05/30 10:54:44 xarthisius Exp $
 
 EAPI=2
-inherit autotools multilib
+inherit autotools eutils multilib
 
 MY_P=${PN}_${PV}
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bzip2 openal"
+IUSE="+bzip2 openal quesoglc"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
@@ -23,7 +23,8 @@ RDEPEND="x11-libs/libX11
 	>=media-gfx/imagemagick-6.4
 	>=x11-misc/xscreensaver-5.08-r2
 	bzip2? ( app-arch/bzip2 )
-	openal? ( >=media-libs/freealut-1.1.0-r1 )"
+	openal? ( >=media-libs/freealut-1.1.0-r1 )
+	quesoglc? ( media-libs/quesoglc )"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	dev-util/pkgconfig
@@ -35,6 +36,8 @@ src_prepare() {
 	sed -e '/CFLAGS=/s:-O2:${CFLAGS}:' \
 		-e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \
 		-i configure.in || die "sed failed"
+	epatch "${FILESDIR}"/${P}-quesoglc.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
 	eautoreconf
 }
 
@@ -45,12 +48,13 @@ src_configure() {
 		--disable-dependency-tracking \
 		$(use_enable bzip2) \
 		$(use_enable openal sound) \
+		$(use_with quesoglc) \
 		--with-configdir=/usr/share/xscreensaver/config
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README*
+	dodoc ChangeLog README* || die
 }
 
 pkg_postinst() {