Add subslot dependency on hdf5 wrt #452622 by David Mohr <bugs@da.mcbf.net>. Thanks to William Throwe <wtt6@cornell.edu> for the patch. Drop old

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

6 files changed, 30 insertions, 99 deletions

diff --git a/dev-python/h5py/ChangeLog b/dev-python/h5py/ChangeLog
index c756c5151b26..3849074c4619 100644
--- a/dev-python/h5py/ChangeLog
+++ b/dev-python/h5py/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/h5py
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/ChangeLog,v 1.15 2013/02/22 06:22:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/ChangeLog,v 1.16 2013/02/28 10:06:41 xarthisius Exp $
+
+  28 Feb 2013; Kacper Kowalik <xarthisius@gentoo.org> -h5py-2.1.0.ebuild,
+  -h5py-2.1.1-r1.ebuild, -h5py-2.1.1.ebuild, h5py-2.1.2.ebuild:
+  Add subslot dependency on hdf5 wrt #452622 by David Mohr <bugs@da.mcbf.net>.
+  Thanks to William Throwe <wtt6@cornell.edu> for the patch. Drop old
 
 *h5py-2.1.2 (22 Feb 2013)
 
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 411fc2f882fc..43a748e5ec63 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,9 +1,24 @@
-DIST h5py-2.1.0.tar.gz 896131 SHA256 625bd47f5b45361fc4549ab3c45c883f49ffc03d54ca294fdbb70f6223b41af0 SHA512 b3290c498191684781ca5286ab454eb1bd045e8d894f5b86fb86beb88f174e22ac3ab008fb02d6562051d9fa6a9593920cab433223f6d5473999913223b8e183 WHIRLPOOL c081dde62ee1ba3f57266382900415756eda1827e0dd0226f3a56cbe8d0459c4b951aa9543b97a5cb56fac8909ab4708639e91e366c7f653ce0a654fe2376ea9
-DIST h5py-2.1.1.tar.gz 984939 SHA256 6e4f135268436cda1dc19a081dc5384d431057344fa1121a886016cd8c89c716 SHA512 57acf583514ba580293b0a3c53b8c1f05bb753589106c1a2f979b13dc5d014eb667f04d664e68ab8641ff85c76b6478435e6e02d87b92910d5164bbf17dcc5f0 WHIRLPOOL 58550440da2db1cd9e5e4a139d24ef2eb72521d1997f69f4ffe12084a16b569219cc9490d2f72babebdc51d2b4265e8ecd1c0872517d66d4d26546f37fadfa53
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST h5py-2.1.2.tar.gz 985537 SHA256 26679852da555db57478b3c65f0ba3e60e2e6c642e6952481e5af85cf59ec5bd SHA512 15ca0209e8d8f172cb0708a2de946fbbde8551d9bebc4a95fa7ae31558457a7f43249d5289d7675490c577deb4e0153698fd2407644078bf30bd5ab10135fce3 WHIRLPOOL dd4bbb3f3ac8a6dd9fcf51b2de53fa1d575ff29a67c2c5b9d9a6cc07267f12c0e36d03db0e29e206306d550ae9f56c6e562b29def3d797f553165edc04a9a374
-EBUILD h5py-2.1.0.ebuild 876 SHA256 a63808e8747f9a726627c056151c9342584c85bcd31f34bd98ecf3a0ac6e0a60 SHA512 8e92a5681f4acc8279d1257e6f28d0a539960d9f7fde12845c3f68be114eaaa0612b04bd7b968c582a330926ef711964bc64ae789fd7cbabb22056c1034eecaa WHIRLPOOL acef993be41b56fc04450fa2b19420053e231256ae498319edc1d8949154d7167e8d336b20c3a633b69c89a22d6c52af08a93d81d8eaee747297d3ef1e987c76
-EBUILD h5py-2.1.1-r1.ebuild 827 SHA256 13a9709f4ba297285a46cd0f24427bd16d1bb8bf18b1bc2b5f24e06fc2ce0263 SHA512 75d598572b7e470962ce133df126d39c7d954a4a7733706f7f012dffc119e416317c75f5da666fd3226988e26182f082eb91d3fa9be60ebad121e84bc3d4e535 WHIRLPOOL 03e8ed3d621dee965129c0f45807f5448256f8f58ad1401ad102e0ae75c149c384f3ed407bf477cc66698ae8c9f04140919e2865fee2a0aa4d3cc48fe6981dbe
-EBUILD h5py-2.1.1.ebuild 880 SHA256 ec570f430278170f31466eba781427e246ccf8d36760659e6c7e0b1609a21be6 SHA512 9edcc8b5e786ad622a11b19e07622f9d5b9a0c8ee820dec4ce58a8aef17b241c19a13f7df38434b557b20507b8cbd9178d6c7a7ebf3d0bff1f5d0b84fa839a96 WHIRLPOOL 92ad505d1bc7a943c2a2f3d2b75bf16f24ac09ff08195eb2eac2a112a0b233bf4b19dc24a93763081177e4d80b360bfaa579b9066f53e8ad9f4733767a3f620f
-EBUILD h5py-2.1.2.ebuild 827 SHA256 e0ed71c2d50c4cbadd01157db49a088011dab8dbdfbff510eab77030d29d28d7 SHA512 42b638d0a6beee880b0f3dcd5e76d787fc6bad43965860b1f5c56b31e2b2fc7cd396c19f2577e607694a011b774c97d8dff6e9b8215311b87bcdace7e1fefb84 WHIRLPOOL f7c46e718b436210d86a7e2c433d75ce2d177ac50e7433b73447428beb18e67ba0978d2c1b1cdb44c7aba3022bdb8533ebeed4bd659ea9a090062b2116c2f458
-MISC ChangeLog 3035 SHA256 2546af12993fd5f125b2b8ed82180c2ac8298845196de90028acb5475a6ed49a SHA512 b9dee5b511a622d3b7608c0ea2142bf81c7ea5e126a71e6439dc648a66411a065fffb406985fbf6c07651f52c1ac6280d75ac1c80023373ddb3cce4f6301ac2d WHIRLPOOL bd2a9bf9e7886ae28cfdd570b30c17b0f52b75d6bb4d3b2ee65d0c77dd2cf08fa34dc5d25d28cebcb6ed1d7fdd762a3b0a80ccef52ea4c4516729f1b29b7c3d4
+EBUILD h5py-2.1.2.ebuild 832 SHA256 c4ee318cc18354bf758f7b98c1db2d787a7ac5fde7948dddd53fd4645493913b SHA512 1274624d2d93182d4ea46bdafda09c893c70430d7451851400cbc0cd7d88a265a7b4808f3f726c107f4f34327ae87c999871100012401c0b73ed27ea3735dffa WHIRLPOOL fc5e27ac29ba530406016cd16374915b6381447a940f38f08316d3dd6e6d0ef84194134120fb0c43b5305a6cd2cc5012b043397ac0118e90a3161d1c55f571f1
+MISC ChangeLog 3326 SHA256 c7a9e47184a33938d1c4862df8a693a79487af64168cef686745e3a12745a861 SHA512 691ff908de201616a85dff8334216380eb2a501459ae6ecb498320642b05096fd617ecb32583cc7b0240a5d9dc3d2ed642b98f74eed44807933bfd40572821e9 WHIRLPOOL 447c378b380228527d3b95146120fb688410159efb1f4488280078f85b8fa7f88d5bb1113684012e00b1d160c03deef1b14b4c9f201f9532e0146a18bbf8c73c
 MISC metadata.xml 782 SHA256 948a16755d0917c8b271cc609023918c395b001f73a8f5e4336f2cc305559b5e SHA512 e6835620c77db69b0d18b54cc3fd004b0c9f18f3b153c3a35c2551b3381ea012c3cc3ac03b0642fa1b6033b3c9b4d50dbda31aa85eca1c80e1bd97f66e8b02cd WHIRLPOOL affd7db591bf0430ac2260b716e0b84b1c19c81d1f5ca3f8630662ee67d23dcf8537c9b9fd010f30cf549ca7eec357cbbfd4c5d5077706cff2df3e67102bf00d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRLyxFAAoJEF0huFKJUZL5TGEQAJtM3EUoaho1RABWfWG7h70q
