Support multilib packages in dependencies. Update/fix dependencies.

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

3 files changed, 144 insertions, 3 deletions

diff --git a/games-action/descent3/ChangeLog b/games-action/descent3/ChangeLog
index 5ee2c5611a32..cd343bdcae35 100644
--- a/games-action/descent3/ChangeLog
+++ b/games-action/descent3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/descent3
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/ChangeLog,v 1.31 2013/08/14 11:27:41 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/ChangeLog,v 1.32 2014/06/27 11:29:22 mgorny Exp $
+
+*descent3-1.4.0b-r2 (27 Jun 2014)
+
+  27 Jun 2014; Michał Górny <mgorny@gentoo.org> +descent3-1.4.0b-r2.ebuild:
+  Support multilib packages in dependencies. Update/fix dependencies.
 
   14 Aug 2013; Patrick Lauer <patrick@gentoo.org> descent3-1.4.0b-r1.ebuild:
   Whitespace / syntax fix
diff --git a/games-action/descent3/Manifest b/games-action/descent3/Manifest
index 6f024618be2e..f0e29104905a 100644
--- a/games-action/descent3/Manifest
+++ b/games-action/descent3/Manifest
@@ -1,5 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST descent3-1.4.0a-x86.run 2736956 SHA256 fe894b1cbcb16ec813c368f16549c38a3cd65514494f0be0b3095e936c9f67fe
 DIST descent3-1.4.0b-x86.run 4504631 SHA256 4c56ab91c332b0ccdc052fa3dd1c3a72cda204724bc98429cda22379269720e1
 EBUILD descent3-1.4.0b-r1.ebuild 3117 SHA256 7abb6f87aec3112eb97d9259448869980afb834e3f2072894a9f861f53918a53 SHA512 3a9328ef8915a2969360d75789f548a6b0f59aec85d6abe0b88bfdf3a51b3ca142feb4a278166f865e4081d96de06aa5615bd82b57bd51b92df4198dc76fcd1a WHIRLPOOL b1f851b0949c556660eccdc526d36cd1ee0a7f6e2d6606ac0ce53004ea97e255dfbf257d5b07ee8ab867171860abc062fd10230228a23be5c0b9a8720e1764df
