fixed some stray 's in wrappers, added ~amd64

4 files changed, 73 insertions, 2 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 011a94149335..ad6e3333bec4 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.13 2004/06/24 22:48:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.14 2004/08/03 01:25:59 george Exp $
+
+*erlang-9c-r3 (02 Aug 2004)
+
+  02 Aug 2004; George Shapovalov <george@gentoo.org> erlang-9c-r3.ebuild :
+  fixed some stray ${D}'s in wrappers (#58901), added support for ~amd64
 
   30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; erlang-8b.ebuild,
   erlang-9c-r1.ebuild, erlang-9c-r2.ebuild, erlang-9c.ebuild:
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 487118835f31..4d2ead57318f 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,12 +1,14 @@
 MD5 952017d9165b65d7786b75dbf44a10e2 erlang-9c-r1.ebuild 1686
 MD5 f947170e5f0fef952a0efc7dcc947f37 erlang-8b.ebuild 1178
+MD5 8a1b11a0e2851447db1e4629fd725bc3 erlang-9c-r3.ebuild 1808
 MD5 888709019e83eac37f3e95c7739de933 erlang-9c.ebuild 1505
 MD5 537a0139e4027538cb161c021d456847 erlang-9c-r2.ebuild 1796
-MD5 382edc95496eb3f5ea0fb247db42812b ChangeLog 2144
+MD5 cc00a1b0bdfe9d45c7a3324b1dd2c6aa ChangeLog 2320
 MD5 cab125757ba7321a40d17b0cc4c673d5 metadata.xml 505
 MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005
 MD5 0ef311d4fbeb2b5e16aab201dcf37297 files/digest-erlang-8b 67
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c 66
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66
 MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66
+MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r3 66
 MD5 e88b4d733b41026e691a981320ac7806 files/erlang-9c.patch.gz 1503
diff --git a/dev-lang/erlang/erlang-9c-r3.ebuild b/dev-lang/erlang/erlang-9c-r3.ebuild
new file mode 100644
index 000000000000..4f532d309aca
--- /dev/null
+++ b/dev-lang/erlang/erlang-9c-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r3.ebuild,v 1.1 2004/08/03 01:25:59 george Exp $
+
+inherit eutils gcc flag-o-matic
+
+MY_P=otp_src_R9C-0
+DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
+HOMEPAGE="http://www.erlang.org/"
+SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz"
+
+LICENSE="EPL"
+SLOT="0"
+KEYWORDS="-*"
+#KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="X ssl"
+
+DEPEND=">=dev-lang/perl-5.6.1
+	X? ( virtual/x11 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	# combines nsswit ch.conf parsing and a fix for strange install behaviour on some systems
+	epatch ${FILESDIR}/${PV}.patch
+}
+
+src_compile() {
+	[ "`gcc-fullversion`" == "3.3.2" ] && filter-mfpmath sse
+	[ "`gcc-fullversion`" == "3.3.3" ] && filter-mfpmath sse
+	addpredict /dev/pty # Bug #25366
+
+	#erlang configure seems to "misdetect" CHOST on amd64
+	[ "${ARCH}" = "amd64" ] && CHOST="x86_64-unknown-linux-gnu"
+	econf --enable-threads || die
+	make || die
+}
+
+src_install() {
+	ERL_LIBDIR="/usr/lib/erlang"
+
+	make INSTALL_PREFIX=${D} install || die
+	dodoc AUTHORS EPLICENCE README
+
+	dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl
+	dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc
+	dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc
+	dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink
+	dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear
+	dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript
+
+	## Remove ${D} from the following files
+	dosed ${ERL_LIBDIR}/bin/erl
+	dosed ${ERL_LIBDIR}/bin/start
+	cd ${ERL_LIBDIR}/erts-*
+	grep -rle ${D} ${D}/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g"
+
+	## Clean up the no longer needed files
+	rm ${D}/${ERL_LIBDIR}/Install
+}
diff --git a/dev-lang/erlang/files/digest-erlang-9c-r3 b/dev-lang/erlang/files/digest-erlang-9c-r3
new file mode 100644
index 000000000000..bdfa77771258
--- /dev/null
+++ b/dev-lang/erlang/files/digest-erlang-9c-r3
@@ -0,0 +1 @@
+MD5 d40842cf79ca65007de5ad54d3c50d18 otp_src_R9C-0.tar.gz 8229056