Version bump. Removed 1.4.0 because pulled out by upstream for ABI incompatibilities

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 23 insertions, 22 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 0561268d2b90..57283d14e2b3 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.108 2010/03/04 20:31:05 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.109 2010/04/22 19:26:48 bicatali Exp $
+
+*numpy-1.4.1 (22 Apr 2010)
+
+  22 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> -numpy-1.4.0.ebuild,
+  -files/numpy-1.4.0-python-2.7.patch, +numpy-1.4.1.ebuild:
+  Version bump. Removed 1.4.0 because pulled out by upstream for ABI
+  incompatibilities
 
   04 Mar 2010; Joseph Jezak <josejx@gentoo.org> numpy-1.4.0.ebuild:
   Marked -ppc/-ppc64 due to a lack of support for long double format. Please
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 820751d139fe..d11034c3fd66 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
 AUX numpy-1.3.0-alpha.patch 1210 RMD160 d92ca3fa7d671da1ff8e3e2e1a6b64469cf7142b SHA1 0a8740710d7b2e40b1a8899771b641999440558b SHA256 ea0da717e694338a1bca72f1b635309be15af2cdee206b50de4b38ce95701c64
 AUX numpy-1.3.0-arm-sh.patch 2166 RMD160 cc60f574ab7fe29968ebc56f9018c2427f01f6cc SHA1 59b4751c26abf837a69d8bd637bd9abb89344f72 SHA256 9b373c5b8886df971c350c44766ccdf165ffec6c2082f68704121965ad7a2f37
@@ -5,16 +8,22 @@ AUX numpy-1.3.0-darwin-no-arch.patch 3016 RMD160 a35968a68fac400e14d5eeafb44e058
 AUX numpy-1.3.0-fenv-freebsd.patch 1177 RMD160 78a84e18836472bd9c657771c43a44e417ec3e19 SHA1 4dba898255df4784eac9e52633307991c12029de SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5
 AUX numpy-1.3.0-parisc.patch 474 RMD160 682971d65894aeb2e87de5f8eac717a8f7803318 SHA1 da6067bd782604119111d69fce06b7536d59f6ca SHA256 413af76d3b5518d2f544c4497110a3401d40a7ea713a7449ea8826facddbf225
 AUX numpy-1.4.0-interix.patch 478 RMD160 9a0290253238e09b824069d0026a5d2f00c90a8f SHA1 261e45c3feb068f033eed9b6468f5115ea418ca5 SHA256 4d6adcc1c66aa1399871c37f57e94ae7138c157ee5575945e83224a36c98c142
-AUX numpy-1.4.0-python-2.7.patch 404 RMD160 3cf3b8fc8274cc5689552a4d612b50e8666af8b8 SHA1 43d3380655149aa605ed936d52e642e736cdc855 SHA256 78952903ad2216de91dddafd1c89b91a4db2ec1080bdf80d89998b63eaf4fc79
 DIST numpy-1.2.1.tar.gz 1448933 RMD160 7eb721d0d853f3b0b9b04a4f447353873d6c0997 SHA1 1aa706e733aea18eaffa70d93c0105718acb66c5 SHA256 4392b4b78eb503b187a6004468d2dd14d976c4b30a327e51f2277730c415003e
 DIST numpy-1.3-html.zip 3303495 RMD160 bd35c66c78574e6225de59a47cf161f3623c5119 SHA1 10799530be334cd7b1120a0b46f3c6f5deae5110 SHA256 933724b83300c9fc0779a579dad212ca8dcee230f1d892a56b977f3854d87c7e
 DIST numpy-1.3-ref.pdf 3907485 RMD160 54fe28c711b49ccc160dceed05bafa4e605aec36 SHA1 1edc6a3467bb36c5f395c2ed4dc066394180c6f8 SHA256 c8420df5d25e7fd76e7662477787184d068f43fc340b6975fa1db9ec06c773e7
 DIST numpy-1.3-user.pdf 461480 RMD160 a8aa36e6a0c03784fa3147cc0f0967c7f3c726d6 SHA1 059eee01d65ea401e47f978e2d5ebf5f67973723 SHA256 ab99f999d33eb1d1100ddb5c995ba525edaa64efce51a1f06b65a8285779d636
 DIST numpy-1.3.0.tar.gz 1995868 RMD160 a75155d2014204e16c59857b92356353505c39b9 SHA1 c04998a1fbf7d990c9a2b99a7b62486012c570ac SHA256 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d
