* bump to 1.3.3 and clean up old revisions

(Portage version: 2.1.4)

13 files changed, 32 insertions, 172 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index eb61ac19c3ce..392c9cae2809 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,15 @@
 # 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.51 2007/12/07 18:20:46 jer Exp $
+# 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 $
+
+*loudmouth-1.3.3 (27 Jan 2008)
+
+  27 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/loudmouth-0.17.2-gnutls_deprecation.patch,
+  -loudmouth-0.17.2-r2.ebuild, -loudmouth-1.0.5.ebuild,
+  -loudmouth-1.1.4.ebuild, -loudmouth-1.2.1.ebuild, -loudmouth-1.2.2.ebuild,
+  +loudmouth-1.3.3.ebuild:
+  bump to 1.3.3 and clean up of old revisions
 
   07 Dec 2007; Jeroen Roovers <jer@gentoo.org> loudmouth-1.2.3.ebuild:
   Marked ~hppa (bug #201532).
diff --git a/net-libs/loudmouth/files/digest-loudmouth-0.17.2-r2 b/net-libs/loudmouth/files/digest-loudmouth-0.17.2-r2
deleted file mode 100644
index 5d6b9881cb58..000000000000
--- a/net-libs/loudmouth/files/digest-loudmouth-0.17.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db5dd069f3c7de18d5347ebaaee4ad61 loudmouth-0.17.2.tar.bz2 286981
-RMD160 c90f046af52a951c0a163fd4f516b82d4709d74e loudmouth-0.17.2.tar.bz2 286981
-SHA256 df79035ad47d8cb6ee507c1787ef06254bc1d0d5bbdf871c669357145c52558b loudmouth-0.17.2.tar.bz2 286981
diff --git a/net-libs/loudmouth/files/digest-loudmouth-1.0.5 b/net-libs/loudmouth/files/digest-loudmouth-1.0.5
deleted file mode 100644
index 2ef64393ff24..000000000000
--- a/net-libs/loudmouth/files/digest-loudmouth-1.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e97102dd6d8a09d2edf33df14c9047e loudmouth-1.0.5.tar.bz2 272631
-RMD160 c45ae856e8a5137b4d63b279c92ee93ca9f426c3 loudmouth-1.0.5.tar.bz2 272631
-SHA256 f928232793407f0ca01264fb67e2f87127fa02315126571a1e99db1faa306656 loudmouth-1.0.5.tar.bz2 272631
diff --git a/net-libs/loudmouth/files/digest-loudmouth-1.1.4 b/net-libs/loudmouth/files/digest-loudmouth-1.1.4
deleted file mode 100644
index 5b4e65ad6274..000000000000
--- a/net-libs/loudmouth/files/digest-loudmouth-1.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9735652b1c6495d092064eaf0df354de loudmouth-1.1.4.tar.bz2 326284
-RMD160 da21f70e808c8ce434cbb51ab00152199c67c88a loudmouth-1.1.4.tar.bz2 326284
-SHA256 4335adcf7ffd769b72c680c57240da630504b5075962756847d4d0a2bded4958 loudmouth-1.1.4.tar.bz2 326284
diff --git a/net-libs/loudmouth/files/digest-loudmouth-1.2.1 b/net-libs/loudmouth/files/digest-loudmouth-1.2.1
deleted file mode 100644
index 552ea96f4aab..000000000000
--- a/net-libs/loudmouth/files/digest-loudmouth-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b9aa5ac29737644714ded6fcbff89137 loudmouth-1.2.1.tar.bz2 326811
-RMD160 ded35aae79c91fadcf4820dfe59623e4785d7a93 loudmouth-1.2.1.tar.bz2 326811
-SHA256 ce33a7cf1e3bb72a43894a1fe59e0a325f1fb8670d708c65281d451c0cda56ec loudmouth-1.2.1.tar.bz2 326811
diff --git a/net-libs/loudmouth/files/digest-loudmouth-1.2.2 b/net-libs/loudmouth/files/digest-loudmouth-1.2.2
deleted file mode 100644
index 1bbb083fe6f9..000000000000
--- a/net-libs/loudmouth/files/digest-loudmouth-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0bdd62dcbca0dfc8b46de6806c0cc3ca loudmouth-1.2.2.tar.bz2 325366
-RMD160 8f3f776355e6e982189af5122e18456a9067e3b1 loudmouth-1.2.2.tar.bz2 325366
-SHA256 74f957c8afc395ffd043ade67dd4bc651ea1ef48355b135438b88dde4b04f06b loudmouth-1.2.2.tar.bz2 325366
diff --git a/net-libs/loudmouth/files/digest-loudmouth-1.3.3 b/net-libs/loudmouth/files/digest-loudmouth-1.3.3
new file mode 100644
index 000000000000..295ca596391d
--- /dev/null
+++ b/net-libs/loudmouth/files/digest-loudmouth-1.3.3
@@ -0,0 +1,3 @@
+MD5 3076bac0f75d22a24e464051af173f18 loudmouth-1.3.3.tar.bz2 350978
+RMD160 fcb5472e7013204b0fe1f4a1cb0f8086ccc9db1c loudmouth-1.3.3.tar.bz2 350978
+SHA256 dd8836e3e3b09cce84861d0259d17b85ba8dc4030a5736c1657d1577c7bd7d38 loudmouth-1.3.3.tar.bz2 350978
diff --git a/net-libs/loudmouth/files/loudmouth-0.17.2-gnutls_deprecation.patch b/net-libs/loudmouth/files/loudmouth-0.17.2-gnutls_deprecation.patch
deleted file mode 100644
index a07c0b07c062..000000000000
--- a/net-libs/loudmouth/files/loudmouth-0.17.2-gnutls_deprecation.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr loudmouth-0.17.2/loudmouth/lm-ssl.c loudmouth-0.17.2.patched/loudmouth/lm-ssl.c
---- loudmouth-0.17.2/loudmouth/lm-ssl.c	2004-10-19 09:52:48.000000000 +0200
-+++ loudmouth-0.17.2.patched/loudmouth/lm-ssl.c	2005-02-15 00:20:48.045550968 +0100
-@@ -71,7 +71,6 @@
- 	}
- 	
- 	if (status & GNUTLS_CERT_INVALID
--	    || status & GNUTLS_CERT_NOT_TRUSTED
- 	    || status & GNUTLS_CERT_REVOKED) {
- 		if (ssl->func (ssl, LM_SSL_STATUS_UNTRUSTED_CERT,
- 			       ssl->func_data) != LM_SSL_RESPONSE_CONTINUE) {
-@@ -126,7 +125,7 @@
- 
- 		gnutls_x509_crt_deinit (cert);
- 
--		if (gnutls_x509_fingerprint (GNUTLS_DIG_MD5, &cert_list[0],
-+		if (gnutls_fingerprint (GNUTLS_DIG_MD5, &cert_list[0],
- 					     ssl->fingerprint,
- 					     &digest_size) >= 0) {
- 			if (ssl->expected_fingerprint &&
diff --git a/net-libs/loudmouth/loudmouth-0.17.2-r2.ebuild b/net-libs/loudmouth/loudmouth-0.17.2-r2.ebuild
deleted file mode 100644
index c95eed4a0fbf..000000000000
--- a/net-libs/loudmouth/loudmouth-0.17.2-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-0.17.2-r2.ebuild,v 1.5 2007/07/13 07:18:13 mr_bones_ Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://loudmouth.imendio.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc amd64"
-
-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"
-
-G2CONF="${G2CONF} `use_with ssl` --disable-mono"
-# FIXME :  We probably want to add a local mono use flag. However, I have no chance to -test- the monobindings, so I'm just disabling it right now.
-
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gnutls_deprecation.patch
-
-}
diff --git a/net-libs/loudmouth/loudmouth-1.0.5.ebuild b/net-libs/loudmouth/loudmouth-1.0.5.ebuild
deleted file mode 100644
index b6e472819da0..000000000000
--- a/net-libs/loudmouth/loudmouth-1.0.5.ebuild
+++ /dev/null
@@ -1,31 +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.5.ebuild,v 1.1 2006/09/17 14:50:45 foser Exp $
-
-inherit gnome2 eutils
-
-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 debug"
-
-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"
-
-pkg_setup() {
-
-	G2CONF="$(use_with ssl) \
-		$(use_enable debug)\
-		$(use_enable doc gtk-doc)"
-
-}
diff --git a/net-libs/loudmouth/loudmouth-1.1.4.ebuild b/net-libs/loudmouth/loudmouth-1.1.4.ebuild
deleted file mode 100644
index 4d903568ddf5..000000000000
--- a/net-libs/loudmouth/loudmouth-1.1.4.ebuild
+++ /dev/null
@@ -1,30 +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.1.4.ebuild,v 1.1 2006/10/15 11:27:59 genstef Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://loudmouth.imendio.org/"
-SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc ssl debug"
-
-RDEPEND=">=dev-libs/glib-2.4
-	ssl? ( >=net-libs/gnutls-1 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable ssl) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc)"
-}
diff --git a/net-libs/loudmouth/loudmouth-1.2.1.ebuild b/net-libs/loudmouth/loudmouth-1.2.1.ebuild
deleted file mode 100644
index 62b14519f1af..000000000000
--- a/net-libs/loudmouth/loudmouth-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.1.ebuild,v 1.1 2007/04/06 00:58:39 genstef Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://developer.imendio.com/projects/loudmouth/"
-SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc ssl debug"
-
-RDEPEND=">=dev-libs/glib-2.4
-	ssl? ( >=net-libs/gnutls-1 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable ssl) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc)"
-}
diff --git a/net-libs/loudmouth/loudmouth-1.2.2.ebuild b/net-libs/loudmouth/loudmouth-1.3.3.ebuild
index e1e63f805418..d41a803c2b2f 100644
--- a/net-libs/loudmouth/loudmouth-1.2.2.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.3.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.2.ebuild,v 1.2 2007/06/05 20:17:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.3.3.ebuild,v 1.1 2008/01/27 21:44:55 eva Exp $
 
 inherit gnome2
 
@@ -10,12 +10,15 @@ SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~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 )"
+	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) \
-		$(use_enable debug) \
+	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
 }