touchups

3 files changed, 29 insertions, 42 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index e0a776e96cf1..cc38d00ad2c2 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,11 +1,14 @@
 # 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.6 2003/05/10 18:59:14 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.7 2003/06/19 20:05:22 vapier Exp $
 
 *erlang-9c (09 May 2003)
 
+  19 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Cleaned up and made the ebuild more 'portage' like ... changed sed cmds to dosed
+
   09 May 2003; George Shapovalov <george@gentoo.org> erlang-9c.ebuild :
-  new version (#20625), original versio n is R9B-1, 9c seems to be the olny approximation
+  new version (#20625), original versio n is R9B-1, 9c seems to be the only approximation
   that works and is considered newer by portage
   (anyway, 'B' seems to be invariant in upstream naming scheme)
   Thanks to Claes Wikstrom <klacke@hyber.org> for an update.
@@ -15,15 +18,12 @@
   07 Jan 2003; George Shapovalov <george@gentoo.org> erlang-8b.ebuild, erlang-9b.ebuild :
   new version,
   cleaned up erlang-8b.ebuild and added IUSE
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *erlang-8b (01 Nov 2002)
 
-  01 Nov 2002; George Shapovalov <george@gentoo.org> erlang-8b.ebuild :
-
-  first inclusion
+  19 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Cleaned up and made the ebuild more 'portage' like ... changed sed cmds to dosed
 
+  01 Nov 2002; George Shapovalov <george@gentoo.org> erlang-8b.ebuild :
   Erlang is a programming language, runtime environment and a large collection of
-  libraries.
-  ebuild submitted by Charlie Mac <charzilla@yahoo.com>
+  libraries.  Ebuild submitted by Charlie Mac <charzilla@yahoo.com>
diff --git a/dev-lang/erlang/erlang-8b.ebuild b/dev-lang/erlang/erlang-8b.ebuild
index 0c45c08db48f..d4df6722d92b 100644
--- a/dev-lang/erlang/erlang-8b.ebuild
+++ b/dev-lang/erlang/erlang-8b.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-8b.ebuild,v 1.6 2003/06/19 20:05:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-8b.ebuild,v 1.7 2003/06/19 20:05:44 vapier Exp $
 
 MY_P=otp_src_R8B-2
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
@@ -9,7 +9,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz"
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
diff --git a/dev-lang/erlang/erlang-9c.ebuild b/dev-lang/erlang/erlang-9c.ebuild
index 252186aa9a71..91df7109c4ea 100644
--- a/dev-lang/erlang/erlang-9c.ebuild
+++ b/dev-lang/erlang/erlang-9c.ebuild
@@ -1,22 +1,22 @@
 # 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.ebuild,v 1.2 2003/05/30 03:12:31 george Exp $
-
-IUSE="X ssl"
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c.ebuild,v 1.3 2003/06/19 20:05:22 vapier Exp $
 
+MY_P=otp_src_R9B-1
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
 HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_R9B-1.tar.gz"
-S="${WORKDIR}/otp_src_R9B-1"
+SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz"
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc ~sparc"
+IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X?	( >=x11-base/xfree-4.2.0-r12 )
-	ssl?	( >=dev-libs/openssl-0.9.6d )"
+	X? ( >=x11-base/xfree-4.2.0-r12 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	econf --enable-threads || die "./configure failed"
@@ -27,6 +27,7 @@ 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
@@ -36,30 +37,16 @@ src_install() {
 	dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript
 
 	## Remove ${D} from the following files
-
-	cd ${D}/${ERL_LIBDIR}/bin
-	sed -e "s;${D};;" erl > erl.tmp
-	mv ./erl.tmp ./erl
-	sed -e "s;${D};;" start > start.tmp
-	mv ./start.tmp ./start
-	sed -e "s;${D};;" ecc > ecc.tmp
-	mv ./ecc.tmp ./ecc
-	sed -e "s;${D};;" ear > ear.tmp
-	mv ./ear.tmp ./ear
-	sed -e "s;${D};;" elink > elink.tmp
-	mv ./elink.tmp ./elink
-	sed -e "s;${D};;" escript > escript.tmp
-	mv ./escript.tmp ./escript
-	sed -e "s;${D};;" esh > esh.tmp
-	mv ./esh.tmp ./esh
-
-	chmod 755 ./erl ./start ./ecc ./ear ./elink ./escript ./esh
-
+	dosed ${ERL_LIBDIR}/bin/erl
+	dosed ${ERL_LIBDIR}/bin/start
+	dosed ${ERL_LIBDIR}/bin/ecc
+	dosed ${ERL_LIBDIR}/bin/ear
+	dosed ${ERL_LIBDIR}/bin/elink
+	dosed ${ERL_LIBDIR}/bin/escript
+	dosed ${ERL_LIBDIR}/bin/esh
+	dosed ${ERL_LIBDIR}/erts-*/bin/erl
+	dosed ${ERL_LIBDIR}/erts-*/bin/start
 
 	## Clean up the no longer needed files
-
 	rm ${D}/${ERL_LIBDIR}/Install
-
-	cd ${S}
-	dodoc AUTHORS EPLICENCE README
 }