Fix tcl/tk slotting

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/games-strategy/xbattleai/ChangeLog b/games-strategy/xbattleai/ChangeLog
index 8cb621b58fbf28d97e659f105808ef8ff2a46b1b..d8a032ce74b05737e07361ecfa40ea92245e68fb 100644 (file)
--- a/games-strategy/xbattleai/ChangeLog
+++ b/games-strategy/xbattleai/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/xbattleai
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattleai/ChangeLog,v 1.4 2009/10/25 15:26:20 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattleai/ChangeLog,v 1.5 2015/03/25 15:37:19 jlec Exp $
+
+  25 Mar 2015; Justin Lecher <jlec@gentoo.org> xbattleai-1.2.2-r1.ebuild:
+  Fix tcl/tk slotting
 
   25 Oct 2009; Markus Meier <maekke@gentoo.org> xbattleai-1.2.2-r1.ebuild:
   amd64/x86 stable, bug #288891
@@ -21,4 +24,3 @@
   22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
   +xbattleai-1.2.2.ebuild:
   Initial import.  Ebuild by Mark Miller <mark@mirell.org>.  Closing bug #72886.
-

diff --git a/games-strategy/xbattleai/Manifest b/games-strategy/xbattleai/Manifest
index bb912bf4ce213c740c25dad5938a80028e9d7d1f..f959f7f28366070b316c1fe649c88ece4543c5f1 100644 (file)
--- a/games-strategy/xbattleai/Manifest
+++ b/games-strategy/xbattleai/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX xbattleai-1.2.2-sandbox.patch 4163 RMD160 b7f634643deb816b9eadb6075813547a36864448 SHA1 dfb88e238044852518ecc0a5a7dc3335cdc10e24 SHA256 b017929a1d4daf60961399a796f81721f3c8e425fbc007a8d655d9b69a667f82
-DIST xbattleai-1.2.2.tgz 1511991 RMD160 f6911383ab6300e8e10d1f8a3f420de461ee0b9c SHA1 d12cc25b23efa85e76a2266ad9f31ebcfd13d439 SHA256 5dc137e33cbb8afb1a2333df1a8bec9c069d83254265826ac33568ae1f502d70
-EBUILD xbattleai-1.2.2-r1.ebuild 1096 RMD160 4f3d7a2bf30f6c1fdbc5c88ba8a04209f6f19db5 SHA1 e972ecaf01964d9636e03872df833d46bbbcbbe6 SHA256 c4ab3441df3f72079725f72324d0263fd595325099a8144ee435c75ca536c438
-MISC ChangeLog 881 RMD160 309fb9201ee6be88ae3c9bc9a7be289e72a58ca0 SHA1 a3e4db5fbfbd93e17570d4fe33bd3cefb25b99c9 SHA256 6b7a2831793585f5756729fd2c5f7bd89784a2def1b015d836335ae77b28cd72
-MISC metadata.xml 1360 RMD160 21f3335fb7d0a292d70c9e5062d189e5573a786a SHA1 46583a184881e41a1eff4f8693e52085d0c54790 SHA256 49efcf76d81f70450581242e49c24ace5ee353ee2ccd308aba553447c927efda
+AUX xbattleai-1.2.2-sandbox.patch 4163 SHA256 b017929a1d4daf60961399a796f81721f3c8e425fbc007a8d655d9b69a667f82 SHA512 b42891eeaba681892943ba5ad4b1d196c6fa92bada03652e640cdb172caa159ce2a9c1203964ea47f65f32e010a4faf14f923d347a11bd31784943785b6191e8 WHIRLPOOL d0d70e0cee0049fc4520a9d93fe4d0b0b0eb3510d9db63b68d21a0a0d2c6bbbb460eb34948d6c0aec56aa04a6a95c579d013692190c351d3c7c38223c75d017d
+DIST xbattleai-1.2.2.tgz 1511991 SHA256 5dc137e33cbb8afb1a2333df1a8bec9c069d83254265826ac33568ae1f502d70
+EBUILD xbattleai-1.2.2-r1.ebuild 1101 SHA256 5a32862de7fc0ff5d829ba5fa7c48493afab4c14eef5a086cb86c03770f4ab35 SHA512 d4e4c81d301c1d7e74630dd8d720049635213a8992abf65cda2136e241ad3fdd8a765cb89ce05e8f6fe8821059bad4b8237940b79e62df3a7d5588ad8bb63cba WHIRLPOOL 4147af56acacbf5ab0ae16e3468c4e47fe8dbe933a029508fff791fb3bb59cbbf73fb4a9cf898cf65bc089b7e46105794319a041761b148d920b7f7aa783738a
+MISC ChangeLog 975 SHA256 48f0e0cdc2ee573f05f731ee38ed9244ebadca03ca731831d0fa0d97173f0a92 SHA512 203c0c1511cd669e7753d5a3ebe193d47b2c3edf14fae6eba72cf7e03775a0b2ef54e5d036774307aa5aa9b4c0b441f1b26737874e00f4ad7ab72e68e0859761 WHIRLPOOL aceb50458afc0ad4fb7342944460f8151e55c2a79ae4cdb4835daa51cf7ac97894054bdc6f1e68a7ea7dc18c8055aeb6f2d7bbd742a5533909b47a25023a1ec7
+MISC metadata.xml 1360 SHA256 49efcf76d81f70450581242e49c24ace5ee353ee2ccd308aba553447c927efda SHA512 1e6056edd84fd1084bbe249cf16cba98ffa220eae2e4dae4f8fff6933e305fcd55a7c25b0df6eff225f3577d3434bf501e72f0ccb7a499fe0f1228368eb9d1ef WHIRLPOOL a4abeaa8a0f85fbe789a5af615ece09e202814188ce96b273156ed42d9befed36069f8938270b6054f3991788e64d2ac2fe674cf3a70f57b0b7b5880cbb69fe8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEARECAAYFAkrkbi4ACgkQkKaRLQcq0GJ58gCeNhuG7m/rxzr10TP2GvYVDGJx
-4lwAn2DCqgQCMVMAkRNkF3IVYX+YD+WA
-=DRWm
+iQJ8BAEBCgBmBQJVEtYwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirQSkP/1FR7S5ksE6ksOogma8TZYl6
+bVV1Ama6+eEdCfGMOJkX46QMpP3E0upAHAB1wdOZIlBBoTui9jHGleMF3s4hDV73
+6IdG0CozXiQ6jATKphJ5zOMBioniXU2rdTCQpC8YFZ4k5lFg/ex9TdlZV7fr1Qse
+3WCWCX8ipI4PBSdP2f83FWSiDcA2k0tsL9dFbL0GQOwRFNsgS4DusbZyqeA/GXrW
+7BLXHoGo0Doi2fLV2MQ/VTubVGqkk/+58DBnf7tkbkTQ3hjcJh392qARo66f8w9t
+JcTBeQjQSGM0DR3DPrP/5sSKKw8/l3Ue6YfNKpWlkk6ngGF8I2kvLyRw8qSDWrDJ
+hKjpQGixgJkWh0QpLf5ImpQ1WCQXHeP1BoSMbw4KMIFLCegalyEj8p3UgWtfXyem
+vCqBfRabPvugxN/542nsnX80Box0LTnoyRBeJspRos7JLYs2WvxvViH07HaOgpF1
+Y9ThnHi9VIJRFNeaKS+DXMh6lNqyDDi+fBZ6HAo+bJDjDzyNfC3u/I6HAXd2Ckf8
+/GjD7oOpq2XywXyre82EgXLfszLzlQ/RiDq5884bn16EoqFWY4mhBpcSoprll7aV
+/cLY3ix1dgLShlSGbiNhSfwuqu4PYF9u9478E0+GZU9+S/VFMxxarW7uQnKmnX4i
+KGREbRRyR9OzgbHkK8s3
+=nMgr
 -----END PGP SIGNATURE-----

diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
index d9392354f8a70d9b7b805198e1edad75451cbbee..499ec87ead810a8195a68f3f63d9ebca52ac2ec7 100644 (file)
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild,v 1.3 2009/10/25 15:26:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild,v 1.4 2015/03/25 15:37:19 jlec Exp $
 
 EAPI=2
+
 inherit eutils games
 
 DESCRIPTION="A multi-player game of strategy and coordination"
@@ -16,10 +17,11 @@ IUSE=""
 
 # Since this uses similar code and the same binary name as the original XBattle,
 # we want to make sure you can't install both at the same time
-RDEPEND="x11-libs/libXext
+RDEPEND="
+       x11-libs/libXext
        x11-libs/libX11
-       dev-lang/tcl
-       dev-lang/tk
+       dev-lang/tcl:0
+       dev-lang/tk:0
        !games-strategy/xbattle"
 DEPEND="${RDEPEND}
        x11-proto/xproto

diff --git a/games-strategy/xconq/ChangeLog b/games-strategy/xconq/ChangeLog
index a0aff60cb98876453837dcda28620f1002f9e4c6..b58017db699910f1cbe2be2a1380792835f6ed86 100644 (file)
--- a/games-strategy/xconq/ChangeLog
+++ b/games-strategy/xconq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/xconq
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.16 2010/10/07 09:06:55 tupone Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.17 2015/03/25 15:42:07 jlec Exp $
+
+  25 Mar 2015; Justin Lecher <jlec@gentoo.org> xconq-7.4.1.ebuild:
+  Fix tcl/tk slotting
 
   07 Oct 2010; Alfredo Tupone <tupone@gentoo.org> xconq-7.4.1.ebuild:
   Respect LDFLAGS. Bug #339871 by flameeyes@gentoo.org

