Added wrapper to allow us to write out some temp files. Wrapper by Alex Linke <incubation.11@freenet.de>. Closing bug #93604.

Package-Manager: portage-2.1.2_pre1-r4

6 files changed, 273 insertions, 10 deletions

diff --git a/games-strategy/heroes3/ChangeLog b/games-strategy/heroes3/ChangeLog
index 56f66a6aeb58..cf1f54e9ff42 100644
--- a/games-strategy/heroes3/ChangeLog
+++ b/games-strategy/heroes3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/heroes3
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.11 2006/04/17 13:29:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.12 2006/10/05 22:59:07 wolf31o2 Exp $
+
+*heroes3-1.3.1a-r2 (05 Oct 2006)
+
+  05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/heroes3-wrapper.sh, +heroes3-1.3.1a-r2.ebuild:
+  Added wrapper to allow us to write out some temp files. Wrapper by Alex
+  Linke <incubation.11@freenet.de>. Closing bug #93604.
 
   17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   heroes3-1.3.1a-r1.ebuild:
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
index 9d8b1f6a5e07..845c33384d56 100644
--- a/games-strategy/heroes3/Manifest
+++ b/games-strategy/heroes3/Manifest
@@ -1,17 +1,38 @@
-DIST heroes3-1.3.1a-cdrom-x86.run 3012188
-DIST heroes3-1.3.1a-ppc.run 2643068
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX heroes3-wrapper.sh 195 RMD160 5ceb0c89041b1640fc38a0aff9833ee3d8b2726b SHA1 f1d84dcee1addb16edc05ea42bf0f3dc770007f8 SHA256 982b2c36a167dd99a6bddc14d13122cf73e306e2711147aa059b1dabb4ae1ae5
+MD5 3e19703cfb5ebc8883d8929234c08606 files/heroes3-wrapper.sh 195
+RMD160 5ceb0c89041b1640fc38a0aff9833ee3d8b2726b files/heroes3-wrapper.sh 195
+SHA256 982b2c36a167dd99a6bddc14d13122cf73e306e2711147aa059b1dabb4ae1ae5 files/heroes3-wrapper.sh 195
+DIST heroes3-1.3.1a-cdrom-x86.run 3012188 RMD160 dafa394c5f63bb3cac5bb65e244fdeaa626b6e70 SHA1 72c23f6eab8505dc561337ce06e49b690a4a6627 SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e
+DIST heroes3-1.3.1a-ppc.run 2643068 RMD160 741ba7c3a9005a38895dd84e02595be75678d7da SHA1 e52fd2f487edfa5650c93f85782654f10513f016 SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137
 EBUILD heroes3-1.3.1a-r1.ebuild 3208 RMD160 7c239bfaff6303bf2956800d7afea7ad8449384f SHA1 a0bc363ffb48dae3dbeb6604fe380a38e40a432d SHA256 5a58e9dc7335fb4aeca0cd114f08143db983262c5c224a5df224c6dc1a823630
 MD5 8849a7d1e818e14d1bf05b9cd6d713c2 heroes3-1.3.1a-r1.ebuild 3208
 RMD160 7c239bfaff6303bf2956800d7afea7ad8449384f heroes3-1.3.1a-r1.ebuild 3208
 SHA256 5a58e9dc7335fb4aeca0cd114f08143db983262c5c224a5df224c6dc1a823630 heroes3-1.3.1a-r1.ebuild 3208
