Added addition dir variable to games_make_wrapper for bug #109793.

Package-Manager: portage-2.0.53_rc6

14 files changed, 60 insertions, 30 deletions

diff --git a/games-strategy/darwinia-demo/ChangeLog b/games-strategy/darwinia-demo/ChangeLog
index d604ca32332e..15918602e308 100644
--- a/games-strategy/darwinia-demo/ChangeLog
+++ b/games-strategy/darwinia-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/darwinia-demo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/ChangeLog,v 1.3 2005/09/21 20:54:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/ChangeLog,v 1.4 2005/10/21 18:08:37 wolf31o2 Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  darwinia-demo-1.2.1.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
   21 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   darwinia-demo-1.2.1.ebuild:
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild
index 671cd1c24b41..881496606ad6 100644
--- a/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild
+++ b/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild,v 1.4 2005/10/04 22:15:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild,v 1.5 2005/10/21 18:08:37 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -40,6 +40,6 @@ src_install() {
 	exeinto "${dir}"
 	doexe bin/Linux/x86/darwinia || die "couldn't do exe"
 
-	games_make_wrapper darwinia-demo ./darwinia "${dir}"
+	games_make_wrapper darwinia-demo ./darwinia "${dir}" "${dir}"
 	prepgamesdirs
 }
diff --git a/games-strategy/dominions2-demo-bin/ChangeLog b/games-strategy/dominions2-demo-bin/ChangeLog
index db4153ccf7cf..9496ab205a1e 100644
--- a/games-strategy/dominions2-demo-bin/ChangeLog
+++ b/games-strategy/dominions2-demo-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/dominions2-demo-bin
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo-bin/ChangeLog,v 1.1 2004/08/08 07:14:18 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo-bin/ChangeLog,v 1.2 2005/10/21 18:14:26 wolf31o2 Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  dominions2-demo-bin-2.08.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
 *dominions2-demo-bin-2.08 (08 Aug 2004)
 
diff --git a/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild b/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild
index 506d546fe4ba..60a51b6a1047 100644
--- a/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild
+++ b/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild,v 1.1 2004/08/08 07:14:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild,v 1.2 2005/10/21 18:14:26 wolf31o2 Exp $
 
 inherit games
 
@@ -21,6 +21,8 @@ DEPEND="virtual/x11
 	kde-base/arts"
 
 S="${WORKDIR}/dominions2demo"
