Support multilib dependencies aside to emul-linux-x86.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 118 insertions, 13 deletions

diff --git a/games-strategy/savage-bin/ChangeLog b/games-strategy/savage-bin/ChangeLog
index c0969ca988cf..1dcb58e7f7ae 100644
--- a/games-strategy/savage-bin/ChangeLog
+++ b/games-strategy/savage-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/savage-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/ChangeLog,v 1.17 2014/04/26 09:48:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/ChangeLog,v 1.18 2014/06/25 17:10:07 mgorny Exp $
+
+*savage-bin-2.00e-r1 (25 Jun 2014)
+
+  25 Jun 2014; Michał Górny <mgorny@gentoo.org> +savage-bin-2.00e-r1.ebuild:
+  Support multilib dependencies aside to emul-linux-x86.
 
   26 Apr 2014; Ulrich Müller <ulm@gentoo.org> savage-bin-2.00e.ebuild:
   Fix LICENSE, add bindist restriction, bug 505778.
diff --git a/games-strategy/savage-bin/Manifest b/games-strategy/savage-bin/Manifest
index 02496d90171c..bbbb3b5f99e8 100644
--- a/games-strategy/savage-bin/Manifest
+++ b/games-strategy/savage-bin/Manifest
@@ -4,20 +4,26 @@ Hash: SHA256
 AUX savage 1060 SHA256 4c3972e4e9f74711ad90644066a663894012257291f462f4dfcd30ab50fd89e9 SHA512 14533a42647d9e5dc6bcec6da89e878004a1c8dec1615011a2cdba732fc9c5ade1ddf9c8d3fc976675b0d5040e87e6137347f704a94ee8db66dcc591572173a8 WHIRLPOOL 497251f5f712adff87526101102a2add3fc4109b8a9a1e497880a4a7d64dc2f2ca646823b91ca32910d8761d9da43e79be5b1fd3d166f9ee872a07f7f2b1a06a
 DIST SFE-Standalone.tar.gz 158803234 SHA256 a6b12837b6d0c643aaa1aa58dcb1b2711b17547e355ba187308472f6e1f52c13 SHA512 1d4811a2fcdb0488f95ec3b7df8d25952b506674aefbe77cf3e8ec87fde012ec69ae9c486d14a1b2f516620c680c33ed55d17cfc38ffdefd3aadf832dcb6c966 WHIRLPOOL a8db5826667a6d385534cd6fb4372a888c5c4abca8980ac5b8dd55a4c6ecbd7ec7aec95c4b3aeaf647b3f7515a5d3c9e930f76527516e58e5d26014cb2c4bde4
 DIST lin-client-auth-patch.zip 1114641 SHA256 f5e714b012270e75fa4e8a188e3b072741889590c8740a74748e0c19acbe42e2 SHA512 6c2766d21803329f3467180fa5d714b39569a885de807a644f0feb83c97b763c9f4591581d5358b96e6cc2eaf9802c2bf027557dd783c82845ded615a1ee557a WHIRLPOOL 9cbe29865e75a41adc6dcea26f6f1bd611ccab4bd4b89611a38ef8effa1dae5c3e2e017be088af9ad9cd076f05abeab7580f2f518a4c05f142045bb95f59d42c
+EBUILD savage-bin-2.00e-r1.ebuild 3121 SHA256 ef2044f63190807a7fca5f63ffd99bb17b264860cb8931f62b8f46bcb39e9711 SHA512 8a04fdd07255d7065609a5d2e8c80b44c13a7c1f0a8a86ccf3f24d2248ec3671c503b6d6cf031980a02bcf831e6a1c90f7706bc8ee0ef46421635a2b9196bce6 WHIRLPOOL d8859a644a9acca5e29a86550afc5e4fb10f184bf2bca3e21ff3a0b7a9e2f729b6bf2e7ca6086e1d7e95dcbbafbc78662f1b67d141953f4ffb7b7f4e4fb70434
 EBUILD savage-bin-2.00e.ebuild 2936 SHA256 ad019f15d5ced523d5af73a24d12223325b5c40d59621805266e919ebcb31751 SHA512 0545414a06f98a93c339342595be124d75b515590047e1614e1ab5b7e61e7da65a506996196c2611ff54c39cd2a469db96296029e33cdc7b5d8d49bc82beed7a WHIRLPOOL 456266e65d24d7b2e6d5bebed48b0afdd603cdf304f296fcf077cf2c550a3c9a2205846fb3371095575bc185991a721c965cf7126eb9bc7c7ba048f7c590c5bf
