bugfix release

Package-Manager: portage-2.1_pre4-r1

11 files changed, 128 insertions, 92 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 568f2bd5da06..6bb1363d9884 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/loudmouth
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.31 2005/12/17 21:57:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.32 2006/04/05 13:27:39 foser Exp $
+
+*loudmouth-1.0.2 (05 Apr 2006)
+
+  05 Apr 2006; Marinus Schraal <foser@gentoo.org> loudmouth-1.0.2.ebuild,
+  files/loudmouth-1.0.2-build_without_ssl.patch :
+  New release, add patch to fix -ssl build
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> loudmouth-1.0.1.ebuild:
   Added ~ppc64
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 9fe99cd8a59f..e42f84c24e89 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,13 +1,30 @@
-MD5 b74df5fec68eafd5548154430e0c7220 ChangeLog 3782
-MD5 e89c7f9d64ded599dc2950968f7b6ded loudmouth-0.16.ebuild 621
-MD5 0e52ccc8bcf7bed0a04eb40b97cf5952 loudmouth-0.17.1.ebuild 793
-MD5 d3a8e167c56545ba1a2aaf703d9c894c loudmouth-0.17.2-r2.ebuild 908
-MD5 b266bb34fcef3783f32a963ecc501ad2 loudmouth-0.17.2.ebuild 795
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 810f306abbf85d1a65e4e3252b737c52 loudmouth-1.0.1.ebuild 616
-MD5 1198670c7a9b3819274997b05c6131ca files/digest-loudmouth-0.16 67
-MD5 5c9d9cbecc7012f358b36f0cde4b75a2 files/digest-loudmouth-0.17.1 69
-MD5 a556924d584687a8f363eed4bb9c743f files/digest-loudmouth-0.17.2 69
+MD5 d92ce32b43d2cee4257905f3db845489 ChangeLog 3980
+RMD160 2f6ad320513053dd689a0cdde094c89f837cf123 ChangeLog 3980
+SHA256 83f539963566129d7ee57f75b9529ee63deb933d5e2865baab534a346a7c42ab ChangeLog 3980
 MD5 a556924d584687a8f363eed4bb9c743f files/digest-loudmouth-0.17.2-r2 69
-MD5 3683fa9c59f744e00481d05e55c763cf files/loudmouth-0.17.2-gnutls_deprecation.patch 782
+RMD160 62ec29854a03843a7722eb4cefa0770b8574a35c files/digest-loudmouth-0.17.2-r2 69
+SHA256 4ac10e37f0beec486ceb516fe0d799b3f0632bcf7e658dacbf507260541b7858 files/digest-loudmouth-0.17.2-r2 69
 MD5 26c44f134406e99f0210b82d0df1d541 files/digest-loudmouth-1.0.1 68
