error check file io; clean up vsinstall; tidy

4 files changed, 76 insertions, 29 deletions

diff --git a/games-rpg/vegastrike/ChangeLog b/games-rpg/vegastrike/ChangeLog
index f996bf758775..b7a4f107d324 100644
--- a/games-rpg/vegastrike/ChangeLog
+++ b/games-rpg/vegastrike/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/vegastrike
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/vegastrike/ChangeLog,v 1.6 2004/05/08 21:31:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/vegastrike/ChangeLog,v 1.7 2004/05/27 08:20:46 mr_bones_ Exp $
+
+  27 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  vegastrike-0.4.1.ebuild:
+  error check file io; clean up vsinstall; tidy
 
   08 May 2004; David Holm <dholm@gentoo.org> +files/0.4.1-endianess.patch,
   vegastrike-0.4.1.ebuild:
diff --git a/games-rpg/vegastrike/Manifest b/games-rpg/vegastrike/Manifest
index 46f4d18418d8..d79e6c3fe9f3 100644
--- a/games-rpg/vegastrike/Manifest
+++ b/games-rpg/vegastrike/Manifest
@@ -1,9 +1,10 @@
-MD5 9c13ebc33b3b8b52c0d77e68c808076a ChangeLog 1529
+MD5 0dd3c9b86a85fcefb3a1f8961b64a090 ChangeLog 1664
 MD5 f5a0d0512450b282c128b5723c86b01b vegastrike-0.3.1.ebuild 2286
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 d4939159848e5ad505f892ef7e27109d vegastrike-0.4.1.ebuild 2984
+MD5 5a286c5938532022c5dca414deb33c6a vegastrike-0.4.1.ebuild 3526
 MD5 2e620174666c33d1a873ea9f3f68286e files/0.3.1-vsinstall.patch 975
 MD5 b7121086183c9741c97fe59559fd9177 files/digest-vegastrike-0.3.1 156
 MD5 6106850a49aab787ec7af37878f3518a files/vegastrike-0.3.1-gcc3.patch 3437
 MD5 36b85699310d5fc0373c61ef3cbfa6fa files/digest-vegastrike-0.4.1 82
+MD5 54e9b74f6699f40a4b755466838a2250 files/0.4.1-vsinstall.patch 753
 MD5 c7b628bd6c2c0473c3ffc715165b860c files/0.4.1-endianess.patch 922
