| 1 |
commit: c87769ab4f410399e3a65c38827b72d733016b73 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Feb 28 18:10:52 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Feb 28 18:10:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c87769ab |
| 7 |
|
| 8 |
dev-python/numpy: sync with upstream |
| 9 |
|
| 10 |
dev-python/numpy/Manifest | 5 +++-- |
| 11 |
.../files/numpy-1.11.2-blas_rec_inc_dir.patch | 24 ++++++++++++++++++++++ |
| 12 |
dev-python/numpy/numpy-1.10.4.ebuild | 4 ++-- |
| 13 |
dev-python/numpy/numpy-1.11.2-r1.ebuild | 4 ++-- |
| 14 |
4 files changed, 31 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest |
| 17 |
index 3cf354d..58ed08d 100644 |
| 18 |
--- a/dev-python/numpy/Manifest |
| 19 |
+++ b/dev-python/numpy/Manifest |
| 20 |
@@ -2,6 +2,7 @@ AUX numpy-1.10.1-musl-fix.patch 543 SHA256 2d3f0358f9a5a33f783817964d1985f48eaff |
| 21 |
AUX numpy-1.10.2-no-hardcode-blas.patch 3295 SHA256 fb1ac68398a9c4fbf2396083e85480d46077d7b29069d8b62c4a929ab48216d1 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd WHIRLPOOL 2a34f1f6f6a3a37a67b7cb1419b0aca7891ab9375cb5489f4ac974e71dff9f6e9442d0b3414437bf3010f271d7782b89b111ef34dcee1530c39e43bebe1a7b08 |
| 22 |
AUX numpy-1.11.1-no-hardcode-blas.patch 3403 SHA256 c0943f88112e0aff962f2eac4478668d7bce35943791985d1b06a7184df569bb SHA512 0b32bf8e6fe08d139a589f5ca6a6d7d80716712f3cebcd84574ba5e90b283df84765d492f18e1fe3712aec6dbd6881a1b03e157e1cd6d42d6cd37022a62597aa WHIRLPOOL 5adec2edc32764f01563203731ca045bd7635a72e30eba27bae4bcd09adfe4a79996c0abef8b6856975e7bd5e63c1a7363e7fc6e6721711ce95fb7d343b89aeb |
| 23 |
AUX numpy-1.11.1-no-xlocale.patch 395 SHA256 e92d51ebbbc01dae37fab2c26b4ad64c4c791da62d52911ab8b6221ee732450a SHA512 2d53027efcb841ddc5ccc020d2a5df687815cf40b309c359f0efd7bfd431abc2786cf8b8b33b9873452f7907bd8b4f43470b5048ad122951a3b81203a5ae6494 WHIRLPOOL e4ddce622b7c7912936a54497f3077ee88a278468ca176758457ebe6de89bd33aebc3274ee85cf80a91d9d2a9cb68996fe7b42b7fee4bc9998d8673c6f4146c5 |
| 24 |
+AUX numpy-1.11.2-blas_rec_inc_dir.patch 958 SHA256 81d7cd91ad08cc5ae26cb16e955b1b52ba7c373d38b27979e868b300e782cdf8 SHA512 c1a10bc9f14fb42e2bd3e361059cde594c539e360f4388cb7fd202e49b2aee6b2e2d9e299094aaa7972a7495e792c1d3dce23da6813d050f66fccefe41b66228 WHIRLPOOL d13a5d51f5d6189372ac732cdc2f94d14b54fc5faa5d44174dc5377a491b8f50f0d14868a5aaf10c0abd0f5b5d3f65bba1f97a4961063ce161aa97da3fbb5193 |
| 25 |
AUX numpy-1.11.2-import-module-fix.patch 932 SHA256 890e1a4d48e510f890b1809b427bbe37ee25abe43349d859de7a9475a5f6b8dd SHA512 5f4b72cbab6a577490b029f3be5cbdacb0f161a26c20a37e1c924e5a9ba6403098de85cf578567292b31eb0a07c9f5ac6053f12c623e00e26605b6cc2f67ffe3 WHIRLPOOL 44db6690cf9bd91934ffddf572fc2821c67e4b56c09634a0eb68855c6b0969579747761596b3f48433a01a225061ea358807bea23f18d9f281a3a9f20a321105 |
| 26 |
DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c |
| 27 |
DIST numpy-1.11.2.tar.gz 4178447 SHA256 04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69 SHA512 c1818de5c8b92cc2a673149f090cc863b484afd29e8a014ffcf8d0f5e70cf8886c7662dbe45847712dec8ae0412d1cb48b13cceefe3e4ec0e85bb20e4beaa46e WHIRLPOOL 668acc8ada165b57e1b2ab76969affa0098a5746c4ca21ae88cd189c5e6f79bde9d05bf951604d0c0f7400174f1e58f17fa0d662029f0b91cff78118fe3cdb0d |
| 28 |
@@ -11,6 +12,6 @@ DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b |
| 29 |
DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1 |
| 30 |
DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71 |
| 31 |
DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4 |
| 32 |
-EBUILD numpy-1.10.4.ebuild 4122 SHA256 a61938b9f5e024c4b7d163452ea1bad398b0b4f2befc92165459cc77e9f781dc SHA512 750a64fc459b4c6e40b4b4cdba3cd7c010f14f83b358f2e897d8485bdd6595cfa447a69da5d7a5b66fc8f0c083d68ea1946d816df79f70a7a7ad9ca84f4d8cd6 WHIRLPOOL b5080726ff5ef082083b47703c492b13be09b39c6bb37786189ba9333068893e7d47afc619cda3bddc985d2890aa476f2714265c02f44e638cad2166da4c8fc7 |
| 33 |
-EBUILD numpy-1.11.2-r1.ebuild 4801 SHA256 51ddf4382f238b1e097605ad7080f252712881d2f4705cbae3f221cafb54fcda SHA512 36c6a399cd74839a462cdf8158254791ca3695d9b985c81ec8be02a0da38a525d513a6aba23b58bf6420d8fc27ccab5fdfedbe0f760ec9fefa8e6aaa530bcf08 WHIRLPOOL 97999b2532f8e6e223e52d1d2c0d3fcbc40a27699837ea6fdfdbecd2f2a4b65ad5493d450ec1d5796de151303e97e7c41af5565708bcf5290bf88a6600c1ee83 |
| 34 |
+EBUILD numpy-1.10.4.ebuild 4123 SHA256 9112b053bd3197d7bad0e5ec16f3f52cd18fa4a8f68820bea2d90174f401c221 SHA512 fdcd3969d8c6932c3f5124d1a68f80a7c1be7fb6171c652ec02c716550be6bb5eefb46a292fff7908ab67232c59105fe25a84a5b63dae787dabad41af9590f1a WHIRLPOOL afddcb18bf806169f759b1c4c0116293093533f13b3b1feedf79aa2a3a840a1af9261bdf33607d903fe148c76dcacc1804a3f19e880b7b21bd13549cfd57a381 |
| 35 |
+EBUILD numpy-1.11.2-r1.ebuild 4853 SHA256 3a3e6955c0fac80f2713ba57716191a1bc38079a657514c041c12154c3c24e7f SHA512 17d3e49cd392f67a8ca09bba77a5758a14eabf640264d61ec689353f839b8303cc9559cb427fa87939b916c926ae7ddeb5a702f3b4d3eb7bc3d4dffb2d31c93f WHIRLPOOL afe693fb794009b852e08de7c994081a697a50bcd70f61139b6788a8a1a522971437c689a6f94e504c2b21d8b87b2ecac40fc09a9ad73fc8e3ebeb0fcf66ab9e |
| 36 |
MISC metadata.xml 876 SHA256 e95b995924f4ee2df04a6ca11978b72f204bba208e5979b3e4832998a5e954a4 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 WHIRLPOOL 464a80aaf42947fa71b62134e77f788c5782441e79d0596cdbbfc81d8641c727298fb5eef4fe835c00ecb5ba9c7bd7f123ceff5eaa98dfb3aa9c45eecc75b8c9 |
| 37 |
|
| 38 |
diff --git a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch |
| 39 |
new file mode 100644 |
| 40 |
index 0000000..9a934cc |
| 41 |
--- /dev/null |
| 42 |
+++ b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch |
| 43 |
@@ -0,0 +1,24 @@ |
| 44 |
+commit 61e9159569a601315b67c30b6e26bbb2149c0bfa |
| 45 |
+Author: Benda Xu <heroxbd@g.o> |
| 46 |
+Date: Wed Feb 15 11:17:05 2017 +0900 |
| 47 |
+ |
| 48 |
+ BUG: blas_info should record include_dirs |
| 49 |
+ |
| 50 |
+ blas specified in site.cfg could have non-standard include dirs. |
| 51 |
+ It should be read and saved in distutils/__config__.py |
| 52 |
+ |
| 53 |
+PR: https://github.com/numpy/numpy/pull/8619 |
| 54 |
+ |
| 55 |
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
| 56 |
+index b8520ac..0fba865 100644 |
| 57 |
+--- a/numpy/distutils/system_info.py |
| 58 |
++++ b/numpy/distutils/system_info.py |
| 59 |
+@@ -1667,6 +1667,8 @@ class blas_info(system_info): |
| 60 |
+ info = self.check_libs(lib_dirs, blas_libs, []) |
| 61 |
+ if info is None: |
| 62 |
+ return |
| 63 |
++ else: |
| 64 |
++ info['include_dirs'] = self.get_include_dirs() |
| 65 |
+ if platform.system() == 'Windows': |
| 66 |
+ # The check for windows is needed because has_cblas uses the |
| 67 |
+ # same compiler that was used to compile Python and msvc is |
| 68 |
|
| 69 |
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild |
| 70 |
index ac0bf37..4533b07 100644 |
| 71 |
--- a/dev-python/numpy/numpy-1.10.4.ebuild |
| 72 |
+++ b/dev-python/numpy/numpy-1.10.4.ebuild |
| 73 |
@@ -4,7 +4,7 @@ |
| 74 |
|
| 75 |
EAPI=5 |
| 76 |
|
| 77 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 78 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 79 |
PYTHON_REQ_USE="threads(+)" |
| 80 |
|
| 81 |
FORTRAN_NEEDED=lapack |
| 82 |
@@ -25,7 +25,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
| 83 |
# It appears the docs haven't been upgraded, still @ 1.8.1 |
| 84 |
LICENSE="BSD" |
| 85 |
SLOT="0" |
| 86 |
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 87 |
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 88 |
IUSE="doc lapack test" |
| 89 |
|
| 90 |
RDEPEND=" |
| 91 |
|
| 92 |
diff --git a/dev-python/numpy/numpy-1.11.2-r1.ebuild b/dev-python/numpy/numpy-1.11.2-r1.ebuild |
| 93 |
index 79f985d..7de119b 100644 |
| 94 |
--- a/dev-python/numpy/numpy-1.11.2-r1.ebuild |
| 95 |
+++ b/dev-python/numpy/numpy-1.11.2-r1.ebuild |
| 96 |
@@ -4,7 +4,7 @@ |
| 97 |
|
| 98 |
EAPI=6 |
| 99 |
|
| 100 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 101 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 102 |
PYTHON_REQ_USE="threads(+)" |
| 103 |
|
| 104 |
FORTRAN_NEEDED=lapack |
| 105 |
@@ -37,8 +37,8 @@ DEPEND="${RDEPEND} |
| 106 |
|
| 107 |
PATCHES=( |
| 108 |
"${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch |
| 109 |
+ "${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch |
| 110 |
"${FILESDIR}"/${PN}-1.11.1-no-xlocale.patch |
| 111 |
- |
| 112 |
# This has been fixed upstream but no new release yet |
| 113 |
# https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa |
| 114 |
"${FILESDIR}"/${P}-import-module-fix.patch |
Archives