Fix for failed detection of vapigen with USE=introspection, #379641

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

diff --git a/dev-libs/libindicate/ChangeLog b/dev-libs/libindicate/ChangeLog
index 49ccb4e3cd87698d654bbd5c540d0bcf8aca97d2..864a894f1442f00e969f081ccb4b57c00b3ef850 100644 (file)
--- a/dev-libs/libindicate/ChangeLog
+++ b/dev-libs/libindicate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libindicate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.17 2011/08/19 19:18:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.18 2011/08/20 10:39:30 jlec Exp $
+
+  20 Aug 2011; Justin Lecher <jlec@gentoo.org> libindicate-0.4.4-r2.ebuild,
+  metadata.xml:
+  Fix for failed detection of vapigen with USE=introspection, #379641
 
   19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   libindicate-0.4.4-r1.ebuild, libindicate-0.4.4-r2.ebuild:

diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 27a11086b1b54a74e4f08f11c442782afcf40677..6443389e8a3864a1b8e8cb457d2492685eba9cf4 100644 (file)
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX libindicate-0.2.3-optional-gtk-support.patch 5038 RMD160 afae6044bc558459b779838aa88e414d2543aff0 SHA1 b9078296d800d1ea41116b6854af833cdd08330f SHA256 856b132e2d080dcfcc65faf7d177ef59e4fe7f2e488bcdbfded8422e4c68feb9
 AUX libindicate-0.4.4-fix-aclocal.patch 181 RMD160 81fbc27796faba28141e2efdd8aefd402c6f3f92 SHA1 afef17326571a4c17404690e06110e611b0e3f1c SHA256 7d34560b93dc25b1bfb89aa9ea726bd9f70cd3107eb21e0692aaa29c9b369c96
@@ -18,24 +18,14 @@ DIST libindicate-0.2.3.tar.gz 426971 RMD160 9aa7a2ad95a232db23739d45497b0e5746cd
 DIST libindicate-0.4.4.tar.gz 473110 RMD160 2e926172d8b0a2604f44b2b42ee70f3a1fc837f9 SHA1 0dc3ad4c35581adea9d9ae89daacf820c764f24a SHA256 20d7ac6fe02b28283c619fe583d5b0fb8a473bb17ef020c2fa40c53f72e315ce
 EBUILD libindicate-0.2.3-r1.ebuild 1590 RMD160 3ee342b28b927908d71fa48a44ff4f1cb0009188 SHA1 c8013f6672e73192dee5ac6f52a74fd769cb8b79 SHA256 310662be5618526226d721bfd440da3e071b3496652096fb4c2e99cfa9efcb43
 EBUILD libindicate-0.4.4-r1.ebuild 2744 RMD160 7078c8b61cc7a3cc90ca80d8bbd9218149306f99 SHA1 4a693e812d5972068ed107ed47dd4aec8cf0e2bd SHA256 4b71becf24613d54b10ec7883ff0dfbe621930395a92d7c3e2016d7b7c07ae7d
-EBUILD libindicate-0.4.4-r2.ebuild 3005 RMD160 cb0925195f9a04473bdd34be8794379a36792122 SHA1 8d58b98a9755791e59be98d999de242e493a3151 SHA256 7412bac16c1745a28cb7566b15ebe1b73d496995cafcde1763a46d2f7d1dcaf2
+EBUILD libindicate-0.4.4-r2.ebuild 3083 RMD160 0e0d0e2e5bdec8c3979bb2ee0f48fa59761b7cb3 SHA1 a6abe2d18d56811e59d741a96b3c2f7596750de7 SHA256 c23a681ad1be06000b2c26b1151af2fcc2f0e479efd10a27a6e4a848ac6e6b04
 EBUILD libindicate-0.4.4.ebuild 2618 RMD160 5e9dab16b468a5ec57438f53e1a18e2c1eab332e SHA1 bc75f6e712fc39de5d17841cee52daeb73ecc17e SHA256 3b4f58a046f6c9a84a0331ee4dc54814201b3e22e365bae0cd9e720a381be83a
