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

diff --git a/games-strategy/gorky17-demo/ChangeLog b/games-strategy/gorky17-demo/ChangeLog
index 1d1c79cccd27..d56058ac37ea 100644
--- a/games-strategy/gorky17-demo/ChangeLog
+++ b/games-strategy/gorky17-demo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/gorky17-demo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/gorky17-demo/ChangeLog,v 1.8 2014/05/06 16:03:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/gorky17-demo/ChangeLog,v 1.9 2014/06/25 17:18:13 mgorny Exp $
+
+*gorky17-demo-1.0.1.0.1-r1 (25 Jun 2014)
+
+  25 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +gorky17-demo-1.0.1.0.1-r1.ebuild:
+  Support multilib dependencies aside to emul-linux-x86.
 
   06 May 2014; Ulrich Müller <ulm@gentoo.org> gorky17-demo-1.0.1.0.1.ebuild:
   Fix LICENSE, add mirror and bindist restrictions, bug 505766.
@@ -38,4 +44,3 @@
   +gorky17-demo-1.0.0.ebuild:
   Initial import. Ebuild by Paul Bredbury <brebs@sent.com> and modified by me.
   Closing bug #135958.
-
diff --git a/games-strategy/gorky17-demo/Manifest b/games-strategy/gorky17-demo/Manifest
index 38055e6e887c..4ddefda07456 100644
--- a/games-strategy/gorky17-demo/Manifest
+++ b/games-strategy/gorky17-demo/Manifest
@@ -3,20 +3,26 @@ Hash: SHA256
 
 DIST gorky17-demo-1.0-1.0.1-x86.run 955547 SHA256 557bd97400101da9b557a5bfc5e6b9d352a9f10f79c927f31d74581ba7acc16b SHA512 ffd054aa1b169de5cca3c85d58ce2cba127f0caca533f8d4f0046ce63e5505a0ea25c3bbea9a2dde863a8fecefb7f8d322968f90ab3f688dee70a2f0d44826ba WHIRLPOOL c133f6175cfaf5e71c183687fa78b49ab7df1816f6ec9ee8696f9be0c7d5ea2b4e0d39decbb7561db9a7e5ceacb78958e11072fbc5812f7c6627b58dde03cf4a
 DIST gorky17_demo.run 158781516 SHA256 35cf62e06747bfe3445c1d3a61ad1644922528c264ff2ec7b5b510f9bc9dd51a SHA512 7e7bf2a6a9f815381381ef5c50135232db7c6ec734300b807794107ab1b902d659f55569ea03c7d68c3e6dbf98e366de8bca4fd13dac3c688ba48d2f244e9f00 WHIRLPOOL 5e4188d85efb60f3abaa56941a1005c14de26ba4a458cfb2dd3753cde825a1f3945351a06c82b934b4f1c94c9dacf1e2d9b00d17852eb1e140166131dab66192
+EBUILD gorky17-demo-1.0.1.0.1-r1.ebuild 2187 SHA256 3ad0f793ab43ed3a64fc27ecf6c96b5e13c959194de7680ef9a20de513fa2b7d SHA512 be72bd3dc9b7ca5b33809b19fb331ebdee230bc64b512a66a5997c05eac6804d745672204c8a90df4936fbbfb31967b9810ee84c2addb0988a98e1a35438025c WHIRLPOOL f07af2acdaea19b6dc3497fa397d71a50e500abef1d945a9d8a28b510a7ac9114903caa81130bf1197d4782dde90ba5091f0998268fbcbc04eea32e8496a63b7
 EBUILD gorky17-demo-1.0.1.0.1.ebuild 2013 SHA256 7bfa0a2d24495ad67802797157363fb2a302f63a9d551326957e84e9ee8c4798 SHA512 6f8da51099ae1015127cc74db64127e63a65a3770055acd44cffa3450b5b0241af07443e619f8b686cf885dff537b2fc6e449aea535f41f96d8f9024ee2f2061 WHIRLPOOL 745a3ace7ffbbf81c666bba98c2255dddc6a95f0763f85b046dd36b46f5b2ae090771862e65aa902abfe975993206f3c830a7c34d8e464d198847e8b306549ac
