Fix missing -I/usr/include/raptor2 in lrdf.pc; as noticed when building rosegarden.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

4 files changed, 24 insertions, 8 deletions

diff --git a/media-libs/liblrdf/ChangeLog b/media-libs/liblrdf/ChangeLog
index 9417135f61bf..d35caaec8dce 100644
--- a/media-libs/liblrdf/ChangeLog
+++ b/media-libs/liblrdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/liblrdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/ChangeLog,v 1.39 2011/07/29 06:47:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/ChangeLog,v 1.40 2011/07/29 07:48:54 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> liblrdf-0.4.0-r20.ebuild,
+  +files/liblrdf-0.4.0-raptor2-pkgconfig.patch:
+  Fix missing -I/usr/include/raptor2 in lrdf.pc; as noticed when building
+  rosegarden.
 
 *liblrdf-0.4.0-r20 (29 Jul 2011)
 
diff --git a/media-libs/liblrdf/Manifest b/media-libs/liblrdf/Manifest
index 16e680360b00..f79df7fcfb29 100644
--- a/media-libs/liblrdf/Manifest
+++ b/media-libs/liblrdf/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX liblrdf-0.4.0-dontbuild-tests.patch 479 RMD160 f8468291bedb71e369c47570b9a005e0dad43505 SHA1 f67d222e4a96b5d9ae81e863a02bf1ef6e8e5918 SHA256 e3418adcd2f627152880bff26f5e59e2b79fd6096a6f265dcc6fad9d0e4cd4dd
+AUX liblrdf-0.4.0-raptor2-pkgconfig.patch 290 RMD160 e388b7350d872a1a146fcfdc4bb4088805560433 SHA1 745f8233e6edafa4646bcd1df7e33f00f3889179 SHA256 b88bcb62ff3f69713111d6f2ebb2ebd7e5b0a4b7ca2968fbab8711716df553ec
 AUX liblrdf-0.4.0-raptor2.patch 7041 RMD160 5afc8cc1f79320de734ea244905d8545ea5cdfa2 SHA1 a189371033e853852f1b76afd611f78af8007eba SHA256 499cce2b11e66e05957e125c4baff33eed266c9a1e1485cbc71df451a880de8f
 DIST liblrdf-0.4.0.tar.gz 336959 RMD160 2cb371c99552ac3045b72e20786494575ded37d8 SHA1 17ce55f692bc52ed12605091b99106255f964b5f SHA256 95e98e86ba06ed73a5571cbcff3ee88e481b403b6eb727e9eb182870efd9b204
-EBUILD liblrdf-0.4.0-r20.ebuild 896 RMD160 6c21d0ccd09f93e1308d8a0a320d1f68881241bd SHA1 e77b6e11a0731f231866ceb7f65ce9e34e0e744c SHA256 17fc44831efdd6a67f6aa4d7b04bf20b0523346f51b65b621fd35ba13350f283
+EBUILD liblrdf-0.4.0-r20.ebuild 909 RMD160 3cb614e2b177a726cb650eba82b393ac3088591e SHA1 cf2d104a7722f616a1fbfdc480bdf2153e6839c2 SHA256 db07fff02df10624284325ccf38de7bd92a67d592fa28ea8c7bc1ddc88aa4a45
 EBUILD liblrdf-0.4.0.ebuild 804 RMD160 6651300089f968e82a637273948394c5ec63d5a6 SHA1 3593fd6bd3688d13ee539f409331394b7b3a26fd SHA256 d9fc42bc1e66b5940628a4e8df76234f0b697df9bc26ee93b67017f17d5a2cef
-MISC ChangeLog 4865 RMD160 c698eb8f44f4a5a2892a3f71b871097005503570 SHA1 6e6007b07183865f5563cd4c022208d567d3d9c4 SHA256 7571c08d15dda6d7eb751332866b2db38306eb81e3a384b3e425ed90e8a7ce0d
+MISC ChangeLog 5082 RMD160 828eba5ce4c6f7e60d4c6750b75820f809355ad1 SHA1 3982ad67f8cc042a103ff0df5bd1b12f3ebdefb8 SHA256 c993b9f4d62fd04948e9246ffef6360b4df1eacce77695941175488c1d1284e5
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4yVw8ACgkQXkR9YqOcLPHKMwD9EcPfp/Cqi3lbR7Jse+LoYQIS
-5zGSxOg3ziF0gfWxUf0A/jw9dTb1c5zRnhpYdb+4k5CazrxbdLeoc1ccaGeVLMKi
-=Zxst
+iF4EAREIAAYFAk4yZWgACgkQXkR9YqOcLPGfAAD+KB4rKkbuj4WgvH+e0P+A6SzS
+FUYmrw4ARDdS1sU4QWYBAIARoD7vd1gIIAqsQqajiBJmCYwD3njPmlqsPL0B0FOD
+=hYME
 -----END PGP SIGNATURE-----
diff --git a/media-libs/liblrdf/files/liblrdf-0.4.0-raptor2-pkgconfig.patch b/media-libs/liblrdf/files/liblrdf-0.4.0-raptor2-pkgconfig.patch
new file mode 100644
index 000000000000..b2190743d936
--- /dev/null
+++ b/media-libs/liblrdf/files/liblrdf-0.4.0-raptor2-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- lrdf.pc.in
++++ lrdf.pc.in
+@@ -6,5 +6,5 @@
+ Name: liblrdf
+ Version: @VERSION@
+ Description: liblrdf, a lightweight RDF library with extensions for LADSPA
+-Libs: -L${libdir} -llrdf
+-Cflags: -I${includedir} 
++Libs: -L${libdir} @RAPTOR_LIBS@ -llrdf
++Cflags: @RAPTOR_CFLAGS@ -I${includedir}
diff --git a/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild b/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild
index 8bdf581d49a0..027d5db20a87 100644
--- a/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild
+++ b/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild,v 1.1 2011/07/29 06:47:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild,v 1.2 2011/07/29 07:48:54 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{dontbuild-tests,raptor2}.patch
+	epatch "${FILESDIR}"/${P}-{dontbuild-tests,raptor2{,-pkgconfig}}.patch
 	eautoreconf
 }