-DIST numpy-1.4.0.tar.gz 2215411 RMD160 313502001e1d30e8b218b5b02f6a1d8387407f3c SHA1 522b789527f280410ab09f10c947ccc3f8086a8f SHA256 b8dbdb2c8459699b4021b72237222e4b7314d0bacecce5951a6a1318de32270d
+DIST numpy-1.4.1.tar.gz 2201795 RMD160 a0bbebd1138ffc93517095e3c06459cd9744a9d6 SHA1 ec6078aa09acbcca3d90f9f36353fc83e7e1daa0 SHA256 2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06
 EBUILD numpy-1.2.1.ebuild 4237 RMD160 523240c56efc80b8fdc32a7a0356d7bbb7d02059 SHA1 531b4656bfd3077d761c0e5074bf19cc033067cd SHA256 18d23bb2e7a8d9cc8c24e039a00b8004773f492af7ce6cd070bc6d1acdb28bc7
 EBUILD numpy-1.3.0-r1.ebuild 4341 RMD160 1954980498a3e2d0ff3241f2b5eb18371351a8ff SHA1 3db4084cafcbdb10a6f0397ddd7cef17e7487270 SHA256 b31a1b5d2dd7feb05a1adc13759a3578f77a6f6cda90d2206e2c1f9e8c73dbd8
 EBUILD numpy-1.3.0-r2.ebuild 4853 RMD160 93add86217a2d1d6aff15b3ce410aae8d1a34615 SHA1 45f67dd9439b4544db707750091ad45c254a106c SHA256 dfeba721ab9b7433c2c532d00473c989fb9bc5839f69bc20cbf1a8d8135f6105
-EBUILD numpy-1.4.0.ebuild 4645 RMD160 89e11d57a3fc6c53ee50807298bef3001c731649 SHA1 bc24ac41fc34ae4f19ce469764736f1b19b1b5ac SHA256 f9bf882d43a6d89bb60b6efb15c41f912736d021b3b9b7124f7e648cf076e88b
-MISC ChangeLog 15641 RMD160 e4a2d3df932d3d5a72fb9fdd1fad513fe12ca6d8 SHA1 cbec2a94d4d3e3d94045fac7ef6f8b8eb88380ea SHA256 fc34f2ab07216b02a59f76117edba1715a0c9cd9fb74d90c3cf840b0ae666b23
+EBUILD numpy-1.4.1.ebuild 4610 RMD160 bf856dd4e253c144d15fee3fb4665459e89922f6 SHA1 c7eca0664eb2ba14fbf8d98ebada1f9555200464 SHA256 7f0f2b2f6762f8dd36117ea9bcc6885eaa8bd9c6a59026a5c5c8f6a908dd425e
+MISC ChangeLog 15897 RMD160 300b6838fbe70cb61ff00cf85f0bd330f98bb6db SHA1 9ed8b4c2b891c1b16834dc18cc22b135316fa757 SHA256 de0a7cf94c08e3fdd49dd10621c97d1915226d1cbd55af8630b976f4feeb509e
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvQre8ACgkQ1ycZbhPLE2CRzgCgm/r59zQ8dwyAJzw0B5U/swB6
+WokAn0GbL94ItUjDcjle4ZpY2CWxVjLb
+=Nn9c
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.4.0-python-2.7.patch b/dev-python/numpy/files/numpy-1.4.0-python-2.7.patch
deleted file mode 100644
index 3bc850ea9015..000000000000
--- a/dev-python/numpy/files/numpy-1.4.0-python-2.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- numpy/distutils/ccompiler.py
-+++ numpy/distutils/ccompiler.py
-@@ -2,9 +2,11 @@
- import os
- import sys
- import new
-+from copy import copy
- 
- from distutils.ccompiler import *
- from distutils import ccompiler
-+from distutils.errors import DistutilsExecError, DistutilsModuleError, DistutilsPlatformError
- from distutils.sysconfig import customize_compiler
- from distutils.version import LooseVersion
- 
diff --git a/dev-python/numpy/numpy-1.4.0.ebuild b/dev-python/numpy/numpy-1.4.1.ebuild
index 113645317464..4d53dfa566f0 100644
--- a/dev-python/numpy/numpy-1.4.0.ebuild
+++ b/dev-python/numpy/numpy-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.4.0.ebuild,v 1.4 2010/03/04 20:31:05 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.4.1.ebuild,v 1.1 2010/04/22 19:26:48 bicatali Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -59,7 +59,6 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
 	epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
-	epatch "${FILESDIR}"/${P}-python-2.7.patch
 
 	# Gentoo patch for ATLAS library names
 	sed -i \
@@ -101,7 +100,7 @@ src_prepare() {
 		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
 	fi
 
-	epatch "${FILESDIR}"/${P}-interix.patch
+	epatch "${FILESDIR}"/${PN}-1.4.0-interix.patch
 }
 
 src_compile() {