-MISC ChangeLog 4441 RMD160 7fe825a6dcc35ab1b24f02a55ad93b5fb797f754 SHA1 b2796096ea6d1044e4e5349a22f44560cd997d51 SHA256 1659a1526888c48eb2afd8c6d00a7433d20c6202e84caba35c5a875cfd81a94a
-MISC metadata.xml 277 RMD160 5e6fcdfca0418d0f932b6ae7c32c2000eb2b77d8 SHA1 c2ea7f268de38dbb7787c82a87487268d3c7cb7d SHA256 4289b928525155b70d003ed03a4292a3ce6e03fb92a883cad6fdadfefebd2f1d
+MISC ChangeLog 4600 RMD160 77c5a8194712d6ae480c0c2e3be7e702f03e6850 SHA1 ff7f054147b8f2cb7b2c7912a8dc86ccfc8834f3 SHA256 df9190acac62e3850f67bbd7bfa1838e7d71ef1d4ea05abbd794c1f42f0c76f5
+MISC metadata.xml 272 RMD160 808eb26860968f7e008c2b3e8385682df1e5271e SHA1 e69c7b5e3cfed8f851ddaa8450af20bee3d0467c SHA256 d3c25ef05517a4f35cde224df9a556894984337471b4616190c9587975b5a673
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOTrcRAAoJEO/kOhxWD91kbHgP/inkJGjwTngDzxalu4ov6gok
-jq+RU3MbCcZggokbUnwzO9BAdG9JyxQCr4okkDO+zMdPv5pIhvVRUXpfRZ/rU1qU
-ZyiqOdJhGHo2VWykXSKOR+OjnbxM9Q2ttGZtqI86vi6YlUOZmntaO70EIeRuw6SO
-toFBOXEw8Kh9afxxk0wk9o54JvQ3rj13PyIYaQ527pQHfGoFvJEOK+KO1rB98uF7
-ilK2kV49og1+RYDpVfTR2m3nZtqH8zsrGBvVngOG57bczGs2yDT8bsuwKnUp8H7x
-qa8C9a6pbtOuW9O1uWJ12xWFLz/CIS+Xzd6i63F8/uR5akVvsioEtj5V3HqEzMO4
-IkSdSB/jxUyPArlGBD5LT+WSRbBHBVFaYAgST2as0+J8r0UBVzFIZK6yHg1uE7aM
-qAWvNaoiKxS/S+VGvBlBdZUH/VOcdise0f+YULeaU+iwNpmPSDvkMHrADiVJnwUG
-+/Jbr6D0CEa2hOYUrUW5BRQyB8SRc5pBfFNd/2f4QkCQ2hqNt9H2KG+XzYK9r9f9
-t2IS1lKROPakNpj8JSMH6DWIGnkpF1WOfcJCrhdMjoya0H34mMP6z7qCFe09H2mr
-SXK/1jXNH6OLJiPxVGApk2i/5vQEayFfSrVaU/HCxKkRE0/IJ95V1znlyFXlUFvC
-rYWQjlIC6Pm96IKAFXPt
-=/Pvt
+iEYEAREKAAYFAk5Pju0ACgkQgAnW8HDreRbg6ACgj8EaIFR02WyEAK2GlpOz6BXR
+szwAnjesfeThp+bA1nSqblLwc1Ag49La
+=d4/s
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
index 1805c990074594ba7afeae4f769bf15c9b0c6d11..ddc0c6c4701b5daccbd1e158152e733c751883d1 100644 (file)
--- a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.4-r2.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/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild,v 1.4 2011/08/19 19:18:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild,v 1.5 2011/08/20 10:39:30 jlec Exp $
 
 EAPI=2
 
@@ -60,6 +60,8 @@ src_prepare() {
        epatch "${FILESDIR}/${P}-mono-parallel-make.patch"
        # Drop -Werror in a release
        sed -e 's:-Werror::g' -i libindicate/Makefile.am libindicate-gtk/Makefile.am || die "sed failed"
+       # Find slotted vapigen
+       sed -e 's:vapigen:vapigen-0.12:g' -i configure.ac || die
        eautoreconf
 }
 

diff --git a/dev-libs/libindicate/metadata.xml b/dev-libs/libindicate/metadata.xml
index 32eac9c47eae845c8680f6b38f64c37eb097435f..1111f90879f51b269119067c8e9621d7011512c6 100644 (file)
--- a/dev-libs/libindicate/metadata.xml
+++ b/dev-libs/libindicate/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <use>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-  </use>
+       <herd>kde</herd>
+       <use>
+               <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+       </use>
 </pkgmetadata>