fix for weird install behaviour on some systems

5 files changed, 11 insertions, 7 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index f0b684279c4a..d3a689343769 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.8 2003/07/02 02:53:52 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.9 2003/07/04 01:50:27 george Exp $
+
+  03 Jul 2003; George Shapovalov <george@gentoo.org> erlang-9c-r1.ebuild :
+  incorporated fix for weird install on some systems from #20625
+  Thanks to Claes Wikstrom <klacke@hyber.org> for the patch
 
 *erlang-9c-r1 (01 Jul 2003)
 
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 5b8d7a966d34..dcf91c6a7428 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,8 +1,8 @@
-MD5 7aee981fb07b0544e66683390601bdd2 erlang-9c-r1.ebuild 1666
+MD5 0b0788938bf544d010645ac5e98e1a04 erlang-9c-r1.ebuild 1677
 MD5 7e6830aa295247eccf8e9532487a1ba4 erlang-8b.ebuild 1165
 MD5 6823280bd290a2e4ae25b1cc260fef09 erlang-9c.ebuild 1493
-MD5 e31e51f87c22ed5025111d6fcf6a16d9 ChangeLog 1529
+MD5 6990e0a71f5edbf71f020909831409e2 ChangeLog 1730
 MD5 0ef311d4fbeb2b5e16aab201dcf37297 files/digest-erlang-8b 67
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c 66
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66
-MD5 ca6bf9ab4b3249ccd298488ca4ff2f51 files/erlang-9c-nsswitch-2.patch.gz 572
+MD5 e88b4d733b41026e691a981320ac7806 files/erlang-9c.patch.gz 1503
diff --git a/dev-lang/erlang/erlang-9c-r1.ebuild b/dev-lang/erlang/erlang-9c-r1.ebuild
index 8c9b1e9caae9..94787c87805b 100644
--- a/dev-lang/erlang/erlang-9c-r1.ebuild
+++ b/dev-lang/erlang/erlang-9c-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r1.ebuild,v 1.1 2003/07/02 02:53:52 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r1.ebuild,v 1.2 2003/07/04 01:50:27 george Exp $
 
 MY_P=otp_src_R9B-1
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
@@ -15,8 +15,8 @@ IUSE="X ssl"
 src_unpack(){
 	unpack ${A}
 	cd ${S}
-	#a conviniece fix, ||die is not necessary
-	gzcat ${FILESDIR}/${P}-nsswitch-2.patch.gz | patch -p0 lib/kernel/src/inet_config.erl
+	#combines nsswitch.conf parsing and a fix for strange install behaviour on some systems
+	gzcat ${FILESDIR}/${P}.patch.gz | patch -p1 || die
 }
 
 DEPEND=">=dev-lang/perl-5.6.1
diff --git a/dev-lang/erlang/files/erlang-9c-nsswitch-2.patch.gz b/dev-lang/erlang/files/erlang-9c-nsswitch-2.patch.gz
deleted file mode 100644
index 7b46fb0a54c0..000000000000
--- a/dev-lang/erlang/files/erlang-9c-nsswitch-2.patch.gz
+++ /dev/null
diff --git a/dev-lang/erlang/files/erlang-9c.patch.gz b/dev-lang/erlang/files/erlang-9c.patch.gz
new file mode 100644
index 000000000000..027a08f296b8
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-9c.patch.gz