fix deps, revert allegro unbundle to fix x86 build, stable for amd64, x86 wrt #480812

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 20 insertions, 17 deletions

diff --git a/games-action/beathazardultra/ChangeLog b/games-action/beathazardultra/ChangeLog
index 749fd59f242d..227dc7721250 100644
--- a/games-action/beathazardultra/ChangeLog
+++ b/games-action/beathazardultra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/beathazardultra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/ChangeLog,v 1.3 2013/05/09 14:11:01 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/ChangeLog,v 1.4 2013/08/18 00:48:51 hasufell Exp $
+
+  18 Aug 2013; Julian Ospald <hasufell@gentoo.org>
+  beathazardultra-20130308.ebuild:
+  fix deps, revert allegro unbundle to fix x86 build, stable for amd64, x86 wrt
+  #480812
 
   09 May 2013; Julian Ospald <hasufell@gentoo.org>
   beathazardultra-20130308.ebuild:
diff --git a/games-action/beathazardultra/Manifest b/games-action/beathazardultra/Manifest
index 33d27c201147..4b6cdfd6956a 100644
--- a/games-action/beathazardultra/Manifest
+++ b/games-action/beathazardultra/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST beathazard-installer_03-08-13 183569201 SHA256 ba5d67d820b3367b7080cd73f433d13964285904a55d5be6578bbe9966963faa SHA512 273f550034473d43ac4ceb41018b540f6518393606249de490642a4e6f0dfb5f0b860d3a633db0f90f3b9fce1dc156cf4bd80d383f7e6eae91a5e7bd9e9427d4 WHIRLPOOL 91032365fce84eff65361397935f9e36eae8740f5ae947c976e2e30e76396e55423d8d959ce4476688d8c77d92b57c951c581023e675b1c59f8c286172ff5ec3
-EBUILD beathazardultra-20130308.ebuild 1782 SHA256 9fd1a6249c85746790a2fc72f0ff12a77ee29e63dd70001b2caa98941aa50d16 SHA512 b2b5fdb67db5bac5bcf1c3878b619931156ae4105ee50f4dd1c2a871cc37582b6173aa42d457c4ba48406922b0ff161953d08a9649a6cdf847fcd449314e1500 WHIRLPOOL f31722e5c75707540ddda783637c61d65948c5d6b3cc62a109f27e0da299f0b9b4ef8ab7f208cfa6141c9ca1cf48fcf07eba1f8c1597dc7f79c3e5f1f514a5ec
-MISC ChangeLog 625 SHA256 c4eb726b33b98439a472b2bd9af9e7501c45db9475ae4b6c13a54120514db8ea SHA512 2e704932f4dc5e7af20375437a101f0b2dbdcaaa5d78453dc68ea032530182b3a355f603110012af10f31ba05ea0501273e2ebaa29b1f81e8a228ecca72e6704 WHIRLPOOL 76f40f3e2ead1597286656689aa2aa6a6ade40fce00ac77c09dc3decc60db412e69d4732c2b1d5f669288ddc851ef56bbb9471b3e547a43cac4dd960a6961f79
+EBUILD beathazardultra-20130308.ebuild 1716 SHA256 9e5a854d4e85c3cbbbd00ef15fd9e7ac57488330c0fc8727b12fb801aa9890ca SHA512 41b485546a76526eb856babbf5f98c20598af97013086c3f978525761878b599e03db24d54c53b7871ef3952934a52f17e65b35da92e72012c10328ff00a51b3 WHIRLPOOL e7bb03e2f4c0b5f98d89aaa9bac943ace7b344ee20ab4f858ad68c386b4f1350da10a3b1565244b0a74a4fb343d2ec7c0ec38a25be59a71883c7fe00b9f58c88
+MISC ChangeLog 802 SHA256 c99558810176dbde91692a6bc4c6ec547cc4dfd011c92bc033f47ac147ffafcf SHA512 fe168aac04a500a34423d02c8e56c96a609b85e2fd6b52fd1bd77c0df3a76d8a453c1996d747a185e7d33fe4bdc532f1d7daf1080887a8791ee6948c8ee4f802 WHIRLPOOL 12e49f9d3bb14d57cc0448278732ae26236f26c6a76e26e8cbca3f35bf6f3284df0afbf2cbf4569f78cc8a169aaed49a84c3ac3cdfad1013ab911c98b89ecdde
 MISC metadata.xml 356 SHA256 64e1a2dbbdf29651db71c06e99585f2a188a642746e0b57622314ca86372feec SHA512 fef3a361a1ab3245e5106d1a1e9a8b61bdd82f77c7d323da8b131b4f913b5ade34d7313777dbd5fa29a5ce3e19d78a6e162df8027458b360673220d9e6ae5d18 WHIRLPOOL 1d6eeb2f0724a3ab29dc80f695134419478fea192cf2aa94c704cff9bdd68a8d16f536458965444da099ad8cbf4c28964c5aa0e9af3a6080ede35311b1a8bdcb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRi655AAoJEFpvPKfnPDWz994IAKrpCaqnFOUXV0iI0Y+4uJ8B
