use games_get_libdir

Package-Manager: portage-2.1.2.3

6 files changed, 13 insertions, 166 deletions

diff --git a/games-emulation/daphne/Manifest b/games-emulation/daphne/Manifest
index f549e75eaf04..3b02d5cc9198 100644
--- a/games-emulation/daphne/Manifest
+++ b/games-emulation/daphne/Manifest
@@ -1,14 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.99.6-local-dapinput.patch 669 RMD160 5c9b078a54717010437a39468a7d1e65345bb40d SHA1 18ec9e3c871392a61fbbfca6fd4e29f0a46816b7 SHA256 c641814cac09fa78d7990481cdf87c1f1f0ed2a0d64fdd33c14a11e43982db09
-MD5 b8108296fd1d844b69546291e958bb4c files/0.99.6-local-dapinput.patch 669
-RMD160 5c9b078a54717010437a39468a7d1e65345bb40d files/0.99.6-local-dapinput.patch 669
-SHA256 c641814cac09fa78d7990481cdf87c1f1f0ed2a0d64fdd33c14a11e43982db09 files/0.99.6-local-dapinput.patch 669
-AUX daphne-0.99.6-gcc41.patch 1109 RMD160 1985ce7fa6b25e2f94f9038025b1ea7bddee3e56 SHA1 1ac5c349dbf54dcc5c39d063c1dff5d3f8d2cfee SHA256 99e39b8c94157e97e15f8ef6ea2e0d7ddffcce3fcda99aba71169c1b59c8c9bd
-MD5 ef997d7c8970bb1ef8a1ecf2a71a27a5 files/daphne-0.99.6-gcc41.patch 1109
-RMD160 1985ce7fa6b25e2f94f9038025b1ea7bddee3e56 files/daphne-0.99.6-gcc41.patch 1109
-SHA256 99e39b8c94157e97e15f8ef6ea2e0d7ddffcce3fcda99aba71169c1b59c8c9bd files/daphne-0.99.6-gcc41.patch 1109
 AUX daphne-0.99.7-exec-stack.patch 360 RMD160 20f49ba81bc5b9fb5e8f2ad01a828ea36920d0dd SHA1 7904d24f3a97798bb69d3ec323f2b6f12a30faf5 SHA256 ad2b25a651fbe5a37646fed02173957a495c027b99372ca492207908aa68ea0a
 MD5 d3ec432a288d8285d1b2ab2712a0c714 files/daphne-0.99.7-exec-stack.patch 360
 RMD160 20f49ba81bc5b9fb5e8f2ad01a828ea36920d0dd files/daphne-0.99.7-exec-stack.patch 360
@@ -17,16 +9,11 @@ AUX daphne-0.99.7-gcc41.patch 522 RMD160 b3b7f1a126648b4088780a29daa5b1835a41a1d
 MD5 4e236161637be523f5d44b193429bbf3 files/daphne-0.99.7-gcc41.patch 522
 RMD160 b3b7f1a126648b4088780a29daa5b1835a41a1d9 files/daphne-0.99.7-gcc41.patch 522
 SHA256 d3677fe46478c34532fbe0d089dbca4f4ff4d40d9de0eed6e20effe21bc8fed7 files/daphne-0.99.7-gcc41.patch 522
-DIST daphne-0.99.6-src.tar.gz 2685633 RMD160 b4e7902887e6dad03d9ad0b8f9fc5b4b34ca9166 SHA1 40ded2e02163047e097f6309e266a9281fb53219 SHA256 ca8e4365d3af7dd484ce14d30eeffafef7947e41956fa12ec7120308ff3658f9
 DIST daphne-0.99.7-src.tar.gz 3499980 RMD160 0607bf6a275f3ada240d8ee4b5ffca44e7ceb246 SHA1 04f402463d94d68814e48d19cbc541a0d5b83bef SHA256 6b40f2028cac01803318bc2d62ad3a3c7d98b3d49d846312e30d2b52fadfce51
