Clean up old revisions. Fix detection of gnutls, bug #272027

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 40 insertions, 133 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 84c5ab87e05e..1eb5a82d0e10 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/loudmouth
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.87 2009/05/15 16:43:42 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.88 2009/06/17 22:09:46 eva Exp $
+
+  17 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -loudmouth-1.2.3.ebuild, -loudmouth-1.4.2.ebuild,
+  -loudmouth-1.4.2-r1.ebuild, loudmouth-1.4.3.ebuild,
+  +files/loudmouth-1.4.3-gnutls28.patch:
+  Clean up old revisions. Fix detection of gnutls, bug #272027
 
   15 May 2009; Raúl Porcel <armin76@gentoo.org> loudmouth-1.4.3.ebuild:
   ia64/sparc stable wrt #265960
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 677acba6bb35..fa05e1077405 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,10 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX loudmouth-1.4.3-asyncns-system.patch 2597 RMD160 5e93e7e1bd1971f6f2f343d85a7866c7af063811 SHA1 7916119f99f4301413c8771a35db22d4ff3084b6 SHA256 80c853318b7e7111682128361acace88b496fa4b5b360d618762eb8aec1bde09
-DIST loudmouth-1.2.3.tar.bz2 325864 RMD160 ced68f5187855f3286caa604c46adf0972013048 SHA1 51c6317170b8f044e489d71c7de8410663fefb6b SHA256 41f775303e76436add3c0141e485246223a60bbbcf90a7e90ed2b5baf6e2602b
-DIST loudmouth-1.4.2.tar.bz2 380128 RMD160 6c94abe777e44331a1133d300cb351307e4bb48a SHA1 f2cbcd000127c6cb97f37e31eef3d9536cf2d8df SHA256 18c43de707477aef86bb170f0642f720e238aba9cc0c44dc68ae5116a70841ec
+AUX loudmouth-1.4.3-gnutls28.patch 703 RMD160 efd8db33c1bedc818ae2c6aef5cd94d8c4cebd03 SHA1 18c45db10cd3a4f185b73d84f97d9f75f88a7784 SHA256 6b74102efa1673fd57fbad52682cd002e4676768c5a8eb49c489f5618727b275
 DIST loudmouth-1.4.3.tar.bz2 366818 RMD160 59852d085f73d68b3c061b7192a484527843e67d SHA1 55dd0475760f98ff0ba1f5c712c52ab776b432be SHA256 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3
-EBUILD loudmouth-1.2.3.ebuild 996 RMD160 f7e19158945d34836ebb5c58ef8ea313548bf76c SHA1 59239c9830814a2fc2a2db0ff3b88de85985ae03 SHA256 38687ed39ca496dbace5ef8c9126b429edfee812b748a994048da7c6f69c0c55
-EBUILD loudmouth-1.4.2-r1.ebuild 1100 RMD160 4d5b74e9bd1291f2c82a29d4e8327f4be021be5a SHA1 3c62012c1f9db465630605a0d0890c5d78f88993 SHA256 a39302241d2844bfc619f6363c6bf5afbe436aad3baef52f8eab2f932165eb5b
-EBUILD loudmouth-1.4.2.ebuild 1015 RMD160 6a92ad8b23885c99cd64d99078e4e93d6bdf3e8d SHA1 c1465870a354d54e4cbd25bbc28e9b499fc5e307 SHA256 661f1acdf2a25190526341652fa3d31f7a04a074f549a319f853b50e79e85d9e
-EBUILD loudmouth-1.4.3.ebuild 1250 RMD160 baa16e91eb83a4bbe64e32eb95de47f357c8901f SHA1 1ec733794e9ae3f3c3b38ebe4e0762cc681ef7a1 SHA256 ce8aaa95bb7e630c823ba5b3b5d926bf7989cf2949df1bc6da04acbb8ec903f6
-MISC ChangeLog 10953 RMD160 3d92b12122b62495e4cbbf3b609eefa1fe94dbc6 SHA1 5fded08de57394852b720fecc36abc6a73d1ed70 SHA256 e67e142cf01a15f7886f423c70f72084e2091f16484c2480d039e6ccdb94a16a
+EBUILD loudmouth-1.4.3.ebuild 1334 RMD160 750f3dad9aabe86fda435f6329f3256b020eb80e SHA1 e6cf49368cb4428f0d2148e8c52cb3fbd52c3cd0 SHA256 69de54a0810b0a389046d70c0058155b60265037ecb3b339dd759a957674af52
+MISC ChangeLog 11214 RMD160 70110809cb3a7371b6cbab140d14145d7f99b8ef SHA1 5fe61ed37b8ec21ebf999163064aa10319012338 SHA256 15d14b547f77579d2b2caab777e52a43eca8db4982bb16b52b5cab364c2a9d74
 MISC metadata.xml 258 RMD160 85cf4588f19fabaeb6fe13f58c6ae1fb6e51e798 SHA1 bced822ded5aef8c673d7e65f1cdc727fe3711c4 SHA256 0db8d15e4fd277e63ff3200516092f2cc3ab46da07da76e5e7baf37937a734c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko5hdEACgkQ1fmVwcYIWAYaugCeMnHAdGflWle0nKFCPtIlm9yL
