fix wrapper script to use correct path for default config (bug #47564); tidy older ebuild

5 files changed, 11 insertions, 81 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index 914e8208ab04..f4576dc17e4c 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.10 2004/03/31 06:57:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.11 2004/04/12 00:57:03 mr_bones_ Exp $
+
+  11 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  visualboyadvance-1.7.ebuild, files/visualboyadvance:
+  fix wrapper script to use correct path for default config (bug #47564); tidy
+  older ebuild
 
   30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
   visualboyadvance-1.7.1.ebuild, visualboyadvance-1.7.ebuild:
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index 1d9d8abdecd7..5e99f08524cb 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -1,7 +1,5 @@
-MD5 713624575eb5317407707ed25133b158 ChangeLog 1713
-MD5 bd53cc12a076ac51a7d85fb64cb2ff01 visualboyadvance-1.7.ebuild 1724
+MD5 177b7bd5a0f8393e5d69ec0313fd503f ChangeLog 1918
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 8601fe538ac478fee2c5fdb142bf2a29 visualboyadvance-1.7.1.ebuild 1237
-MD5 c9b2448c55c77264131542bd91b98f59 files/visualboyadvance 638
-MD5 9c7aaa583405bdbea7e73d2141d8db54 files/digest-visualboyadvance-1.7 156
+MD5 8fb8f48034d54be406fb81f353961448 files/visualboyadvance 641
 MD5 6db235a2f4659121d5898a9c6d6f92fe files/digest-visualboyadvance-1.7.1 79
diff --git a/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7 b/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7
deleted file mode 100644
index 044790a01444..000000000000
--- a/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 31a8665e90e84a079ab6664842083f55 VisualBoyAdvance-src-1.7.tar.gz 1078959
-MD5 aca2ce31e5cfd1a7bde1135d09e0fb58 visualboyadvance-1.7-zutil.h-1.2.bz2 2518
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance b/games-emulation/visualboyadvance/files/visualboyadvance
index 99fad101318b..b2934bb8c807 100644
--- a/games-emulation/visualboyadvance/files/visualboyadvance
+++ b/games-emulation/visualboyadvance/files/visualboyadvance
@@ -1,16 +1,16 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/files/visualboyadvance,v 1.3 2004/04/12 00:57:03 mr_bones_ Exp $
 
 PN=VisualBoyAdvance
 if ! [ -d ~/.${PN}/save ]; then
 	mkdir -p ~/.${PN}/save
 	cd ~/.${PN}
 	ln -s `which ${PN}` .
-	cp /usr/games/share/${PN}/${PN}.cfg .
+	cp /usr/share/games/${PN}/${PN}.cfg .
 	sed -i \
-		-e "s:#saveDir.*:saveDir ${HOME}/.${PN}/save:" \
+	    -e "s:#saveDir.*:saveDir ${HOME}/.${PN}/save:" \
 	    -e "s:#captureDir.*:captureDir ${HOME}/.${PN}:" \
 	    -e "s:#batteryDir.*:batteryDir ${HOME}/.${PN}/save:" \
 	    ${PN}.cfg
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild
deleted file mode 100644
index b74de326998e..000000000000
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.3 2004/03/31 06:57:03 mr_bones_ Exp $
-
-inherit games
-
-DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
-HOMEPAGE="http://vboy.emuhq.com/"
-SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz
-	mirror://gentoo/${P}-zutil.h-1.2.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="mmx debug"
-
-RDEPEND="virtual/x11
-	media-libs/libpng
-	sys-libs/zlib
-	media-libs/libsdl"
-DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/VisualBoyAdvance-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:@LIBTOOL@:/usr/bin/libtool:" \
-		`find -name Makefile.in` \
-		|| die "sed Makefile.in failed"
-	cd win32/include/png
-	for f in * ; do
-		[ -e /usr/include/${f} ] \
-			&& rm ${f} && ln -s /usr/include/${f}
-	done
-	cd ../zlib
-	for f in * ; do
-		[ -e /usr/include/${f} ] \
-			&& rm ${f} && ln -s /usr/include/${f}
-	done
-	has_version '>=sys-libs/zlib-1.2' \
-		&& unpack ${P}-zutil.h-1.2.bz2 \
-		&& mv ${P}-zutil.h-1.2 zutil.h
-}
-
-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
-	insinto ${GAMES_DATADIR}/VisualBoyAdvance
-	doins src/VisualBoyAdvance.cfg
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README-win.txt
-	prepgamesdirs
-}