-MISC ChangeLog 1904 RMD160 dc81b8f045ab4a0912e262c2e156696f69a17360 SHA1 4531b16c279f94d04d02818323dcd14a5500de89 SHA256 0984d3413cee0f5acc78cd053d4d07682400cb3b85a9a09ea11b412a66d27d20
-MD5 ba56b80bc94aac5484b6488e3d246cf0 ChangeLog 1904
-RMD160 dc81b8f045ab4a0912e262c2e156696f69a17360 ChangeLog 1904
-SHA256 0984d3413cee0f5acc78cd053d4d07682400cb3b85a9a09ea11b412a66d27d20 ChangeLog 1904
+EBUILD heroes3-1.3.1a-r2.ebuild 5741 RMD160 1ad1a1092b840adfa6391c0d5752adf443d65591 SHA1 bac959caa24fa87350d47e157720ad0864325bcb SHA256 a341d395f8fa979b1645470de6eb396074351f6183e861c4f1295dd8082c39cc
+MD5 99dba06d2aa1b643019723f0619634b7 heroes3-1.3.1a-r2.ebuild 5741
+RMD160 1ad1a1092b840adfa6391c0d5752adf443d65591 heroes3-1.3.1a-r2.ebuild 5741
+SHA256 a341d395f8fa979b1645470de6eb396074351f6183e861c4f1295dd8082c39cc heroes3-1.3.1a-r2.ebuild 5741
+MISC ChangeLog 2179 RMD160 b972aff47f703756edfc1ba04d3d3c6230b2f704 SHA1 f8c622fbd6073c6cf2eab9d7cfc1308d16531ddb SHA256 36cf3812901238b5eed753a2355f23db9f6de11474ac1881dff7a543c7949a41
+MD5 0034fea5d2b835e3d7147e7003081811 ChangeLog 2179
+RMD160 b972aff47f703756edfc1ba04d3d3c6230b2f704 ChangeLog 2179
+SHA256 36cf3812901238b5eed753a2355f23db9f6de11474ac1881dff7a543c7949a41 ChangeLog 2179
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
 SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 metadata.xml 254
-MD5 448d580609f09736aaa5f762b631e813 files/digest-heroes3-1.3.1a-r1 142
-RMD160 cd3bdb646b1718039eb8d8b7956c3b0926993e53 files/digest-heroes3-1.3.1a-r1 142
-SHA256 594c6ae80bb2ba302143c1f8ead2fee320b12b56d471a668182e9a70d07c6420 files/digest-heroes3-1.3.1a-r1 142
+MD5 6d1a10714d00c4c534db37057c538292 files/digest-heroes3-1.3.1a-r1 518
+RMD160 a7a61b29b8422b5a73cc4784e2013428c5f0f75c files/digest-heroes3-1.3.1a-r1 518
+SHA256 4538637a18d6a597d9daf2722d2e168241ae77c9c71a8e607e2a7d98d457ab40 files/digest-heroes3-1.3.1a-r1 518
+MD5 6d1a10714d00c4c534db37057c538292 files/digest-heroes3-1.3.1a-r2 518
+RMD160 a7a61b29b8422b5a73cc4784e2013428c5f0f75c files/digest-heroes3-1.3.1a-r2 518
+SHA256 4538637a18d6a597d9daf2722d2e168241ae77c9c71a8e607e2a7d98d457ab40 files/digest-heroes3-1.3.1a-r2 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFJY5BkT4lNIS36YERAt9sAKCrJVWIB0toiPJaK/Yl8IsCtMVKJwCgi6Xz
+BKiSFVFsMkQGC2A7wnBmRsg=
+=Kf6q
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/heroes3/files/digest-heroes3-1.3.1a-r1 b/games-strategy/heroes3/files/digest-heroes3-1.3.1a-r1
index a34593c46c90..0066c2ec3e8b 100644
--- a/games-strategy/heroes3/files/digest-heroes3-1.3.1a-r1
+++ b/games-strategy/heroes3/files/digest-heroes3-1.3.1a-r1
@@ -1,2 +1,6 @@
 MD5 be8d44e9bc808019011161f7605c9ba1 heroes3-1.3.1a-cdrom-x86.run 3012188
+RMD160 dafa394c5f63bb3cac5bb65e244fdeaa626b6e70 heroes3-1.3.1a-cdrom-x86.run 3012188
+SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e heroes3-1.3.1a-cdrom-x86.run 3012188
 MD5 32b2749e8097df6cde0a529c99e4d620 heroes3-1.3.1a-ppc.run 2643068
