Fix detection of >=net-libs/gnutls-2.7.1 (bug #268472). Fix automagic dependency on net-libs/gnutls.

Package-Manager: portage-13625-svn/cvs/Linux x86_64

4 files changed, 40 insertions, 9 deletions

diff --git a/dev-libs/iksemel/ChangeLog b/dev-libs/iksemel/ChangeLog
index 8c02023ee563..dd5b0ace993a 100644
--- a/dev-libs/iksemel/ChangeLog
+++ b/dev-libs/iksemel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/iksemel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iksemel/ChangeLog,v 1.11 2009/05/03 16:47:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iksemel/ChangeLog,v 1.12 2009/05/30 21:41:11 arfrever Exp $
+
+  30 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  iksemel-1.3.ebuild, +files/iksemel-1.3-gnutls-2.8.patch:
+  Fix detection of >=net-libs/gnutls-2.7.1 (bug #268472). Fix automagic
+  dependency on net-libs/gnutls.
 
   03 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   iksemel-1.3.ebuild:
diff --git a/dev-libs/iksemel/Manifest b/dev-libs/iksemel/Manifest
index 0c00c4ad2984..76a2b39f74bb 100644
--- a/dev-libs/iksemel/Manifest
+++ b/dev-libs/iksemel/Manifest
@@ -1,4 +1,5 @@
+AUX iksemel-1.3-gnutls-2.8.patch 484 RMD160 282bab4f748909dc5ec526d2c7cdf5dd3d4bdcd3 SHA1 24372f4c441e339def98b0874abb0799df56250c SHA256 8ab439d4f3106ee3fd2a07c8396c041edcd1dde12b798521406a3141d5bfeed7
 DIST iksemel-1.3.tar.gz 485208 RMD160 fad098ddf6a7c529866c03d213bbd490f35d019d SHA1 6b3e2c5e8990e71bc435918c60147c56c4f1a68a SHA256 ee021861be6bdb9a970ab3d5997dd14ffdbf33ad573691292176031f49aa4f45
-EBUILD iksemel-1.3.ebuild 833 RMD160 9e392958b375a74848439d90536ce3a11f9fd83e SHA1 c6db583cce349676d7a63ff8e9a542553647ff52 SHA256 aeca4fc3bb35c487a058f77980a60036dcf79818f8b5230032956db70f846eb4
-MISC ChangeLog 1517 RMD160 ae823a2ed0ad1326a209bc48c5ab879247081a02 SHA1 9e35e2eb92101087bdd97b28fe0e99d4d9f121bc SHA256 7b17f41678b62629fd3692e220df99ca53e565d029449d20bb134a9ff1404539
+EBUILD iksemel-1.3.ebuild 928 RMD160 509032adc4ed98b876e76fb08f5cb0a588a74aca SHA1 c5b8be4ea739f2913a83367688ecf22e76e4f360 SHA256 38c0734a2d6e69dbb06ef7fa3601fc6214b4df721026787a9145be38fe833998
+MISC ChangeLog 1755 RMD160 35b4e063eadfb4dcd9e142b58d105fc51658e5ad SHA1 7578779119ab4350f2add52610fe2fbd4e302c3a SHA256 ca9c3d7869cb25d1e85c4514c1f08c2209fa4f566a8f294c22a4254990ef0ce9
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch b/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch
new file mode 100644
index 000000000000..8c0aa49bc431
--- /dev/null
+++ b/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch
@@ -0,0 +1,16 @@
+--- configure.ac
++++ configure.ac
+@@ -45,7 +45,12 @@
+ AC_CHECK_FUNCS(getopt_long)
+ AC_CHECK_FUNCS(getaddrinfo)
+ 
+-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
++AC_ARG_WITH([gnutls],
++            [AS_HELP_STRING([--with-gnutls],
++                            [Enable use of GnuTLS])])
++if test "$with_gnutls" != "no"; then
++  PKG_CHECK_MODULES(LIBGNUTLS, gnutls, AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
++fi
+ 
+ dnl Check -Wall flag of GCC
+ if test "x$GCC" = "xyes"; then
diff --git a/dev-libs/iksemel/iksemel-1.3.ebuild b/dev-libs/iksemel/iksemel-1.3.ebuild
index 84bdd19e84b0..7d9c04d54b1a 100644
--- a/dev-libs/iksemel/iksemel-1.3.ebuild
+++ b/dev-libs/iksemel/iksemel-1.3.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iksemel/iksemel-1.3.ebuild,v 1.6 2009/05/03 16:47:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iksemel/iksemel-1.3.ebuild,v 1.7 2009/05/30 21:41:11 arfrever Exp $
+
+EAPI="2"
+
+inherit autotools eutils
 
 DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications"
 HOMEPAGE="http://code.google.com/p/iksemel"
@@ -12,17 +16,22 @@ KEYWORDS="amd64 ppc x86"
 IUSE="gnutls"
 
 RDEPEND="gnutls? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+		gnutls? ( dev-util/pkgconfig )"
 
 # http://code.google.com/p/iksemel/issues/detail?id=4
 RESTRICT="test"
 
-src_compile() {
-	econf $(use_with gnutls libgnutls-prefix /usr)
-	emake || die "emake failed"
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gnutls-2.8.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with gnutls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
 }