Always install the vapi file since it needs no deps and is only 333 bytes in size. See bug 372813.

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

3 files changed, 26 insertions, 11 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index a8cff6767663..090aa47e7e87 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.60 2011/07/14 17:35:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.61 2011/07/16 22:10:00 nirbheek Exp $
+
+  16 Jul 2011; Nirbheek Chauhan <nirbheek@gentoo.org> libproxy-0.4.6-r3.ebuild:
+  Always install the vapi file since it needs no deps and is only 333 bytes in
+  size. See bug 372813.
 
   14 Jul 2011; Pacho Ramos <pacho@gentoo.org> libproxy-0.4.6-r3.ebuild:
   amd64 stable, bug #372813
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 61799e670e83..9cb0328ecd69 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -7,14 +7,24 @@ AUX libproxy-0.4.6-mozjs-link_directory.patch 1365 RMD160 4ba7b7f923a8d48575db2f
 AUX libproxy-0.4.6-xulrunner-2.patch 4763 RMD160 66210bdb6497b14358fd73037b6e9813ffd55de3 SHA1 a0ee71fc9b6cd15176b53601655ee6c0d760651b SHA256 e4bd9cb3c43249593015c1fe2b6630e999627e01ca1091455a70ec32d0233525
 DIST libproxy-0.4.6.tar.gz 82483 RMD160 f5f03c84ad2d87fe728869fadc669628737c639e SHA1 6e9745c87b774f34bf53f07a54284c0d72020e94 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
 EBUILD libproxy-0.4.6-r2.ebuild 2009 RMD160 bebf116c5478345343aa3bd2fbeabeefb6637ab4 SHA1 6ad2056b8efd1beed4495c1fbf283dc454c43acf SHA256 739dbc640d4d58fafe3723f4eda8fc197c52a381aa797e456d2fe426e532b4a7
-EBUILD libproxy-0.4.6-r3.ebuild 2310 RMD160 4bd20cb71853eaaa89fc77667f918f8c56e54fa3 SHA1 7935f4a20f5654cd82f61ed4bf1ea1ce7cbcffe5 SHA256 0db044d58461773c6a3c38610d7d2f13add8a799828eef886cc66639079a8bcc
+EBUILD libproxy-0.4.6-r3.ebuild 2365 RMD160 bb1a554449fdbe0087c5a80a9785242cb32e2d48 SHA1 5ee949590546b6e6ee45e48d9eb52055c287ea5a SHA256 cb13049f76b2159480d8dc864dda282c7e401a055357e2ce7cb44cc0dbd39639
 EBUILD libproxy-0.4.6.ebuild 2158 RMD160 d43c8c283daea56e53712eda8f498a5be07eaf4c SHA1 41b655075b6ef6bc0b109f1b098857573cb02116 SHA256 a3bcf5ea0df5bc42d30907774ee1745c5b95adfbb7c99364845a19a6103422cf
-MISC ChangeLog 9831 RMD160 a160ecb7c011de58138b59c2c9638c87fb05da8d SHA1 6743da97abeacb0e9597640cac294e577df4cdcb SHA256 39fd69b19565e517581b82f57fe52dbf599da031292102e48aec9ef1b197cb44
+MISC ChangeLog 10018 RMD160 d8e4762aff9b78f13c1e13f969d359672cb1ec5b SHA1 1a1ee2a893cff7a8eebc5104b9f7ba7b5d6a6abc SHA256 159caa9860bbdc3927858c6e0cb78d98eed8e4e91d3e10c1deda9c991fcac902
 MISC metadata.xml 733 RMD160 877172f5073bdd58cf76bdb152503d6080027191 SHA1 1d5eb42d45cafddd1af934c3a7bcfea3bd4d9c1e SHA256 7c806aa9aee9a1b529b0353ed05898466be659ea3fde84007ff614e935742b34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4fKPEACgkQCaWpQKGI+9RlCQCeKJjyYitLppICk1xzv7HpE9Gd