+5XsAn2lPkH6YrCUNYodYDJZEIw7ft6ss
+=50gJ
+-----END PGP SIGNATURE-----
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-gnutls28.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-gnutls28.patch
new file mode 100644
index 000000000000..a538533db03b
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-gnutls28.patch
@@ -0,0 +1,15 @@
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=272027
+# Patch from mandriva
+--- a/configure.ac	2009-05-30 17:59:03.000000000 +0200
++++ b/configure.ac	2009-05-30 18:02:24.000000000 +0200
+@@ -146,8 +146,9 @@
+ enable_ssl=no
+ if test "x$ac_ssl" = "xgnutls"; then
+   dnl Look for GnuTLS
+-  AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
++  PKG_CHECK_EXISTS([gnutls >= $GNUTLS_REQUIRED], have_libgnutls=yes, have_libgnutls=no)
+   if test "x$have_libgnutls" = "xyes"; then
++    PKG_CHECK_MODULES(LIBGNUTLS, [gnutls >= $GNUTLS_REQUIRED])
+     CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+     LIBS="$LIBS $LIBGNUTLS_LIBS"
+     AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
diff --git a/net-libs/loudmouth/loudmouth-1.2.3.ebuild b/net-libs/loudmouth/loudmouth-1.2.3.ebuild
deleted file mode 100644
index 08aa3cad7f5f..000000000000
--- a/net-libs/loudmouth/loudmouth-1.2.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.13 2008/04/08 13:13:28 armin76 Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://www.loudmouth-project.org/"
-SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
-
-IUSE="doc gnutls ssl debug test"
-
-RDEPEND=">=dev-libs/glib-2.4
-	ssl? ( || (
-		gnutls? ( >=net-libs/gnutls-1.4.0 )
-		!gnutls? ( dev-libs/openssl )
-		) )"
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)"
-
-	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
-}
diff --git a/net-libs/loudmouth/loudmouth-1.4.2-r1.ebuild b/net-libs/loudmouth/loudmouth-1.4.2-r1.ebuild
deleted file mode 100644
index fbb90fc1306b..000000000000
--- a/net-libs/loudmouth/loudmouth-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.4.2-r1.ebuild,v 1.1 2008/10/23 09:48:03 leio Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://www.loudmouth-project.org/"
-SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc ssl debug test"
-
-RDEPEND=">=dev-libs/glib-2.4
-	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 )
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug)
-		--without-asyncns"
-	# Currently asyncns segfaults on some machines and breaks XMPP for telepathy, disabled till fixed
-
-	if use ssl; then
-		G2CONF="${G2CONF} --with-ssl=gnutls"
-	else
-		G2CONF="${G2CONF} --with-ssl=no"
-	fi
-}
diff --git a/net-libs/loudmouth/loudmouth-1.4.2.ebuild b/net-libs/loudmouth/loudmouth-1.4.2.ebuild
deleted file mode 100644
index 78f541fc890a..000000000000
--- a/net-libs/loudmouth/loudmouth-1.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.4.2.ebuild,v 1.6 2008/09/18 12:46:25 ranger Exp $
-
-EAPI=1
-
-inherit gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="http://www.loudmouth-project.org/"
-SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-
-IUSE="+asyncns doc ssl debug test"
-
-RDEPEND=">=dev-libs/glib-2.4
-	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 )
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_with asyncns)"
-
-	if use ssl; then
-		G2CONF="${G2CONF} --with-ssl=gnutls"
-	else
-		G2CONF="${G2CONF} --with-ssl=no"
-	fi
-}
diff --git a/net-libs/loudmouth/loudmouth-1.4.3.ebuild b/net-libs/loudmouth/loudmouth-1.4.3.ebuild
index 7f9d0c426a04..099b56275d42 100644
--- a/net-libs/loudmouth/loudmouth-1.4.3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3.ebuild,v 1.9 2009/05/15 16:43:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3.ebuild,v 1.10 2009/06/17 22:09:46 eva Exp $
 
 inherit autotools gnome2
 
@@ -50,5 +50,8 @@ src_unpack() {
 	# Use system libasyncns, bug #236844
 	epatch "${FILESDIR}/${P}-asyncns-system.patch"
 
+	# Fix detection of gnutls-2.8, bug #272027
+	epatch "${FILESDIR}/${P}-gnutls28.patch"
+
 	eautoreconf
 }