Bump the dependency on opengfx wrt bug#412557. Drop the stable amd64 keyword as it broke the depgraph. (drop the arm and ppc64 from the ebuild for now, handled by keywordreq).

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 25 insertions, 14 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 0b601a4af5ac..93997289ff4a 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.119 2012/04/18 19:52:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.120 2012/04/18 20:33:56 scarabeus Exp $
+
+  18 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> openttd-1.2.0.ebuild:
+  Bump the dependency on opengfx wrt bug#412557. Drop the stable amd64 keyword
+  as it broke the depgraph. (drop the arm and ppc64 from the ebuild for now,
+  handled by keywordreq).
 
   18 Apr 2012; Agostino Sarubbo <ago@gentoo.org> openttd-1.2.0.ebuild:
   Stable for amd64, wrt bug #398161
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index b373a606d312..129a0dd731d8 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,22 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX openttd-1.1.3-cflags.patch 1246 RMD160 75ba5fa96bb079ff293af6071b47d265b7b2b193 SHA1 db09c40667712c9597eb08581943ca0e86ee724f SHA256 ba8d183f9cd8e97e6a98c3a6fec5555b695bcc6d033723ff096e6953cad68ddd
 AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
 DIST openttd-1.1.3-source.tar.gz 7854903 RMD160 a1441084fdc4f8ebe4e7198a7d07ef45baadd8cd SHA1 d6e6cb09e238b6bee4b9da48de78bad68565f773 SHA256 003ffe231bf98cf6c83c58f68091ea0cc1c2f851b17a7dbb8e5eda61ff9665bf
 DIST openttd-1.2.0-source.tar.gz 8702942 RMD160 25f133c3b302b56215d9f46fa5b96fb9ee23f999 SHA1 6094f37c27fd8801c23c588b9945d14919b53132 SHA256 e0d5ac8a972e079331d1bb43e1fbb70156f416254b1d9f220c8288bb417ed414
 EBUILD openttd-1.1.3.ebuild 5112 RMD160 aa46d9c37d1526e877802756c0dbd2daa0ffbc20 SHA1 c72e50615951b614c5a577fa940a19048667514d SHA256 78612cf6172075dcee6e9bae82330d4e4e0e27886a288b9b684156e8158175a1
-EBUILD openttd-1.2.0.ebuild 5044 RMD160 2f269be6c6d61e325ff672b41be14e59360edfd5 SHA1 1766fa8582ca92fe32a42995a512a3e9a9055db4 SHA256 1c43dc837036ce976e0701bfd1363aab4a5445e4a8e54c84e7d515ce9977349e
-MISC ChangeLog 15751 RMD160 20633fcb476b05c0142140e28077aac4ef1bf2cf SHA1 fb027cb9898409f4db0631ce397d4cb16108223e SHA256 0beca3502f4a1549df63aea549ad37e4c73805f14ee4d49661d34efafa273337
+EBUILD openttd-1.2.0.ebuild 5047 RMD160 11d5f772fc7b4dc4ac80ad8885aba7c0639812be SHA1 5c718cf37cbb90adca2fe61a3383377ae1b9817f SHA256 d5d35e125e750417692ba564cb2113b020dee88185445ea253774c64963fa677
+MISC ChangeLog 16017 RMD160 8ceab6b07c2596bddf5b96b4a0ade157c233956d SHA1 1e28c4319d052de128b360c534f73219e54f273f SHA256 4c5be8ee1cee41d6feeee2ce2c78133beb83ba78be0b7da3751ef23d678de492
 MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPjxt9AAoJEOTDgjZ80txdgFoIAKvFFIs/5a98nYXPDqAeUFg+
-sXMHMblODm9fAJnUE9qgw3W1Hqo6sJ0vMLaNdtAl+0x1N4O3+R61cm+Tmtxd3fpb
-/6FQM8Z3Oa5jLfu1ybtAuIqXgxo568NT9xAo6Dqkm4PJSh5Li3TID62rOOPxDItd
-o7d1gu4ytY4gxmHSIvSUokY2ivkybXShvTs4gusVx7de5vsgsej4G27RsJEi0Mw6
-V+c1W1aqEGdjpMHzeqMMpe+8NrOxBHZrkkCsrPVHq754v7rZQWTHA2RQ8shJWKJS
-mMI6bAircEc5iMDoDlS6DA/Yg/L48hzVaqDRfUiLgv5Cgd+i1BVgIgI+nOWe9o4=
-=NNc3
+iQIcBAEBAgAGBQJPjyU7AAoJEOSiRoyO7jvo3AYP/ilCMyOn+SURDXX913LJUD2c
+ki++OWk9zPT2vQNxd+q0b5x2jFgZY70Y3IanEHpq82kGIbMG0aJD6MCWorNLCAxU
+28A3NZz+pVwkn+ySiI5mYlAHBE6jjwWEk85d5cC+IfnLENsylJoz2/rsUDhFuWW8
+BHFWjzvkG0/9kuFedySCZTeryDCWku1X+Ytity905RV93nNdSGN07i3oLSCYXk2k
+iN13nl/PPqhUqQ4IHW6kr+QTHsd/Gd+V4ZhFdh46BYfi3biWRj1A3m9JVSHhi+vi
+Wxr1tsOZn01riX/b2S5Sg98D/UxfU6n8ycH7ExySLJkrqp4Zo7ZMQvpZDySxy/z3
+1kNSvybz6wNSq0JN4K3zWPe8xTI5SPd/3KA0m1e7PEcuDmQ0DeE9ngvRzdtaYOHs
+NmUSXH2uyXfuTB8PYHF4BkytLYnwUxPHi/2+HoomXzrYLp7b26z7mZ491aMcUAUX
+/Eq9tp3ex4IZF+6zOmg1B0CM0u2mV0Ag5Ui7HoofsTEZkPwX6aMFs7ZuZ2HaQ8Eo
+rSLwHNcLqQbIZkBDeGVDG1guf4L9co2fx/RWlkDsch0NRu3KkGfA7yaAc+QOp/cc
+D81jrFZNh4jxeUnuUDjgi4qbD53elSI8Xp31nUyrXKJvd9FMcCW+TXUH7x8DrXjs
+VSXC5MWMXzBRUOoa9mf5
+=3ZR8
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/openttd-1.2.0.ebuild b/games-simulation/openttd/openttd-1.2.0.ebuild
index ee1fb9d893d2..bcebb339e090 100644
--- a/games-simulation/openttd/openttd-1.2.0.ebuild
+++ b/games-simulation/openttd/openttd-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.0.ebuild,v 1.2 2012/04/18 19:52:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.0.ebuild,v 1.3 2012/04/18 20:33:56 scarabeus Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
 
 DEPEND="
@@ -38,7 +38,7 @@ PDEPEND="
 		aplaymidi? ( media-sound/alsa-utils )
 		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
 	)
-	openmedia? ( games-misc/opengfx )
+	openmedia? ( >=games-misc/opengfx-0.4.4 )
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-1.1.3-cflags.patch )