version bump, patch to fix compile with gcc-3.4

5 files changed, 76 insertions, 8 deletions

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index 8cd811e06ab4..ce5a4858d8c9 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libsigc++
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.36 2004/10/05 12:19:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.37 2004/10/09 21:20:19 khai Exp $
+
+*libsigc++-2.0.5 (09 Oct 2004)
+
+  09 Oct 2004; Yi Qiang <khai@gentoo.org> +libsigc++-2.0.5.ebuild:
+  Version bump, included fix for gcc-3.4
 
   05 Oct 2004; Jason Wever <weeve@gentoo.org> libsigc++-2.0.1.ebuild:
   Added ~sparc keyword.
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index a28bf4af4b03..4b9ef6c4f50e 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,12 +1,15 @@
-MD5 8367be2d0913845d27a9c02f9b83f105 ChangeLog 4533
-MD5 4135ebbe76b53e6f95a1bbad000ba371 libsigc++-1.0.4-r2.ebuild 1571
+MD5 8930d6d444a3c391d23d6932fda4edb5 libsigc++-1.2.5.ebuild 1447
+MD5 f478f3fd293da6d92fbee73de8e497fb libsigc++-2.0.5.ebuild 1366
 MD5 26ee349a64446191811ba5bbbd6a365d libsigc++-1.2.2.ebuild 1045
+MD5 660b84deb10a23e9641cf60fa65e69c0 libsigc++-2.0.1.ebuild 1281
+MD5 4135ebbe76b53e6f95a1bbad000ba371 libsigc++-1.0.4-r2.ebuild 1571
 MD5 43d194a3efe5e70b93e2a8d17b9611ee libsigc++-1.2.3.ebuild 1044
-MD5 8930d6d444a3c391d23d6932fda4edb5 libsigc++-1.2.5.ebuild 1447
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 660b84deb10a23e9641cf60fa65e69c0 libsigc++-2.0.1.ebuild 1281
-MD5 628fd3eec229a5ec7bdf9751004f9b46 files/digest-libsigc++-1.0.4-r2 67
+MD5 e69fcc138d2dc3091cc0750cbb37d300 ChangeLog 4673
 MD5 1dafc199015856931c135a0a15a757c1 files/digest-libsigc++-1.2.2 67
-MD5 d022afc817cff89e7d0eec21e87613f3 files/digest-libsigc++-1.2.3 67
-MD5 2097fbc4c79a21de2b7f3a7e89a35137 files/digest-libsigc++-1.2.5 67
 MD5 93e340ba1a71b45f55c37e87dc0b1624 files/digest-libsigc++-2.0.1 68
+MD5 b1f9c8d8239349f2f8501d3ff425b77b files/gcc-3.4.patch 692
+MD5 2097fbc4c79a21de2b7f3a7e89a35137 files/digest-libsigc++-1.2.5 67
+MD5 628fd3eec229a5ec7bdf9751004f9b46 files/digest-libsigc++-1.0.4-r2 67
+MD5 d022afc817cff89e7d0eec21e87613f3 files/digest-libsigc++-1.2.3 67
+MD5 2456d199198c3d5a0d0f0edb607589c8 files/digest-libsigc++-2.0.5 68
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-2.0.5 b/dev-libs/libsigc++/files/digest-libsigc++-2.0.5
new file mode 100644
index 000000000000..4586eb9dae4a
--- /dev/null
+++ b/dev-libs/libsigc++/files/digest-libsigc++-2.0.5
@@ -0,0 +1 @@
+MD5 2965d0cafe894717a67ab003c7ce439b libsigc++-2.0.5.tar.gz 1796052
diff --git a/dev-libs/libsigc++/files/gcc-3.4.patch b/dev-libs/libsigc++/files/gcc-3.4.patch
new file mode 100644
index 000000000000..625b888c55f2
--- /dev/null
+++ b/dev-libs/libsigc++/files/gcc-3.4.patch
@@ -0,0 +1,12 @@
+diff -ruN libsigc++-2.0.5/sigc++/adaptors/lambda/macros/group.h.m4 libsigc++-2.0.5.new/sigc++/adaptors/lambda/macros/group.h.m4
+--- libsigc++-2.0.5/sigc++/adaptors/lambda/macros/group.h.m4	2004-07-23 07:51:42.000000000 -0700
++++ libsigc++-2.0.5.new/sigc++/adaptors/lambda/macros/group.h.m4	2004-10-09 14:08:11.329353224 -0700
+@@ -68,7 +68,7 @@
+ 
+   template <LOOP(class T_arg%1=void,$2)>
+   struct deduce_result_type
+-    { typedef typename functor_type::deduce_result_type<LOOP([
++    { typedef typename functor_type::template deduce_result_type<LOOP([
+           typename value%1_type::template deduce_result_type<LOOP([
+             _P_(T_arg%1)],$2)>::type],$1)
+         >::type type; };
diff --git a/dev-libs/libsigc++/libsigc++-2.0.5.ebuild b/dev-libs/libsigc++/libsigc++-2.0.5.ebuild
new file mode 100644
index 000000000000..305182d47faa
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.0.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.0.5.ebuild,v 1.1 2004/10/09 21:20:19 khai Exp $
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="http://libsigc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libsigc/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1.3"
+KEYWORDS="~x86 ~ppc ~alpha amd64 ~sparc"
+IUSE="debug"
+inherit eutils
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gcc-3.4.patch
+}
+src_compile() {
+	local myconf
+	use debug \
+		&& myconf="--enable-debug=yes" \
+		|| myconf="--enable-debug=no"
+	# added libtoolize, add "-I scripts" to aclocal, autoconf before econf
+	# all these changes are necessary on amd64
+	# Danny van Dyk (kugelfang@gentoo.org)
+	libtoolize -c -f --automake
+	aclocal -I scripts
+	automake --gnu --add-missing
+	autoconf
+	econf ${myconf} || die
+	emake || die "emake failure"
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS ChangeLog COPYING* README INSTALL NEWS TODO
+}
+
+pkg_postinst() {
+	ewarn "To allow parallel installation of sig++-1.0, sig++-1.2, and sig++2.0"
+	ewarn "the header files are now installed in a version specific"
+	ewarn "subdirectory.  Be sure to unmerge any libsig++ versions"
+	ewarn "< 1.0.4 that you may have previously installed."
+}