add the possibility to use openssl in place of gnutls

Package-Manager: portage-2.1.3.16

3 files changed, 38 insertions, 13 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 0e911d4b92ea..f1567f1c88d3 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/loudmouth
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.49 2007/06/14 05:45:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.50 2007/11/04 23:47:54 eva Exp $
+
+  04 Nov 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  loudmouth-1.2.3.ebuild:
+  add the possibility to use openssl instead of gnutls
 
   14 Jun 2007; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
   loudmouth-1.2.3.ebuild:
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 78ef4be32e34..fcdae438ba48 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX loudmouth-0.17.2-gnutls_deprecation.patch 782 RMD160 a13b1ba37a6d1cc1bcafef122da88320f3d21c76 SHA1 716094b3a4706bfe8edb67708248263e994ff1a1 SHA256 b77b85442d738d8d647a94449df0f6eab12dbb76b0b4ae05ee1a3060a2ca7627
 MD5 3683fa9c59f744e00481d05e55c763cf files/loudmouth-0.17.2-gnutls_deprecation.patch 782
 RMD160 a13b1ba37a6d1cc1bcafef122da88320f3d21c76 files/loudmouth-0.17.2-gnutls_deprecation.patch 782
@@ -33,14 +36,14 @@ EBUILD loudmouth-1.2.2.ebuild 806 RMD160 15d4a6b1709f5b85f1e51fb75129712576dcc2a
 MD5 fd95c9086baa1432148719677c983dc4 loudmouth-1.2.2.ebuild 806
 RMD160 15d4a6b1709f5b85f1e51fb75129712576dcc2a1 loudmouth-1.2.2.ebuild 806
 SHA256 ec170c5d0b35d0c5d0f71ad992f34dd0a78131d99efd8814bcdd017642cec23e loudmouth-1.2.2.ebuild 806
-EBUILD loudmouth-1.2.3.ebuild 810 RMD160 432646262c15be445c75227592b59c2174b01bd7 SHA1 cec1a5d908aaf992b31700cfd5df1eab902db32a SHA256 20432ea820c0c63a6068794d50e49d22167e575c68db0227d1ecffa3d5f07994
-MD5 4210931712511a9e84f14e2fcce15e33 loudmouth-1.2.3.ebuild 810
-RMD160 432646262c15be445c75227592b59c2174b01bd7 loudmouth-1.2.3.ebuild 810
-SHA256 20432ea820c0c63a6068794d50e49d22167e575c68db0227d1ecffa3d5f07994 loudmouth-1.2.3.ebuild 810
-MISC ChangeLog 6067 RMD160 c66f430ffd9cda4ee3a65a5960ad4d46462ae9b1 SHA1 82de1b3756f1ecc5f347af204cb8b4bdd7c769b5 SHA256 7feb4d95da1b59fcd5450167798e1b528caf3ebbb2265da65b6c45842e23635d
-MD5 920748f908a3c4573bdb55245529721d ChangeLog 6067
-RMD160 c66f430ffd9cda4ee3a65a5960ad4d46462ae9b1 ChangeLog 6067
-SHA256 7feb4d95da1b59fcd5450167798e1b528caf3ebbb2265da65b6c45842e23635d ChangeLog 6067
+EBUILD loudmouth-1.2.3.ebuild 1022 RMD160 8c0f02654627334e56723b9e150ef093630921cf SHA1 4faeee5c5c6150a734377516374b5a02781926e2 SHA256 a212cd89de77c92890fa295117999d72e181c2fe1280c3be96d9135b077ccd82
+MD5 d9ba85d638a7bca3e7535036c9c861f0 loudmouth-1.2.3.ebuild 1022
+RMD160 8c0f02654627334e56723b9e150ef093630921cf loudmouth-1.2.3.ebuild 1022
+SHA256 a212cd89de77c92890fa295117999d72e181c2fe1280c3be96d9135b077ccd82 loudmouth-1.2.3.ebuild 1022
+MISC ChangeLog 6199 RMD160 496139e771d41771e489bb4ee097b79331b79212 SHA1 46ab925a43301cf638b3c2c440d6a577f9b23e34 SHA256 37be680a2de9e5805827902fd1e481a0bbdc36d3bbcd696d9b0a23cbc767b16a
+MD5 2a16c7d6fa14035949d9129f759b7a19 ChangeLog 6199
+RMD160 496139e771d41771e489bb4ee097b79331b79212 ChangeLog 6199
+SHA256 37be680a2de9e5805827902fd1e481a0bbdc36d3bbcd696d9b0a23cbc767b16a ChangeLog 6199
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -66,3 +69,10 @@ SHA256 bf1fa903d044382343b342959c95b1a03317a97a4961eb761f438aaff41a732f files/di
 MD5 afd993ee058356765c1f0193eac595c4 files/digest-loudmouth-1.2.3 250
 RMD160 ea2ae3ab3a6e2864fb4296caab4fa8415703a133 files/digest-loudmouth-1.2.3 250
 SHA256 d699d340d7123a489ea4f1cec0d86c59056e32f70c65b0e1429215b4f5483321 files/digest-loudmouth-1.2.3 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHLloy1fmVwcYIWAYRApECAJ0WM42JMUSITtalcDKe0jpl3v7q5QCeIRyq
+0JCK8wubDRvZIzu+aWTj3Lw=
+=/i0Q
+-----END PGP SIGNATURE-----
diff --git a/net-libs/loudmouth/loudmouth-1.2.3.ebuild b/net-libs/loudmouth/loudmouth-1.2.3.ebuild
index dea3828049e9..ac2a26f83798 100644
--- a/net-libs/loudmouth/loudmouth-1.2.3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.2.3.ebuild,v 1.2 2007/06/14 05:45:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.2.3.ebuild,v 1.3 2007/11/04 23:47:54 eva Exp $
 
 inherit gnome2
 
@@ -12,10 +12,13 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="doc ssl debug test"
+IUSE="doc gnutls ssl debug test"
 
 RDEPEND=">=dev-libs/glib-2.4
-	ssl? ( >=net-libs/gnutls-1.4.0 )"
+	ssl? ( || (
+		gnutls? ( >=net-libs/gnutls-1.4.0 )
+		dev-libs/openssl
+		) )"
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
@@ -25,7 +28,15 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	G2CONF="$(use_enable ssl) \
+	G2CONF="${G2CONF}
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc)"
+
+	if use ssl && use gnutls; then
+		G2CONF="${G2CONF} --with-ssl=gnutls"
+	elif use ssl; then
+		G2CONF="${G2CONF} --with-ssl=openssl"
+	else
+		G2CONF="${G2CONF} --with-ssl=no"
+	fi
 }