-MISC ChangeLog 4174 SHA256 d4880e51a3712ab3fa3d702ebed385d01ae409ed6a6cb3f420e61a96112aae44 SHA512 ac71ee16cb16e9dcc554cee196aa2866b360b24e8606bcd453638ae2583c0404647fa7d51eb82414ac1ce461e333e9690c4e43b65885520dfc6b80c2ced94f9a WHIRLPOOL d6cf6d681c73c614ad1ee648bf610a6ca5e0a395ebca704f29d64376b46db778f8f916ac41c1370b5bc7c5c843b88121d0be1c56a6a3092b1b978d7b1ceae70d
+EBUILD descent3-1.4.0b-r2.ebuild 3054 SHA256 57dafb6a658c13c9391d70d228df1146bd9f7a95dd55dedd82cec46f38186609 SHA512 55e544a7fd2a8bf61d5a077d48873a885b73a0107bc62814d9fb9834669e00365f205e8932f349349115e6d1f38b04cc2ece75f45540927f199b3c8d9e6d5d10 WHIRLPOOL b0acf42bf009d6d830e62c4eaca47007c691e9e505ce434811a8328ec617be994a1b4264272ab57910109f17cba4d4e7d42cb89dc54043d47af6be5584c88bd5
+MISC ChangeLog 4357 SHA256 a28c011a1e1b781e1cb3bc80e7b7d82865be22a29b609bf403abf27f511fbb50 SHA512 bae1c7d49bb500e466f8d900b5bd512046a3d02676f593100fca7ff46238ad0e87b8f37435ff2514fa9a9ecc4ffe4256b58bba23eb951bac3667426312d927df WHIRLPOOL f633e80cfc0fc52426efece930b0607041b54ef20430a2eabdeec6b585cea2b6a3dc638dc9ae6ab81d188822d0438aa37a4da990cf5187a766e2b60a87f2d091
 MISC metadata.xml 534 SHA256 9c50aeee71c2327cb1fe1939b5e1e9c83c1bfeac9449985826cba1d648fe5905 SHA512 e498bd6210828362739b15ed15268fbb3c8158c83f4ebccca6ab441bb8357e8128e5ead6b07fbd47851ef443292504743f99d1c6a449085b14a5e46d3d18a6e3 WHIRLPOOL 8094e2e33f4435a48a43baebbcd729c24e1b62059302dd587be6e711e8caf14c0e8977878a5427f1b0c16023dce974b030647fd0ff52cd9f559a856cf1158688
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJTrVWTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOEssP/RTah8DGDFV56IFJlYw8vgxI
+/tF58PdZ6oWQenLeDDfVGHD/PCIYtrCsMb36ZfnG+SshAIAXKzLHvYhi6cwKOF5C
+XyXEGWW/qw7m+WW0OljAvWouvId4FkGjRAlF9m4Rjd6S2VYJBkGq8KviIJ886vbT
++Un9HRN9ESQGEKBV9oxVK3T2U/uMX/pGoptjqLYVhy+bWx/hByhe4tQygx3cA2N0
+GqSQxbE/JBCddXfvaBtqf3sZR2a/BlBPTYxYBFQESzy4100J9IMjingGC+RBJs6B
+iLJzH4bE6EDviRouNzIiCdsQDn87L2uqVPaeNH/58pLMd6dG8HayLTbhn82Q2Mdh
+9+lnZGBOyoMe2dbsrJSlmBCpAMZwMFPi9Y84z2IY2SRIwYIhg7/YkpB6MXDU6wrT
+Hy4P6mMS/5tBMG/NuYwGo5Hwb/SLi5KbNnVwnqvmbdyIZ6Mm/gCVUiycoiLXMPe+
+G6jk77elJHmpp37dZqxNVqXBBilTlfMHokMqNn0kA7YNUoLhmSmb09kKhy7GdArD
+oP5beKp2+wXMXvSPndQ7hBwc406pddf7+NzVqncLwqJiAz9lTFMBQnwondiZxREU
+mVlj/s00nvq96mBMeUk95eiPyoHaqFysG433sfhsVcIlAVhZ66PLiRIe9u190DuR
+Y5cXnadotwtizwcUlTQO
+=W5Zi
+-----END PGP SIGNATURE-----
diff --git a/games-action/descent3/descent3-1.4.0b-r2.ebuild b/games-action/descent3/descent3-1.4.0b-r2.ebuild
new file mode 100644
index 000000000000..0c5600117264
--- /dev/null
+++ b/games-action/descent3/descent3-1.4.0b-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/descent3-1.4.0b-r2.ebuild,v 1.1 2014/06/27 11:29:22 mgorny Exp $
+
+EAPI=5
+
+inherit eutils unpacker cdrom multilib games
+
+IUSE="nocd videos"
+DESCRIPTION="Descent 3 - 3-Dimensional indoor/outdoor spaceship combat"
+HOMEPAGE="http://www.lokigames.com/products/descent3/"
+SRC_URI="mirror://lokigames/${PN}/${PN}-1.4.0a-x86.run
+	mirror://lokigames/${PN}/${P}-x86.run"
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+DEPEND=""
+RDEPEND="sys-libs/glibc
+	|| (
+		(
+			media-libs/libsdl[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-opengl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)"
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	games_pkg_setup
+	if use videos ; then
+		ewarn "The installed game takes about 1.2GB of space!"
+	elif use nocd ; then
+		ewarn "The installed game takes about 510MB of space!"
+	else
+		ewarn "The installed game takes about 220MB of space!"
+	fi
+}
+
+src_unpack() {
+	if use videos ; then
+		cdrom_get_cds missions/d3.mn3 movies/level1.mve
+	else
+		cdrom_get_cds missions/d3.mn3
+	fi
+	mkdir -p "${S}"/{a,b} || die
+	cd "${S}"/a || die
+	unpack_makeself ${PN}-1.4.0a-x86.run
+	cd "${S}"/b || die
+	unpack_makeself ${P}-x86.run
+}
+
+src_install() {
+	einfo "Copying files... this may take a while..."
+	exeinto "${dir}"
+	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/{${PN},nettest}
+	insinto "${dir}"
+	doins ${CDROM_ROOT}/{FAQ.txt,README{,.mercenary},d3.hog,icon.{bmp,xpm}}
+
+	cd "${Ddir}" || die
+	# TODO: move this to src_unpack where it belongs
+	tar xzf ${CDROM_ROOT}/data.tar.gz || die "uncompressing data"
+	tar xzf ${CDROM_ROOT}/shared.tar.gz || die "uncompressing shared"
+
+	if use nocd; then
+		doins -r ${CDROM_ROOT}/missions
+	fi
+
+	if use videos ; then
+		cdrom_load_next_cd
+		doins -r ${CDROM_ROOT}/movies
+	fi
+
+	cd "${S}"/a || die
+	bin/Linux/x86/loki_patch --verify patch.dat || die
+	bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching a"
+	cd "${S}"/b || die
+	bin/Linux/x86/loki_patch --verify patch.dat || die
+	bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching b"
+
+	# 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 '{}' +
+
+	games_make_wrapper descent3 ./descent3.dynamic "${dir}" "${dir}"
+	newicon ${CDROM_ROOT}/icon.xpm ${PN}.xpm
+
+	# Fix for 2.6 kernel crash
+	cd "${Ddir}" || die
+	ln -sf ppics.hog PPics.Hog
+
+	prepgamesdirs
+	make_desktop_entry ${PN} "Descent 3" ${PN}
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "To play the game run:"
+	elog " descent3"
+	echo
+}