-EBUILD daphne-0.99.6-r2.ebuild 2047 RMD160 55e2da9014ca54bcd1a6afd81fc536ab795912a8 SHA1 8d3de811cc7c02e868f2c6daa209d930e728bab4 SHA256 ff28e6f9c4dff5782e7d14b110d29dce017db6bceb7bc09fcda48ed6006ca781
-MD5 d5848c8fb75201d9b74a585ea60c9c23 daphne-0.99.6-r2.ebuild 2047
-RMD160 55e2da9014ca54bcd1a6afd81fc536ab795912a8 daphne-0.99.6-r2.ebuild 2047
-SHA256 ff28e6f9c4dff5782e7d14b110d29dce017db6bceb7bc09fcda48ed6006ca781 daphne-0.99.6-r2.ebuild 2047
-EBUILD daphne-0.99.7.ebuild 1635 RMD160 1538259826a1a06e65706a55d3784142bb2119ee SHA1 628c90ed94eb25008d1c72f431f0a299ea416a21 SHA256 b89c33ce03792f315fffa5fca09fdd22cdec7b9c3700964bf06c72abe565a63e
-MD5 ed72b2f6b3d34fa434be954c8d926ed3 daphne-0.99.7.ebuild 1635
-RMD160 1538259826a1a06e65706a55d3784142bb2119ee daphne-0.99.7.ebuild 1635
-SHA256 b89c33ce03792f315fffa5fca09fdd22cdec7b9c3700964bf06c72abe565a63e daphne-0.99.7.ebuild 1635
+EBUILD daphne-0.99.7.ebuild 1642 RMD160 d94164445ff9b1c040e2ab005f66c7e4f8582998 SHA1 734c7d4b69c95a6688c0ba7457f8aad38cff1cff SHA256 f7a6c338e1b9b0ce2fd132d2fdb11c03668d4079808204f25918dadda1dec2c4
+MD5 cdfdc0f5012a294c9bd22a0718dd5a2d daphne-0.99.7.ebuild 1642
+RMD160 d94164445ff9b1c040e2ab005f66c7e4f8582998 daphne-0.99.7.ebuild 1642
+SHA256 f7a6c338e1b9b0ce2fd132d2fdb11c03668d4079808204f25918dadda1dec2c4 daphne-0.99.7.ebuild 1642
 MISC ChangeLog 1504 RMD160 b91aa45c535082e755b5722c33187a0671186ed0 SHA1 dd877459530d496ce6485a35e5c32947f1d32ad4 SHA256 003765fb72a4e8ccaa9849a49ef97bcddab90551eda01787e41af7e6baec0a80
 MD5 ccac946113a38a01196bb542963c354f ChangeLog 1504
 RMD160 b91aa45c535082e755b5722c33187a0671186ed0 ChangeLog 1504
@@ -35,16 +22,13 @@ MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be525
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 24ea93c7ac728cbe44ba1c4704749623 files/digest-daphne-0.99.6-r2 256
-RMD160 b3f33db51987b0647c67ad8200ac71f97b2aaa27 files/digest-daphne-0.99.6-r2 256
-SHA256 2197b763fb5e84394806c5f7ce628259613f444580b3234a4654c042dafbe3fa files/digest-daphne-0.99.6-r2 256
 MD5 1545a5137fa27f0f0c853042a0a6adc7 files/digest-daphne-0.99.7 256
 RMD160 ddb63b15c9cb5c86bbfd7fa02b9bb5b3b1869e49 files/digest-daphne-0.99.7 256
 SHA256 8fa1fc5cec079bae5a7f30625302764d1c3adf843f8fa4b1ee1d18ec1767ba36 files/digest-daphne-0.99.7 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFkwwhdz7hIScOURERArtfAKC/3OkSE62SH9Oj94x3xJBTNA6PaACeISB4
