dev-lang/scheme2c: Drop keywords (live ebuild), use cd, add some die statements, simplyfy dosed statement

svn path=/sunrise/; revision=7950

4 files changed, 23 insertions, 18 deletions

diff --git a/dev-lang/scheme2c/ChangeLog b/dev-lang/scheme2c/ChangeLog
index 439f096fb..5c6452ccd 100644
--- a/dev-lang/scheme2c/ChangeLog
+++ b/dev-lang/scheme2c/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  scheme2c-9999.ebuild, metadata.xml:
+  Drop keywords (live ebuild), use cd, add some die statements, simplyfy dosed
+  statement
+
   18 Feb 2009; Andrei Barbu (andrei) <andrei@0xab.com>
   +scheme2c-9999.ebuild, +metadata.xml:
   Ebuild for bug 233197
diff --git a/dev-lang/scheme2c/Manifest b/dev-lang/scheme2c/Manifest
index 067d81276..88d6bd9ba 100644
--- a/dev-lang/scheme2c/Manifest
+++ b/dev-lang/scheme2c/Manifest
@@ -1,3 +1,3 @@
-EBUILD scheme2c-9999.ebuild 2418 RMD160 193936037711d8f47bc97e53cf6a71b37cd6e097 SHA1 876a5725db986ccbb0fc1a484c8e1cb8c8859b25 SHA256 2478739b1326ebe50d1eb1989fa31b0b9fd24c2d370864386c9780be8f9a07bd
-MISC ChangeLog 238 RMD160 c794f1ad7f69fd9c1ebdf2e4c9a9eeb63329c778 SHA1 af0495cc8b3b3f98130ae8f631b51b13768d5079 SHA256 718d5a66b46f3941b3ce7496580e59815fa1875eb6930e62d633a998dcf19faa
-MISC metadata.xml 434 RMD160 588a436fe0d7c5f40db2ae585f164d551fb9167b SHA1 40d7755165a620f9ca5cdcae9418a727d82a2abc SHA256 792c8e9f680c1b83bda05d672b3eb338dfbd4f0c14ef0eefa3e317b4a6836fc0
+EBUILD scheme2c-9999.ebuild 2323 RMD160 3614fa60f72e547c5885fe8cbbcab00619e87eb9 SHA1 6374d135095b6a1728fb26919c2b70008392ed18 SHA256 d008bb12a57d88d9920f8dd5a2546e35101dea6ac9c532368b164b618abfede7
+MISC ChangeLog 427 RMD160 579485d6b009e5a61b584e108b2f1346f07a5181 SHA1 183021fb9322323f4c0de6102d329820017c7620 SHA256 6d12405ff8b4c84a1f7ef7bc561a2d779d68507e7f57339e3f92373486b4840c
+MISC metadata.xml 467 RMD160 f8f7814ad74066a292158e4402225b3086212930 SHA1 e63df7236da30d7511a34e587d1c029686995515 SHA256 67768d17f7ecdb335ef7be39e8a63478e2d0e181a70c32a2410549b53f0ff01d
diff --git a/dev-lang/scheme2c/metadata.xml b/dev-lang/scheme2c/metadata.xml
index 0e6fe55aa..663fed78b 100644
--- a/dev-lang/scheme2c/metadata.xml
+++ b/dev-lang/scheme2c/metadata.xml
@@ -7,4 +7,7 @@
   Scheme and other languages. Includes macros, records, foreign
   function calls, interface to Xlib, call/cc, interpreter.
 </longdescription>
+<herd>
+maintainer-wanted
+</herd>
 </pkgmetadata>
diff --git a/dev-lang/scheme2c/scheme2c-9999.ebuild b/dev-lang/scheme2c/scheme2c-9999.ebuild
index 129419ac6..33246d044 100644
--- a/dev-lang/scheme2c/scheme2c-9999.ebuild
+++ b/dev-lang/scheme2c/scheme2c-9999.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS=""
 IUSE="X doc"
 
 DEPEND="dev-libs/libsigsegv
@@ -28,10 +28,10 @@ src_compile() {
 
 	if use x86; then
 		emake forLINUX || die "Failed to set up Linux build"
-		pushd LINUX
+		cd LINUX
 	elif use amd64; then
 		emake forAMD64 || die "Failed to set up AMD64 build"
-		pushd AMD64
+		cd AMD64
 	else
 		die "Unimplemented architecture"
 	fi
@@ -41,7 +41,6 @@ src_compile() {
 	touch scrt/*.c
 	touch scsc/*.c
 
-	# emake does the wrong thing here, so we have to use make
 	emake -j1 all || die "Failed to compile"
 
 	if use X; then
@@ -49,15 +48,13 @@ src_compile() {
 		emake -C xlib -B sizeof.cdecl || die "cdecl couldn't run"
 		emake -C xlib all || die "xlib bindings failed to build"
 	fi
-
-	popd
 }
 
 src_install() {
 	if use x86; then
-		pushd LINUX
+		cd LINUX
 	elif use amd64; then
-		pushd AMD64
+		cd AMD64
 	else
 		die "Unimplemented architecture"
 	fi
@@ -76,10 +73,10 @@ src_install() {
 		newdoc xlib/doc.txt xlib.txt || die "Failed to install X documentation"
 	fi
 
-	popd
+	cd ..
 
-	cp doc/scc.l doc/scc.1
-	cp doc/sci.l doc/sci.1
+	cp doc/scc.l doc/scc.1 || die
+	cp doc/sci.l doc/sci.1 || die
 	doman doc/{scc,sci}.1 || die "Failed to install man pages"
 
 	if use doc; then
@@ -88,8 +85,8 @@ src_install() {
 
 	dodoc CHANGES README || die "Failed to install documentation"
 
-	dosed "s:.*sccomp:sccomp:g" /usr/bin/scc
-	dosed "s:-LIBDIR.*t:-LIBDIR /usr/$(get_libdir)/scheme2c/ \
-			   -I/usr/$(get_libdir)/scheme2c/:g" /usr/bin/scc
-	dosed "s:-scmh 40:-scmh 1000 -sch 10:g" /usr/bin/scc
+	dosed -e "s:.*sccomp:sccomp:g" \
+		-e"s:-LIBDIR.*t:-LIBDIR /usr/$(get_libdir)/scheme2c/ \
+		-I/usr/$(get_libdir)/scheme2c/:g" \
+		-e "s:-scmh 40:-scmh 1000 -sch 10:g" /usr/bin/scc || die
 }