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, 108 insertions, 14 deletions

diff --git a/games-strategy/coldwar-demo/ChangeLog b/games-strategy/coldwar-demo/ChangeLog
index cd066952dc06..e7996853dd43 100644
--- a/games-strategy/coldwar-demo/ChangeLog
+++ b/games-strategy/coldwar-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/coldwar-demo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/coldwar-demo/ChangeLog,v 1.8 2014/05/07 15:41:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/coldwar-demo/ChangeLog,v 1.9 2014/06/25 17:25:46 mgorny Exp $
+
+*coldwar-demo-1-r2 (25 Jun 2014)
+
+  25 Jun 2014; Michał Górny <mgorny@gentoo.org> +coldwar-demo-1-r2.ebuild:
+  Support multilib dependencies aside to emul-linux-x86.
 
   07 May 2014; Ulrich Müller <ulm@gentoo.org> coldwar-demo-1-r1.ebuild:
   Fix LICENSE, add mirror and bindist restrictions, bug 505752.
@@ -33,4 +38,3 @@
   +coldwar-demo-1.ebuild:
   Initial import. Ebuild by Paul Bredbury <brebs@sent.com> and modified by me.
   Closing bug #111884.
-
diff --git a/games-strategy/coldwar-demo/Manifest b/games-strategy/coldwar-demo/Manifest
index bf61217d48ad..ca192d258567 100644
--- a/games-strategy/coldwar-demo/Manifest
+++ b/games-strategy/coldwar-demo/Manifest
@@ -3,19 +3,25 @@ Hash: SHA256
 
 DIST coldwar-demo.run 354684447 SHA256 769ca25da2f095e85e594ee09343ea20bf353e75f3bce362b937c2fae04c52aa SHA512 12fb0b482d7914c0f04256e5daefd287f1b172106de756c486e92341beb1d85332ba29941be0ba9711dabd2f2e7332c05034103c5a2a979743901b4eeb13b4a3 WHIRLPOOL 7df09173069969d2e7f7b50896058ae1553ef58eaa528db83c294adfad41c2b27ba4c7d1ff335a3901c66f1ea4bbb70f126f4f0cbcc369dab656d4ad93eacc9b
 EBUILD coldwar-demo-1-r1.ebuild 1823 SHA256 a7027feb69190410236db443cb6bc82e1eba29753d25898267c2f89dae34dc61 SHA512 a94bb453dc2e42da85efb85c490f899ee60c0fa8a0e194a8d433792f0eb7078e31142523d676bcfff1aa5bcc7ba58a6e6eae3b21c7f7021e7add747ab23cb83f WHIRLPOOL 58784fc5db0a12bc76d7c2dd25227000cf6206ecdd4c4ba7dcac9d1ad682e2f7c93921f2c64b0755f03c63c8d14720c886a2f27c8b158d743f8ee84035a9d2e4
