Support multilib packages in dependencies. Remove unnecessary dependencies.

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

3 files changed, 34 insertions, 26 deletions

diff --git a/games-action/descent3-demo/ChangeLog b/games-action/descent3-demo/ChangeLog
index bb7a9db112c3..9355a411c546 100644
--- a/games-action/descent3-demo/ChangeLog
+++ b/games-action/descent3-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/descent3-demo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3-demo/ChangeLog,v 1.12 2014/04/15 11:41:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent3-demo/ChangeLog,v 1.13 2014/06/27 11:11:36 mgorny Exp $
+
+  27 Jun 2014; Michał Górny <mgorny@gentoo.org> descent3-demo-1.4.0a.ebuild:
+  Support multilib packages in dependencies. Remove unnecessary dependencies.
 
   15 Apr 2014; Ulrich Müller <ulm@gentoo.org> descent3-demo-1.4.0a.ebuild:
   Fix LICENSE, add mirror and bindist restrictions, bug 506810.
@@ -50,4 +53,3 @@
   +descent3-demo-1.4.0a.ebuild:
   Initial import. Ebuild by Paul Bredbury <brebs@sent.com>. Closing bug
   #120371.
-
diff --git a/games-action/descent3-demo/Manifest b/games-action/descent3-demo/Manifest
index 356178846421..9380a052ea0b 100644
--- a/games-action/descent3-demo/Manifest
+++ b/games-action/descent3-demo/Manifest
@@ -2,20 +2,25 @@
 Hash: SHA256
 
 DIST descent3-demo.run 45118289 SHA256 9304dff200a062bb5bd1fa69517b5cc6c19db0a63c06b2084f05c98c9eca786c SHA512 8f5e790257d0477e4238aae8fb5b4b1f21e23f188775cb53a5197baf0c174017d821e3a8dd696f9c0fd27838e08cff4bde0d6f5a9dca87a7e8af29cdc627d29c WHIRLPOOL 42d4aabadf185fe88e9e2dff91595a8895a2f51e212e7efbdcaccb9b55d380c10a3fbb0e4c5c2814d3017e0d90ba46c70a2d770bc7a8cbe25b6fc210a0a4204c
-EBUILD descent3-demo-1.4.0a.ebuild 1669 SHA256 cbba84cef118bebae8b66a9b2860f38be12c26710b0576a97d703119a0379e3c SHA512 4d975a8ef96bbe76ad2ec92e689fef41fb5903600d7017100db21db0aafb003a1addcdc28dad7de87f8975ce0c8bc5a97d4fff3ff4054cc270c071b4e1dc5f7b WHIRLPOOL 7f3dbfe06dfc966611f2624fc682fd6c6552a28d499bd74c97dd1fbbf89954cf6c34fb8766db5f43072b1e144d011c42175d1d075ab326ea50a932ec4b9aa1f3
-MISC ChangeLog 1955 SHA256 ba7f521a63e7b2b59c5eae0a7981a6377ef85edacef681b11d271dbab0d7e8ea SHA512 0ee5908f0cda112453e95b52d4c3eeafeeb6eee3c96e8caa7fcba24a6a3694cc7b32768e2aeaa009a95bebce93bcc6d2beb352427c60ab04f7ba073b8ccb30bd WHIRLPOOL e8f050d3e644c628c1cd66337631544859b8cfea256a8071fb245578dc4b741bb909e7f8d55f2d8a79b732ef98732b92babeff543da9cafc69a502a614412399
+EBUILD descent3-demo-1.4.0a.ebuild 1696 SHA256 26d461ff79d064b8f9c50d9ce67244886d1b8a32e32eb6107dbe7dd486d03d67 SHA512 4e5497e392af4de4db2f459e45a07f097eb36487e4a58d98677e8610bdda9d3038ac9793a5e6dee381e133261c0769fdda5af60b84f4d91afc308fe2f3a07994 WHIRLPOOL 57a1daaad0ad3e839a59776719e04dcb8cc06d43f1663fc831258539027c7abb79e631596f4897154517b68907438811ea5c4d9a93c88971ab7032dd55c03d35
+MISC ChangeLog 2115 SHA256 e3eddb86da7b684369d85bde7138210b6b7fa77124af2fc6066c6853e0985c8a SHA512 fee0590848d03c92273981761e0b370b984224adac7faf8e4a4ef6ba34a4040104d5885ee4fe78eab7e1d8fd637ed219e0dde48977d48f1c4341ff8c37cfa208 WHIRLPOOL bae6ca4df2a8fca38c257a3b338bf6119a7707d4db2661f5b00ad77e937b3b353913d705dd0cd77cb28307b636a4a15a663d81d27607d4c9f9ef76583a892d5a
 MISC metadata.xml 583 SHA256 2d4fac1d2aeab3be603ad1457564a2c33176dfa0907147c010054a6658134bdd SHA512 87cefed6be7a1bee7ba598436eb6cb0b359ed5a68d44e9ef1a528847c46488e8a3c82cf64f930988ef7e5e6ffb1d2d1b92f54994115821fc0bbc45e605c13c9e WHIRLPOOL 0e0ffb36ab6db06e60cbfd6c01770e40d55769e9ee2c456fa8bf526a4cb48e3271b9f7c773c5f314fcccdbbf5656588b07ef9b16d216864d98b3f5363ebc03f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTTRsCAAoJEJQzkH1pP7W4boIL/1IKXoGJtAXzUpYwQXXx61Kf
