Fix for build with introspection adapted from upstream patch, #380115

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

diff --git a/media-libs/babl/ChangeLog b/media-libs/babl/ChangeLog
index 831849c20fff0ac4dd36fa6b983805f6e03159c6..0cb570d0dde658bc19610500cfce07bbc88a91de 100644 (file)
--- a/media-libs/babl/ChangeLog
+++ b/media-libs/babl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/babl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.29 2011/08/23 15:58:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.30 2011/08/28 16:24:37 jlec Exp $
+
+*babl-0.1.4-r2 (28 Aug 2011)
+
+  28 Aug 2011; Justin Lecher <jlec@gentoo.org> -babl-0.1.4-r1.ebuild,
+  +babl-0.1.4-r2.ebuild, +files/babl-0.1.4-introspection.patch, metadata.xml:
+  Fix for build with introspection adapted from upstream patch, #380115
 
 *babl-0.1.4-r1 (23 Aug 2011)
 

diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index ff1ee16bffb137b251fa4064cd0526498f5525a0..2e881f2a43727e85a9734164a4337b2e108e5605 100644 (file)
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX babl-0.1.0-build-fixes.patch 551 RMD160 787daf8d440fbb16a777e9fa07bac828bb98fddf SHA1 99a01c078f48e5dcc6a8db5a894995b335ab4c32 SHA256 bae0afb4e8c1feb7a0bd566616e7b0a303583f8978b28dea84be9e354e9bf9e6
+AUX babl-0.1.4-introspection.patch 708 RMD160 50a8d612b437571a698b275ddec787e9e663a245 SHA1 d11153d5d14dba1fc400aaef8c68dfbec58de6ab SHA256 f0ae623b81888e8455a25ec24529bc6158ad1d9ab16954de2e0e1ecd11b57d5e
 DIST babl-0.0.22.tar.bz2 396413 RMD160 a10c07e70f1fe8944a969bba46484acf410c2583 SHA1 9de50fb5833f41691f50f6e735d6422aad52ea94 SHA256 1a8437e714cf48bdfd24a3c1db218826eea5737514b99482014d93a8935b0f6d
 DIST babl-0.1.4.tar.bz2 423645 RMD160 8ef928258867945712ca2e1549acc90e4407f8fd SHA1 9f7186e5d968a4c9d81a63b20836b163f56df616 SHA256 5b36312528de84815f054345cd478743a9493981a44060013b682d0304ffe733
 EBUILD babl-0.0.22.ebuild 767 RMD160 f2e605ae0f0ecb7d791abbc09c2ee86de7ec2bb3 SHA1 e8699d60870cfa373134a838fc2401bb63631a08 SHA256 7d0311e8ee81752a7bc889166e4a07a6d60f09ebc8f851a6afe3a15fd46915c4
-EBUILD babl-0.1.4-r1.ebuild 1238 RMD160 386c1e22ba8932359862348118b94b2c52e10be1 SHA1 5cd1e6c86c4cf4c8950bb08f31a0445da9f841b2 SHA256 2b50c83f8060e033d2bf2598800b09600af5edba6066296baac0519a67e78eea
+EBUILD babl-0.1.4-r2.ebuild 1339 RMD160 1d0cd18efb51f7efa716f61ba2dc8a0db686acae SHA1 2c5f1367139a597ca6b17acb53e9be7e9bed5b7d SHA256 85bef151ac77e96edf923b0b2f583142923cab2df069122c6dafb3da36cd232b
 EBUILD babl-0.1.4.ebuild 1230 RMD160 81cc2a990e2f9defd5f9b28e797eeda5f274c8c6 SHA1 75faf12c754ff950d3adf87621625c52af85f143 SHA256 5b26644eb8c72a38795c5fb1ded31f6791585e54a92b4fb71eb5aafd2d25063f
