Bump to 1.4.3. Allow building against system libasyncns, bug #236844.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 157 insertions, 2 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index fef26db42cac..79a4f48c2680 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,12 @@
 # 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.78 2008/10/23 09:48:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.79 2008/12/04 22:56:45 eva Exp $
+
+*loudmouth-1.4.3 (04 Dec 2008)
+
+  04 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/loudmouth-1.4.3-asyncns-system.patch, +loudmouth-1.4.3.ebuild:
+  Bump to 1.4.3. Allow building against system libasyncns, bug #236844.
 
 *loudmouth-1.4.2-r1 (23 Oct 2008)
 
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index e848c4028fe0..02a66a9dc2b4 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,7 +1,20 @@
+-----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
+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
-MISC ChangeLog 9849 RMD160 0edd1499321557f7677817522633e4b239b4eb74 SHA1 3d02cef4637fe567260d788a87ca6cfb57a7ce8c SHA256 e6e440280c071bc935f86fb4eed93fa9ce608d3be87c3468d2f0a972231a1500
+EBUILD loudmouth-1.4.3.ebuild 1216 RMD160 b3f36700db8383332bcdf4a0ce735d7194af8082 SHA1 b957529255608f14823e1809612ef075bc0ff154 SHA256 31933915ad18bdd25f3d5c2e98e4185715f8a25edfbffd9e927c1e4ef92ef898
+MISC ChangeLog 10079 RMD160 90c66641f11e98e6700dd1e07d60da0aad81f736 SHA1 61a8c36642c51328a50ea38694936c891be77adc SHA256 4858452782793743fa78562d42fec2ba8ca145d2785cbec41cd888123027199b
 MISC metadata.xml 258 RMD160 85cf4588f19fabaeb6fe13f58c6ae1fb6e51e798 SHA1 bced822ded5aef8c673d7e65f1cdc727fe3711c4 SHA256 0db8d15e4fd277e63ff3200516092f2cc3ab46da07da76e5e7baf37937a734c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk4YDMACgkQ1fmVwcYIWAZlCACg2PED/fi9kApdwW2zs/mRTlod
+NmEAn0FJIZnIm2JUsljQt3pdcvaQRYg3
+=/YGh
+-----END PGP SIGNATURE-----
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-asyncns-system.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-asyncns-system.patch
new file mode 100644
index 000000000000..9cf5345e558d
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-asyncns-system.patch
@@ -0,0 +1,83 @@
+diff --git a/configure.ac b/configure.ac
+index 9369e55..17a9e1d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -199,19 +199,31 @@ AM_CONDITIONAL(USE_GNUTLS, test x$enable_ssl = xGnuTLS)
+ dnl +-------------------------------------------------------------------+
+ dnl | Checking for libasyncns                                           |
+ dnl +-------------------------------------------------------------------+
+-AC_ARG_WITH(asyncns, [  --with-asyncns=yes/no  define whether to use libasyncns, default=no],
+-            ac_asyncns=$withval,
+-            ac_asyncns=no
+-            )
++AC_ARG_WITH(asyncns,
++	AS_HELP_STRING([--with-asyncns],
++		[define whether to use libasyncns, @<:@default=no@:>@ (internal/system/no)]),
++	ac_asyncns=$withval,
++	ac_asyncns=no)
+ 
+ enable_asyncns=no
++have_asyncns_system=no
+ if test x$ac_asyncns != xno; then
+ 	enable_asyncns=yes
+ 	AC_DEFINE(HAVE_ASYNCNS, 1, [Whether to use libasyncns])
++
++	if test x$ac_asyncns = xsystem; then
++		PKG_CHECK_MODULES(ASYNCNS, [libasyncns >= 0.3],
++			[have_asyncns_system=yes],
++			[have_asyncns_system=no])
++	fi
+ else
+ 	echo "Not using asynchronous dns lookups"
+ fi
+ 
++AC_SUBST(ASYNCNS_CFLAGS)
++AC_SUBST(ASYNCNS_LIBS)
++AM_CONDITIONAL(USE_SYSTEM_ASYNCNS, test x$have_asyncns_system = xyes)
++
+ dnl +-------------------------------------------------------------------+
+ dnl | Checking for Linux TCP/IP stack                                   |
+ dnl +-------------------------------------------------------------------+
+diff --git a/loudmouth/Makefile.am b/loudmouth/Makefile.am
+index f73aa0c..e308e1c 100644
+--- a/loudmouth/Makefile.am
++++ b/loudmouth/Makefile.am
+@@ -6,6 +6,7 @@ AM_CPPFLAGS = 				    \
+ 	-I.				    \
+ 	-I$(top_srcdir)			    \
+ 	$(LOUDMOUTH_CFLAGS)		    \
++	$(ASYNCNS_CFLAGS)                   \
+ 	$(LIBIDN_CFLAGS)		    \
+ 	-DLM_COMPILATION	  	    \
+ 	-DRUNTIME_ENDIAN                    \
+@@ -51,8 +52,6 @@ libloudmouth_1_la_SOURCES =		\
+ 	lm-sock.c			\
+ 	lm-socket.c                     \
+ 	lm-socket.h                     \
+-	asyncns.c     \
+-	asyncns.h     \
+ 	lm-sasl.c                       \
+ 	lm-sasl.h                       \
+ 	md5.c                           \
+@@ -61,6 +60,13 @@ libloudmouth_1_la_SOURCES =		\
+ 	base64.h                        \
+ 	$(NULL)
+ 
++if ! USE_SYSTEM_ASYNCNS
++libloudmouth_1_la_SOURCES += \
++	asyncns.c     \
++	asyncns.h     \
++	$(NULL)
++endif
++
+ libloudmouthinclude_HEADERS =		\
+ 	lm-connection.h			\
+ 	lm-error.h			\
+@@ -75,6 +81,7 @@ libloudmouthinclude_HEADERS =		\
+ 
+ libloudmouth_1_la_LIBADD = 		\
+ 	$(LOUDMOUTH_LIBS)		\
++	$(ASYNCNS_LIBS)			\
+ 	$(LIBIDN_LIBS) \
+ 	-lresolv
+ 
diff --git a/net-libs/loudmouth/loudmouth-1.4.3.ebuild b/net-libs/loudmouth/loudmouth-1.4.3.ebuild
new file mode 100644
index 000000000000..d8bfd64e03fb
--- /dev/null
+++ b/net-libs/loudmouth/loudmouth-1.4.3.ebuild
@@ -0,0 +1,53 @@
+# 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.3.ebuild,v 1.1 2008/12/04 22:56:45 eva Exp $
+
+inherit autotools 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 )
+	asyncns? ( net-libs/libasyncns )"
+# FIXME:
+#   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)"
+
+	if use ssl; then
+		G2CONF="${G2CONF} --with-ssl=gnutls"
+	else
+		G2CONF="${G2CONF} --with-ssl=no"
+	fi
+
+	if use asyncns; then
+		G2CONF="${G2CONF} --with-asyncns=system"
+	else
+		G2CONF="${G2CONF}  --without-asyncns"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Use system libasyncns, bug #236844
+	epatch "${FILESDIR}/${P}-asyncns-system.patch"
+
+	eautoreconf
+}