Fix automagic introspection, always pass VALAC and VAPIGEN, doesn't hurt

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

3 files changed, 26 insertions, 13 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 93ee716a3ed2..4a1714ab1474 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.316 2011/10/31 04:57:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.317 2011/11/15 08:54:46 nirbheek Exp $
+
+  15 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  evolution-data-server-3.2.1.ebuild:
+  Fix automagic introspection, always pass VALAC and VAPIGEN, doesn't hurt
 
 *evolution-data-server-3.2.1 (31 Oct 2011)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index bebe7257fa9f..8427a2e262d4 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
 AUX e-d-s-camel-skip-failing-test.patch 660 RMD160 0907bb916a124d689f1880016eb8013971944016 SHA1 7ef6fd67bddbba16b3c6dd24a9b50ea9f8f5aa86 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5
@@ -16,13 +16,23 @@ EBUILD evolution-data-server-2.32.2-r1.ebuild 4152 RMD160 e54b7f66c57669c5a3f561
 EBUILD evolution-data-server-2.32.2.ebuild 3925 RMD160 40696eead31cd6967cee24757284322a03ad54dc SHA1 7982a446e8b556abf0d549a4de9a9faa1966c74b SHA256 1bbf97c42b44a2a47e7bf2d2271694ef1c9f8fe86375da418d73dafd02ec193c
 EBUILD evolution-data-server-2.32.3-r1.ebuild 4645 RMD160 b2886f04ad7cde68a875e086ba60886f84084cbb SHA1 f1c8ea4ca624f41232e6296e73aa1d33cd95da46 SHA256 d1dcff8dac6ec70b125fc6fefcbb107b154308da0e649e466415d48f49caf0ab
 EBUILD evolution-data-server-3.0.3.ebuild 3871 RMD160 f587689dffdf9858b257952d11078a16842ae086 SHA1 6036468edb2b89c8513ee41d8d3f10679ba90f57 SHA256 3b79c526e73c04710b20876a64b00ec2472a29e28456115b4d48b9158ffe48a3
-EBUILD evolution-data-server-3.2.1.ebuild 4168 RMD160 76639d332f3bb99658afd4f221265a33a91b2e02 SHA1 6493b4610987151fb3fb161f99e1d6643f147bac SHA256 d839d522fc4a64e58f7e70f65ae5e2b456017f2c18fde7095579b109bc97c4f4
-MISC ChangeLog 60783 RMD160 590791c91e614bd80a4b79840f38c03d6377b4d5 SHA1 8fbd2d8f7c1330049ebe2bcdafd8d2e8aadbf1de SHA256 32b360c234f2b651fed914425f002b45366692d2aea2209297be6124df534396
+EBUILD evolution-data-server-3.2.1.ebuild 4154 RMD160 996ac9984c51336f63a6aa0429363704468392a2 SHA1 3237f89f401fb618b197802eb6f98e2a6e9aef51 SHA256 0836a4d6c3f45a77ef81ab0888c599aaebf21367fb132fd248442da967ff90d4
+MISC ChangeLog 60950 RMD160 ffc20c1da8631a91eeff64c091ee89f6a7d3243b SHA1 ba01146b6d80bd20e9b52da943767b931bea8144 SHA256 ca5cbdab722e5cddf09891846bdeaea74912723b0d4fa03e7cc3e48ce28d29e7
 MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6uKtgACgkQdjK8w9WeBnAIPwD8DR7uYxkQIGZf6hFrAUJlAyuY
-gV1lwGgHDutg5HdOUcEA/jr+zNrWV+F7drK6Z8B3c/MzshlwUti/Q35eeMyEC9//
-=RudJ
+iQIcBAEBAgAGBQJOwijbAAoJEO/kOhxWD91kyCEP/3HxLoptLh/MrYMdzGspxwD4
+GNLHubp6NFfZrz0CmJNwN3uaa0deg2c8hYdnuUAz6TrF/viJSp5x7k6BBQgAArZH
+XylnCBjhkwuubntiIsIK1d6d7EsumC13ynff5v6wDBBFhm0+8wc6+ZsYxF78s7k6
+Ak7IRGPpz1EjhusPTbiO0cXARhZfI9CjXAH6sw7gWRULuFcDhKf5L+73/WODZ2Tn
+zcYMgGIqlBNhUmfvqDEtmPe5jNK6R6wGPqwY2DNDsG1e1mukS4NVmD6Xbfb66PCP
+N1xUD/HIi21papXkmKD2nauOAKKZIRiKnOQLmYfcbuzMnASBiC/E3h8pIy1WqqVk
+P+76ejg5H5kl2B0Q6c0IIN2F5g/b8z2p/uX5t9Xh9Qz2iAAKTq1StmA3mqABUk7b
+7QkRdL9jgcyG0azS3Ckn7beKqBIJBnDcgkCGtUzSlPvnDUQM/yC+rwoA60CXP0ks
+dpG7ZXmiCQ4CRAqevrM0COWzcAher6OTu+5o7Xx22IHvh/aynhwlkDilwj1LdFvu
+WpCKVi5V18eTKwm7wfooqKUcg80giDO2c8xoCJv3UUallRxV/8RNLI90iTp/u7s1
+9Pa7XCMMBejoxBaJjiqwtMXjvV5SJyEvI6eKFnTCGCHhnQhKIESF7FbMSVWENti3
+eBf+hm0SFs4gUIqNECgt
+=Rigg
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild
index 4cdf06565d1f..80bfbed42728 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.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/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild,v 1.1 2011/10/31 04:57:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild,v 1.2 2011/11/15 08:54:46 nirbheek Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -65,7 +65,10 @@ pkg_setup() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
 	# Uh, what to do about dbus-call-timeout ?
 	G2CONF="${G2CONF}
+		VALAC=$(type -P valac-0.14)
+		VAPIGEN=$(type -P vapigen-0.14)
 		$(use_enable gnome-online-accounts goa)
+		$(use_enable introspection)
 		$(use_enable ipv6)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)
 		$(use_with ldap openldap)
@@ -77,10 +80,6 @@ pkg_setup() {
 		--enable-nntp
 		--enable-largefile
 		--with-libdb=${EPREFIX}/usr"
-	if use vala; then
-		G2CONF="${G2CONF}
-			VALAC=$(type -P valac-0.14) VAPIGEN=$(type -P vapigen-0.14)"
-	fi
 }
 
 src_prepare() {