dev-python/numpy: version bump to 1.12.1

5 files changed, 9 insertions, 40 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 58ed08dd..6b85c06a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,17 +1,16 @@
 AUX numpy-1.10.1-musl-fix.patch 543 SHA256 2d3f0358f9a5a33f783817964d1985f48eaffb5f239f494b9a57cab1c35565d7 SHA512 b832d756e2518471c117e72bba01c5b93859d694948f545f136a12cca69dc9f9a459539fce8fde740c0822c423572ec6aa9e805a28a6d9620df36b54c52b1d8f WHIRLPOOL 8708b667ce5d86ef5e7b468d5e059cf7d3ca572fff5e462f0f12f3855e0addd0dc9170390f720b90ccbb01c330c308124596d9808ad05f8ea8c0658de63e8284
 AUX numpy-1.10.2-no-hardcode-blas.patch 3295 SHA256 fb1ac68398a9c4fbf2396083e85480d46077d7b29069d8b62c4a929ab48216d1 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd WHIRLPOOL 2a34f1f6f6a3a37a67b7cb1419b0aca7891ab9375cb5489f4ac974e71dff9f6e9442d0b3414437bf3010f271d7782b89b111ef34dcee1530c39e43bebe1a7b08
-AUX numpy-1.11.1-no-hardcode-blas.patch 3403 SHA256 c0943f88112e0aff962f2eac4478668d7bce35943791985d1b06a7184df569bb SHA512 0b32bf8e6fe08d139a589f5ca6a6d7d80716712f3cebcd84574ba5e90b283df84765d492f18e1fe3712aec6dbd6881a1b03e157e1cd6d42d6cd37022a62597aa WHIRLPOOL 5adec2edc32764f01563203731ca045bd7635a72e30eba27bae4bcd09adfe4a79996c0abef8b6856975e7bd5e63c1a7363e7fc6e6721711ce95fb7d343b89aeb
 AUX numpy-1.11.1-no-xlocale.patch 395 SHA256 e92d51ebbbc01dae37fab2c26b4ad64c4c791da62d52911ab8b6221ee732450a SHA512 2d53027efcb841ddc5ccc020d2a5df687815cf40b309c359f0efd7bfd431abc2786cf8b8b33b9873452f7907bd8b4f43470b5048ad122951a3b81203a5ae6494 WHIRLPOOL e4ddce622b7c7912936a54497f3077ee88a278468ca176758457ebe6de89bd33aebc3274ee85cf80a91d9d2a9cb68996fe7b42b7fee4bc9998d8673c6f4146c5
 AUX numpy-1.11.2-blas_rec_inc_dir.patch 958 SHA256 81d7cd91ad08cc5ae26cb16e955b1b52ba7c373d38b27979e868b300e782cdf8 SHA512 c1a10bc9f14fb42e2bd3e361059cde594c539e360f4388cb7fd202e49b2aee6b2e2d9e299094aaa7972a7495e792c1d3dce23da6813d050f66fccefe41b66228 WHIRLPOOL d13a5d51f5d6189372ac732cdc2f94d14b54fc5faa5d44174dc5377a491b8f50f0d14868a5aaf10c0abd0f5b5d3f65bba1f97a4961063ce161aa97da3fbb5193
-AUX numpy-1.11.2-import-module-fix.patch 932 SHA256 890e1a4d48e510f890b1809b427bbe37ee25abe43349d859de7a9475a5f6b8dd SHA512 5f4b72cbab6a577490b029f3be5cbdacb0f161a26c20a37e1c924e5a9ba6403098de85cf578567292b31eb0a07c9f5ac6053f12c623e00e26605b6cc2f67ffe3 WHIRLPOOL 44db6690cf9bd91934ffddf572fc2821c67e4b56c09634a0eb68855c6b0969579747761596b3f48433a01a225061ea358807bea23f18d9f281a3a9f20a321105
+AUX numpy-1.12.1-no-hardcode-blas.patch 3473 SHA256 6c3563123a6fbc8c76648c5c4875af694d161ad8294b02cec3014c10e78c2d7f SHA512 0066fdc822151b13a4f91cab522000ab43bea52539100070949d08e0baf6bd35e9c32e13e877e22c40041c3fa0e8d716d802087b3c9016d6c1e05edd0e48fd6a WHIRLPOOL 700003d10c0681f0a41dd487eb0b2171042eeed70d667bd86fea4b6c9fc8ee842bbcacc6c2bc0d430a1213e311a01fb8ed465ed5b52a11565a2639f3159f8634
 DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
-DIST numpy-1.11.2.tar.gz 4178447 SHA256 04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69 SHA512 c1818de5c8b92cc2a673149f090cc863b484afd29e8a014ffcf8d0f5e70cf8886c7662dbe45847712dec8ae0412d1cb48b13cceefe3e4ec0e85bb20e4beaa46e WHIRLPOOL 668acc8ada165b57e1b2ab76969affa0098a5746c4ca21ae88cd189c5e6f79bde9d05bf951604d0c0f7400174f1e58f17fa0d662029f0b91cff78118fe3cdb0d
+DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d
 DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
 DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba
 DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
 DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1
 DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
 DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4
