Fixing build with forced --as-needed and automagic dependency on media-libs/quesoglc...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 72d626b081ffc1318d90ec770f6e878ba264b8f3..1cef6fb4061c05023f52a184df79f2979a2f57a1 100644 (file)
--- 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/Manifest b/x11-misc/rss-glx/Manifest
index 8b789b4766d5fd1906c19d306cd4c7cd8527207e..b063e3acb0e0e82ca2891b59dbdf798c588b65c1 100644 (file)
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rss-glx-0.9.1-asneeded.patch 259 RMD160 bb891d3fefb239543ec09f5c4970d6d6ec37392a SHA1 4a382f0f5f00063d4eee181fe3ebf44c1ce56bf5 SHA256 9d460082465ecc593f6735834dc4984e245997352246759fd8cc13cbef369847
+AUX rss-glx-0.9.1-quesoglc.patch 733 RMD160 fc280087658bd0800d03299e97ed4dc2c86bd9cd SHA1 a4fe92e1bafbcbd7026955eee7e146a005fb10bf SHA256 eefd099b77e9ac84bd676cf0c747b744a73deed75f68613a0d184c79b5a1cb39
 DIST rss-glx_0.9.0.tar.bz2 5379720 RMD160 8d6f2c3dd64575f5b845195f41e35096b3255e53 SHA1 afbf8a6bbfd2d19e3c4298f8f445a635f17c8b2e SHA256 04383a49f3c57d27708c314ece750dbe7f873aecff6a83a6803635dbeaf720f6
 DIST rss-glx_0.9.1.tar.bz2 5435799 RMD160 45d746520aa59a34dd4215037fee15832751b28c SHA1 44d18b44a3d47fcfad4f84050652b904ccdbfb86 SHA256 8f8d773864695fd57e6ff21f430994369ad74c69a5e66ce510bbba8ca55333aa
 EBUILD rss-glx-0.9.0.ebuild 3599 RMD160 5d0500e06db09286cf052914580c678824e81936 SHA1 61b1a90a65cfe3fe60ba8dc2233306a996f0f901 SHA256 8f949e8d1ff5c0587473235c1375db220599b7c520607ea62515b970d07994ba
-EBUILD rss-glx-0.9.1.ebuild 3688 RMD160 56b2df5adaf2ee0f68aab798fab3b91cb2344ee5 SHA1 bae4b58d750cdae1010cb215c5c62f975f5928ec SHA256 0115fa8d05d071d8e5631dd54da2e967392f22cc293f473b0e09703a48e2e54b
-MISC ChangeLog 12116 RMD160 a915ccb8b9e9c6f9fba68fd0b931ae96f27d17c9 SHA1 cf1d09d7b01daf37fbc49d3f466153395dd77ba4 SHA256 1191d994147193099aa46fcbdab44977313fdd0a155d53823c39faa602b9894b
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+EBUILD rss-glx-0.9.1.ebuild 3858 RMD160 127dc420f142dfee18adaed21182b9869870a816 SHA1 ac2dc852e1b214364a9ad8994b8221a6fb9fc1a8 SHA256 6eb947f755988fcdc6bd8ed8267134cdf9d6e980d1e28f69843df993c209642a
+MISC ChangeLog 12425 RMD160 54394caf3a7cad418c71b751070774dde741277d SHA1 e21a357d1be42fc0531074724b00a611d92c5270 SHA256 d8194262a5c1c0082df4f75e28665662976c54b0ff8bc2cca4b341398e0c32fa
+MISC metadata.xml 257 RMD160 34b4a0d8301347f0f8fd2df287f387b684bd7720 SHA1 984eb3f981243feb05535f1cc51b0d5814f9ef84 SHA256 770a3be1eb3e38a700fd714deb3f97bcce3248be5949c3b6cc08df97b6f56cf4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwCQ/8ACgkQIiMqcbOVdxSBEQP/VKigTwPpXyqpqtXcqwJcsbgc
+coGCNZoyYt7oTZ4vrFAT2RBWMUZs/o6LKz6LuWPuAyt0U1r9TxwR1kEwxyzbS5+X
+kzfaK4GDaYkVhQ9wUHosy6VWOR0X5w2TfGX3SpGL94TwZto7zZTxLivrxxGbrIPe
+A5kFBk3ZKhPUxv5tEWQ=
+=ief/
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..8fb2bbb
--- /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 (file)
index 0000000..88afe71
--- /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 7312250486525c5a9cfdcbdb2d96c18b99bfe093..b0ceccd24453a353e1b593d5c9605f30b719ed14 100644 (file)
--- 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 631f1004ebe20a11c74aef8efd8c8f90fba4b0a5..e8989aef5c97b0666c0245b76158eaa735dbbbc0 100644 (file)
--- 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() {