-MISC ChangeLog 3390 RMD160 69c8ae4db41beb84b58dd75bbc414ca2ff580a31 SHA1 2888555e6f4ebabe7379242865d2839a272ebb8c SHA256 3171e9388bd2a55a184bc1e8253d4d6154599f57952c32a14c38e7d8c22bd490
-MISC metadata.xml 334 RMD160 9708165e298bdb8259efda949d4085a51efdf0f8 SHA1 f7cd96ad0ee32eeec4fc0a9abd0d9791d7a460c3 SHA256 3b3e658191df6fe52bcec00e992a3c73d4980010d9c3dc1f29c0050e7be41417
+MISC ChangeLog 3637 RMD160 68c0e858fe816abd3f419643ad3c3ef43921f0c9 SHA1 86c4f5b081b4ffba1c8cf7935071b6070f10eb7b SHA256 3ff3a4d82f5198ff248c7fa11d96e4fa7ec73b942920077e49a97dc1167539ca
+MISC metadata.xml 341 RMD160 52869aeb09c39ccc3c90a1d4f4b46d6f5cfca692 SHA1 86637e5425d20cce8ba2019610cf2881f28aca30 SHA256 aeb102cb1c42ee75005f1bb80eea95bcfd6291041b06dc8b487c5ea3643b627e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOU84nAAoJEO/kOhxWD91kOQkP/AkEA/cCtG1u+JoZs6P5uFSc
-/+HjMLH6MzQ6eASF9oQFHycjFD52GjXeKZpMCKtK2leVVI99YNuLApyLmV/nBFbm
-09sDXTQX9ASP03qK1gd7a8NtmlsnxXbid1HHDf1uZuwaYuAuG3w9S3Cl2mVta39F
-vjNcrrm0UYOlw3ABLI/EtLXVAS7+RJYvs5lyhukptaRvOQpgQnHPikGLiJ+HPw1X
-yJ4cS/5aLxTwKRBIclBkGt+sl9J1ePLPucIRRzqLYLu3I3mZz+ETfVsR95DbXEse
-O/VUu7a+7+iDDjrLyQM/rOOezjA8Kg7kRmUbRoQ1jF0J/SGcC6YtRacVdxOfiEDW
-+mzSkOCB3HmM/ruIGIcZXzhxsqvx2Ku6q0RhY4NE5RD7Y6DPaLLdZr6lxdKOIEeT
-PAo9H6L3OEAs8kGIhXvckHW27+B2kPT5/7u4v9RrfWDv197Q0xqBFzZz3qrjujR/
-lYX74AsXtde286mKUWR5YXobiCsUrszzEilzqH3vTn6nU+zw/RdDjk9fJVTmAZe6
-JPlkxPudUfbegIBsobGQV4X1DZeEccywd0aESwc5w1MDprOrtPXOG4tfZrs6xO+m
-DYE7pZd3/iXedi4UKmEQXmauY2A/7mxZsHw8rBqJ2vb5xIHJ1/uuHz9cA43iYD66
-slGtDRCngN8ofMHKe6wX
-=d0Ai
+iEYEAREKAAYFAk5aa9AACgkQgAnW8HDreRZ4mwCaAvDsMiCsm/EV4GH6fTsAmNH8
+8zMAn2udm0Xx80QJsIol9WKXOFJJ0ff7
+=Et8R
 -----END PGP SIGNATURE-----

diff --git a/media-libs/babl/babl-0.1.4-r1.ebuild b/media-libs/babl/babl-0.1.4-r2.ebuild
similarity index 84%
rename from media-libs/babl/babl-0.1.4-r1.ebuild
rename to media-libs/babl/babl-0.1.4-r2.ebuild
index be6fd9a2e785a6db63771671d102e56bc69e91e2..e818678bac89507af28e0b51920198ac7446f0b1 100644 (file)
--- a/media-libs/babl/babl-0.1.4-r1.ebuild
+++ b/media-libs/babl/babl-0.1.4-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.1.4-r1.ebuild,v 1.1 2011/08/23 15:58:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.1.4-r2.ebuild,v 1.1 2011/08/28 16:24:37 jlec Exp $
 
 EAPI=3
 
+inherit autotools eutils
+
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
 HOMEPAGE="http://www.gegl.org/babl/"
 SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
@@ -16,6 +18,11 @@ IUSE="altivec +introspection sse mmx"
 RDEPEND="introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-introspection.patch
+       eautoreconf
+}
+
 src_configure() {
        # Automagic rsvg support is just for website generation we do not call,
        #     so we don't need to fix it

diff --git a/media-libs/babl/files/babl-0.1.4-introspection.patch b/media-libs/babl/files/babl-0.1.4-introspection.patch
new file mode 100644 (file)
index 0000000..14f2b9c
--- /dev/null
+++ b/media-libs/babl/files/babl-0.1.4-introspection.patch
@@ -0,0 +1,16 @@
+diff --git a/babl/Makefile.am b/babl/Makefile.am
+index 6abf148..6b3e270 100644
+--- a/babl/Makefile.am
++++ b/babl/Makefile.am
+@@ -92,10 +92,9 @@ if HAVE_INTROSPECTION
+ Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am
+       $(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=$(BABL_API_VERSION) \
+             --add-include-path=$(srcdir) --add-include-path=. \
+-            --library=babl-$(BABL_API_VERSION) \
++            --library=libbabl-$(BABL_API_VERSION).la \
+             --libtool="$(LIBTOOL)" \
+             --output $@ \
+-            --pkg babl \
+             -DBABL_IS_BEING_COMPILED \
+           -I$(top_srcdir) \
+           -I$(top_builddir) \

diff --git a/media-libs/babl/metadata.xml b/media-libs/babl/metadata.xml
index 572efe79fcfcf1d4b08636950dddde71b59f81d0..9d5906267eb1cefbd96fc624c3a0c1b1e62968bc 100644 (file)
--- a/media-libs/babl/metadata.xml
+++ b/media-libs/babl/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-       <email>hanno@gentoo.org</email>
-</maintainer>
-<use>
-       <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+       <herd>no-herd</herd>
+       <maintainer>
+               <email>hanno@gentoo.org</email>
+       </maintainer>
+       <use>
+               <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
                introspection</flag>
-</use>
+       </use>
 </pkgmetadata>