Use lrdf.pc to gain -I/usr/include/raptor2 (lrdf.h -> raptor.h)

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

2 files changed, 17 insertions, 18 deletions

diff --git a/media-sound/jack-rack/ChangeLog b/media-sound/jack-rack/ChangeLog
index 8de1474fac48..15089be9fa3a 100644
--- a/media-sound/jack-rack/ChangeLog
+++ b/media-sound/jack-rack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/jack-rack
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/ChangeLog,v 1.36 2011/03/29 05:53:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/ChangeLog,v 1.37 2011/07/29 09:58:51 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
+  jack-rack-1.4.7-r1.ebuild:
+  Use lrdf.pc to gain -I/usr/include/raptor2 (lrdf.h -> raptor.h)
 
   29 Mar 2011; Tim Harder <radhermit@gentoo.org> jack-rack-1.4.6.ebuild,
   jack-rack-1.4.7-r1.ebuild:
diff --git a/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild b/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild
index c464cf1ece26..6930cb45ef2e 100644
--- a/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild,v 1.5 2011/03/29 05:53:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild,v 1.6 2011/07/29 09:58:51 ssuominen Exp $
 
-EAPI=2
-WANT_AUTOMAKE="1.9"
-
-inherit autotools eutils
+EAPI=4
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="JACK Rack is an effects rack for the JACK low latency audio API."
 HOMEPAGE="http://jack-rack.sourceforge.net/"
@@ -29,14 +27,18 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO WISHLIST )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.5-asneeded.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-noalsa.patch
-	eautomake
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.5-asneeded.patch \
+		"${FILESDIR}"/${PN}-1.4.6-noalsa.patch
+	eautoreconf
 }
 
 src_configure() {
-	local myconf="--disable-ladcca --enable-desktop-inst"
+	# Use lrdf.pc to get -I/usr/include/raptor2 (lrdf.h -> raptor.h)
+	use xml && append-cppflags $($(tc-getPKG_CONFIG) --cflags lrdf)
 
 	econf \
 		$(use_enable alsa aseq) \
@@ -44,12 +46,5 @@ src_configure() {
 		$(use_enable lash) \
 		$(use_enable nls) \
 		$(use_enable xml) \
-		$(use_enable xml lrdf ) \
-		--disable-dependency-tracking \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO WISHLIST
+		$(use_enable xml lrdf)
 }