fix wrapper script (bug #41740); check sed return

3 files changed, 25 insertions, 15 deletions

diff --git a/games-action/orbital-eunuchs-sniper/ChangeLog b/games-action/orbital-eunuchs-sniper/ChangeLog
index d2e3302aa102..6f8945086bbc 100644
--- a/games-action/orbital-eunuchs-sniper/ChangeLog
+++ b/games-action/orbital-eunuchs-sniper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/orbital-eunuchs-sniper
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/ChangeLog,v 1.4 2003/12/31 21:16:47 vapier Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/ChangeLog,v 1.5 2004/02/16 09:19:44 mr_bones_ Exp $
+
+  16 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  orbital-eunuchs-sniper-1.29.ebuild:
+  fix wrapper script (bug #41740); check sed return
 
 *orbital-eunuchs-sniper-1.29 (22 Apr 2003)
 
diff --git a/games-action/orbital-eunuchs-sniper/Manifest b/games-action/orbital-eunuchs-sniper/Manifest
index b7822b889b15..89067a538e32 100644
--- a/games-action/orbital-eunuchs-sniper/Manifest
+++ b/games-action/orbital-eunuchs-sniper/Manifest
@@ -1,5 +1,5 @@
-MD5 87b760356ffb832e44e446c664cc8064 ChangeLog 931
-MD5 cce850f65416174749f5818b2471272a orbital-eunuchs-sniper-1.29.ebuild 1296
+MD5 e1adda4cdfe6332572ac582a407d07da ChangeLog 1080
+MD5 a9821cf3f753d7c65972a879b0b3b5f1 orbital-eunuchs-sniper-1.29.ebuild 1489
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
 MD5 f97829ecc792f2794277b8aec6a11e07 files/digest-orbital-eunuchs-sniper-1.29 80
 MD5 8c689e156112d15da15aa7a5753e7f1c files/1.29-gentoo-paths.patch 798
diff --git a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
index 7ef1ef05138f..28225134ed4d 100644
--- a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
+++ b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild,v 1.4 2004/02/03 11:57:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild,v 1.5 2004/02/16 09:19:44 mr_bones_ Exp $
 
 inherit eutils games
 
 MY_PN=${PN//-/_}
+S="${WORKDIR}/${MY_PN}-${PV}"
 DESCRIPTION="Snipe terrorists from your orbital base"
 HOMEPAGE="http://icculus.org/oes/"
 SRC_URI="http://filesingularity.timedoctor.org/${MY_PN}-${PV}.tar.gz"
@@ -14,34 +15,39 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2.5-r1
+RDEPEND=">=media-libs/libsdl-1.2.5-r1
 	>=media-libs/sdl-mixer-1.2.5-r1
 	>=media-libs/sdl-image-1.2.2"
-
-S=${WORKDIR}/${MY_PN}-${PV}
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:datadir="$with_games_dir"::' configure
+	sed -i \
+		-e 's:datadir="$with_games_dir"::' configure \
+			|| die "sed configure failed"
 	cp -rf ${S}{,.orig}
 	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
-	sed -i "s:GENTOO_DIR:${GAMES_DATADIR}/${MY_PN}:" src/snipe2d.cpp
+	sed -i \
+		-e "s:GENTOO_DIR:${GAMES_DATADIR}/${MY_PN}:" src/snipe2d.cpp \
+			|| die "sed src/snipe2d.cpp failed"
 }
 
 src_compile() {
 	egamesconf --with-games-dir=${GAMES_PREFIX} || die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
+	rm -f ${D}/${GAMES_BINDIR}/*
 	dodir ${GAMES_LIBDIR}/${PN}
-	mv ${D}/${GAMES_DATADIR}/${MY_PN}/snipe2d.* ${D}/${GAMES_LIBDIR}/${PN}/
+	mv ${D}/${GAMES_DATADIR}/${MY_PN}/snipe2d.* ${D}/${GAMES_LIBDIR}/${PN}/ \
+		|| die "mv failed"
 
-	dogamesbin ${FILESDIR}/snipe2d
-	dosed "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/snipe2d
+	games_make_wrapper snipe2d ./snipe2d.x86.dynamic "${GAMES_LIBDIR}/${PN}"
 
-	dodoc AUTHORS ChangeLog README TODO readme.txt
+	dodoc AUTHORS ChangeLog README TODO readme.txt || die "dodoc failed"
 	prepgamesdirs
 }