-3laoitIfz+kP07INxDvr4twUId/LkSLMvvRiW0uF/Et8o5CFXeuX5kj2fMAhAaV6
-ymzjF7j7ijLywXZtUw/PRHZs2+TraFNg2J8+/PVFztHQbpAiX3Gs6RrvM4iXd7qZ
-An/d8ek9nnFH880aoQBYy0Be/KC/73zGkBCEP0ffK7xL5QTcqQ4uS7KAkWBIHcDk
-FXNK3pyG+aclltdVaXbjlu+NnWc5d9QDy6EbtK2QCmJgN2cbV0+O0AjMlCdv11X2
-FvQjZzMUsrnwtvOlNLo+Sv57LP2x2p1HZUWeGFvOrmXZXeae6BB14R1gclJkeL4=
-=qFtR
+iQEcBAEBCAAGBQJSEBn6AAoJEFpvPKfnPDWzUnsH/jgoFjsWUSjEW5ThNa/ub+UJ
+/aQlxYFvhDZQ1fGxt0LdkzG48qp9f3CtDnqJaPmFm/K+0u1U1yAoPciY3mS+EV7O
+LgbmVfS2oJnyhcfXab5aK0kiUivl2ix4oXnLPWuBwkfSdenY87p2PcyiHWEaex8l
+dIXuAQYxnIQIV5ghz/eh9Lke1OoYsuO0it3YM/pRY4iC9URaz65acUQ6RJ3aEMt7
+6VZq0IZBl6p/nERRaUmozOocGUALQ98/w1eZvJwcZsyKeZQ6FicbbLrptTHhFo7I
+xeuuTTBv5oOF4Igfm3D6KqZv0naMiAkszG77IC1crXS2BYtTsjplwCFI7ujF8Rs=
+=ZJtu
 -----END PGP SIGNATURE-----
diff --git a/games-action/beathazardultra/beathazardultra-20130308.ebuild b/games-action/beathazardultra/beathazardultra-20130308.ebuild
index fa5eb3e0ca0d..59ef00308e69 100644
--- a/games-action/beathazardultra/beathazardultra-20130308.ebuild
+++ b/games-action/beathazardultra/beathazardultra-20130308.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/beathazardultra-20130308.ebuild,v 1.4 2013/05/09 14:11:01 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/beathazardultra-20130308.ebuild,v 1.5 2013/08/18 00:48:51 hasufell Exp $
 
-# TODO: unbundle allegro on amd64 when multilib support
+# TODO: unbundle allegro[gtk...] (no multilib on amd64 and 5.0.9 soname)
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="beathazard-installer_03-08-13"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
@@ -31,15 +31,14 @@ RDEPEND="
 		app-emulation/emul-linux-x86-xlibs
 	)
 	x86? (
+		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXcursor
 		x11-libs/libXinerama
 		x11-libs/libXrandr
 		!bundled-libs? (
-			media-libs/allegro:5
 			media-libs/libpng:1.2
 			virtual/jpeg
-			x11-libs/gtk+:2
 		)
 	)"
 
@@ -59,7 +58,6 @@ src_unpack() {
 src_prepare() {
 	if ! use bundled-libs ; then
 		einfo "Removing bundled libs..."
-		use x86 && { rm -v all/hge_lib/liballegro* || die ; }
 		rm -v all/hge_lib/libjpeg.so* all/hge_lib/libpng12.so*
 	fi
 }