Use python-any-r1 for waf.

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

diff --git a/sci-mathematics/kodkod/ChangeLog b/sci-mathematics/kodkod/ChangeLog
index 22e62ed70041968c2b488ad7eeaa3fc21ae622fa..9b88a7606d6da213a7b5071a410405529bae44fc 100644 (file)
--- a/sci-mathematics/kodkod/ChangeLog
+++ b/sci-mathematics/kodkod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/kodkod
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.5 2014/06/22 13:52:20 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.6 2015/01/03 12:26:50 mgorny Exp $
+
+  03 Jan 2015; Michał Górny <mgorny@gentoo.org> kodkod-1.5.2.ebuild:
+  Use python-any-r1 for waf.
 
   22 Jun 2014; Mark Wright <gienah@gentoo.org> kodkod-1.5.2.ebuild:
   Use waf 1.7.16 instead of 1.7.6 in kodkod to try to fix Bug 513978. Specify

diff --git a/sci-mathematics/kodkod/Manifest b/sci-mathematics/kodkod/Manifest
index b0f5a32ffa66bd7e2cc528f8df401566b1adeee4..50b13700664b7ad91885c029b3a210984f139626 100644 (file)
--- a/sci-mathematics/kodkod/Manifest
+++ b/sci-mathematics/kodkod/Manifest
@@ -4,13 +4,25 @@ Hash: SHA256
 AUX kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch 1045 SHA256 87727817e23d03156acc5a56238124e265f0eef13f441ea5ba6802df1e94ca34 SHA512 ff30065387503ffa1fb74de988a36526f3680a648faae1a6826db6b91c2dfaac0f63ff6dba32e5fcef11a7b5727a385dfd9301d030f45213e091886c40ea7867 WHIRLPOOL 413786b0562f86e378d96494f71a81da4b6eedb0b66c2b64c908c7adf8b309d62c5d3999a0aca9d135601f1c337c05a927b73926c2c52e0232edd114d2f4c9f1
 DIST kodkod-1.5.2.zip 2092639 SHA256 c54e2181f1e094bf34d52d3ab47b313c4d4464dc25c2cbb3ffd80929d1004a41 SHA512 d55d84e1daabe37c6994fd434c157d5eaecd1d0b2bbe4ab5a2d5e0e529a378d0cb8dc1eac5b89336706f899b23b9682dfd1033f4a2caec76485b12966e091df0 WHIRLPOOL 9919b7bb4de3cf8d53804cfb4a8c5874575acadc6fc7f0afcabd31847947e2f1f77ffb5565fe283088bafb9421fdc8d1245243a58e7f5d97004ecf66d7f1ac12
 DIST waf-1.7.16 91846 SHA256 b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf WHIRLPOOL 79b59876606a93c7a13548799c8797f40515cbf8bc2944018de758df3e8cd9698e4304d5d26a03ae883195ec02d6e0b12e6fc7160e4ef31446d7c3d05f98983a