+RMD160 30e4d674410d10247f4818cb1c4175886b6e5bc3 files/digest-loudmouth-1.0.1 68
+SHA256 475d47be876fe28f481f5c2d5a3e9534cd941be60280608bf05d4c1831ebf36f files/digest-loudmouth-1.0.1 68
+MD5 4f4aae2241abe2190d6c8f3c62a39d98 files/digest-loudmouth-1.0.2 250
+RMD160 cd7063461a9a95d956869c4f8b7d01fd303a04d8 files/digest-loudmouth-1.0.2 250
+SHA256 782847dccfff4857bccf4c1b8a1e84c81ebaeb5b5d20f45ec5bac57bad59c5c1 files/digest-loudmouth-1.0.2 250
+MD5 3683fa9c59f744e00481d05e55c763cf files/loudmouth-0.17.2-gnutls_deprecation.patch 782
+RMD160 a13b1ba37a6d1cc1bcafef122da88320f3d21c76 files/loudmouth-0.17.2-gnutls_deprecation.patch 782
+SHA256 b77b85442d738d8d647a94449df0f6eab12dbb76b0b4ae05ee1a3060a2ca7627 files/loudmouth-0.17.2-gnutls_deprecation.patch 782
+MD5 943b98486f505d1231db25cee51ddd02 files/loudmouth-1.0.2-build_without_ssl.patch 1154
+RMD160 6b4c085077f34346a13fd9506d0c8a59e5c11234 files/loudmouth-1.0.2-build_without_ssl.patch 1154
+SHA256 035f9dafe2d66fb127c2758fb4da804e5a9bcc2a9a398040722a62c71a1f6869 files/loudmouth-1.0.2-build_without_ssl.patch 1154
+MD5 d3a8e167c56545ba1a2aaf703d9c894c loudmouth-0.17.2-r2.ebuild 908
+RMD160 66904e39e24d616744ff94815038d9a2749f9f50 loudmouth-0.17.2-r2.ebuild 908
+SHA256 5bcb9c8d5707f7054b685ec842bcfb1e8efe68976f287e4b7546e27a97a4f169 loudmouth-0.17.2-r2.ebuild 908
+MD5 810f306abbf85d1a65e4e3252b737c52 loudmouth-1.0.1.ebuild 616
+RMD160 5a4e56055c44ef298cd1d155b3d58e21600f21d2 loudmouth-1.0.1.ebuild 616
+SHA256 dcf8c83ea54b966909ed5d5d6303c1b6c6cc59e4533c10d769d8189be601f7fb loudmouth-1.0.1.ebuild 616
+MD5 9bdd56e7008e5c077a6fea0c2062f0b8 loudmouth-1.0.2.ebuild 835
+RMD160 733fb0d8036125741b36a0466facb027a699d7dc loudmouth-1.0.2.ebuild 835
+SHA256 87636e00f789d98baabfeadd4d0239640f2541e4493616e70b854828767305e2 loudmouth-1.0.2.ebuild 835
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
diff --git a/net-libs/loudmouth/files/digest-loudmouth-0.16 b/net-libs/loudmouth/files/digest-loudmouth-0.16
deleted file mode 100644
index ae83bb13846a..000000000000
--- a/net-libs/loudmouth/files/digest-loudmouth-0.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 58bfa1b2ef244c6fd5f69cce7faa4cf5 loudmouth-0.16.tar.bz2 280909
diff --git a/net-libs/loudmouth/files/digest-loudmouth-0.17.1 b/net-libs/loudmouth/files/digest-loudmouth-0.17.1
deleted file mode 100644
index 06610243ed11..000000000000
--- a/net-libs/loudmouth/files/digest-loudmouth-0.17.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e089cf0843c4b5069d49d1a9ee067a14 loudmouth-0.17.1.tar.bz2 283627
diff --git a/net-libs/loudmouth/files/digest-loudmouth-0.17.2 b/net-libs/loudmouth/files/digest-loudmouth-0.17.2
deleted file mode 100644
index ac92b907b1a2..000000000000
--- a/net-libs/loudmouth/files/digest-loudmouth-0.17.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db5dd069f3c7de18d5347ebaaee4ad61 loudmouth-0.17.2.tar.bz2 286981
diff --git a/net-libs/loudmouth/files/digest-loudmouth-1.0.2 b/net-libs/loudmouth/files/digest-loudmouth-1.0.2
new file mode 100644
index 000000000000..da5cf690c990
--- /dev/null
+++ b/net-libs/loudmouth/files/digest-loudmouth-1.0.2
@@ -0,0 +1,3 @@
+MD5 c7726a7b6f36a9d3bde89084f2ad5485 loudmouth-1.0.2.tar.bz2 304321
+RMD160 d20eaf3705349725ef471bfd2ab0edffa24d2dce loudmouth-1.0.2.tar.bz2 304321
+SHA256 9e97dc28657fe3e05ab7f314411e1bbf0cfb8a36d49a65f44769657f02ffec3e loudmouth-1.0.2.tar.bz2 304321
diff --git a/net-libs/loudmouth/files/loudmouth-1.0.2-build_without_ssl.patch b/net-libs/loudmouth/files/loudmouth-1.0.2-build_without_ssl.patch
new file mode 100644
index 000000000000..6bbffa7634bb
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.0.2-build_without_ssl.patch
@@ -0,0 +1,49 @@
+--- loudmouth/lm-ssl.c~	2006-04-03 17:01:39.000000000 +0200
++++ loudmouth/lm-ssl.c	2006-04-05 14:06:05.000000000 +0200
+@@ -47,13 +47,14 @@
+ 
+ static void           ssl_free                  (LmSSL       *ssl);
+ 
+-#ifdef HAVE_GNUTLS
+-static gboolean       ssl_verify_certificate    (LmSSL       *ssl,
+-						 const gchar *server);
+ static LmSSLResponse  ssl_func_always_continue  (LmSSL       *ssl,
+ 						 LmSSLStatus  status,
+ 						 gpointer     user_data);
+ 
++#ifdef HAVE_GNUTLS
++static gboolean       ssl_verify_certificate    (LmSSL       *ssl,
++						 const gchar *server);
++
+ static gboolean
+ ssl_verify_certificate (LmSSL *ssl, const gchar *server)
+ {
+@@ -148,13 +149,7 @@
+ 	return TRUE;
+ }
+ 
+-static LmSSLResponse  
+-ssl_func_always_continue (LmSSL       *ssl,
+-			  LmSSLStatus  status,
+-			  gpointer     user_data)
+-{
+-	return LM_SSL_RESPONSE_CONTINUE;;
+-}
++
+ 
+ void
+ _lm_ssl_initialize (LmSSL *ssl) 
+@@ -263,6 +258,13 @@
+ }
+ #endif 
+ 
++static LmSSLResponse  
++ssl_func_always_continue (LmSSL       *ssl,
++			  LmSSLStatus  status,
++			  gpointer     user_data)
++{
++	return LM_SSL_RESPONSE_CONTINUE;;
++}
+ 
+ static void
+ ssl_free (LmSSL *ssl)
diff --git a/net-libs/loudmouth/loudmouth-0.16.ebuild b/net-libs/loudmouth/loudmouth-0.16.ebuild
deleted file mode 100644
index a0cb9dc96a5e..000000000000
--- a/net-libs/loudmouth/loudmouth-0.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-0.16.ebuild,v 1.4 2004/09/02 22:49:14 spider Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://loudmouth.imendio.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-
-IUSE="doc ssl"
-
-RDEPEND=">=dev-libs/glib-2
-	ssl? ( >=net-libs/gnutls-1.0.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.0 )"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
-G2CONF="${G2CONF} `use_with ssl`"
diff --git a/net-libs/loudmouth/loudmouth-0.17.1.ebuild b/net-libs/loudmouth/loudmouth-0.17.1.ebuild
deleted file mode 100644
index 10c196565060..000000000000
--- a/net-libs/loudmouth/loudmouth-0.17.1.ebuild
+++ /dev/null
@@ -1,26 +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.1.ebuild,v 1.5 2005/07/19 03:26:36 tester Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://loudmouth.imendio.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-IUSE="doc ssl"
-
-RDEPEND=">=dev-libs/glib-2.4
-	ssl? ( >=net-libs/gnutls-1.0.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.0 )"
-
-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.
diff --git a/net-libs/loudmouth/loudmouth-0.17.2.ebuild b/net-libs/loudmouth/loudmouth-0.17.2.ebuild
deleted file mode 100644
index 3e124d7e3714..000000000000
--- a/net-libs/loudmouth/loudmouth-0.17.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.1 2004/12/18 17:03:51 foser Exp $
-
-inherit gnome2
-
-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.0.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.0 )"
-
-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.
diff --git a/net-libs/loudmouth/loudmouth-1.0.2.ebuild b/net-libs/loudmouth/loudmouth-1.0.2.ebuild
new file mode 100644
index 000000000000..cf26932ff3f2
--- /dev/null
+++ b/net-libs/loudmouth/loudmouth-1.0.2.ebuild
@@ -0,0 +1,41 @@
+# 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.2.ebuild,v 1.1 2006/04/05 13:27:39 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)"
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}/loudmouth
+	# fix building sans ssl
+	epatch ${FILESDIR}/${P}-build_without_ssl.patch
+
+}