+dir="${GAMES_PREFIX_OPT}/${PN}"
+Ddir="${D}/${dir}"
 
 src_unpack() {
 	unpack ${A}
@@ -29,8 +31,8 @@ src_unpack() {
 }
 
 src_install() {
-	dodir "${GAMES_PREFIX_OPT}/${PN}"
-	cp -R "${S}/"* "${D}${GAMES_PREFIX_OPT}/${PN}" || die "cp failed"
-	games_make_wrapper dominions2-demo ./dom2demo "${GAMES_PREFIX_OPT}/${PN}"
+	dodir "${dir}"
+	cp -r "${S}/"* "${Ddir}" || die "cp failed"
+	games_make_wrapper dominions2-demo ./dom2demo "${dir}" "${dir}"
 	prepgamesdirs
 }
diff --git a/games-strategy/dominions2/ChangeLog b/games-strategy/dominions2/ChangeLog
index 78e01c2eb636..ccb701490ba6 100644
--- a/games-strategy/dominions2/ChangeLog
+++ b/games-strategy/dominions2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/dominions2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.1 2005/10/05 15:58:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.2 2005/10/21 18:12:26 wolf31o2 Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  dominions2-2.16.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
 *dominions2-2.16 (05 Oct 2005)
 
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16.ebuild
index 7dbcfa41e57e..788a82705b3a 100644
--- a/games-strategy/dominions2/dominions2-2.16.ebuild
+++ b/games-strategy/dominions2/dominions2-2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.2 2005/10/05 23:34:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.3 2005/10/21 18:12:26 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -31,6 +31,9 @@ DEPEND="virtual/x11
 	amd64? ( app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-sdl )"
 
+dir="${GAMES_PREFIX_OPT}/${PN}"
+Ddir="${D}/${dir}"
+
 src_unpack() {
 	mkdir -p ${S}/patch
 	cd ${S}/patch
@@ -47,9 +50,7 @@ src_install() {
 	cdrom_get_cds dom2icon.ico
 	einfo "Copying files to harddisk... this may take a while..."
 
-	DOM2DIR="${GAMES_PREFIX_OPT}/${PN}"
-	dodir ${DOM2DIR}
-	exeinto ${DOM2DIR}
+	exeinto "${dir}"
 	if use amd64 || use x86
 	then
 		doexe ${CDROM_ROOT}/bin_lin/x86/dom2* || die "doexe failed"
@@ -57,7 +58,7 @@ src_install() {
 	then
 		doexe ${CDROM_ROOT}/bin_lin/ppc/dom2* || die "doexe failed"
 	fi
-	insinto ${DOM2DIR}
+	insinto "${dir}"
 	doins -r ${CDROM_ROOT}/dominions2.app/Contents/Resources/* || \
 		die "doins failed"
 	dodoc ${CDROM_ROOT}/doc/* || die "dodoc failed"
@@ -85,7 +86,7 @@ src_install() {
 	# update times
 	find ${D} -exec touch '{}' \;
 
-	games_make_wrapper dominions2 ./dom2 ${DOM2DIR}
+	games_make_wrapper dominions2 ./dom2 "${dir}" "${dir}"
 	make_desktop_entry dominions2 "Dominions II" dominions2.png
 
 	prepgamesdirs
diff --git a/games-strategy/heroes3/ChangeLog b/games-strategy/heroes3/ChangeLog
index 2c54067dfdf1..b64cbc9847c0 100644
--- a/games-strategy/heroes3/ChangeLog
+++ b/games-strategy/heroes3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/heroes3
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.7 2005/09/27 19:55:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.8 2005/10/21 18:15:48 wolf31o2 Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  heroes3-1.3.1a-r1.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
   27 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   heroes3-1.3.1a-r1.ebuild:
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild
index 90b64eb387a5..4c4e145ec031 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild,v 1.6 2005/09/27 19:55:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild,v 1.7 2005/10/21 18:15:48 wolf31o2 Exp $
 
 # 	[x] Base Install Required (+4 MB) 
 #	[x] Scenarios (+7 MB)
@@ -71,7 +71,7 @@ src_install() {
 	loki_patch --verify patch.dat
 	loki_patch patch.dat ${Ddir} >& /dev/null || die "patching"
 
-	games_make_wrapper heroes3 ./heroes3 ${dir}
+	games_make_wrapper heroes3 ./heroes3 "${dir}" "${dir}"
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
diff --git a/games-strategy/majesty-demo/ChangeLog b/games-strategy/majesty-demo/ChangeLog
index 0002a07a59d1..9c40c936be12 100644
--- a/games-strategy/majesty-demo/ChangeLog
+++ b/games-strategy/majesty-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/majesty-demo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/ChangeLog,v 1.2 2005/05/09 15:31:29 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/ChangeLog,v 1.3 2005/10/21 18:16:17 wolf31o2 Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  majesty-demo-1.0.0.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
   09 May 2005; David Holm <dholm@gentoo.org> majesty-demo-1.0.0.ebuild:
   Added to ~ppc.
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
index 76632c3d2bf9..4b62baae6484 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild,v 1.2 2005/05/09 15:31:29 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild,v 1.3 2005/10/21 18:16:17 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -38,7 +38,7 @@ src_install() {
 	elif use ppc; then
 		doexe bin/Linux/ppc/glibc-2.1/maj_demo || die "doexe"
 	fi
-	games_make_wrapper maj_demo ./maj_demo ${dir}
+	games_make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
 	prepgamesdirs
 	make_desktop_entry maj_demo "Majesty Demo" ${PN}.xpm
 }
diff --git a/games-strategy/mindrover-demo/ChangeLog b/games-strategy/mindrover-demo/ChangeLog
index b07dc04a51a3..e33cef953274 100644
--- a/games-strategy/mindrover-demo/ChangeLog
+++ b/games-strategy/mindrover-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/mindrover-demo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/ChangeLog,v 1.1 2005/06/17 17:53:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/ChangeLog,v 1.2 2005/10/21 18:16:45 wolf31o2 Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  mindrover-demo-1.07b.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
 *mindrover-demo-1.07b (17 Jun 2005)
 
diff --git a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
index 0ccf96361c01..7fb7d3a28d97 100644
--- a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
+++ b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild,v 1.1 2005/06/17 17:53:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild,v 1.2 2005/10/21 18:16:45 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -42,7 +42,7 @@ src_install() {
 		bin/Linux/x86/glibc-2.1/lib/libopenal.so.0.0.6 || die "doexe failed"
 	dosym ${dir}/libopenal.so.0.0.6 ${dir}/libopenal.so.0
 
-	games_make_wrapper ${PN} ./mindrover_demo ${dir}
+	games_make_wrapper ${PN} ./mindrover_demo "${dir}" "${dir}"
 
 	prepgamesdirs
 	make_desktop_entry ${PN} "Mindrover: Europa Project (Demo)" ${PN}.xpm
diff --git a/games-strategy/smac/ChangeLog b/games-strategy/smac/ChangeLog
index 064ef572ce5b..36a5489b895d 100644
--- a/games-strategy/smac/ChangeLog
+++ b/games-strategy/smac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/smac
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.2 2005/09/27 19:56:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.3 2005/10/21 18:17:16 wolf31o2 Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> smac-6.0a.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
   27 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> smac-6.0a.ebuild:
   Changed to use new lokigames mirror:// setup.
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
index 3348238575e9..7008d4812ec2 100644
--- a/games-strategy/smac/smac-6.0a.ebuild
+++ b/games-strategy/smac/smac-6.0a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.2 2005/09/27 19:56:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.3 2005/10/21 18:17:16 wolf31o2 Exp $
 
 inherit games
 
@@ -68,8 +68,8 @@ src_install() {
 	insinto /usr/share/pixmaps
 	newins ${CDROM_ROOT}/icon.xpm smac.xpm
 
-	games_make_wrapper ${PN} ./${PN} "${dir}"
-	games_make_wrapper ${PN}x ./${PN}x "${dir}"
+	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	games_make_wrapper ${PN}x ./${PN}x "${dir}" "${dir}"
 	prepgamesdirs
 
 	einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."