-J2rFlEWWYf4qkixNFMDH0bo=
-=c3Iy
+iD8DBQFGFaNudz7hIScOURERAtN1AKDEDqRsxu463WPJxKbA0Wnu34duiACePPvS
+/vbd62vc0ZgQMlyWfBR6hUE=
+=m0zO
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/daphne/daphne-0.99.6-r2.ebuild b/games-emulation/daphne/daphne-0.99.6-r2.ebuild
deleted file mode 100644
index 7321347619e6..000000000000
--- a/games-emulation/daphne/daphne-0.99.6-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-0.99.6-r2.ebuild,v 1.10 2006/08/28 01:53:27 tupone Exp $
-
-inherit eutils flag-o-matic games
-
-DESCRIPTION="Laserdisc Arcade Game Emulator"
-HOMEPAGE="http://www.daphne-emu.com/"
-SRC_URI="http://www.daphne-emu.com/download/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND="media-libs/libogg
-	media-libs/libvorbis
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	sys-libs/zlib"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-
-	replace-cpu-flags i686 pentium3 pentium4 i586 #18807
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}"-gcc41.patch
-	cd src
-	sed \
-		-e "/^DFLAGS/d" \
-		-e "/-fexpensive-optimizations/d " \
-		-e "s/\${DFLAGS}/${CFLAGS}/g" \
-		Makefile.vars.linux_x86 > Makefile.vars \
-		|| die "sed failed"
-
-	# lets make this guy play nice with our filesystem setup
-	sed -i \
-		-e "s:pics/:${GAMES_DATADIR}/${PN}/pics/:g" \
-		video/video.cpp \
-		|| die "sed failed"
-	sed -i \
-		-e "s:roms/:${GAMES_DATADIR}/${PN}/roms/:g" \
-		game/game.cpp \
-		|| die "sed failed"
-	sed -i \
-		-e "s:sound/:${GAMES_DATADIR}/${PN}/sound/:g" \
-		sound/sound.cpp \
-		|| die "sed failed"
-	sed -i \
-		-e "s:./lib:${GAMES_LIBDIR}/${PN}/lib:g" \
-		io/dll.h \
-		|| die "sed failed"
-	sed -i \
-		-e 's:daphne_log.txt:/tmp/daphne_log.txt:g' \
-		daphne.cpp daphne.h io/error.cpp \
-		|| die "sed failed"
-	epatch "${FILESDIR}/${PV}-local-dapinput.patch"
-}
-
-src_compile() {
-	cd "${S}/src"
-	emake || die "src build failed"
-	cd "${S}/src/vldp"
-	emake -f Makefile.linux || die "vldp build failed"
-	cd "${S}/src/vldp2"
-	egamesconf || die
-	emake -f Makefile.linux || die "vldp2 build failed"
-}
-
-src_install() {
-	dogamesbin daphne || die "dogamesbin failed"
-	exeinto "${GAMES_LIBDIR}/${PN}"
-	doexe libvldp*.so || die "doexe failed"
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -rf pics sound roms "${D}/${GAMES_DATADIR}/${PN}/" \
-		|| die "cp failed"
-	dodoc doc/*.{ini,txt}
-	dohtml -r doc/*
-	prepgamesdirs
-}
diff --git a/games-emulation/daphne/daphne-0.99.7.ebuild b/games-emulation/daphne/daphne-0.99.7.ebuild
index ce11fa4a8e04..245f7419d42a 100644
--- a/games-emulation/daphne/daphne-0.99.7.ebuild
+++ b/games-emulation/daphne/daphne-0.99.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-0.99.7.ebuild,v 1.1 2006/12/28 00:13:14 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-0.99.7.ebuild,v 1.2 2007/04/06 01:33:28 nyhm Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.daphne-emu.com/download/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="media-libs/libogg
@@ -35,7 +35,7 @@ src_unpack() {
 	sed -i "s:sound/:${GAMES_DATADIR}/${PN}/&:" \
 		sound/sound.cpp \
 		|| die "sed sound.cpp failed"
-	sed -i "s:./lib:${GAMES_LIBDIR}/${PN}/lib:" \
+	sed -i "s:./lib:$(games_get_libdir)/${PN}/lib:" \
 		io/dll.h \
 		|| die "sed dll.h failed"
 	cp Makefile.vars{.linux_x86,}
@@ -58,7 +58,7 @@ src_compile() {
 src_install() {
 	cd ..
 	dogamesbin daphne || die "dogamesbin failed"
-	exeinto "${GAMES_LIBDIR}"/${PN}
+	exeinto "$(games_get_libdir)"/${PN}
 	doexe libvldp2.so || die "doexe failed"
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r pics roms sound || die "doins failed"
diff --git a/games-emulation/daphne/files/0.99.6-local-dapinput.patch b/games-emulation/daphne/files/0.99.6-local-dapinput.patch
deleted file mode 100644
index 9b3c3a413e02..000000000000
--- a/games-emulation/daphne/files/0.99.6-local-dapinput.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/io/input.cpp.orig	2003-11-04 02:51:56.308868080 -0500
-+++ src/io/input.cpp	2003-11-04 02:53:57.283477144 -0500
-@@ -22,6 +22,9 @@
- 
- // Handles SDL input functions (low-level keyboard/joystick input)
- 
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
- #include <time.h>
- #include "input.h"
- #include "conout.h"
-@@ -113,6 +116,9 @@
- 	char strTemp[25] = {0};
- 	char thisChar = 0;
- 
-+	chdir(getenv("HOME"));
-+	mkdir(".daphne", 0700);
-+	chdir(".daphne");
- 	F = fopen("dapinput.ini", "rt");
- 
- 	// if we opened the file successfully
-@@ -589,4 +595,4 @@
- 	}
- 	idle_timer = refresh_ms_time();
- }
--// end edit
-\ No newline at end of file
-+// end edit
diff --git a/games-emulation/daphne/files/daphne-0.99.6-gcc41.patch b/games-emulation/daphne/files/daphne-0.99.6-gcc41.patch
deleted file mode 100644
index b136ebd387f8..000000000000
--- a/games-emulation/daphne/files/daphne-0.99.6-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/game/game.h.old	2006-08-27 18:45:27.000000000 +0200
-+++ src/game/game.h	2006-08-27 18:45:43.000000000 +0200
-@@ -121,7 +121,7 @@
- 	int get_video_col_offset();
- 	SDL_Surface *get_video_overlay(int index);	// returns pointer to video overlay specified, or NULL if index is out of range
- 	SDL_Surface *get_active_video_overlay();	// returns the current active video overlay (that is currently being drawn)
--	SDL_Surface *game::get_finished_video_overlay();	// returns the last complete video overlay (that isn't currently being drawn)
-+	SDL_Surface *get_finished_video_overlay();	// returns the last complete video overlay (that isn't currently being drawn)
- 	bool is_overlay_size_dynamic();	// returns m_overlay_size_is_dynamic
- 
- 	void enable_cheat();
---- src/ldp-out/pioneer.h.old	2006-08-27 18:47:55.000000000 +0200
-+++ src/ldp-out/pioneer.h	2006-08-27 18:48:12.000000000 +0200
-@@ -45,7 +45,7 @@
- 	bool pioneer_audio1;
- 	bool pioneer_audio2;
- 	bool check_result(Uint32, bool);
--	bool pioneer::getstring(char *, int, Uint32,bool);
-+	bool getstring(char *, int, Uint32,bool);
- 	void printmodel();
- };
- 
diff --git a/games-emulation/daphne/files/digest-daphne-0.99.6-r2 b/games-emulation/daphne/files/digest-daphne-0.99.6-r2
deleted file mode 100644
index 344ba83b7d7b..000000000000
--- a/games-emulation/daphne/files/digest-daphne-0.99.6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7602c8c1c7d54f61e23e55fe55b44ffd daphne-0.99.6-src.tar.gz 2685633
-RMD160 b4e7902887e6dad03d9ad0b8f9fc5b4b34ca9166 daphne-0.99.6-src.tar.gz 2685633
-SHA256 ca8e4365d3af7dd484ce14d30eeffafef7947e41956fa12ec7120308ff3658f9 daphne-0.99.6-src.tar.gz 2685633