From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Wed, 31 Mar 2004 06:26:12 +0000 (+0000)
Subject: don't rdepend on sed; error check sed; use games src_compile
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23fe967b1d3f7bb0dea2c554646eb59114109cff;p=gentoo.git

don't rdepend on sed; error check sed; use games src_compile
---

diff --git a/games-roguelike/moria/ChangeLog b/games-roguelike/moria/ChangeLog
index 5e4511726069..e767c8e894b4 100644
--- a/games-roguelike/moria/ChangeLog
+++ b/games-roguelike/moria/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-roguelike/moria
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/ChangeLog,v 1.3 2004/03/15 17:13:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/ChangeLog,v 1.4 2004/03/31 06:26:12 mr_bones_ Exp $
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> moria-5.5.2.ebuild:
+  don't rdepend on sed; error check sed; use games src_compile
 
   15 Mar 2004; David Holm <dholm@gentoo.org> moria-5.5.2.ebuild:
   Added to ~ppc.
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index 801ba6612993..e3aed2e00acc 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1,6 +1,6 @@
-MD5 5006e42cacfb5149cdf38f9c838d4a74 ChangeLog 546
+MD5 f8837a8a53829a856f95748244072cbc ChangeLog 689
+MD5 161bbbb19774a20b8d0b0d7ea021b99d moria-5.5.2.ebuild 1935
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 ba704e61a6128ada3d14e526a9935356 moria-5.5.2.ebuild 1857
 MD5 b39d7c4a2dd55ea387aad81b73b91d6d files/5.5.2-gentoo-paths.patch 2363
 MD5 7474a4c2af916defe5d530cd97b8cfce files/5.5.2-glibc.patch 9137
 MD5 ce7e2d9e9dbd488130b49ae8fa9ab9b2 files/digest-moria-5.5.2 122
diff --git a/games-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild
index 0adbb97ccd6e..71af4b25f8db 100644
--- a/games-roguelike/moria/moria-5.5.2.ebuild
+++ b/games-roguelike/moria/moria-5.5.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/moria-5.5.2.ebuild,v 1.4 2004/03/15 17:13:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/moria-5.5.2.ebuild,v 1.5 2004/03/31 06:26:12 mr_bones_ Exp $
 
-inherit games eutils gcc
+inherit eutils gcc games
 
 DESCRIPTION="Rogue-like D&D curses game similar to nethack (BUT BETTER)"
 HOMEPAGE="http://remarque.org/~grabiner/moria.html"
@@ -17,11 +17,12 @@ LICENSE="Moria"
 SLOT="0"
 IUSE=""
 
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4
+RDEPEND="virtual/glibc
 	>=sys-libs/ncurses-5"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
-S=${WORKDIR}/umoria
+S="${WORKDIR}/umoria"
 
 src_unpack() {
 	unpack ${A}
@@ -38,7 +39,8 @@ src_unpack() {
 		-e "s:David Grabiner:root:" \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
 		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}:" \
-		config.h
+		config.h \
+			|| die "sed config.h failed"
 	sed -i \
 		-e "/^STATEDIR =/s:=.*:=\$(DESTDIR)${GAMES_STATEDIR}:" \
 		-e "/^BINDIR = /s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \
@@ -47,16 +49,13 @@ src_unpack() {
 		-e "/^OWNER = /s:=.*:=${GAMES_USER}:" \
 		-e "/^GROUP = /s:=.*:=${GAMES_GROUP}:" \
 		-e "/^CC = /s:=.*:=$(gcc-getCC):" \
-		Makefile
-}
-
-src_compile() {
-	emake || die "make failed"
+		Makefile \
+			|| die "sed Makefile failed"
 }
 
 src_install() {
-	dodir ${GAMES_BINDIR} ${GAMES_DATADIR}/${PN} ${GAMES_STATEDIR}
-	make install DESTDIR=${D} || die
+	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}"
+	make DESTDIR="${D}" install || die "make install failed"
 
 	doman doc/moria.6
 	rm doc/moria.6
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index 41f0b360e952..dce28a477e75 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,10 +1,8 @@
+MD5 c1ab16d523a5dc9c9d860993e4e55e70 ChangeLog 2284
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 9f148c90d24158dc3477992dbc34e721 tome-2.2.3.ebuild 1408
 MD5 486f01e3f3f6d898bfc497c42553b5d6 tome-2.2.5.ebuild 1441
-MD5 68c94720bd042aad0e280fbb148dc1b4 tome-1.0.0.ebuild 853
 MD5 43a5064877930e38a5ac03a125208731 tome-2.2.5-r1.ebuild 1573
-MD5 9f148c90d24158dc3477992dbc34e721 tome-2.2.3.ebuild 1408
-MD5 a9db0e010fb30969491fb7e7a93542c2 ChangeLog 2185
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 5febc7a1e153cf2a764178addf34e891 files/digest-tome-1.0.0 62
 MD5 129d70105453afe3da145b2b38cf60c9 files/digest-tome-2.2.3 62
 MD5 44a615ff66d86ba4e6b431a73ed386bc files/digest-tome-2.2.5 62
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.5-gentoo-paths.patch 1172