diff --git a/games-rpg/vegastrike/files/0.4.1-vsinstall.patch b/games-rpg/vegastrike/files/0.4.1-vsinstall.patch
new file mode 100644
index 000000000000..77a25e947f45
--- /dev/null
+++ b/games-rpg/vegastrike/files/0.4.1-vsinstall.patch
@@ -0,0 +1,26 @@
+--- vsinstall.orig	2004-03-20 19:38:15.000000000 -0800
++++ vsinstall	2004-03-20 19:40:50.000000000 -0800
+@@ -1,16 +1,16 @@
+ #!/bin/sh
+-CURPWD=$PWD
+-mkdir $HOME/.vegastrike
++(
++mkdir $HOME/.vegastrike 2> /dev/null
+ cd $HOME/.vegastrike
+-if cat save.4.x.txt ;
+-then
+-touch save.4.x.txt;
++if [ -f save.4.x.txt ] ; then
++	touch save.4.x.txt
+ else
+-echo "default"> save.4.x.txt ;
++	echo "default"> save.4.x.txt
+ fi
+ cp /usr/local/share/vegastrike/data/setup.config .
+ cp /usr/local/share/vegastrike/data/.vegastrike/*.m3u .
+ cp /usr/local/share/vegastrike/data/vegastrike.config .
+ /usr/local/bin/vssetup
++)
+ echo "If you wish to have your own music edit ~/.vegastrike/*.m3u  Each playlist represents a place or situation in Vega Strike"
+-cd $CURPWD
++exit 0
diff --git a/games-rpg/vegastrike/vegastrike-0.4.1.ebuild b/games-rpg/vegastrike/vegastrike-0.4.1.ebuild
index dbbc75f3166b..dab102e6224e 100644
--- a/games-rpg/vegastrike/vegastrike-0.4.1.ebuild
+++ b/games-rpg/vegastrike/vegastrike-0.4.1.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-rpg/vegastrike/vegastrike-0.4.1.ebuild,v 1.10 2004/05/08 21:31:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/vegastrike/vegastrike-0.4.1.ebuild,v 1.11 2004/05/27 08:20:46 mr_bones_ Exp $
 
-inherit games eutils flag-o-matic
+inherit flag-o-matic eutils games
 
 DESCRIPTION="A 3D space simulator that allows you to trade and bounty hunt"
 HOMEPAGE="http://vegastrike.sourceforge.net/"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="sdl"
 
-RDEPEND="virtual/glu
+RDEPEND="virtual/x11
+	virtual/glu
 	virtual/glut
 	virtual/opengl
 	media-libs/libsdl
@@ -23,28 +24,36 @@ RDEPEND="virtual/glu
 	dev-libs/expat
 	media-libs/openal
 	media-libs/sdl-mixer
-	virtual/x11
 	=x11-libs/gtk+-1*"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	>=sys-devel/autoconf-2.58"
 
-S=${WORKDIR}/${P}-installer
+S="${WORKDIR}/${P}-installer"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	for tar in ${P}-{data,source,setup}.tgz ; do
-		tar -zxf ${tar}
+		tar -zxf ${tar} || die "tar ${tar} failed"
 		# save space :)
 		rm ${tar}
 	done
-	epatch ${FILESDIR}/${PV}-endianess.patch
+	epatch "${FILESDIR}/${PV}-endianess.patch"
 
 	# Clean up data dir
 	find data -name CVS -type d -exec rm -rf '{}' \; >&/dev/null
 	find data -name '*~' -type f -exec rm -f '{}' \; >&/dev/null
 
+	# we install this as vsinstall so fix it up here.
+	mv vsfinalize vsinstall
+	epatch "${FILESDIR}/${PV}-vsinstall.patch"
+	sed -i \
+		-e "s!/usr/local/share/vegastrike!${GAMES_DATADIR}/vegastrike!" \
+		-e "s!/usr/local/bin!${GAMES_BINDIR}!" \
+		vsinstall \
+		|| die "sed vsinstall failed"
+
 	# Sort out directory references
 	sed -i \
 		-e "s!/usr/local/share/doc!/usr/share/doc!" \
@@ -52,25 +61,31 @@ src_unpack() {
 		-e "s!/usr/games/vegastrike!${GAMES_DATADIR}/vegastrike!" \
 		-e "s!/usr/local/bin!${GAMES_BINDIR}!" \
 		-e "s!/usr/local/lib/man!/usr/share/man!" \
-		data/documentation/vegastrike.1
+		data/documentation/vegastrike.1 \
+		|| die "sed data/documentation/vegastrike.1 failed"
+
+	cd ${S}/vegastrike
 	sed -i \
 		-e "s!/usr/games/vegastrike!${GAMES_DATADIR}/vegastrike!" \
 		-e "s!/usr/local/bin!${GAMES_BINDIR}!" \
-		vegastrike/launcher/saveinterface.cpp
+		launcher/saveinterface.cpp \
+		|| die "sed launcher/saveinterface.cpp failed"
 	sed -i \
 		"s!/usr/local/share/vegastrike!${GAMES_DATADIR}/vegastrike!" \
-		vegastrike/src/common/common.cpp
+		src/common/common.cpp \
+		|| die "sed src/common/common.cpp failed"
 	sed -i \
 		"s!/usr/share/local/vegastrike!${GAMES_DATADIR}/vegastrike!" \
-		vegastrike/src/filesys.cpp
+		src/filesys.cpp \
+		|| die "sed src/filesys.cpp failed"
 	sed -i \
-		-e "s!/usr/local/games/vegastrike!${GAMES_DATADIR}/vegastrike!" \
-		-e "s!/usr/local/bin!${GAMES_BINDIR}!" \
-		vsfinalize
-
-	cd ${S}/vegastrike
-	sed -i '/^SUBDIRS =/s:tools::' Makefile.am
-	sed -i 's:$(liblowlevel)::' src/networking/Makefile.am
+		-e '/^SUBDIRS =/s:tools::' \
+		Makefile.am \
+		|| die "sed Makefile.am failed"
+	sed -i \
+		-e 's:$(liblowlevel)::' \
+		src/networking/Makefile.am \
+		|| die "sed src/networking/Makefile.am failed"
 	aclocal || die "aclocal failed"
 	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
 	automake -a || die "automake failed"
@@ -88,18 +103,19 @@ src_compile() {
 }
 
 src_install() {
-	newgamesbin vsfinalize vsinstall
-	newgamesbin vssetup/src/bin/setup vssetup
-	dogamesbin vegastrike/src/vegastrike
-	dogamesbin vegastrike/launcher/vslauncher
-	cp -rf vegastrike/src/networking/soundserver data/
+	dogamesbin \
+		vegastrike/src/vegastrike \
+		vegastrike/launcher/vslauncher \
+		vsinstall \
+		|| die "dogamesbin failed"
+	newgamesbin vssetup/src/bin/setup vssetup || die "newgamesbin failed"
+	cp -rf vegastrike/src/networking/soundserver data/ || die "cp failed"
 
 	doman data/documentation/*.1
 	dodoc data/documentation/*.txt
 
-	dodir ${GAMES_DATADIR}/${PN}
-	cp -r data ${D}/${GAMES_DATADIR}/${PN}/
-
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r data/ "${D}/${GAMES_DATADIR}/${PN}/" || die "cp failed (data)"
 	prepgamesdirs
 }