bump to 1.4.0. Remove openssl dep, bug #216705. Clean up old revisions.

(Portage version: 2.1.5.4)

4 files changed, 21 insertions, 39 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 3beb39ca0dfb..46f629f6b4f6 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2008/04/08 13:13:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.63 2008/06/08 18:45:55 eva Exp $
+
+*loudmouth-1.4.0 (08 Jun 2008)
+
+  08 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -loudmouth-1.0.1.ebuild, -loudmouth-1.3.3.ebuild, loudmouth-1.3.4.ebuild,
+  +loudmouth-1.4.0.ebuild:
+  bump to 1.4.0. Remove openssl dep, bug #216705. Clean up old revisions.
 
   08 Apr 2008; Raúl Porcel <armin76@gentoo.org> loudmouth-1.2.3.ebuild:
   sparc stable wrt #215125
diff --git a/net-libs/loudmouth/loudmouth-1.0.1.ebuild b/net-libs/loudmouth/loudmouth-1.0.1.ebuild
deleted file mode 100644
index a9d0e0559e1a..000000000000
--- a/net-libs/loudmouth/loudmouth-1.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.0.1.ebuild,v 1.9 2006/09/18 00:52:01 allanonjl Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://loudmouth.imendio.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-IUSE="doc ssl"
-
-RDEPEND=">=dev-libs/glib-2.4
-	ssl? ( >=net-libs/gnutls-1 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
-USE_DESTDIR="1"
diff --git a/net-libs/loudmouth/loudmouth-1.3.4.ebuild b/net-libs/loudmouth/loudmouth-1.3.4.ebuild
index 92a6b3cd6d45..480e7f15ab4c 100644
--- a/net-libs/loudmouth/loudmouth-1.3.4.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.3.4.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.4.ebuild,v 1.1 2008/03/23 00:15:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.3.4.ebuild,v 1.2 2008/06/08 18:45:55 eva Exp $
 
 inherit gnome2
 
@@ -18,8 +18,9 @@ RDEPEND=">=dev-libs/glib-2.4
 	ssl? ( || (
 		gnutls? ( >=net-libs/gnutls-1.4.0 )
 		!gnutls? ( dev-libs/openssl )
-		) )
-	asyncns? ( net-libs/libasyncns )"
+		) )"
+# FIXME: can't build against system lib
+#	asyncns? ( net-libs/libasyncns )"
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
diff --git a/net-libs/loudmouth/loudmouth-1.3.3.ebuild b/net-libs/loudmouth/loudmouth-1.4.0.ebuild
index cca256e83345..3a0e037cca68 100644
--- a/net-libs/loudmouth/loudmouth-1.3.3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.4.0.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.3 2008/03/18 09:50:21 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.0.ebuild,v 1.1 2008/06/08 18:45:55 eva Exp $
 
 inherit gnome2
 
@@ -12,13 +12,13 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="doc gnutls ssl debug test"
+IUSE="asyncns doc ssl debug test"
 
 RDEPEND=">=dev-libs/glib-2.4
-	ssl? ( || (
-		gnutls? ( >=net-libs/gnutls-1.4.0 )
-		!gnutls? ( dev-libs/openssl )
-		) )"
+	ssl? ( >=net-libs/gnutls-1.4.0 )"
+# FIXME: can't build against system lib
+#	asyncns? ( net-libs/libasyncns )"
+#   openssl dropped because of bug #216705
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
@@ -29,12 +29,11 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable debug)"
+		$(use_enable debug)
+		$(use_with asyncns)"
 
-	if use ssl && use gnutls; then
+	if use ssl; then
 		G2CONF="${G2CONF} --with-ssl=gnutls"
-	elif use ssl; then
-		G2CONF="${G2CONF} --with-ssl=openssl"
 	else
 		G2CONF="${G2CONF} --with-ssl=no"
 	fi