Force python-exec:0 since the ebuild does hackery on top of script wrapping.

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

3 files changed, 28 insertions, 9 deletions

diff --git a/dev-python/scientificpython/ChangeLog b/dev-python/scientificpython/ChangeLog
index 2aa28e8baf3a..b37f5c95d302 100644
--- a/dev-python/scientificpython/ChangeLog
+++ b/dev-python/scientificpython/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/scientificpython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.42 2013/05/22 10:59:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.43 2013/09/17 20:11:53 mgorny Exp $
+
+  17 Sep 2013; Michał Górny <mgorny@gentoo.org> scientificpython-2.9.2.ebuild:
+  Force python-exec:0 since the ebuild does hackery on top of script wrapping.
 
 *scientificpython-2.9.2 (22 May 2013)
 
diff --git a/dev-python/scientificpython/Manifest b/dev-python/scientificpython/Manifest
index bb697bb9e76b..bf79d9fcc7ed 100644
--- a/dev-python/scientificpython/Manifest
+++ b/dev-python/scientificpython/Manifest
@@ -1,18 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX scientificpython-2.9-mpi.patch 1176 SHA256 de665a5fbf474253a1fff8b5a929cd68165e5d6dd0d9e0fe52b4ecd39bedc43f SHA512 1a71e79ae1ded669dc8a0796000e663fd19dd805c8756ec2731774a611d39d23a335cfd295b79922ddc6e66a423442147d075bf520a07017bb0735e655327455 WHIRLPOOL 23be6c232903e9121f378aa0b97e5fffa44456108e1648f14d8a6a74fdd21529a53ff1145780542db67351fc1d4fc5e061b5f7a9b514bee740499437afc69fbd
 AUX scientificpython-2.9.1-mpi-netcdf.patch 1367 SHA256 f803131ab252e4754e6364e8c83d14adac316ad2be35418a20ba935f85eb65e9 SHA512 b213d6adec852cd0c85ffe17523b7b6c47047b17edf8b62d4bfe58c5488f475fbcd32594c782b7cfa905e5f76acbac6c551c511bb20ea7b59f7efb7de151d467 WHIRLPOOL ee36dd22ba8d18c88331d1a3d6901675599242230436a77fd74eebeb9fcbe07d3743deeec3e1d002a8aa216d0cd18d762e9ca2858ee1722833b21d9c5487cbc3
 DIST ScientificPython-2.9.1.tar.gz 595239 SHA256 b45305b03d8238fe1be74d6bbd5541d452d9705ab15069dcd506d38e137e9c5c SHA512 08c609d9204088fa1f9a2563f5321ed7e248469e44c86b5d5bc56dc3f975854c4e2b266a8e750fbdc858ed58a466487da4fe986c15a077319ab1a73d8e9b0305 WHIRLPOOL b731e0aaac972c118519cea9b9076cb449294c3929b4f7baceda69293a1a5c153952b5e46b54e111d1bcdcb2f1ea05162141c8c1f88d284071a7a341218b730d
 DIST ScientificPython-2.9.2.tar.gz 596467 SHA256 0ed9cb725a7c1736a15de27d62a2abfd1d84de1a45b5932e9747bc3952a73ad9 SHA512 d15f888a237ab49128666b983224590e24d3d41caf8f05f29cd70454076df8dbb66fa70984789e4e5ba6dbd96c474af6432ee27d01e432fd2472459a959312d5 WHIRLPOOL 0e301e9d77fc0d6da9c8df4c57946c77c98d0c4f936689c39ae03a69d2a483d66bc64f75081173ab5c3ca4eecfe018bc5e928dec45d2e1fe40fed7783624539f
 EBUILD scientificpython-2.9.1.ebuild 2302 SHA256 68763eafca71a09adaf4e4bbcc83ec53b3420a80e43eea545bd364cc0c2599a6 SHA512 8f7a222cc6e35d1e061648822f1a76744cadae9b4516f9c458fa0edd4018b19bc572e2a707a076d5b2101c4db9c2a9165cbbf5438f2ea9e96204fddb1e54f1d1 WHIRLPOOL 583d7200401162d4979974a439b627236c9e6077444e848f621c8b6c8615c2a6e876ef3495b87621925ca28ae42b3483b974613e56d28d920dca61172d894126