-yulTwKVlz054MbPIXINbocQWPLxDRiGbckf2TIhygp2hYE65OfgKhrq+BdN6Li6i
-tNOIE8kM0v5zFyGV5nqbiqA6eYDu9HEvFno/LT1I7QK18LgFEEWiJYVK7s3FGu99
-h+0BR8NG41Pb+TP6izSPgzKzBWXmuhmGnqf/plEBo4FG6tZIiG2QC0J9/3tWCKH4
-B7dVpGbjH3Z5tWoVkNTRC64bZlJ7NGOTAsvL13s8FdhLOZhVeBw8kJsIFRAjheyi
-pCqbYld3Ns8882mwmL2URK0dh7YXE5JjQWzU6XQIXJaYIpRsHvO7vNSdJF/gQrTT
-taE5+zhQ7tMq6hrxL2tjXqJTGJVBBQ3jVTSbcdMSqdK/Z/LBYMg8G9bDCd/P9N1b
-z6vVDR2JUE55PfivmKaKp/Qnwc+Wqw6I9/2NRNUdzrT0vKli3jduopzynrbYhtgK
-EvL1qWDNZd4UPWrfZySmFcL57aCgc6CVmbJCH0B78g==
-=zn5l
+iQJ8BAEBCABmBQJTrVFpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOeicP/Az9TIjHaSUu0OBwnSZLmCse
+9nFf34EAvgiMg631fCQQaWh1a3O2LmXiriMeQHJ+hjd6o4Im3hyen05cSotk6oNn
+FZFob/x3ECvmhHNRhYjFIai4AFBfKa+EuxNJEodl7XqRyjDNoMToNae77eG9A7ci
+14OFgz6Lz7VBax5UxUos13YgjcMcAt9Lguv7d3FVmSwcr0+S1z2jIUCO2JY/ynFL
+bZlNpgT9kb0VXQnraQ2XnWCRdn7XrlkJVjgtIszyFslXX9hcakY5LvnB8VMExvZI
+a1JI6/upnDWSJJ0VAbY/B/BiI2BHcODSEVh7WUm8sPjjk4C6fw6jtV/z7gZuY94o
+3JLSse5DWloNSh4ZzyHS/0FhKJheiowStX27TiE/JOmnXTYvl4SNq12ysGT0JXTF
+6Z+XtP6COc+sn3tfQwrzkYz5oSF6Rd9Hn5IpAsYliC14aLDavCQv8gIOPgmiJQbz
+i4Fr6TZgw0xrZ0R82XPypNWgAaO7l1OLesBFG6rFp66bsHReCPxHi3Z8H17WgLcS
+Cd0j9C91tCdK4Gkv14JRdZ9Gz3JArzG3o6XKCkYqnNY1QaBVfb2zbX+k+sLyZu0C
+2HmhPpNGvRpkuHs8mLm4U3jcmfzERzVYUwdKV+wAtk0n5AyrrwJ3ZpxIIw1/BXrD
+Be7sdbp4BKWheAu+d6Bx
+=GyMU
 -----END PGP SIGNATURE-----
diff --git a/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild b/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
index d323aaf98772..c03efdb8ce56 100644
--- a/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
+++ b/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild,v 1.13 2014/04/15 11:41:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild,v 1.14 2014/06/27 11:11:36 mgorny Exp $
 
 EAPI=4
 
@@ -18,16 +18,17 @@ RESTRICT="mirror bindist strip"
 
 DEPEND="games-util/loki_patch"
 RDEPEND="sys-libs/glibc
-	virtual/opengl
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXext
-		=media-libs/libsdl-1.2* )
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-sdl
-		>=sys-libs/lib-compat-loki-0.2 )"
+	|| (
+		(
+			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)"
 
 dir="${GAMES_PREFIX_OPT}/${PN}"
 QA_PREBUILT="${dir:1}/descent3_demo.x86