-EBUILD numpy-1.10.4.ebuild 4123 SHA256 9112b053bd3197d7bad0e5ec16f3f52cd18fa4a8f68820bea2d90174f401c221 SHA512 fdcd3969d8c6932c3f5124d1a68f80a7c1be7fb6171c652ec02c716550be6bb5eefb46a292fff7908ab67232c59105fe25a84a5b63dae787dabad41af9590f1a WHIRLPOOL afddcb18bf806169f759b1c4c0116293093533f13b3b1feedf79aa2a3a840a1af9261bdf33607d903fe148c76dcacc1804a3f19e880b7b21bd13549cfd57a381
-EBUILD numpy-1.11.2-r1.ebuild 4853 SHA256 3a3e6955c0fac80f2713ba57716191a1bc38079a657514c041c12154c3c24e7f SHA512 17d3e49cd392f67a8ca09bba77a5758a14eabf640264d61ec689353f839b8303cc9559cb427fa87939b916c926ae7ddeb5a702f3b4d3eb7bc3d4dffb2d31c93f WHIRLPOOL afe693fb794009b852e08de7c994081a697a50bcd70f61139b6788a8a1a522971437c689a6f94e504c2b21d8b87b2ecac40fc09a9ad73fc8e3ebeb0fcf66ab9e
+EBUILD numpy-1.10.4.ebuild 4116 SHA256 5bafcebdb2517abdbb3cda4f539b3b26b18d9dcfac20a886a91aa9252f51f2d5 SHA512 6a3bdecca124dde80c432b8a15f7a550999b15a0868a3672f30d97d600cd5aad33b98a15d831dcfd3ba79d0240aa7abd08f8076e5ab484980af9f3bb3cec6bc4 WHIRLPOOL 019886435a82eb071bef26812a58a4a497ef012a401754884c75e447648a5e87c6c3f668d3afffc45d95be77b7e5395741379b8ac675b55ddfdd56791ef32149
+EBUILD numpy-1.12.1.ebuild 4656 SHA256 d3198d5fdbd24ca7b9bf37619836d10800748b05ee02312f8bd4f709f1159f4c SHA512 a0382498b092c2bea421bf6b22d4e13c3ca1fd52fc2c851b9be3f567ad1af7e1a2dbee93c516f6b73f50750ceeb9680f538da6306c8fc7d137aa6a2e8b28d5f6 WHIRLPOOL bbb0b7dae0aaa4ec36fbc3354581eaad7544c43dde4526c966937268bb7cc47027b45127af8dcf97f6bf95eef6bfca7eb9af55b147d04dcae6b6d4d29c4034eb
 MISC metadata.xml 876 SHA256 e95b995924f4ee2df04a6ca11978b72f204bba208e5979b3e4832998a5e954a4 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 WHIRLPOOL 464a80aaf42947fa71b62134e77f788c5782441e79d0596cdbbfc81d8641c727298fb5eef4fe835c00ecb5ba9c7bd7f123ceff5eaa98dfb3aa9c45eecc75b8c9
diff --git a/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch b/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
deleted file mode 100644
index 80b710b5..00000000
--- a/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5d0ce36e5be134bb5ead03cab1edeaa60fa355aa Mon Sep 17 00:00:00 2001
-From: Jonathan Helmus <jjhelmus@gmail.com>
-Date: Wed, 12 Oct 2016 13:07:42 -0500
-Subject: [PATCH] BUG: import full module path in npy_load_module
-
-Use the full module path when importing importlib.machinery for use in the
-npy_load_module function. Just importing importlib is not sufficient in certain
-cases, for example Python 3.4.
-
-closes #8147
----
- numpy/compat/py3k.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
-index 25cc535..d5bb2e4 100644
---- a/numpy/compat/py3k.py
-+++ b/numpy/compat/py3k.py
-@@ -118,7 +118,7 @@ def npy_load_module(name, fn, info=None):
-         mod : module
- 
-         """
--        import importlib
-+        import importlib.machinery
-         return importlib.machinery.SourceFileLoader(name, fn).load_module()
- else:
-     def npy_load_module(name, fn, info=None):
diff --git a/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
index 1f6f9c4c..81d6084b 100644
--- a/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch
+++ b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
@@ -1,6 +1,6 @@
 --- numpy-1.11.1/numpy/distutils/system_info.py
 +++ numpy-1.11.1/numpy/distutils/system_info.py
-@@ -312,26 +312,7 @@
+@@ -312,27 +312,7 @@
        1 - display warning message
        2 - raise error
      """
@@ -21,6 +21,7 @@
 -          'openblas': openblas_info,          # use blas_opt instead
 -          # openblas with embedded lapack
 -          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'blis': blis_info,                  # use blas_opt instead
 -          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
 -          'blas_mkl': blas_mkl_info,          # use blas_opt instead
 -          'x11': x11_info,
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index 4533b079..96b5cb9e 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/dev-python/numpy/numpy-1.11.2-r1.ebuild b/dev-python/numpy/numpy-1.12.1.ebuild
index 7de119b9..7ff8bba0 100644
--- a/dev-python/numpy/numpy-1.11.2-r1.ebuild
+++ b/dev-python/numpy/numpy-1.12.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -16,7 +15,8 @@ DOC_P="${PN}-${DOC_PV}"
 
 DESCRIPTION="Fast array and numerical python library"
 HOMEPAGE="http://www.numpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
 	doc? (
 		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
 		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
@@ -36,12 +36,9 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch
+	"${FILESDIR}"/${P}-no-hardcode-blas.patch
 	"${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch
 	"${FILESDIR}"/${PN}-1.11.1-no-xlocale.patch
-	# This has been fixed upstream but no new release yet
-	# https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa
-	"${FILESDIR}"/${P}-import-module-fix.patch
 )
 
 src_unpack() {