-MISC ChangeLog 1539 SHA256 c2d890812ff666a7c586e0622494cdc39d823da08d3d5838191fa357f0af4c2a SHA512 3bffed255bdb0dad667ac2e5c89163117ecf1f39fdca07ebc674645f70283865f5c2d800e6560e06626aa3e61ae7e97ea5210cd6b74c28ca7747d90e36babaa9 WHIRLPOOL ae5028cea3f86cba35406f3118331ccfa6c80d2ff28dca4f8dc29bba137bda72a760da1804972e979810899c8cf95fbfc7658ed836791f612e74c161189f24ef
+MISC ChangeLog 1728 SHA256 332427fad8a9f1c98fd7d57e741a296e135f82c422727edf1dd7eff268155e5e SHA512 789060bd816523d881257b6cfad782daac64ab7df8b3cda297c3fb39afa9e41cbadfc3f2ed4917f5c4850d0ca333ffef20aefbf600fb0b11fa2ff64d4dfe48cc WHIRLPOOL 97d9144a0c7eb0b5f69427acbcce01a005cb9c57e6f8f696f0e87bb20bd9bc5d415cebcbfeb40aa2dad885914f72fd617fb1952d4a939af3ce7f92085237afd3
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTaQfzAAoJEJQzkH1pP7W4nksL/iqsBxc6vTwLDNJmfnpPD0Uj
-5mdw+RnOHE1UUUrMng6yCV0fNDbLUqZ0lMeHUa1Nb0OXyZ7Cbyj9ohkTsS5jSsdM
-mrxnkL8GPBmQns/C1ki2AP101j9NgglvRiieeKjXzSXvGHoMSzXtFCsci0hVD7XC
-KrNTEEcQ0/hWO2pDDZo8BMzJoXLVPSDnvmeiJ65NaXTdUFyqG+fOEog87DcbiDSk
-a/eJymTZwohw/M2+/u0dCygwmTgnQHIGljTPRAnOyN5Ps/xX1aGqGjfanR1xlKkv
-vxJYtO/5TTqF/RZsLUGgxelmjIDy4es+nVbLVj0NrOOn6OXKVFb8gkOdWSgkM3nY
-HNOmI1KhGaYv1eG271kxxKvEtG0sOPSChu8MV93YYsiv7TuEflpZ427NVoh/BIgC
-yKcXlDJwsN0Qn1zhPzE9Tk91gmTBg54FTchasKDmZKdLwxa2Pi1GKAbNSJaXxgWF
-nxOpjERwFlvPed3kz2s15y6qssRiwQRG02JawHCZyw==
-=i0oG
+iQJ8BAEBCABmBQJTqwRWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsGIP/0WB48EfK5Hh/WcPN0gYYGom
+ZU6bgiJNL5pZHfCfJBnQPwf/jOKHXU7pdSsLg53igVDyP+V0KnaU3fu9y0UOvzSD
+C0q6ePQmbA0DfrPsqOh6DQnIOmn+meW87iRnPzmv13hNHBKzFHTkev5GS2IAwA/x
+pRSLz3DdhNvVX2+8El1VudlInmyy/G6NSJjFFX0hnslwUhrzaxWCfld0C5Nhy6iI
+SMpvqN2MTBz2O7e7dWdbIDyWI37Y4GtrSdTlRx93iyScV6upjH+DXxxZA4ZY5zxz
+BdQdXVsawkUrPoidWcP7P+4W4wGtWoCsJ5Syrbp8+JR5ngFkb4rqzeqQThNAIPKw
+IuUKJESCFHMi5f56Bwu6axr7RRVBwciG21JN/QSsSXo5rncb7kdjYB1NGZngxko2
+fG2QkiRZExCBweGEXdbpF4w9oBL5kKGfJCZkWWVVyujPPxe1Wm58o2n1KGUh1hxS
+YH2KXll0YUeYvn3u10BG5f9gBgqIxWR5uiJJUyHtnzeIt5bBqnNiFvZQAjKigLOt
+uf6XMv6zVB6Y9g6QT7xPCW4ognniePRWZnWeRv5GZeNYtNaFSFkyJbR2uVAUKvGM
+2aFalvJBwUSindQsEr+xUAev355jFk/jYO8ZM1MKJX03nqq+toQPW65qARfoBQ5x
+pd0SDbBe3iPjCX02dyPT
+=8/Pf
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild b/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild
new file mode 100644
index 000000000000..f8cbdd720af3
--- /dev/null
+++ b/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild,v 1.1 2014/06/25 17:18:13 mgorny Exp $
+
+EAPI=5
+
+inherit eutils unpacker versionator games
+
+MY_PN="gorky17"
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="Horror conspiracy game mixing elements of strategy and role-playing"
+HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=gorky17"
+SRC_URI="http://demofiles.linuxgamepublishing.com/${MY_PN}/${MY_PN}_demo.run
+	http://updatefiles.linuxgamepublishing.com/gorky17-demo/${PN}-${MY_PV}-x86.run"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+RESTRICT="mirror bindist strip"
+
+RDEPEND="
+	|| (
+		(
+			media-libs/alsa-lib[abi_x86_32(-)]
+			media-libs/libsdl[abi_x86_32(-)]
+			sys-libs/zlib[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXau[abi_x86_32(-)]
+			x11-libs/libXdmcp[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+		)
+		amd64? (
+			(
+				app-emulation/emul-linux-x86-baselibs[-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(-)]
+			)
+		)
+	)"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+QA_EXECSTACK="${dir:1}/gorky17_demo ${dir:1}/gorky17_demo.dynamic"
+
+src_unpack() {
+	unpack_makeself ${MY_PN}_demo.run
+	unpack ./data/data.tar.gz
+
+	mkdir patch
+	cd patch
+	unpack_makeself ${PN}-${MY_PV}-x86.run
+	cd "${S}"
+
+	# Apply patch
+	mv bin/Linux/x86/* .
+	mv patch/*.sh .
+	./patch/bin/Linux/x86/loki_patch patch/patch.dat . \
+		|| die "loki_patch failed"
+
+	rm -r update.sh *patch.sh data lgp_* patch setup* bin
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r *
+	rm "${Ddir}"/${MY_PN}*
+
+	exeinto "${dir}"
+	doexe ${MY_PN}*
+
+	games_make_wrapper ${PN} ./${MY_PN}_demo "${dir}" "${dir}"
+	newicon icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Gorky 17 (Demo)" ${PN}
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	elog "The instruction manual is available as:"
+	elog "   http://demofiles.linuxgamepublishing.com/gorky17/manual.pdf"
+	echo
+}