-MISC ChangeLog 1500 SHA256 cc4889beb5da845167b73a56b3dce94f839e8cb2be0983a5a68ef91dac862611 SHA512 b82748391f5d79c7b90d03861f5b38cc385036a3ff37b864cc547fa7717f3e1a421f3e0538d00823f809d841ab2b9b13ddcaf8db5e6cf1e1b9c6ace16c933b5c WHIRLPOOL 8874f1f5f5089f61827c4795677ed52eb2b73a777ac49357faafcf21d27a924f362501673333b2f74dcb43776a5d2576147fa53b42afad8533a665486218afff
+EBUILD coldwar-demo-1-r2.ebuild 2040 SHA256 c51431863ffa9f31bd35b47d003bbc6f84d2846c8d5c3584a82f516ce875315d SHA512 9340e73252202ecf4deee8699a7d58ba52e441068ae528d54fe271ea90d42309bdef2dfac5ba2da45148f799d6e5333f33322653e6822c4276ca28ede7952c8a WHIRLPOOL ba65223b7fdba7dd7d291ec1534de327a81d5974e5b525fcde54b78987b29e1a8a2acd8a852c02a410b59384664fbbbb3281c72d1dc4fcb7eac0f58e11504b09
+MISC ChangeLog 1671 SHA256 6f136a9c8cbb40366bd3eeaaeb71d760b973621a8c782186ea58450effd4b1b9 SHA512 5ac3aa0d2e181d630e0b87d118e3217cd19119c91897bfb002b514fc722d3fe48b816cfbc7b1d0d65742cf4c93821b32cf98c49b920cffd0c2e7197bceae2439 WHIRLPOOL bc0cf7a0277e3f6f590364b5a8aae7cb3e66041dae5e9b5a7b03d19928191bd925088dc4cf67b09b27d33f0681eb0affb842dc54f9de1a24fd0b6cac45ff08c6
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTalQbAAoJEJQzkH1pP7W4MEcMAJXgveUI14qKjtu3ZOEgfYnd
-WPmDya1tR5UoxxpIeb+dwcytCKRBK73TZKljYS4gfEQDTaiB5XcHE7Yn9ukhkqtL
-iwxlATlHVDf/jt34eD/5nriEbL44t19vpzoPFqFjF2dylgLhiAepizjFi6mtFSOb
-c9RPeH/vb5Ffxu7eL4RM6ZF3wP0mXBiKNZS8PBgVCcND+C3JDbAlj8EqVSt2Q209
-cWCg1km43ZN+1d6SSmDd8j2VFuNY8DbpbqZtYH/LWoAZ6C6lSY86el8fcbr6EliO
-M4GGJ/jnliZ/ypsma9XHNVkrR8up4HmDpuyuuldIA7O91ZzoKO+kaGSht50u2xrv
-+Mw/si3/Us1/jEjiynKVlEz4ss6CStlX0F8CVOgpEl1zBTPb6Ft8NIBgd4jOL7uK
-7rTfP29s+hVywrOEN1Z5SxSdpWIiwdblKICrKAow0UHba4IfIfFYButlkJnoVHaM
-uSPFKvkj4ZeHowx4cA9RJOBaS05dPLmfKua/rgsiTA==
-=aA/0
+iQJ8BAEBCABmBQJTqwYbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAlkQAKCnYLr0NfugfUap2w255zm5
+iEqGzou5i6AtfAdFKX/j799NjAZH3vpZK3kn6JRpZxvRpXYYaEHyZB1CigtyH+5c
+1+Glag+d7Wr9/zu36qtTYmxkfMkzVppP5aAixh/neMHHCr8DKiDGvVEIwSqdLbF0
+uigwkk6Vp79PMcKeRdviIBhY722Br2YYcrkfIzYr4pem59WjVqMqfhC5SDo2flxx
+d8qqir48pUFbWNKUEhpq1iUigvtMMHHXBSHnOV1U7yo//4TdYahFp8sMyTIgF8Qo
+O4kuH8BXgZJYa8l/ahy5WUpE4Y0mCivmFDFBkWa8X44uc2KKDb5G9CeLTQAuJgCV
+/wDMdfNJfJNwf71KfFvw/GEQ6hiNaGT6d461egfrHuOcSyhRBJxoAQe8pt0xC/1O
+2LXrgrY3vMR4m31sP1PUXeq3/lQISZcACHXiriBw3/Z+6M1evGILn4swWznxUYzF
+B7yEjVO4zxkh7+Z4vkPV7iCBIeUzjzrByf2UTJP/o2pXlkQHzmLv4oTNxBNRRHHj
+22SVzAgwJqq06fRbPSA/acYTuWG1kTVEpul32ujxIRtcSn/pfbbpnSDdyNkgbgu/
+2FZReSyEwXIShp4GY6FLKBDsjoOZBu1Yi91rQIpkNZrxuq5+r0999TM1vJ1m+fcT
+A3VH9edk9XQCf7KfOe1M
+=gvfD
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild b/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild
new file mode 100644
index 000000000000..f9f364e7adcc
--- /dev/null
+++ b/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild,v 1.1 2014/06/25 17:25:46 mgorny Exp $
+
+EAPI=5
+
+inherit eutils unpacker games
+
+MY_PN=${PN%-demo}
+
+DESCRIPTION="Third-person sneaker like Splinter Cell"
+HOMEPAGE="http://linuxgamepublishing.com/info.php?id=coldwar"
+SRC_URI="http://demofiles.linuxgamepublishing.com/coldwar/coldwar-demo.run"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror bindist strip"
+
+RDEPEND="
+	|| (
+		(
+			dev-libs/glib[abi_x86_32(-)]
+			media-libs/libogg[abi_x86_32(-)]
+			media-libs/libvorbis[abi_x86_32(-)]
+			media-libs/openal[abi_x86_32(-)]
+			media-libs/smpeg[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXext[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-soundlibs[-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			)
+		)
+	)"
+DEPEND=""
+
+S=${WORKDIR}
+dir=${GAMES_PREFIX_OPT}/${PN}
+
+QA_PREBUILT="${dir:1}/lib/*
+	${dir:1}/bin/meng"
+
+src_unpack() {
+	unpack_makeself
+	unpack ./data/data.tar.gz
+
+	mv bin/Linux/x86/${MY_PN}_demo .
+	mv bin/Linux/x86/bin/meng bin
+
+	rm -r bin/{Linux,*BSD} lgp_* setup.* data/data.tar.gz
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r *
+	rm "${D}/${dir}"/{${MY_PN}_demo,bin/{launcher,meng}}
+
+	exeinto "${dir}"
+	doexe ${MY_PN}_demo
+	exeinto "${dir}/bin"
+	doexe bin/{launcher,meng}
+
+	games_make_wrapper ${PN} ./${MY_PN}_demo "${dir}" "${dir}"
+	newicon icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Cold War (Demo)" ${PN}
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "The instruction manual is available as:"
+	elog "   http://demofiles.linuxgamepublishing.com/coldwar/manual.pdf"
+	echo
+	einfo "To play the game, run: ${PN}"
+}