Closes bug #138112

(Portage version: 2.1.1_pre2-r6)

5 files changed, 101 insertions, 1 deletions

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index fdbc7a4fdd58..bd0022f2bbc5 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-libs/libsigc++
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.88 2006/07/10 17:39:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.89 2006/07/12 23:48:46 pvdabeel Exp $
 
   10 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   libsigc++-2.0.17.ebuild:
@@ -19,6 +19,12 @@
   04 Feb 2006; Aron Griffis <agriffis@gentoo.org> libsigc++-2.0.16.ebuild:
   Mark 2.0.16 stable on ia64
 
+*libsigc++-1.0.4-r3 (13 Jul 2006)
+
+  13 Jul 2006; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  +libsigc++-1.0.4-r3.ebuild:
+  closes bug #138112
+
 *libsigc++-2.0.17 (02 Feb 2006)
 
   02 Feb 2006; John N. Laliberte <allanonjl@gentoo.org>
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r2 b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r2
index b085cc3b6cc8..6a9124abe6d6 100644
--- a/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r2
+++ b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r2
@@ -1 +1,3 @@
 MD5 88d34840acc1cc5d47b347726e4a09e0 libsigc++-1.0.4.tar.gz 212089
+RMD160 b750a5b6cd75fbb7288c6e35d8f3abad9f641722 libsigc++-1.0.4.tar.gz 212089
+SHA256 4b808da7f652ee4965295b92085e1da29a59eef24924aac10c1d8fc37b8fd9b3 libsigc++-1.0.4.tar.gz 212089
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r3 b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r3
new file mode 100644
index 000000000000..6a9124abe6d6
--- /dev/null
+++ b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r3
@@ -0,0 +1,3 @@
+MD5 88d34840acc1cc5d47b347726e4a09e0 libsigc++-1.0.4.tar.gz 212089
+RMD160 b750a5b6cd75fbb7288c6e35d8f3abad9f641722 libsigc++-1.0.4.tar.gz 212089
+SHA256 4b808da7f652ee4965295b92085e1da29a59eef24924aac10c1d8fc37b8fd9b3 libsigc++-1.0.4.tar.gz 212089
diff --git a/dev-libs/libsigc++/files/sandbox.patch b/dev-libs/libsigc++/files/sandbox.patch
new file mode 100644
index 000000000000..f60811bf9647
--- /dev/null
+++ b/dev-libs/libsigc++/files/sandbox.patch
@@ -0,0 +1,50 @@
+diff -urN libsigc++-1.0.4.orig/sigc++/Makefile libsigc++-1.0.4/sigc++/Makefile
+--- libsigc++-1.0.4.orig/sigc++/Makefile	2006-07-13 01:08:00.000000000 +0200
++++ libsigc++-1.0.4/sigc++/Makefile	2006-07-13 01:11:49.000000000 +0200
+@@ -494,13 +494,11 @@
+ 	  echo ;\
+ 	  echo "  \"$(includedir)/sigc++\"" ;\
+ 	  echo ;\
+-	  echo "The entire directory will be removed now." ;\
+ 	  echo "To allow parallel installation of sigc++-1.0 and sigc++-1.2," ;\
+ 	  echo "the header files are now installed in a version specific subdirectory:" ;\
+ 	  echo ;\
+ 	  echo "  \"$(libsigcincludedir)\"" ;\
+ 	  echo ;\
+-	  rm -rf "$(includedir)/sigc++" ;\
+ 	fi
+ 
+ #---------------------------------------
+diff -urN libsigc++-1.0.4.orig/sigc++/Makefile.am libsigc++-1.0.4/sigc++/Makefile.am
+--- libsigc++-1.0.4.orig/sigc++/Makefile.am	2006-07-13 01:08:00.000000000 +0200
++++ libsigc++-1.0.4/sigc++/Makefile.am	2006-07-13 01:11:41.000000000 +0200
+@@ -46,7 +46,6 @@
+ 	  echo ;\
+ 	  echo "  \"$(libsigcincludedir)\"" ;\
+ 	  echo ;\
+-	  rm -rf "$(includedir)/sigc++" ;\
+ 	fi
+ 
+ 
+diff -urN libsigc++-1.0.4.orig/sigc++/config/Makefile libsigc++-1.0.4/sigc++/config/Makefile
+--- libsigc++-1.0.4.orig/sigc++/config/Makefile	2006-07-13 01:08:00.000000000 +0200
++++ libsigc++-1.0.4/sigc++/config/Makefile	2006-07-13 01:11:32.000000000 +0200
+@@ -275,8 +275,7 @@
+ 	  echo "The entire directory will be removed now." ;\
+ 	  echo "To allow parallel installation of sigc++-1.0 and sigc++-1.2," ;\
+ 	  echo "the header files are now installed in a version specific subdirectory." ;\
+	  echo ; \
+-	  rm -rf "$(libdir)/sigc++" ;\
+ 	fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff -urN libsigc++-1.0.4.orig/sigc++/config/Makefile.am libsigc++-1.0.4/sigc++/config/Makefile.am
+--- libsigc++-1.0.4.orig/sigc++/config/Makefile.am	2006-07-13 01:08:00.000000000 +0200
++++ libsigc++-1.0.4/sigc++/config/Makefile.am	2006-07-13 01:11:15.000000000 +0200
+@@ -16,6 +16,5 @@
+ 	  echo "To allow parallel installation of sigc++-1.0 and sigc++-1.2," ;\
+ 	  echo "the header files are now installed in a version specific subdirectory." ;\
+ 	  echo ; \
+-	  rm -rf "$(libdir)/sigc++" ;\
+ 	fi
+ 
diff --git a/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild b/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..00798ae81dde
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild,v 1.1 2006/07/12 23:48:46 pvdabeel Exp $
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://libsigc.sourceforge.net/"
+SRC_URI="http://download.sourceforge.net/libsigc/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86"
+IUSE="debug"
+
+inherit eutils
+
+DEPEND=""
+
+src_compile() {
+	use debug \
+		&& myconf="--enable-debug=yes" \
+		|| myconf="--enable-debug=no"
+	econf ${myconf} || die
+
+	epatch ${FILESDIR}/sandbox.patch || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README* INSTALL NEWS
+}
+
+pkg_postinst() {
+	ewarn "To allow parallel installation of sig++-1.0 and sig++-1.2,"
+	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."
+}