version bump; use sed -i in wrapper; add header to wrapper

7 files changed, 106 insertions, 28 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index 7fa972766051..f8e87da313cb 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.3 2003/09/21 20:46:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.4 2004/01/02 00:03:32 mr_bones_ Exp $
+
+*visualboyadvance-1.7 (01 Jan 2004)
+
+  01 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  visualboyadvance-1.6a.ebuild, visualboyadvance-1.7.ebuild,
+  files/visualboyadvance:
+  version bump; use sed -i in wrapper; add header to wrapper
 
 *visualboyadvance-1.6a (21 Sep 2003)
 
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index be41afa7e6d1..7c7543621c84 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -1,6 +1,7 @@
-MD5 a17cf7a4ba15f9f5ea94ae1711fbc627 ChangeLog 791
-MD5 975ed878726b43b85151889fe2753c2e visualboyadvance-1.6a.ebuild 1429
-MD5 975ed878726b43b85151889fe2753c2e visualboyadvance-1.7.ebuild 1429
+MD5 4c555d37065bd48ae9549d006fcc5844 ChangeLog 1035
+MD5 c6be6ad802a8e185875ce156b5e3743d visualboyadvance-1.6a.ebuild 1432
+MD5 d56693ec99af2b376e28aba097dd9511 visualboyadvance-1.7.ebuild 1432
+MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
+MD5 c9b2448c55c77264131542bd91b98f59 files/visualboyadvance 638
 MD5 42b444f4dbac4471a93a5571f4910a8a files/digest-visualboyadvance-1.6a 77
-MD5 3f95d6c5bb1a61a6e7e8f329521a87e0 files/visualboyadvance 447
 MD5 aa3165325ed426b15dd44dc5d684d2fc files/digest-visualboyadvance-1.7 77
diff --git a/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7 b/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7
new file mode 100644
index 000000000000..8982cff95df2
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7
@@ -0,0 +1 @@
+MD5 31a8665e90e84a079ab6664842083f55 VisualBoyAdvance-src-1.7.tar.gz 1078959
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance b/games-emulation/visualboyadvance/files/visualboyadvance
index d93da142d316..99fad101318b 100644
--- a/games-emulation/visualboyadvance/files/visualboyadvance
+++ b/games-emulation/visualboyadvance/files/visualboyadvance
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/files/visualboyadvance,v 1.2 2004/01/02 00:03:32 mr_bones_ Exp $
 
 PN=VisualBoyAdvance
 if ! [ -d ~/.${PN}/save ]; then
@@ -6,12 +9,11 @@ if ! [ -d ~/.${PN}/save ]; then
 	cd ~/.${PN}
 	ln -s `which ${PN}` .
 	cp /usr/games/share/${PN}/${PN}.cfg .
-	mv ${PN}.cfg ${PN}.cfg.old
-	sed -e "s:#saveDir.*:saveDir ${HOME}/.${PN}/save:" \
+	sed -i \
+		-e "s:#saveDir.*:saveDir ${HOME}/.${PN}/save:" \
 	    -e "s:#captureDir.*:captureDir ${HOME}/.${PN}:" \
 	    -e "s:#batteryDir.*:batteryDir ${HOME}/.${PN}/save:" \
-	    ${PN}.cfg.old > ${PN}.cfg
-	rm -f ${PN}.cfg.old
+	    ${PN}.cfg
 fi
 
 cd ~/.${PN}
diff --git a/games-emulation/visualboyadvance/metadata.xml b/games-emulation/visualboyadvance/metadata.xml
new file mode 100644
index 000000000000..1cef6e243af3
--- /dev/null
+++ b/games-emulation/visualboyadvance/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Games Team</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.6a.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.6a.ebuild
index 148c33bf5162..7025f8cfa591 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.6a.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.6a.ebuild
@@ -1,50 +1,54 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.6a.ebuild,v 1.1 2003/09/21 20:46:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.6a.ebuild,v 1.2 2004/01/02 00:03:32 mr_bones_ Exp $
 
 inherit games
 
-S=${WORKDIR}/VisualBoyAdvance-${PV}
-
+S="${WORKDIR}/VisualBoyAdvance-${PV}"
 DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
 HOMEPAGE="http://vboy.emuhq.com/"
 SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz"
 
+KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+
 IUSE="mmx debug"
 
-DEPEND="mmx? ( dev-lang/nasm )
+DEPEND="virtual/x11
+	mmx? ( dev-lang/nasm )
 	media-libs/libpng
 	sys-libs/zlib
 	media-libs/libsdl
-	virtual/x11"
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
-	sed -i "s:@LIBTOOL@:/usr/bin/libtool:" `find -name Makefile.in`
+	sed -i \
+		-e "s:@LIBTOOL@:/usr/bin/libtool:" `find -name Makefile.in` || \
+			die "sed Makefile.in failed"
 }
 
 src_compile() {
 	egamesconf \
 		--enable-c-core \
 		`use_with debug profiling` \
-		`use_with mmx` \
-		|| die
+		`use_with mmx` || \
+			die
 	if [ ! `use debug` ] ; then
-		cp src/Makefile{,.orig}
-		sed -e 's:prof/libprof.a::' \
-			src/Makefile.orig > src/Makefile
+		sed -i \
+			-e 's:prof/libprof.a::' src/Makefile || \
+				die "sed src/Makefile failed"
 	fi
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
-	dogamesbin ${FILESDIR}/visualboyadvance
-	insinto ${GAMES_DATADIR}/VisualBoyAdvance
-	doins src/VisualBoyAdvance.cfg
-	dodoc README README-win.txt INSTALL ChangeLog AUTHORS NEWS
+	make DESTDIR=${D} install                 || die "make install failed"
+	dogamesbin "${FILESDIR}/visualboyadvance" || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}/VisualBoyAdvance"
+	doins src/VisualBoyAdvance.cfg            || die "doins failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README-win.txt || \
+		die "dodoc failed"
 	prepgamesdirs
 }
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild
new file mode 100644
index 000000000000..1e8170d957f1
--- /dev/null
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild,v 1.1 2004/01/02 00:03:32 mr_bones_ Exp $
+
+inherit games
+
+S="${WORKDIR}/VisualBoyAdvance-${PV}"
+DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
+HOMEPAGE="http://vboy.emuhq.com/"
+SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz"
+
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="mmx debug"
+
+DEPEND="virtual/x11
+	mmx? ( dev-lang/nasm )
+	media-libs/libpng
+	sys-libs/zlib
+	media-libs/libsdl
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	sed -i \
+		-e "s:@LIBTOOL@:/usr/bin/libtool:" `find -name Makefile.in` || \
+			die "sed Makefile.in failed"
+}
+
+src_compile() {
+	egamesconf \
+		--enable-c-core \
+		`use_with debug profiling` \
+		`use_with mmx` || \
+			die
+	if [ ! `use debug` ] ; then
+		sed -i \
+			-e 's:prof/libprof.a::' src/Makefile || \
+				die "sed src/Makefile failed"
+	fi
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install                 || die "make install failed"
+	dogamesbin "${FILESDIR}/visualboyadvance" || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}/VisualBoyAdvance"
+	doins src/VisualBoyAdvance.cfg            || die "doins failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README-win.txt || \
+		die "dodoc failed"
+	prepgamesdirs
+}