-f4YAnjZ/baIU4eS+FHwlBVmI3ily7lkU
-=J8su
+iQIcBAEBAgAGBQJOIgw+AAoJEO/kOhxWD91k7V4P/ikQr7AflPLWa2+p/lVUhs9D
+/Fg0Sk79fp3tC6JLckiF97p3bEXvSh9/h/1L+FORgs31YGuyUYjan6QZ3ZNcb3Hv
+giDVqzfkuSFZd8dGR6VPkZNbDS5B3jQx9Bktjk8OX7KQhNnH1fnHDl9Czbzsd2gF
+J4II4RSyGjoFARPX3Yiw3KB6UQ+dc8bkLai6bN20AkKdeBApM3UZDqafFs/nQgI1
+ZWS1gRaOl8r05sDauUFUzb4GjBoBUWPKIvwClVtK+kAoHAFKHMgP9wSYH0hF22SG
+Vy/PH5yeeSSCahHb5GTf8KWVESWM+RgSFlhrqQ2ZX03WGbuko5dzswDXR47XR94v
+5ZOGvb2xkcfR8O1HB0bSkQDyOpWilKHynWaaUFHC8TrfIvMh2l8Wp1FZ1j+RUiw9
+PiZODABXQAWebArvDYx0nSDIUowpkfb3XsDkzDfFRbK9IiZO4LfE7k+cxXCf4qtl
+hifcZAtqtjCzNjt0r2jCxVi/UpLFvEauOAA6pfDI5BwwZfsbuGSCssS5MQsoV7RY
+8AB6UKngf6zAmz1fvwqVD7sfcyLNhKm5YH+7cBopgjFTa5SczvIxLo4LnQLhYBOB
+kgpy4X7QkJ4sM+hD7txpD8dz4VTvtUeao68Xdq1Fr+hIWbyoLHHM8aGIWIKipqQ8
+XfX9DNgl+NU6i3+Yt783
+=OY8V
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libproxy/libproxy-0.4.6-r3.ebuild b/net-libs/libproxy/libproxy-0.4.6-r3.ebuild
index 43219dcd77eb..ede0ae731e48 100644
--- a/net-libs/libproxy/libproxy-0.4.6-r3.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.6-r3.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/net-libs/libproxy/libproxy-0.4.6-r3.ebuild,v 1.3 2011/07/14 17:35:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6-r3.ebuild,v 1.4 2011/07/16 22:10:00 nirbheek Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2:2.6"
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gnome kde mono networkmanager perl python test vala"
+IUSE="gnome kde mono networkmanager perl python test"
 
 # FIXME: Disable webkit support due problems like bug #366791
 # FIXME: Also disable xulrunner support due bug #360893, will be readded
@@ -24,8 +24,7 @@ RDEPEND="gnome? ( gnome-base/gconf:2 )
 	kde? ( >=kde-base/kdelibs-4.4.5 )
 	mono? ( dev-lang/mono )
 	networkmanager? ( net-misc/networkmanager )
-	perl? (	dev-lang/perl )
-	vala? ( dev-lang/vala:0.10 )"
+	perl? (	dev-lang/perl )"
 #	xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )
 #	webkit? ( net-libs/webkit-gtk:2 )
 DEPEND="${RDEPEND}
@@ -49,6 +48,8 @@ pkg_setup() {
 }
 
 src_configure() {
+	# WITH_VALA just copies the .vapi file over and needs no deps,
+	# hence always enable it unconditionally
 	local mycmakeargs=(
 			-DPERL_VENDORINSTALL=ON
 			-DCMAKE_C_FLAGS="${CFLAGS}"
@@ -59,7 +60,7 @@ src_configure() {
 			$(cmake-utils_use_with networkmanager NM)
 			$(cmake-utils_use_with perl PERL)
 			$(cmake-utils_use_with python PYTHON)
-			$(cmake-utils_use_with vala VALA)
+			-DWITH_VALA=ON
 			-DWITH_WEBKIT=OFF
 			-DWITH_MOZJS=OFF
 			$(cmake-utils_use test BUILD_TESTING)