-EBUILD kodkod-1.5.2.ebuild 3757 SHA256 0a9f404b1491546f6661d2813c4e2636a80291b165494c17cdb3885803490752 SHA512 77447337b2d15d1db6ed7c5ca32fa89ea35b2a93b5cec314d41881e121d4e726428dc6de3d199643eadea5b780feb13e70b53833f8d270ed35df7976dbc33d28 WHIRLPOOL 45a2b5c3cf627536173a04f307589d37b62c051ad226d139d3b80032d1db7b3017220278daff958005f37abdd0fdc4b9792e783d9915fd5e88e23f513b46c91f
-MISC ChangeLog 1405 SHA256 75b13b4274cbf008545a8150e9dd0fe4cd4c166259e966353738820c0fd219c2 SHA512 3195635880572f432f1fbeb424ce232b0a363fe5d95777b315d1987eeb9ed6683098f7b609afbe16af3833422f30efa86044d7b5799135f548c1c05e83f22d27 WHIRLPOOL 17ad58fdc29865d286499e610fd0f883f7873bf39df6417c95f54d5606fdd22e474c252168c3192a66f7e93f5b1a5d0f5a122f9d913da3f931f4428eadd0efcd
+EBUILD kodkod-1.5.2.ebuild 3891 SHA256 b6ea9381fb408be68cd26dbdfc0a4f46ea6ff97035025cddce1d68e2915cca82 SHA512 530943d84f8cd31627d9135d4bd805b72b5adb0d2ec41abc00101f9ff5b87bc42b78c02520b2dfa1e31ca347b5bb18350bdda331ce6e051e73dea8569e27965f WHIRLPOOL 193cdf670d3f7488dbdeda45b298c392f6985473b1a4f9bc0656f417e2bf34ab77c34cb4c13192dec786746cf549bb557f20e07c652dc1ee640d95978f02f3d7
+MISC ChangeLog 1506 SHA256 21a896ae5b29786e151965eb7dae7c7beccea842493f42fd60fb499db695a1bf SHA512 a5ad0ec7cad451628e01137935d8d169b736e3b4e3de7c40a6f4466341377e6e75972b5206660d68e303905971f4782710e7ec4b2041b65cec8e431f8b6855e7 WHIRLPOOL f304439a0dd350d1631b9ea23077f5d735d1f5a65ed29942dd69840e41afbe2b060a4493b7cabc2216d7062b6e272289660316f8db21c26fd473079c295b5cca
 MISC metadata.xml 798 SHA256 74928d2fab41145e7be09baed056d967e2b8039d2cf19bb76d93dc760af8b383 SHA512 e824fda882b8079e26001bfedf50843a30d16956184088e4fb12805da2b1b65e1ecc85556f74c43f0c211c7f5c00df64695688f9c98b4ee4b199b458dda40ca2 WHIRLPOOL 1d2004703df7a3f126545a755d26f4216c4d3fd9ab8b0a190c4a4807af136b6a7f975728456462604ab939fcf9d18cd1af68f12ac2b3f567ecf11486cb211419
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlOm35wACgkQoBEVQmGOlx9MdAD/Vlv6PhmAcJW9EdVu7Ao+LeH+
-btBllwssj7F+jNzOljMA/2mnOp7TQhmIcoAYmtd6QQKjx7OjrlmPSvbVhxzZn/PS
-=ri4B
+iQJ8BAEBCABmBQJUp+ALXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOH1UQAMV9U0+DA0SONy2Q/kvfI5/z
+IEbKA1ih4hAnNlFjK/5vd35Ce89GECZN9OzkxrGIqV1l16QmdoKgACgrCZeViD5T
+BXC2Gr4oeSAXs+cHz/F3ogb3+xUInfwcy/y7jEsc/fZc6gnvXl6q8Nm7vLjoi2da
+gGSI6xOemx+5gBy2YZzKzA9A2jtX/+IMIXbgQ1V8Yf64ehXRlcsNzUHe6pgxY5sN
+vlzkdT1XRgEsM9qMY/OkgJhBjKi6FI3TE22FNnJQ6X5lJ0byqkSVdDio4a+t8nPb
+TaU9ScA/OTKg2AoiuSdIkaijylHUcFGn9U5k2UEJ8qqP+7qdwTLz7WBStOdiTbm5
+rZUWwba6YvWK7vil4LKR6QWpQKMvk7Rzi0RBdPxQjhPzOndg0hythjq+SXIujWF7
+7A5zLUlUydPa1gSamlMlmaNvA35wvfr0QTFplF58amk6Wjwn6nQCCXJYbBQVFOMO
+nNx6L4WgVB8cl0rbmXEvQpLqkqk+ziZZ82JahVzZpm99qQjP3f6YYLl1Z3TVMPcN
+4vvAdMBZxJzsx7Kz9vkGAr01xKZCkJrbsvj+7/r+vEKVsOIRFhZMyq/v8YVeF7J6
+y7NsYUr/pNMPuwiUo0I8dzrABtJcFJCrKbB9/o65wgbrWGvhpaHYxe3DWoHPaea6
+zQ4WZNSFtiSWBNlfynT7
+=mfoy
 -----END PGP SIGNATURE-----

diff --git a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
index ac96d56cbd5fbea1b2177176237ad4e2e1aa9056..403a155deddc46c0a75145f720adbc542cf5cd05 100644 (file)
--- a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
+++ b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.4 2014/06/22 13:52:20 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.5 2015/01/03 12:26:50 mgorny Exp $
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
 
-inherit java-pkg-2 waf-utils
+inherit java-pkg-2 python-any-r1 waf-utils
 
 DESCRIPTION="a constraint solver for relational logic"
 HOMEPAGE="http://alloy.mit.edu/kodkod/index.html"
@@ -29,6 +31,11 @@ S="${WORKDIR}/kodkod-1.5"
 JAVA_SRC_DIR="src"
 LIBDIR="/usr/"$(get_libdir)"/${PN}"
 
+pkg_setup() {
+       python-any-r1_pkg_setup
+       java-pkg-2_pkg_setup
+}
+
 src_unpack() {
        unpack "${A% *}"
        cp "${DISTDIR}/${A#* }" "${S}/waf" || die "Could not copy waf"