-MISC ChangeLog 2480 SHA256 a038a7271470dc2be55e36328c5597ec0c61adee3d7214fb55519b75d05063ab SHA512 a85dd01a93680bd0dd80853fcb3bd57ffcf687fbc76264ecce6f0db4438c41e2d454ed638b5bb38f22c708bc45fafa4e00ec3c4a4c8bda6fe941c022c76571e5 WHIRLPOOL ef4db2b1fee390f8f1d918e96cd9a582c7e1952822f0701f633120ec619e16c263ffba5a9ac14ed80c87819e25f8872e5f4e61ee9ad6a11b42038721fb5f2da1
+MISC ChangeLog 2656 SHA256 e2d1a0f5c2c1ff63a889a1274d3aad08743d215c45798c7cc68bba36cadc38a2 SHA512 d40d8fc23aa7d97bd573abf57cbddbd16bc3bfbf640aad58d818e165b96e5b3c2ef8382430c1a5b0c38abbd2170d2df1985fa7694bae780dffca98caa5792885 WHIRLPOOL 621c5edf033317d437c42a8f6bada359e4a420021884e8b852ba2917a6a38b356fcf91f19232c486b640a2ba198e239b11ba32ddd087c50b93ceb666d04b9a0a
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTW4D5AAoJEJQzkH1pP7W4iVsL/1WmP9cpp/Zx+ePx7KXK0VJm
-d1JKGsNN7ynEzKjJiBVF7w78GpWlSHdyADfLjXttQCi7lOTz+A4SlRdcIs/FAWYW
-zfn310AQdkzn1lgzcqZSTlcZa7Nhe7SlWJNOmla3CtfQO7iMNJWX2Ksm0n5PRtyg
-TMchKJ91ChzNwpqI0MxuduiaL8Wddq7C7E4X9lCoTq/rorVX7pn1YY7Hen3eJgNG
-5pvSXM04BTFgI7U9fmE2wuJV91JXgPDIkPb1nIPyvk065lINGy/tSb8aTe4CU2/L
-0XHsZGVAwBf8Dlnuft5vqT1BtzkBgPMo2QN711K4WmJuyCNipXOISbV1ekb5tny1
-Qa3VFyGWIQpAqtobgRCZJz8Zmk1DeddGU9n0/rAJmi6dwxddpP/riFT3VbUF32A5
-MtDkSR2mcE/9MDNeJNGGdAmpoUgabuEgLA+gIrlFaH3lc/Cdxru9lR3WlJ/880rl
-MwAPAy/npGWIV0xL3r09KP580JL8p1zwY7IGPPIpkA==
-=Knmu
+iQJ8BAEBCABmBQJTqwJwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9gAP/2V619SRMgEXN55t6i38DWRm
+ntFxC2QeAYhsDw7h90nVcuchDvwnhemjC3tQJTGYrPctb6lFcxC8g45IOQNuUjmO
+USNGWFTBJqckglk3UNLq2FyIvcK0uesD/9rIGE/39F4hCO8rOJRnfkNEyUdaVeQ/
+aiLC6xeDUBfQkcbRrgXxNnk9vL6D/4SyWtF/j2Y3Lyumjtbuvje2I8f13ONxrfL1
+Jj7rPtNpCVdaoqR3r0GoJ0WbrmrpSKg4hIZDY4uO6TMi6tUzAPrgZ04qNyrKss9I
+htjF2kf7yTWxo16iPhC6z0zDJt4MLfKWKbHGj3s3X+zBmSen+skCwdFsIBtaA+5+
+CPcJ6xRO2HHJpS0YTGvZEXGPKqZT/5KpzRkABkv6/4L2HGAv0iZ/JmSyqxlZK0fj
+4uVBJ28zLz1A/74oiOgnTZ+uY6dJ9D8yoSbh9xBSZzFvDzpEhcD1uzE7FawjIZbv
+HklPLyZqEn5MbQJH+wUFkH+aYdtf7tu2BGgwWcvIA8Cdldi6kxCKsbVRsLtoaf4D
+2X9w0Y0nEBYYdyyw3Pe2bBYBx2rEDOmaCsGUKRARfY5gQANg5q/M1XPTljDIr92A
+MZq7lHS8Tac0t4qQWWugUlindKJEpYu/Pz6Pa9KC18WpmvVah7Y80uDdsxvzATH7
+C+rpijovrY2Mkcvlsflg
+=PUUW
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/savage-bin/savage-bin-2.00e-r1.ebuild b/games-strategy/savage-bin/savage-bin-2.00e-r1.ebuild
new file mode 100644
index 000000000000..d5aa04fc00d5
--- /dev/null
+++ b/games-strategy/savage-bin/savage-bin-2.00e-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/savage-bin-2.00e-r1.ebuild,v 1.1 2014/06/25 17:10:07 mgorny Exp $
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Unique mix of strategy and FPS"
+HOMEPAGE="http://www.s2games.com/savage/
+	http://www.notforidiots.com/SFE/
+	http://www.newerth.com/"
+SRC_URI="http://www.newerth.com/?id=downloads&op=downloadFile&file=SFE-Standalone.tar.gz&mirrorid=1 -> SFE-Standalone.tar.gz
+	http://www.newerth.com/?id=downloads&op=downloadFile&file=SFE-Standalone.tar.gz&mirrorid=2 -> SFE-Standalone.tar.gz
+	http://www.newerth.com/?id=downloads&op=downloadFile&file=SFE-Standalone.tar.gz&mirrorid=3 -> SFE-Standalone.tar.gz
+	http://www.newerth.com/?id=downloads&op=downloadFile&file=lin-client-auth-patch.zip&mirrorid=1 -> lin-client-auth-patch.zip
+	http://www.newerth.com/?id=downloads&op=downloadFile&file=lin-client-auth-patch.zip&mirrorid=2 -> lin-client-auth-patch.zip
+	http://www.newerth.com/?id=downloads&op=downloadFile&file=lin-client-auth-patch.zip&mirrorid=3 -> lin-client-auth-patch.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror bindist strip"
+
+RDEPEND="
+	|| (
+		(
+			>=media-libs/freetype-2[abi_x86_32(-)]
+			media-libs/libsdl[abi_x86_32(-)]
+			virtual/jpeg:62[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+		)
+		amd64? (
+			(
+				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			)
+		)
+	)"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/savage
+
+QA_TEXTRELS="${dir:1}/libs/libfmod.so
+	${dir:1}/libs/libfmod-3.75.so
+	${dir:1}/game/game.so"
+QA_EXECSTACK="${dir:1}/libs/libfmod.so
+	${dir:1}/libs/libfmod-3.75.so"
+
+src_prepare() {
+	cp -f lin-client-auth-patch/silverback.bin .
+	cp -f lin-client-auth-patch/game/game.so game/.
+	cp -f lin-client-auth-patch/libs/libpng12.so.0 libs/.
+	rm -rf lin-client-auth-patch/
+	rm -f graveyard/game.dll *.sh
+	sed -e "s:%GAMES_PREFIX_OPT%:${GAMES_PREFIX_OPT}:" \
+		-e 's/^exec /__GL_ExtensionStringVersion=17700 exec /' \
+		"${FILESDIR}"/savage > "${T}"/savage || die
+	# Here, we default to the best resolution
+	sed -i \
+		-e 's/setsave vid_mode -1/setsave vid_mode 1/' \
+		game/settings/default.cfg || die
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r *
+	fperms g+x "${dir}"/silverback.bin
+	dosym /dev/null "${dir}"/scripts.log
+
+	dogamesbin "${T}"/savage
+	make_desktop_entry savage "Savage: The Battle For Newerth"
+
+	games_make_wrapper savage-graveyard "./silverback.bin set mod graveyard" \
+		"${dir}" "${dir}"/libs
+	sed -i \
+		-e 's/^exec /__GL_ExtensionStringVersion=17700 exec /' \
+		"${D}/${GAMES_BINDIR}/savage-graveyard" || die
+	make_desktop_entry savage-graveyard "Savage: Graveyard"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "In order to play \"Savage: The Battle For Newerth\", use:"
+	elog "savage"
+	elog "In order to start Editor, use:"
+	elog "savage-graveyard"
+}