diff --git a/games-strategy/xconq/Manifest b/games-strategy/xconq/Manifest
index 461930c9fd107f50f2317c395ab1ab1021ad868c..5402b2e332422a66afe8d7a8eb319f93e81a0e15 100644 (file)
--- a/games-strategy/xconq/Manifest
+++ b/games-strategy/xconq/Manifest
@@ -1,7 +1,29 @@
-AUX xconq-gcc-3.4.patch 223 RMD160 286b8a0f3604eff1030234d35ca4c14a835e96fc SHA1 77545a35c1c84ee05a50c796efa27e6b26863769 SHA256 59e72407bef819ccabd9b1b0c175b8105a40521c3a8e33f370a63002074e695b
-AUX xconq-make-382.patch 1238 RMD160 8a76e1148ebbc2d5dbda20d0dae20b4f9c9b35ca SHA1 ec08ada20034c4cb2c11d0cddcdd40ace3136104 SHA256 2292c75bef3c6a3b42bc925fdfec1a50caba38be30d03593c11d0a79c8771e8b
-AUX xconq-tkconq.patch 3712 RMD160 f2527764a5c40d871f3a17d7a94c506408fa157d SHA1 bcba3ff34f687c5962a062f40a44d74f832effa0 SHA256 425351a06a8271d832caa936be3b106e579a7a27338fa30443b0b1d3c45822c4
-DIST xconq-7.4.1.tar.gz 3402832 RMD160 e596eaccb6a48709e9ceb58fc59e715e36dbf43a SHA1 b7d03d17806500f05c23889a00b7608843a27ce7 SHA256 50d0d11887374a9351ec1235f6b93b1e9060fd852ca99a6700c76098e585f3ce
-EBUILD xconq-7.4.1.ebuild 1343 RMD160 18d3c91ae272b1a4430fac0e3e9a5ccdaf6b4dd4 SHA1 cfd2842ae6f90faf7e1d8dc1b4f4402409003f32 SHA256 7a07f6a217646a09e36916a0ee0998a0004358a5021c9fae4ea7d747cd4ec7c0
-MISC ChangeLog 1945 RMD160 4e1fb61ce3793ec5dc3cca900a0449df0e763806 SHA1 5d80615d78ecf6b8027ad1abd547de9a2c668e82 SHA256 10324c3226ea1bfc55b7812f77ba07a61f4190ed1e7bee49108c50376dd4e3d2
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX xconq-gcc-3.4.patch 223 SHA256 59e72407bef819ccabd9b1b0c175b8105a40521c3a8e33f370a63002074e695b SHA512 e81c19215f0f871fe62134224a38026508ba183896c7d29009b570f9ef82b3c18ebc2d7868dd97f49735348c0c52a1f38978edf24f4fb2d0757654761894d883 WHIRLPOOL e84a80756412fd8740bcb491b469d86eec47090f2cef92a9c798a7d068329be1ec9ef1d74a506e1ce704d163447ddb42966c0f5533305d4b2b9f8b176a3d2400
+AUX xconq-make-382.patch 1238 SHA256 2292c75bef3c6a3b42bc925fdfec1a50caba38be30d03593c11d0a79c8771e8b SHA512 8dfb39e3f8f2168d1a54fedcd047829f8f8a32659425ff83efd47e35fba9383ddb018ce937a662624c07ac41b66f3e802ad36feeb86da13b160338af57254186 WHIRLPOOL a3dee3ed7d8756e12483655e41590b2780b55ca0ef79a620da885155f62b2157347d0eb7906f5c760eae01aecc68bc18d8f807513bd39eb12391ad0c7604882d
+AUX xconq-tkconq.patch 3712 SHA256 425351a06a8271d832caa936be3b106e579a7a27338fa30443b0b1d3c45822c4 SHA512 12cc3ecc59fdc0fa6036deb0d8dbc311d3076651610a14a3b1e7d33a0788a55c25882e6e6ed268216845e13dbe5f5110d323d0e99f614959b4251004bb6d6ed8 WHIRLPOOL f6967b2f9944335ee2699f2bc88f4b4d81bc4810240554e0e1c06f2be5ce7cae3ca0c8a6b1ffbe78f480e2de36ac04730589b155b9cc76823db8745915a0589f
+DIST xconq-7.4.1.tar.gz 3402832 SHA256 50d0d11887374a9351ec1235f6b93b1e9060fd852ca99a6700c76098e585f3ce
+EBUILD xconq-7.4.1.ebuild 1359 SHA256 ec9793affb81a6a37e58cc31162a60eebfb85cfa3bd85e7445a0c96f63ab5021 SHA512 124f7f487fc1f49a06688f6b80ae64a2c0381b4a39f5b4e501b46ed67522b3c8baf3e08619c0ac4b771d3fb817ba07b53a7b1f15959d77dfd58cee8d277667a2 WHIRLPOOL 739f8da1e503e61b445438ce6348af2164b8f163d323b189879af25c5c3fab568718b0bd582700a7a433b0dd0e3bed6e85b1e3b26635bb1c9ad96314f6a671bd
+MISC ChangeLog 2033 SHA256 c403c0364d3a90c39efa5fe3391653876784ad9982873a076c082b737c898af5 SHA512 bc4a275e4481ea79254f165e57d3311fe6f63e6519c85c0a8d7008b29297d96d4763f8fd86827708e13946f3f36233ffcccbf76e5e2b31a0d3fec7f15d959024 WHIRLPOOL b353c30e7477b32cc1d303d377e678a576f102314b1b50760796f09304446b36d531aa00b9918271ad50ce8358c72c8b40640c109d8a0ce16fea66ab5c83f222
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVEtdQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVircHUP/R8rAYkjftOtmQvstzHB/BGN
+fzXMkPW/2v7jCoZkB8/nKzl3zQEPyteY/OmlO5LylLOtSgBq6ZLVWttG2ovr4Gdf
+YhGaLpuELc4gt8C8TzdNDAJsDpEIahZZze3/GDbs6qqxe1bjBvg2wjc0/nYVZPDS
+bxUfqp0QCrt2/SXS7YiGd28KGIIkfFuGAIOzoTRQDstcioOViT/DkYQHB75OZ9wp
+Y9td7TOMaOOuFJWyEw16YEyONmN2+xutXZEQMees+QcTE2s8D/ltHYpVYaqa5/KD
+frR/QI75VTj2Ngw+ombMC0gzhFlBdyLxxPh8LKQBtysgYnJX9czwCEiVlVvvVDxf
+Ps+x9WqOaplOsOOWJy/10AIoNPxxZJT+TxzE4JCURwwsWZx1u4zMPUSXPlfjYuPh
+wcst/nSGfl//mUkgZgAD0MqXdBvDvCL/GFnLZCBmVZ8JqXy5/1NnS8bKdNPKUpfd
+/M8sThIlcKEDHhexsOahiehcQCAoFaX4WgSj4V0GFs87XSpWcKC3i1Jmp1Iro2qH
+OLcMHi+gROru9CWTUv79g9I6sAvL1lQeuwbqw+y8+LWJ8NiykTIHmEzJsx+Um4+i
+4sJj6Fb6Q9TryQZ/W4bfzJ3+NLqwdF+nOhPMcPzSRhpb3uBIIbvsIKeg36t5Jyoe
+bLqcqfMnEkDGwWqG3hQx
+=M32F
+-----END PGP SIGNATURE-----