+RMD160 741ba7c3a9005a38895dd84e02595be75678d7da heroes3-1.3.1a-ppc.run 2643068
+SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137 heroes3-1.3.1a-ppc.run 2643068
diff --git a/games-strategy/heroes3/files/digest-heroes3-1.3.1a-r2 b/games-strategy/heroes3/files/digest-heroes3-1.3.1a-r2
new file mode 100644
index 000000000000..0066c2ec3e8b
--- /dev/null
+++ b/games-strategy/heroes3/files/digest-heroes3-1.3.1a-r2
@@ -0,0 +1,6 @@
+MD5 be8d44e9bc808019011161f7605c9ba1 heroes3-1.3.1a-cdrom-x86.run 3012188
+RMD160 dafa394c5f63bb3cac5bb65e244fdeaa626b6e70 heroes3-1.3.1a-cdrom-x86.run 3012188
+SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e heroes3-1.3.1a-cdrom-x86.run 3012188
+MD5 32b2749e8097df6cde0a529c99e4d620 heroes3-1.3.1a-ppc.run 2643068
+RMD160 741ba7c3a9005a38895dd84e02595be75678d7da heroes3-1.3.1a-ppc.run 2643068
+SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137 heroes3-1.3.1a-ppc.run 2643068
diff --git a/games-strategy/heroes3/files/heroes3-wrapper.sh b/games-strategy/heroes3/files/heroes3-wrapper.sh
new file mode 100644
index 000000000000..3847c539ed76
--- /dev/null
+++ b/games-strategy/heroes3/files/heroes3-wrapper.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+DIR="${HOME}/.loki/heroes3"
+
+if [ ! -d "${DIR}" ]; then
+    echo "* Creating '${DIR}'"
+    mkdir -p ${DIR}
+fi
+
+# fixes bug #93604
+cd ${DIR}
+
+exec GAMES_PREFIX_OPT/heroes3/heroes3 ${@}
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
new file mode 100644
index 000000000000..47d93574de2e
--- /dev/null
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/10/05 22:59:08 wolf31o2 Exp $ 
+
+# 	[x] Base Install Required (+4 MB) 
+#	[x] Scenarios (+7 MB)
+#	[x] Sounds and Graphics (+118 MB)
+#	[x] Music (+65 MB)
+#	[x] Videos (+147 MB)
+#	--------------------
+#	Total 341 MB
+
+LANGS="de es pl"
+LANGPACKPREFIX="${PN}-lang"
+LANGPACKBASE="http://babelize.org/download/"
+LANGPACKPATHPREFIX="${LANGPACKBASE}/${LANGPACKPREFIX}"
+LANGPACKVERSION=1.0.4
+
+inherit eutils games
+
+DESCRIPTION="Heroes of Might and Magic III : The Restoration of Erathia - turn-based 2-D medieval combat"
+HOMEPAGE="http://www.lokigames.com/products/heroes3/"
+
+# Since I do not have a PPC machine to test with, I will leave the PPC stuff in
+# here so someone else can stabilize loki_setupdb and loki_patch for PPC and
+# then KEYWORD this appropriately.
+SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
+	ppc? ( mirror://lokigames/${PN}/${P}-ppc.run )"
+# This is commented because the server is unreachable.
+#	linguas_es? ( ${LANGPACKPATHPREFIX}-es.tar.gz )
+#	linguas_de? ( ${LANGPACKPATHPREFIX}-de.tar.gz )
+#	linguas_pl? ( ${LANGPACKPATHPREFIX}-pl.tar.gz )"
+
+#		${LANGPACKBASE}/${PN}-localize-${LANGPACKVERSION}.run
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+IUSE="nocd maps music sounds videos"
+#linguas_en linguas_es linguas_pl linguas_de"
+KEYWORDS="~ppc ~x86"
+RESTRICT="strip"
+
+DEPEND="virtual/libc
+	dev-util/xdelta
+	games-util/loki_patch"
+RDEPEND="!ppc? ( sys-libs/lib-compat-loki )"
+
+S=${WORKDIR}
+
+GAMES_CHECK_LICENSE="yes"
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	games_pkg_setup
+#	strip-linguas en ${LANGS}
+
+	use nocd && fullinstall=1
+	use sounds && use videos && use maps && fullinstall=1
+
+	[ ${fullinstall} -eq 1 ] \
+		&& ewarn "The full installation takes about 341 MB of space!"
+
+#	if [ -n "${fullinstall}" ]
+#	then
+#		langcount=0
+#		for i in ${LINGUAS}
+#		do
+#			i="${i/_/-}"
+#			if [ ${i} != "en" ]
+#			then
+#				let $((++langcount))
+#				if [ $langcount = 2 ]
+#				then
+#					eerror "Heroes3 only supports one localization at once!"
+#					die "Localization is only supported when Heroes3 is in a single language!"
+#				fi
+#			fi
+#		done
+#	else
+#		for i in ${LINGUAS}
+#		do
+#			i="${i/_/-}"
+#			if [ ${i} != "en" ]
+#			then
+#				eerror "Full installation (nocd flag or data + video + maps flags) is needed for ${i} language!"
+#				die "Localization is only supported when Heroes3 is fully locally installed!"
+#			fi
+#		done
+#	fi
+	cdrom_get_cds hiscore.tar.gz
+}
+
+src_unpack() {
+	use x86 && unpack_makeself ${P}-cdrom-x86.run
+	use ppc && unpack_makeself ${P}-ppc.run
+
+#	for i in ${LINGUAS}
+#	do
+#		i="${i/_/-}"
+#		if [ ${i} != "en" ]
+#		then
+#			mkdir localize
+#			cd localize
+##			unpack_makeself ${PN}-localize-${LANGPACKVERSION}.run
+#			unpack ${LANGPACKPREFIX}-${i}.tar.gz
+#			break
+#		fi
+#	done
+}
+
+src_install() {
+	exeinto "${dir}"
+	insinto "${dir}"
+	einfo "Copying files... this may take a while..."
+	doexe ${CDROM_ROOT}/bin/x86/${PN}
+	doins ${CDROM_ROOT}/{Heroes_III_Tutorial.pdf,README,icon.{bmp,xpm}}
+
+	if use nocd
+	then
+		doins -r ${CDROM_ROOT}/{data,maps,mp3} || die "copying data"
+	else
+		if use maps
+		then
+			doins -r ${CDROM_ROOT}/maps
+		fi
+		if use music
+		then
+			doins -r ${CDROM_ROOT}/mp3
+		fi
+		if use sounds
+		then
+			insinto "${dir}"/data
+			doins ${CDROM_ROOT}/data/{*.lod,*.snd}
+		fi
+		if use videos
+		then
+			doins -r ${CDROM_ROOT}/data/video
+		fi
+	fi
+
+#	if [ -n "${fullinstall}" ]
+#	then
+#		for i in ${LINGUAS}
+#		do
+#			i="${i/_/-}"
+#			if [ ${i} != "en" ]
+#			then
+#				find "${S}/localize/${i}" -type f | while read xfile
+#				do
+#					local file=$(echo "${xfile}" | \
+#						sed "s#^${S}/localize/${i}/##;s#\.xdelta\$##")
+#					ebegin "Localizing ${file}"
+#					xdelta patch "${xfile}" "${Ddir}/${file}" "${Ddir}/${file}.xdp"
+#					local retval=$?
+#					if [ $retval = 0 ] ; then
+#						mv -f  "${Ddir}/${file}.xdp" "${Ddir}/${file}"
+#					else
+#						rm -f "${Ddir}/${file}.xdp"
+#					fi
+#					eend $retval "File $file could not be localized/patched! Original english version untouched..."
+#				done
+#				break
+#			fi
+#		done
+#	fi
+
+	tar zxf ${CDROM_ROOT}/hiscore.tar.gz -C "${Ddir}" || die "unpacking hiscore"
+
+	cd "${S}"
+	loki_patch --verify patch.dat
+	loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching"
+
+	# 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 (!)
+	# we run touch on ${D} so as to make sure portage doesnt do any such thing
+	find "${Ddir}" -exec touch '{}' \;
+
+	newicon ${CDROM_ROOT}/icon.xpm heroes3.xpm
+
+	prepgamesdirs
+	make_desktop_entry heroes3 "Heroes of Might and Magic III" "heroes3.xpm"
+
+	if ! use ppc
+	then
+		einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
+		dosym /lib/loki_ld-linux.so.2 ${dir}/ld-linux.so.2 || die "dosym"
+		dosym /usr/lib/loki_libc.so.6 ${dir}/libc.so.6 || die "dosym"
+		dosym /usr/lib/loki_libnss_files.so.2 ${dir}/libnss_files.so.2 \
+			|| die "dosym failed"
+	fi
+
+	einfo "Changing 'hiscore.dat' to be writeable for group 'games'."
+	fperms g+w "${dir}/data/hiscore.dat" || die "fperms failed"
+
+	# in order to play campaign games, put this wrapper in place.
+	# it changes CWD to a user-writeable directory before executing heroes3.
+	# (fixes bug #93604)
+	einfo "Preparing wrapper."
+	cp "${FILESDIR}"/heroes3-wrapper.sh "${T}"/heroes3 || \
+		die "copying wrapper failed"
+	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${T}"/heroes3 ||
+		die "sed failed"
+	dogamesbin "${T}"/heroes3 || die "doexe failed"
+
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "To play the game run:"
+	einfo " heroes3"
+}