Add missing gcrypt dependency when USE=ssl, and fix build with USE=-ssl when gcrypt is not installed (bug #411139, thanks to Marvin Vek for reporting).

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

5 files changed, 31 insertions, 25 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index f4c7db4cb751..12a167bd894e 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/glib-networking
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.31 2012/03/31 12:16:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.32 2012/04/08 05:55:23 tetromino Exp $
+
+  08 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  glib-networking-2.28.7.ebuild, glib-networking-2.30.1-r1.ebuild,
+  glib-networking-2.30.2.ebuild:
+  Add missing gcrypt dependency when USE=ssl, and fix build with USE=-ssl when
+  gcrypt is not installed (bug #411139, thanks to Marvin Vek for reporting).
 
 *glib-networking-2.32.0 (31 Mar 2012)
 
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 8e5e6df16d51..7f217216a39e 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch 987 RMD160 42073eaf04967418ad48b2566ca76f5102741288 SHA1 af4948a6152305cad24294eb5da92e3901c4de5f SHA256 d9bcf47ac0fd511394542d9158322cd546df38cb1b12bf7680b9c129b22e8b9d
 AUX glib-networking-2.30.1-gnome-proxy-test.patch 752 RMD160 428c085867db8e4130858b2ecc94e6eb2b6b4a64 SHA1 6959c6d32a9f111d4bba3dbe1c0e7f977410db2c SHA256 8c7aa53e636b99f158a5e1ac01f50b8ac3d34ba680d9b80203bd584857406d18
@@ -7,26 +7,17 @@ DIST glib-networking-2.28.7.tar.bz2 319260 RMD160 059f5956c96de586db6f457d529094
 DIST glib-networking-2.30.1.tar.xz 297072 RMD160 a88088598afeb09241f4d399e84deb8b4f321264 SHA1 5762eb4e37fb595ab0ef12dbbc44514b226c4e06 SHA256 5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3
 DIST glib-networking-2.30.2.tar.xz 297336 RMD160 c2ad8faf5f2bd93dd4c9241e5897259032d6505c SHA1 3619af3414ed90a75ceb2849b3b315e8eaed6bd6 SHA256 9f7542500939ca25896f0a74955cd3889758524583f6a15d02e00c9b815559bc
 DIST glib-networking-2.32.0.tar.xz 326040 RMD160 466937e973a43c408225d711eb7dc9a9fe632d3c SHA1 7e546b928c92b5ad2cb48679fd32163bd22a38d3 SHA256 3f399f8a8977bef5b07a89772ab473ee247773ac7362e4ebfb1f4643828838dc
-EBUILD glib-networking-2.28.7.ebuild 1160 RMD160 7bd3bd7e2e178f9eac0c50194de3e8c5c2ed06ed SHA1 38485d31dde8503864d206aee18e585681d15306 SHA256 46b0c7d38bb34c8ca5b0a71e77e0d824bccbb2f72aa16652fd99cf24a6102c07
-EBUILD glib-networking-2.30.1-r1.ebuild 2275 RMD160 a886ec10dbd1f9dd683d8efabb7830b04ae8baac SHA1 bd4b62d87d07667296ac45373982c09685555dec SHA256 4a3bcac2a38bf028a8c70907b9f55612e3bf13b70321487f19b5c6822bae3ed5
-EBUILD glib-networking-2.30.2.ebuild 1928 RMD160 a6d3ae254f37ee6e3592465a8b6faa91ae88bbc0 SHA1 3a76145a94801d208f783051fd451952b8ef85c4 SHA256 9cfe0cc00d7f04b04a6309abdfacc35663ed4cf76e27ba7df2d0ddfbc0c8ed5b
+DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128
+EBUILD glib-networking-2.28.7.ebuild 1185 RMD160 14697d2e13288cf094850706284e3c7be3d282aa SHA1 8d0f8a3a75a9a9d0162c46d69e117cd8a59f4ad7 SHA256 49bb9883cb2a6c061e4f3982bff99da014adda335a87e4d38ccda8a48d93b203
+EBUILD glib-networking-2.30.1-r1.ebuild 2500 RMD160 b61834f4c79db5805f03e789e559af151cfe4f3c SHA1 e38be6fbc50772d6c043f6204874d3d565e90977 SHA256 192f2b81c94fc983b4ffe18f3f9ce5e3a1ed3e5aba8f600e8af1cbd13886c268
+EBUILD glib-networking-2.30.2.ebuild 1949 RMD160 adbd08b2aa0f12d96b8fdee17d5e36d0a142c91e SHA1 1220d4c4ba7b9b650c5646de5faccc21cadd8b4f SHA256 f9a14537009ef4da4ef2928f8d0b3cfff2a0a225b34194be4a970ebddfa65f93
 EBUILD glib-networking-2.32.0.ebuild 1883 RMD160 8595eb9d457d6c3307a76e447dca0b67bdf6a20b SHA1 1dc2ba32cc4f303f60fbc4ba1645b6241e702a20 SHA256 29a0978014303bf08c26c384e844cca36dfc2d75da1952781ddf341aceabb791
-MISC ChangeLog 5452 RMD160 4babf85d510c705c7390dfe38773b13fc02655a0 SHA1 02f5cb47328fe529042456d415ae8e90473d1410 SHA256 dc957b1ef5cbcb10471d9842b13c3636ada01fa0d314eba38354a9d9ee28d31a
+MISC ChangeLog 5769 RMD160 43e1fc0df8845902d0d03454e26fbfbdd593fbd6 SHA1 5a8e5190c1b960c4d6bd45f358e3f0153694db68 SHA256 b94097dbd6402e73c2dedfc21e53df550f4d994faa8e3db91190cd5c0826e444
 MISC metadata.xml 395 RMD160 18bae0d230824208fc84fdad0c54b73e2e99eeeb SHA1 a07face2c8ec4a0b4bf04b18dbbd9b29a86f20b8 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPdvWfAAoJEO/kOhxWD91kqEIP/2nzcfPHKtP0ZnQRyS814OIJ
-Vn9/yjFzZNCrf1Gy7JIhX/vcAzhlOnBihUMfrBLtRpFQ9F3xemnOCuWRgyp+LbFL
-I/KWZO3fA5hKa+NIhN1bvGB6m0WZg1fI87Ol8z+GLo6tu3gURLwZrIVa3aVkYiVk
-WXrNs2UWvt+FwCGEDhJTADspnD5Ewiy6H0rk489gAu+l8V1A7g/jRTO2vnSxRelE
-b2ohlCnhig7hvrw6e6+l6EGYYBSUMdQGEsVOH0BZ4SMLyVZmkTAFXXuI1cI/sGkY
-hbPWDAPx3o5W5FdsOd8XxmBSpbvKDoI6t/JKSqXpupY+4MIrriBhjO19yAlrazqC
-P3rmeM98W6UQjv/nhacXsnERP3JNrDFPmqTxMi6mHNptxRoW31tvlywghRiBecvO
-B4zhJjRtvHwIVZiMMfdMO+02kYR4M1RBgduVRsQKPtTyQdyi2tHvIg85NGVZ52Fq
-p6LsHg0OK+9R/zc1Zd6adjx0kToBWKpta/6X/cO0qMmZ4kYV+Tgp5BiXO0JmH7kZ
-CoqygI4L7A0u12gt813p5yvcL49fAV7aGDwF3WVjQFGuA1e1aTSftqUmjV79pID+
-LP7JpYpggpbpj/xDf9UNGV6YkoGpokWDqX6CziIYHGu2he9G6/IQuOlCJyOIlk7n
-xTXLl+BZK8GXa815TNs6
-=LYbe
+iF4EAREIAAYFAk+BKFEACgkQdjK8w9WeBnC27gD+KAazZoWI7CrDwv/dcqIKe7/G
+R4GFW1Yu8ehR6qDSaugA/jsnD+5EaZvDYFvewyfpVFeU51TX/T+QrBfcHITLY8nf
+=R4ae
 -----END PGP SIGNATURE-----
diff --git a/net-libs/glib-networking/glib-networking-2.28.7.ebuild b/net-libs/glib-networking/glib-networking-2.28.7.ebuild
index 14d219b8d8a5..d55fa824f2f8 100644
--- a/net-libs/glib-networking/glib-networking-2.28.7.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.28.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild,v 1.13 2011/09/18 11:33:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild,v 1.14 2012/04/08 05:55:23 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -19,7 +19,9 @@ IUSE="+gnome +libproxy +ssl"
 RDEPEND=">=dev-libs/glib-2.27.90:2
 	gnome? ( gnome-base/gsettings-desktop-schemas )
 	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
-	ssl? ( >=net-libs/gnutls-2.1.7 )
+	ssl? (
+		dev-libs/libgcrypt
+		>=net-libs/gnutls-2.1.7 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0
diff --git a/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild b/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild
index 433577b36d7e..6c3d297a0d26 100644
--- a/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild,v 1.9 2012/03/25 17:08:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild,v 1.10 2012/04/08 05:55:23 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,6 +11,9 @@ inherit autotools eutils gnome2
 
 DESCRIPTION="Network-related giomodules for glib"
 HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+# for eautoreconf
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -22,6 +25,7 @@ RDEPEND=">=dev-libs/glib-2.29.16:2
 	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
 	ssl? (
 		app-misc/ca-certificates
+		dev-libs/libgcrypt
 		>=net-libs/gnutls-2.1.7 )
 "
 DEPEND="${RDEPEND}
@@ -56,6 +60,8 @@ src_prepare() {
 	# Fixed in upstream git master
 	epatch "${FILESDIR}/${P}-gnome-proxy-test.patch"
 	mkdir m4
+	# libgcrypt.m4 needed for eautoreconf, bug #411139
+	mv "${WORKDIR}/libgcrypt.m4" m4/ || die
 	eautoreconf
 
 	gnome2_src_prepare
diff --git a/net-libs/glib-networking/glib-networking-2.30.2.ebuild b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
index 25ac26fd3c58..abb321f6c5d6 100644
--- a/net-libs/glib-networking/glib-networking-2.30.2.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v 1.2 2012/01/18 06:48:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v 1.3 2012/04/08 05:55:23 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -22,6 +22,7 @@ RDEPEND=">=dev-libs/glib-2.29.16:2
 	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
 	ssl? (
 		app-misc/ca-certificates
+		dev-libs/libgcrypt
 		>=net-libs/gnutls-2.1.7 )
 "
 DEPEND="${RDEPEND}