[proaudio] [1829] dev-libs/redlandmm-9999 update

[subversion@xxxxxxxxxxxxx]

Revision: 1829
Author:   gavlee
Date:     2010-12-28 18:46:49 +0100 (Tue, 28 Dec 2010)
Log Message:
-----------
dev-libs/redlandmm-9999 update

Modified Paths:
--------------
    trunk/overlays/proaudio/dev-libs/redlandmm/ChangeLog
    trunk/overlays/proaudio/dev-libs/redlandmm/Manifest
    trunk/overlays/proaudio/dev-libs/redlandmm/redlandmm-9999.ebuild

Modified: trunk/overlays/proaudio/dev-libs/redlandmm/ChangeLog
===================================================================
--- trunk/overlays/proaudio/dev-libs/redlandmm/ChangeLog	2010-12-27 12:01:38 UTC (rev 1828)
+++ trunk/overlays/proaudio/dev-libs/redlandmm/ChangeLog	2010-12-28 17:46:49 UTC (rev 1829)
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Dec 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
+  redlandmm-9999.ebuild:
+  update, work around link failure with ingen
+
   08 Nov 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
   redlandmm-9999.ebuild, metadata.xml:
   respect toolchain environment. add --libdir option to fix building on amd64

Modified: trunk/overlays/proaudio/dev-libs/redlandmm/Manifest
===================================================================
--- trunk/overlays/proaudio/dev-libs/redlandmm/Manifest	2010-12-27 12:01:38 UTC (rev 1828)
+++ trunk/overlays/proaudio/dev-libs/redlandmm/Manifest	2010-12-28 17:46:49 UTC (rev 1829)
@@ -1,3 +1,3 @@
-EBUILD redlandmm-9999.ebuild 1087 RMD160 88d3722c349ecfdee0f4febe458b2cfc4722124e SHA1 fce80fc43dd63d9c6edf82cf9e795f5bdbad6fb4 SHA256 858d786300623debaa594bcbf9ad7e96832476d0971884ed92a60ef62bcd6466
-MISC ChangeLog 850 RMD160 e635cc2f7407d7d32634c25c5f02300721febb7e SHA1 642dfefbfa1905d6293efbe3d75feb562a9a8922 SHA256 f490573d1db322b5a68d70e50897b9500c01792d44a8aff5cecd5442016840a7
+EBUILD redlandmm-9999.ebuild 1265 RMD160 8dcc61fe18a091aeccc7618534e2d561eed39479 SHA1 99eca4ce6dc0f2a74b14851aa9d134f069dfa9d9 SHA256 6a4316cb9002e5884b5743bf4ad0f67f0a6b8a581982c0f3933ca7390446a9b4
+MISC ChangeLog 978 RMD160 6abadc9b8a1031c0a10f3410bbe2224b6ac009c0 SHA1 c2e33f3307bdf1ca14162c9f54824d5bcfc9fafe SHA256 bd4ca218d8cc1e1687b4c136d76f114bdf8ef76030d2f208a22ed38deb228f1f
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/dev-libs/redlandmm/redlandmm-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/dev-libs/redlandmm/redlandmm-9999.ebuild	2010-12-27 12:01:38 UTC (rev 1828)
+++ trunk/overlays/proaudio/dev-libs/redlandmm/redlandmm-9999.ebuild	2010-12-28 17:46:49 UTC (rev 1829)
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
 inherit multilib subversion toolchain-funcs
 
 RESTRICT="mirror"
-IUSE="debug"
 DESCRIPTION="An STL-style C++ wrapper for the Redland RDF Toolkit (librdf)"
 HOMEPAGE="http://drobilla.net/software";
 
@@ -15,30 +15,41 @@
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
+IUSE="doc debug"
+
 RDEPEND="dev-libs/redland
 	dev-libs/boost
 	>=dev-cpp/glibmm-2.4"
 DEPEND=">=dev-util/pkgconfig-0.9.0
 	${RDEPEND}"
 
-src_compile() {
-	tc-export CC CXX CPP AR RANLIB
-	cd "${S}/${PN}" || die "cd to ${S}/${PN} failed"
+src_prepare() {
+	# redlandmm no longer provides a lib. works around link failure with ingen
+	sed -i -e "s/-lredlandmm //" ${PN}/redlandmm.pc.in || die
 
+	# work around ldconfig call causing sandbox violation
+	sed -i -e "s/bld.add_post_fun(autowaf.run_ldconfig)//" ${PN}/wscript || die
+}
+
+src_configure() {
+	cd ${PN}
+
 	local myconf="--prefix=/usr --libdir=/usr/$(get_libdir)"
-
-	use doc && myconf="${myconf} --build-docs --htmldir=/usr/share/doc/${P}/html"
+	use doc && myconf="${myconf} --build-docs
+		--htmldir=/usr/share/doc/${P}/html"
 	use debug && myconf="${myconf} --debug"
 
+	tc-export CC CXX CPP AR RANLIB
 	./waf configure ${myconf} || die
+}
 
-	./waf build ${MAKEOPTS} || die
+src_compile() {
+	cd ${PN}
+	./waf build || die
 }
 
 src_install() {
-	cd "${S}/${PN}" || die "cd to ${S}/${PN} failed"
-	# addpredict for the ldconfig
-	addpredict /etc/ld.so.cache
+	cd ${PN}
 	./waf install --destdir="${D}" || die
 	dodoc AUTHORS README
 }