-EBUILD scientificpython-2.9.2.ebuild 1690 SHA256 af380de006767ebebac4d3601bd658882780f6986268c2635eb0a124aa751f2b SHA512 b82e3e9e783d8c0fecfddd9934950b6238d821165dcdfe982525d299d39a30508c3449c57fd113793e2ad6b5074575edfb1b8bc9feeba87e2256220c54d88cb8 WHIRLPOOL 4037db5519ba084820dcb79cd162ec425e88d8939e32823e807c794053a77d6cd14c3b8a2c527a22942bff6b10e5e7346fc2841b52d4ef79c377ef40fb0ea6b7
-MISC ChangeLog 8298 SHA256 ede6dc11c4f513171aab1d346be1064ef98cd7fedcf93950044c9ce6ecf341a9 SHA512 c43b51f6f8e111831b8180e3277dad9205b3ec121c51a8640038d96aba3f94c0fa2da1f673727520384e40688a0cfdb89af2fa97ee7eeb9a78b2d902cc06e296 WHIRLPOOL f303b50d5d9bf53250343182dd7d170ba540db8bf895909cb124ff4730fe10b4aca1bbbcd2ed327d7b36b03abc0de06a6630b6dbdd430b8ac41bcb79e69052c9
+EBUILD scientificpython-2.9.2.ebuild 1831 SHA256 1d3680e922e4135b9915621d1ad276b3103ce86319da0f8a64d9155189e755d9 SHA512 788390bb3b633c22e1afe57442fbd1c5c644f0f8fe1cb4079c8c892f709dd633767af8353107045b3f8c6c9cc026dcb34619795f676b64fc1f1bd2ad65422c41 WHIRLPOOL 9f8cf7011598c307e83b92ba06f2308bc9ff8990260de4e4bced3ea99dc28c279d3de018ba2d9273982985d4fdf81d53d22294f9ad0fbf95ab78ee38fa6a7543
+MISC ChangeLog 8461 SHA256 48091fd88f46b64873f16889469d5a79e1595074a049953956037519af875058 SHA512 8d0bac91f5400a5e78ab6d51370c69f55480dbb6e59e41cd11828c7a126673391e33fd66e9daaee4c52a12f6ad476b437f57ada3b3d0cbe8f08967b32e960b22 WHIRLPOOL 21d601d6db6b84dce92c37d153b9b680399bb68063b9a98a6ef37f0ea34d4bd49da2208e689b0b9bb8190660aa1055551c2919d0c5bde2a83bfa9d25ecdcd6ee
 MISC metadata.xml 740 SHA256 6648332cd25c2a1c573081b77ef15489d124e70e272e4402493eceec4f6a5e2c SHA512 4ad8a6cf2e24896e06b194bd70fd6242e5aa78e66fd42076db3d3dc049260fb74db5e1e887e6f2a526254dd4f1778d8713d21e5e445cee2992704ff39d92f9eb WHIRLPOOL 86014fb9efb59d292d2895601cd3bb1681e7cee62fc9918068f804c3497331ba108e679942d4c453b0e0892961822777aba24eb4db678f37349d02bdc69dd02c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREKAAYFAlGcpSgACgkQgAnW8HDreRYvFACfe1PjWa8E8umQtIj4S9+dy4ZI
-Q8QAoKRmIlyFwYlLe/2oeTtmSKMZGurK
-=pD2g
+iQJ8BAEBCABmBQJSOLexXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOUToQAMlKmnXXCClEviYNmGmln4W4
+hc421xFj2aQGn3z2lqXTJsosJQJpc1/86uVW1jdjbdfD7pZeTMduM3ok5ZZRVwnY
+GXgmb9WceezkuY3J3VV/GByDt9+mBJ730K0BBMr7YuVTzohOS7axUL6hTSTvn5sV
+G03VUYPluPlfOSaIkgqJCQ+Rn/RrLWV4dYDYRuNC3/qMgVuQ7akc+rSOqF8a+fW6
+jHV0zbQHoPnGrFYhyV64UJyZ57774Extq2hotxaPvpNsS8KtAkM8FiB497s48cHE
+Ce2mV9pQ96IXaWcm/gNBx3Ho9et8kAeESkmds6Lg6BXt7rd1wWrWNkOJ8I4KqV07
+CXGZ6bjUyf1DaPGRVXWaCXDoiRtz3+oL84qHXyJMcjW63pmaW9ZIy8OWRMRB3ok6
+6hPtrqC9c7BG3y/uWr9wcgcjdwnFipxiMmmmwtizapZmlwiSK/o/6lY/tqg8FlVM
+9GDilKGLhyASyfNrFkM99Nf5RTT/eplbWDiroSyzQvIpK2lXQPJrGSfjU6VgsxYz
+0bFqdmxQzLgvIWRhGpnlowNyI5f7+2izgu4Vqz0D/AKWsim5uYxW/JntT2MwLgBC
+ZqmD6nZkqRUYu/GbCEapWbSr8LmPHXOx7RE2548x0Zh4ebX2G5cXM9S0ZS29XHH0
+SEpxaj8l3+uH5hfvae8r
+=6COM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/scientificpython/scientificpython-2.9.2.ebuild b/dev-python/scientificpython/scientificpython-2.9.2.ebuild
index dcaede76a1bb..1ed583f73589 100644
--- a/dev-python/scientificpython/scientificpython-2.9.2.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.2.ebuild,v 1.1 2013/05/22 10:59:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.2.ebuild,v 1.2 2013/09/17 20:11:53 mgorny Exp $
 
 EAPI=5
 
@@ -27,10 +27,14 @@ RDEPEND="
 	sci-libs/netcdf
 	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
+	dev-python/python-exec:0[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
+# enforce python-exec:0 due to hackery in the ebuild, bug #484416
+_PYTHON_WANT_PYTHON_EXEC2=0
+
 PATCHES=( "${FILESDIR}"/${PN}-2.9-mpi.patch )
 DOCS=( README README.MPI Doc/CHANGELOG Examples/demomodule.c Examples/netcdf_demo.py )