Add patch to fix error in configure.ac, bug #232312.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.27-rc1-00504-g2b12a4c x86_64

4 files changed, 49 insertions, 15 deletions

diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index 42c0565082c1..c3e333e1364e 100644
--- a/net-im/centerim/ChangeLog
+++ b/net-im/centerim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/centerim
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.23 2008/07/19 10:38:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.24 2008/08/04 19:10:30 swegener Exp $
+
+  04 Aug 2008; Sven Wegener <swegener@gentoo.org>
+  +files/centerim-4.22.5-libotr-configure.patch, centerim-4.22.5.ebuild:
+  Add patch to fix error in configure.ac, bug #232312.
 
   19 Jul 2008; Alexis Ballier <aballier@gentoo.org> centerim-4.22.5.ebuild:
   keyword ~x86-fbsd thanks to Davide Italiano <dav_it@gentoo.org>, bug
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index a12689faeddb..11feab2cb2a5 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX centerim-4.22.5-libotr-configure.patch 1030 RMD160 c91caf93c985f3ddbac4d1c0c93b120443e097ae SHA1 aaae07370333871d8eaefc265394c951301511b4 SHA256 8173b329930703cd37aa92c089882a9fd01e21a7bc55dc379a7f0f320589e870
 DIST centerim-4.22.5.tar.gz 2803217 RMD160 94ade501f8ba46ff24bf4b3cc283533924c3e2f4 SHA1 422c368064f47886585720c1c639515acff21ae9 SHA256 c68abb59043602a2b28fb55d45361d0b22fc1566848cc0c255580914df7b3eb3
-EBUILD centerim-4.22.5.ebuild 2754 RMD160 b8fa1cf6391c1a0ee7c8a3db0ee7ebb5bfebf134 SHA1 cb8abafae81dfc9f10d78c55e313e57ee29cdb28 SHA256 d064dca4397476a5de7500c9270f339b7ad71eb9e4114cd92c84a100b89d75e4
-MISC ChangeLog 4217 RMD160 0e6d8b8a9373db97fda3722da4484cf698017a3a SHA1 2577af6293cc354f544aaea1f00b2ef045f97a58 SHA256 6156068f000836d8fd71eecd04340e450ff5ce16ae06d272688e7a961c43c3a1
+EBUILD centerim-4.22.5.ebuild 2871 RMD160 8482a7cb4d8a4c95ab7fee915ea337486d825fe8 SHA1 f5ecdcf663b85ccb7a9fe19901a0e5212e1ed5df SHA256 a4f6db42ed93c258e06d6ea4189f2240f85c6f86eaf77adb41d05864f0e75485
+MISC ChangeLog 4396 RMD160 684a3b62ce8ea6efd1b5b5daac180bda904b17f2 SHA1 29c8cdc068e822be940834f17c34462658846344 SHA256 c3eeb04dc2eeb25b72c045b23a80bbdefe93da9cf0c455ba4a44933a35fdb0e3
 MISC metadata.xml 270 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 SHA1 6762f98354ff738ecbe57163b0bbfe9c95dabf15 SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiBxBkACgkQvFcC4BYPU0oQUwCfQCovCbljJ7th79hQHkPsQSaK
-NCAAnAjp/isYFq4ccQW8giedZL40jE2J
-=vjTP
------END PGP SIGNATURE-----
diff --git a/net-im/centerim/centerim-4.22.5.ebuild b/net-im/centerim/centerim-4.22.5.ebuild
index d3d87e2a831c..07bf82294b88 100644
--- a/net-im/centerim/centerim-4.22.5.ebuild
+++ b/net-im/centerim/centerim-4.22.5.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.5.ebuild,v 1.5 2008/07/19 10:38:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.5.ebuild,v 1.6 2008/08/04 19:10:30 swegener Exp $
 
-inherit eutils
+WANT_AUTOMAKE="none"
+
+inherit eutils autotools
 
 PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
 IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
@@ -86,6 +88,11 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/centerim-4.22.5-libotr-configure.patch
+
+	eautoconf
 
 	# Don't execute git commands, bug #228151
 	cat >"${S}"/misc/git-version-gen <<-EOF
diff --git a/net-im/centerim/files/centerim-4.22.5-libotr-configure.patch b/net-im/centerim/files/centerim-4.22.5-libotr-configure.patch
new file mode 100644
index 000000000000..1d5cbff83699
--- /dev/null
+++ b/net-im/centerim/files/centerim-4.22.5-libotr-configure.patch
@@ -0,0 +1,32 @@
+commit 42add0132dad8c32ec356d59d0f7daceb9d42ed8
+Author: Sven Wegener <sven.wegener@stealer.net>
+Date:   Tue Jul 22 02:18:03 2008 +0200
+
+    Fix configure.ac libotr error
+    
+    This fixes the following error:
+    
+    checking for otrl_init in -lotr... yes
+    checking libotr/context.h usability... yes
+    checking libotr/context.h presence... yes
+    checking for libotr/context.h... yes
+    ./configure: line 15006: libotr/userstate.h: No such file or directory
+    
+    Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 04ca231..56cf974 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -261,7 +261,7 @@ if test "x$with_libotr" != "xno"; then
+ 
+ 	AC_CHECK_LIB(otr, otrl_init,
+ 	[
+-		AC_CHECK_HEADERS(libotr/context.h, libotr/userstate.h
++		AC_CHECK_HEADERS(libotr/context.h libotr/userstate.h,
+ 		[
+ 			AC_DEFINE(HAVE_LIBOTR, 1, [define if you have libotr])
+             OTR_LIBS="-lotr $LIBS"