+DW/XMO86Z67ENfJT5eKVk+ugGk/6Xx7rURyTA2zipnah9OqXn5Gz2KLp2wRlvezX
+RAMHO+sl5NGrVoEfNtEdHIw8MoG0DAbIuHwJWTgyEZzLhndgQyxmlaseCp62PwEr
+znBxs8btmLFDkB8bmIO6m7wGO5VZRTYyQ8tCrf/1+AyQzX/jpQxMRWkZ9HDYaFbX
+DY5+3ft2i+z1g0B5uN2ThQZTLs3+APQQEaYeYqLevcsWMAcRX5OHBDRcC8Wv+xGw
+IOu00hHy4tBSYqjEu9fVqlAHYsDSuokK9kCUIonV9xzffPWxJ4cpnrexxV2Y/LU/
+YDzPNoW6lqbvlZIj1Gi8pecDpkfK8AoNjUqrCR1goQD9I6ecYILu6oJNET4AGogu
+92E2uR+Hvk0HQrUoNBz7uFHu7hL1362gUJBXd26ljsXkv/jmuJhCa6UURzsLlmYZ
+XNCAHKauAVqmz5x3bHeEhpJjU4X26xxm5AqNKAQN5rdtmlAmLjsj50hipmsFAINc
++0ckVr+0xsYS8R9HY7CUZdtpaIPNOSuHwFUBTGAe9XvDmK2GPe+fLGEHmDRIA2wH
+4oQKVLBZkxWZeTkRCOGj89jmQ/B5v6wIXYw7pysqlyB5w5f3ODun2DiUwZo6JEIE
+FpCEejBtJlMODs59AkHb
+=jq8W
+-----END PGP SIGNATURE-----
diff --git a/dev-python/h5py/h5py-2.1.0.ebuild b/dev-python/h5py/h5py-2.1.0.ebuild
deleted file mode 100644
index 1adc6a8748d8..000000000000
--- a/dev-python/h5py/h5py-2.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.1.0.ebuild,v 1.3 2013/01/06 18:40:21 mgorny Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-jython 2.7-pypy-* 3.3"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A simple Python interface to HDF5 files."
-HOMEPAGE="http://h5py.alfven.org/ http://code.google.com/p/h5py/ http://pypi.python.org/pypi/h5py"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="sci-libs/hdf5
-	dev-python/numpy"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? ( virtual/python-unittest2 )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
diff --git a/dev-python/h5py/h5py-2.1.1-r1.ebuild b/dev-python/h5py/h5py-2.1.1-r1.ebuild
deleted file mode 100644
index f024caf874f5..000000000000
--- a/dev-python/h5py/h5py-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.1.1-r1.ebuild,v 1.1 2013/02/13 20:44:31 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A simple Python interface to HDF5 files"
-HOMEPAGE="http://h5py.alfven.org/ http://code.google.com/p/h5py/ http://pypi.python.org/pypi/h5py"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	sci-libs/hdf5
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-}
diff --git a/dev-python/h5py/h5py-2.1.1.ebuild b/dev-python/h5py/h5py-2.1.1.ebuild
deleted file mode 100644
index 69a365074761..000000000000
--- a/dev-python/h5py/h5py-2.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.1.1.ebuild,v 1.1 2013/01/07 16:46:24 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-jython 2.7-pypy-* 3.3"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A simple Python interface to HDF5 files."
-HOMEPAGE="http://h5py.alfven.org/ http://code.google.com/p/h5py/ http://pypi.python.org/pypi/h5py"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="sci-libs/hdf5
-	dev-python/numpy"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? ( virtual/python-unittest2 )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
diff --git a/dev-python/h5py/h5py-2.1.2.ebuild b/dev-python/h5py/h5py-2.1.2.ebuild
index f1b25581168d..e06fa0dc393b 100644
--- a/dev-python/h5py/h5py-2.1.2.ebuild
+++ b/dev-python/h5py/h5py-2.1.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/h5py/h5py-2.1.2.ebuild,v 1.1 2013/02/22 06:22:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.1.2.ebuild,v 1.2 2013/02/28 10:06:41 xarthisius Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	sci-libs/hdf5
+	sci-libs/hdf5:=
 	dev-python/numpy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]