Fix bug #218774 by using --enable-debug, since otherwise your CFLAGS get sedded to kill the make. Fix bug #225387 wrt gcc-4.3 compat. Thanks to Marek Miller <mlm@ngc17.pl> for the patch. Drop old.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25.8 i686

5 files changed, 53 insertions, 44 deletions

diff --git a/net-libs/libicq2000/ChangeLog b/net-libs/libicq2000/ChangeLog
index df793f77fa46..f40626e95b41 100644
--- a/net-libs/libicq2000/ChangeLog
+++ b/net-libs/libicq2000/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libicq2000
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/ChangeLog,v 1.10 2007/02/22 01:30:40 peper Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/ChangeLog,v 1.11 2008/07/27 10:11:05 loki_val Exp $
+
+  27 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/libicq2000-0.3.2-gcc43.patch, -libicq2000-0.3.1.ebuild,
+  libicq2000-0.3.2.ebuild:
+  Fix bug #218774 by using --enable-debug, since otherwise your CFLAGS get
+  sedded to kill the make. Fix bug #225387 wrt gcc-4.3 compat. Thanks to
+  Marek Miller <mlm@ngc17.pl> for the patch. Drop old.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-libs/libicq2000/Manifest b/net-libs/libicq2000/Manifest
index e0dd96057d63..6397ebb24ba3 100644
--- a/net-libs/libicq2000/Manifest
+++ b/net-libs/libicq2000/Manifest
@@ -1,6 +1,5 @@
-DIST libicq2000-0.3.1.tar.gz 514043 RMD160 cc76ddee422640f89f402eeb33f11e4f6b097526 SHA1 57ec618d82c544503bb8357d406816d50b2349a8 SHA256 c86ac9fe81188418ef301c53a132fadef190b431591e74030d22f9847463b47e
+AUX libicq2000-0.3.2-gcc43.patch 717 RMD160 8d41bea919888d54fd5f01e5fdb296e2f37964e7 SHA1 e8244a0bf4694bafb56fa9e925926a049c73cb14 SHA256 2c3f858740e85e2df16e84c26749b3009613506cf563fac64bf9eba19b1c5463
 DIST libicq2000-0.3.2.tar.gz 519316 RMD160 62469ee13e3c0b610abe9fb4671a02509ad462d5 SHA1 823b4001a928c410c647c08698fdedd045ebfae3 SHA256 de82b4d1965c9e721ee457ea727a9f8922e74dc79417bd50848f4d11c4d4e1cf
-EBUILD libicq2000-0.3.1.ebuild 794 RMD160 6d3cd04afe101f293984c4ce3c1c5eb7dfed2d4b SHA1 499abca361712958587d28f4b4ed987a3be19d9d SHA256 78f24762eccd20c601b41a610c69eddae75791eef8bfc314736eff13ee6dc5b1
-EBUILD libicq2000-0.3.2.ebuild 830 RMD160 4394d7aba34b7c9166d94a83155d8057982247d0 SHA1 67328204b1b96583481cf9f71bdaeaa3dc816154 SHA256 59c041fcd5b72063e0edd4a7f428e11c420bd7b86f47cb708aef2d7c63af0132
-MISC ChangeLog 1117 RMD160 b523e74ff90b8e826af60bff0958373f4e95a33e SHA1 5e27b225b0af5245ee018ce06d623a4628e1e560 SHA256 6d5bda3147fa1f6d16d1362b2cc5579c5e7e9f41d3fdd0fc7550652fce056aae
+EBUILD libicq2000-0.3.2.ebuild 758 RMD160 5d01dc167847b7397f960d85f5df7450f30055de SHA1 39c57cb98adc781e59f57dbd91603fbd6174794e SHA256 abd51d0803c6938d0894e08f67d5508e4f170601d1eda1a61d2e6348be39ee4c
+MISC ChangeLog 1469 RMD160 befcb4a185b2a82d8f2e71865ec670cd242874e1 SHA1 a1f1122e250710c651c74f5baa394dcb1cb6d858 SHA256 247534a0c6122777e68093c46c12d413238e0d942af01e45cfcda4cb55f784fe
 MISC metadata.xml 159 RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 SHA1 08e27d5a696205dc5c9992d4f3b647cd609ec139 SHA256 bb3130d2515d5b2e4ff19aff2199bb00ac7c350bf78b34bbec55268bf1013908
diff --git a/net-libs/libicq2000/files/libicq2000-0.3.2-gcc43.patch b/net-libs/libicq2000/files/libicq2000-0.3.2-gcc43.patch
new file mode 100644
index 000000000000..12fa524192fc
--- /dev/null
+++ b/net-libs/libicq2000/files/libicq2000-0.3.2-gcc43.patch
@@ -0,0 +1,34 @@
+--- src/userinfohelpers.cpp~	2007-04-02 11:01:38.000000000 +0000
++++ src/userinfohelpers.cpp	2007-04-02 11:01:45.000000000 +0000
+@@ -23,6 +23,8 @@
+ 
+ #include "sstream_fix.h"
+ 
++#include <cstdlib>
++
+ using std::vector;
+ using std::string;
+ using std::ostringstream;
+
+
+--- src/socket.cpp.orig	2008-06-08 17:55:26.000000000 +0200
++++ src/socket.cpp	2008-06-08 17:55:57.000000000 +0200
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <cstring>
+ #include "sstream_fix.h"
+ #include <algorithm>
+ 
+ 
+--- src/Capabilities.cpp.orig	2008-06-08 18:04:34.000000000 +0200
++++ src/Capabilities.cpp	2008-06-08 18:05:15.000000000 +0200
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <cstring>
+ #include <libicq2000/Capabilities.h>
+ 
+ using std::set;
diff --git a/net-libs/libicq2000/libicq2000-0.3.1.ebuild b/net-libs/libicq2000/libicq2000-0.3.1.ebuild
deleted file mode 100644
index ab251d170a24..000000000000
--- a/net-libs/libicq2000/libicq2000-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +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/libicq2000/libicq2000-0.3.1.ebuild,v 1.10 2004/07/15 00:54:29 agriffis Exp $
-
-DESCRIPTION="ICQ 200x compatible ICQ libraries."
-SRC_URI="mirror://sourceforge/libicq2000/${P}.tar.gz"
-HOMEPAGE="http://ickle.sf.net"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc "
-IUSE=""
-
-DEPEND="=dev-libs/libsigc++-1.0*"
-
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--localstatedir=/var/lib \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
-
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
-}
diff --git a/net-libs/libicq2000/libicq2000-0.3.2.ebuild b/net-libs/libicq2000/libicq2000-0.3.2.ebuild
index 8e87122cacf1..e37e5a264451 100644
--- a/net-libs/libicq2000/libicq2000-0.3.2.ebuild
+++ b/net-libs/libicq2000/libicq2000-0.3.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/libicq2000-0.3.2.ebuild,v 1.6 2004/07/15 00:54:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/libicq2000-0.3.2.ebuild,v 1.7 2008/07/27 10:11:05 loki_val Exp $
+
+inherit base autotools
 
 DESCRIPTION="ICQ 200x compatible ICQ libraries."
 SRC_URI="mirror://sourceforge/libicq2000/${P}.tar.gz"
@@ -13,13 +15,10 @@ IUSE=""
 
 DEPEND="=dev-libs/libsigc++-1.0*"
 
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
 src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--localstatedir=/var/lib \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf --enable-debug || die "econf failed"
 	emake || die "emake failed"
 
 }