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).

(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)

4 files changed, 21 insertions, 6 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/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}