Fix building with liblrdf-0.4.0-r20

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

3 files changed, 42 insertions, 7 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index d53ac7204166..b4f875b928ee 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.95 2011/04/08 11:11:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.96 2011/07/29 09:15:29 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> hydrogen-0.9.5.ebuild,
+  +files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch:
+  Use lrdf.pc to get -I/usr/include/raptor2 (lrdf.h -> raptor.h) with
+  liblrdf-0.4.0-r20
 
 *hydrogen-0.9.5 (08 Apr 2011)
 
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
new file mode 100644
index 000000000000..6c862eac5836
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
@@ -0,0 +1,23 @@
+conf.CheckCHeader lrdf.h check fails because of missing -I/usr/include/raptor2, use pkg-config instead
+
+--- Sconstruct
++++ Sconstruct
+@@ -268,7 +268,8 @@
+ 		env.Append( LIBPATH = 'C:\Program Files\GnuWin32\lib' )
+ 		env.Append( LIBS = [ "pthread" ] )
+ 	
+-        if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] )
++        if str(env['lrdf']) == "1":
++		env.ParseConfig('pkg-config --cflags --libs lrdf')
+ 	if str(env['jack']) == "1": env.Append( LIBS = ["jack"])
+ 	if str(env['alsa']) == "1": env.Append( LIBS = ["asound"])
+ 	if str(env['libarchive']) == "1": env.Append( LIBS = ["archive"])
+@@ -449,7 +450,7 @@
+    Exit(1)
+ 
+ #lrdf: categorizing of ladspa effects
+-if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
++if str(env['lrdf']) == "1" and not conf.CheckPKG('lrdf >= 0.4.0'):
+     print 'lrdf must be installed!'
+     Exit(1)
+ 
diff --git a/media-sound/hydrogen/hydrogen-0.9.5.ebuild b/media-sound/hydrogen/hydrogen-0.9.5.ebuild
index 4e1f99d28ac1..705af211286a 100644
--- a/media-sound/hydrogen/hydrogen-0.9.5.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.5.ebuild
@@ -1,9 +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/hydrogen/hydrogen-0.9.5.ebuild,v 1.1 2011/04/08 11:11:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild,v 1.2 2011/07/29 09:15:29 ssuominen Exp $
 
-EAPI=2
-inherit eutils multilib
+EAPI=4
+inherit eutils multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/"
@@ -24,14 +24,21 @@ RDEPEND="x11-libs/qt-gui:4 x11-libs/qt-core:4
 	lash? ( media-sound/lash )
 	portaudio? ( >=media-libs/portaudio-19_pre )"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	dev-util/scons"
 
 src_prepare() {
 	sed -i -e '/cppflags +=/d' Sconstruct || die
-	epatch patches/portaudio.patch
+	epatch \
+		patches/portaudio.patch \
+		"${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch
 }
 
 src_compile() {
+	# FIXME: The -I/usr/include/raptor2 gets lost in middle of build
+	# despite -use_lrdf_pkgconfig.patch
+	use ladspa && append-flags $($(tc-getPKG_CONFIG) --cflags lrdf)
+
 	export QTDIR="/usr/$(get_libdir)"
 	local myconf='portmidi=0' #90614
 
@@ -51,9 +58,9 @@ src_compile() {
 }
 
 src_install() {
-	dobin hydrogen || die
+	dobin hydrogen
 	insinto /usr/share/hydrogen
-	doins -r data || die
+	doins -r data
 	doicon data/img/gray/h2-icon.svg
 	domenu hydrogen.desktop
 	dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html