diff --git a/games-strategy/xconq/xconq-7.4.1.ebuild b/games-strategy/xconq/xconq-7.4.1.ebuild
index 1a956798845996e4df342a7bfca2a782463c6fb7..8f49255ee5808081f8001224b5e3c07fbad5814f 100644 (file)
--- a/games-strategy/xconq/xconq-7.4.1.ebuild
+++ b/games-strategy/xconq/xconq-7.4.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.16 2010/10/13 23:47:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.17 2015/03/25 15:42:07 jlec Exp $
 
 EAPI=2
+
 inherit eutils games
 
 DESCRIPTION="a general strategy game system"
@@ -15,15 +16,18 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 RESTRICT="test"
 
-DEPEND="x11-libs/libXmu
+DEPEND="
+       x11-libs/libXmu
        x11-libs/libXaw
-       dev-lang/tk
-       dev-lang/tcl"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc-3.4.patch
-                 "${FILESDIR}"/${PN}-tkconq.patch
-                 "${FILESDIR}"/${PN}-make-382.patch
-               )
+       dev-lang/tk:0
+       dev-lang/tcl:0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-gcc-3.4.patch
+       "${FILESDIR}"/${PN}-tkconq.patch
+       "${FILESDIR}"/${PN}-make-382.patch
+       )
 
 src_configure() {
        egamesconf \