fix gnutls/openssl dependency, bug #198093

Package-Manager: portage-2.1.4.4

4 files changed, 25 insertions, 13 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 392c9cae2809..0461d81b8d39 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/loudmouth
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.52 2008/01/27 21:44:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.53 2008/02/24 11:42:26 eva Exp $
+
+  24 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  loudmouth-1.2.3.ebuild, loudmouth-1.3.3.ebuild:
+  fix gnutls/openssl dependency, bug #198093
 
 *loudmouth-1.3.3 (27 Jan 2008)
 
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 77aa3b72d9e1..7a3a613687b9 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST loudmouth-1.0.1.tar.bz2 259440 RMD160 8b8a9575db3a0b3681904e607f5fccd12df495f8 SHA1 5b7ecdce4cac8a9a2c666bc6247b84e683603792 SHA256 3fcffddbe67d124d33e23821450a8efbc7775c8c76442e99e4d07f31a3f1767c
 DIST loudmouth-1.2.3.tar.bz2 325864 RMD160 ced68f5187855f3286caa604c46adf0972013048 SHA1 51c6317170b8f044e489d71c7de8410663fefb6b SHA256 41f775303e76436add3c0141e485246223a60bbbcf90a7e90ed2b5baf6e2602b
 DIST loudmouth-1.3.3.tar.bz2 350978 RMD160 fcb5472e7013204b0fe1f4a1cb0f8086ccc9db1c SHA1 d8bbe4130efd64f51a17e3a20e1856ca715e2256 SHA256 dd8836e3e3b09cce84861d0259d17b85ba8dc4030a5736c1657d1577c7bd7d38
 EBUILD loudmouth-1.0.1.ebuild 613 RMD160 d941bdfbfb70c79b34cdf100ed745452df836651 SHA1 c0a660361d6734c7d0e4ce89e1675b5ec03c3532 SHA256 9683d72d6759883ec6cb6f829f21d5009e6004f7763ddf68c69257e2b39a101f
-EBUILD loudmouth-1.2.3.ebuild 1028 RMD160 b6870d1a74f6495753282a9a6a1d20d78f29289e SHA1 314c993f4606d2815574b26bcb979c383769ba48 SHA256 bc23362b9e1aee78fa193b292160b20ab54fdd4a586520a2a721b608720ec189
-EBUILD loudmouth-1.3.3.ebuild 1026 RMD160 71463fd196d75c91ba4c439011346f97e6fc39e6 SHA1 60d4823b30246f2a701dbeca264d1ad0adcd50cb SHA256 4584e5279217c3c2a3c28be425aced6f63706dfcc5c19e1ac1fe283b6a57dc8b
-MISC ChangeLog 6646 RMD160 6b7493b2c3fcc712d8d88e6bbffdcc8d3ad7c320 SHA1 44655a7c7b1d003f04e157daac4dd81d0ccdd5b2 SHA256 5c355295750cbe3d0cb38c35965cc1987ddef884f2a693181a22aa1e973faa0f
+EBUILD loudmouth-1.2.3.ebuild 1011 RMD160 c202a379394d57cd4d23384b755b79fca37ea398 SHA1 0c7e3b4d0a748574d4d81682b2ff07554dfffa31 SHA256 e3744438695b2ec95656799539273d64038be3a496ddc67d30943c042030d116
+EBUILD loudmouth-1.3.3.ebuild 1011 RMD160 f6ab68692a1648b0028058de80587f81e0eca722 SHA1 c2e85cd716ceb19029d35feb3582ac7aa03b0759 SHA256 cf062c1186e59703f24bea21da227f17626db1029c2fbe0ca424ac36eaca523d
+MISC ChangeLog 6796 RMD160 7c5e968ff01245480ca844c093fb4a10d9009639 SHA1 ddbf854f8d505cb862c984d99ecb0e6826d1410e SHA256 55fefe3f36427a45109ea6a6a972ffd1ee1510b710aa4c8d62f97122d91533bc
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHwVgq1fmVwcYIWAYRAlrmAKChVyt+E2yD8PGtsCNJ7OvNFuaiQwCfX1td
+HF1bqdDQNGTknGe7ADGlzVo=
+=JGeV
+-----END PGP SIGNATURE-----
diff --git a/net-libs/loudmouth/loudmouth-1.2.3.ebuild b/net-libs/loudmouth/loudmouth-1.2.3.ebuild
index fc9f3343527a..fe203b864e23 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
+# Copyright 1999-2008 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.4 2007/12/07 18:20:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.2.3.ebuild,v 1.5 2008/02/24 11:42:26 eva Exp $
 
 inherit gnome2
 
@@ -17,7 +17,7 @@ IUSE="doc gnutls ssl debug test"
 RDEPEND=">=dev-libs/glib-2.4
 	ssl? ( || (
 		gnutls? ( >=net-libs/gnutls-1.4.0 )
-		dev-libs/openssl
+		!gnutls? ( dev-libs/openssl )
 		) )"
 
 DEPEND="${RDEPEND}
@@ -29,8 +29,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc)"
+		$(use_enable debug)"
 
 	if use ssl && use gnutls; then
 		G2CONF="${G2CONF} --with-ssl=gnutls"
diff --git a/net-libs/loudmouth/loudmouth-1.3.3.ebuild b/net-libs/loudmouth/loudmouth-1.3.3.ebuild
index d41a803c2b2f..0136c45a179a 100644
--- a/net-libs/loudmouth/loudmouth-1.3.3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.3.3.ebuild,v 1.1 2008/01/27 21:44:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.3.3.ebuild,v 1.2 2008/02/24 11:42:26 eva Exp $
 
 inherit gnome2
 
@@ -17,7 +17,7 @@ IUSE="doc gnutls ssl debug test"
 RDEPEND=">=dev-libs/glib-2.4
 	ssl? ( || (
 		gnutls? ( >=net-libs/gnutls-1.4.0 )
-		dev-libs/openssl
+		!gnutls? ( dev-libs/openssl )
 		) )"
 
 DEPEND="${RDEPEND}
@@ -29,8 +29,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable doc gtk-doc)"
+		$(use_enable debug)"
 
 	if use ssl && use gnutls; then
 		G2CONF="${G2CONF} --with-ssl=gnutls"