fixed sandbox violation as reported on bug #384

3 files changed, 63 insertions, 38 deletions

diff --git a/dev-libs/libsigc++/files/digest-libsigc++-1.0.4 b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r1
index 12ab397a7b34..12ab397a7b34 100644
--- a/dev-libs/libsigc++/files/digest-libsigc++-1.0.4
+++ b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r1
diff --git a/dev-libs/libsigc++/libsigc++-1.0.4-r1.ebuild b/dev-libs/libsigc++/libsigc++-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..d706d87efebd
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-1.0.4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.0.4-r1.ebuild,v 1.1 2002/01/29 17:10:21 gbevin Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="The GLib library of C routines"
+SRC_URI="http://download.sourceforge.net/libsigc/${P}.tar.gz"
+HOMEPAGE="http://libsigc.sourceforge.net/"
+
+DEPEND="virtual/glibc"
+
+src_compile() {
+
+	local myconf
+    
+	if [ "${DEBUG}" ]
+	then
+		myconf="--enable-debug=yes"
+	else
+		myconf="--enable-debug=no"
+	fi
+    
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+	  	    --infodir=/usr/share/info				\
+		    --mandir=/usr/share/man				\
+		    ${myconf} || die
+	
+	# Fix sandbox violation when old libsig++ is already installed,
+	# hopefully this will go away after the header location settles down
+	# Comment out the remove old header directory line
+	
+	cp sigc++/Makefile sigc++/Makefile.orig
+	sed -e 's:\(@if\):#\1:' \
+		sigc++/Makefile.orig > sigc++/Makefile
+	
+	# This occurs in two places
+	
+	cp sigc++/config/Makefile sigc++/config/Makefile.orig
+	sed -e 's:\(@if\):#\1:' \
+        sigc++/config/Makefile.orig > sigc++/config/Makefile
+		
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D}						\
+	     install || die
+    
+	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
+}
+
+pkg_postinst() {
+	einfo "************************* WARNING ************************"
+	einfo ""
+	einfo "To allow parallel installation of sig++-1.0 and sig++-1.2,"
+	einfo "the header files are now installed in a version specific"
+	einfo "subdirectory.  Be sure to unmerge any libsig++ versions"
+	einfo "< 1.0.4 that you may have previously installed."
+	einfo ""
+	einfo "**********************************************************"
+}
diff --git a/dev-libs/libsigc++/libsigc++-1.0.4.ebuild b/dev-libs/libsigc++/libsigc++-1.0.4.ebuild
deleted file mode 100644
index 38dad2054381..000000000000
--- a/dev-libs/libsigc++/libsigc++-1.0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.0.4.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GLib library of C routines"
-SRC_URI="http://download.sourceforge.net/libsigc/${P}.tar.gz"
-HOMEPAGE="http://libsigc.sourceforge.net/"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-	local myconf
-    
-	if [ "${DEBUG}" ]
-	then
-		myconf="--enable-debug=yes"
-	else
-		myconf="--enable-debug=no"
-	fi
-    
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-	  	    --infodir=/usr/share/info				\
-		    --mandir=/usr/share/man				\
-		    ${myconf} || die
-	
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D}						\
-	     install || die
-    
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
-}