Delete older ebuild.

Package-Manager: portage-2.2.0_alpha9_p3/cvs/Linux x86_64

4 files changed, 6 insertions, 184 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 33eb379a2a7a..7d8e6f68de2a 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.122 2010/11/19 04:35:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.123 2010/12/18 21:38:49 arfrever Exp $
+
+  18 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -numpy-1.5.0-r2.ebuild, -files/numpy-1.5.0-python3.patch:
+  Delete.
 
 *numpy-1.5.1 (19 Nov 2010)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7e4b6e88a83a..6fa8bc05e262 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,6 +1,3 @@
------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
@@ -8,7 +5,6 @@ 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.5.0-python3.patch 559 RMD160 880a47284b214c4b2f55e60702130972138a2d1e SHA1 b8981077591b58e3c932769f6fc17b5df5962d80 SHA256 e3b7c082b11219816d687b1a9378db35320c6a632fa066ceab3ea1bc9a3bca0c
 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
@@ -17,19 +13,10 @@ DIST numpy-1.4.1.tar.gz 2201795 RMD160 a0bbebd1138ffc93517095e3c06459cd9744a9d6
 DIST numpy-1.5-html.zip 8545276 RMD160 41636f21c2c82ed1d9f15fe595c9d9303f62a2ee SHA1 c4fb912eec5850e5cf20afd47920a0019bfa5535 SHA256 2b71258bc71b623f682eaa791b81e0f81dce43b69546a1bcd3b1a9de830ce057
 DIST numpy-1.5-ref.pdf 7112007 RMD160 35901204b7e4c0ffc08ebb43a8a4dfa5b5a79bf1 SHA1 5e496e87a4f9873759397cb1cf546f6af0533598 SHA256 9ec75950b46e9d086cfb170f6978ba2b146ed7b1dc103af51e3c81ed5b8b5406
 DIST numpy-1.5-user.pdf 562092 RMD160 20d475d9c5a4abbad0ec5f969fdf9a5eef79c4b3 SHA1 6fafde625a81dd4be22a158cd73c010cb219e855 SHA256 afe77bacce8839460330e0c1c8a01508a03dd4a3010c2b8739ab61956d47f69d
-DIST numpy-1.5.0.tar.gz 2276377 RMD160 6c6a8ce32d32705b66966c7a58359a0f2f404549 SHA1 5e3c40e1dde20bd8fda7a2131cb1259af7689295 SHA256 06d2181c884c5937c7c475103dd55de4fe4842a9d91bab1ed0965dd973a4661a
 DIST numpy-1.5.1.tar.gz 2280220 RMD160 6d8f03e4cd2db48a7c9ac39b441d9e0219b15dcf SHA1 423c6bf74f9ac00697db574ba981547991110896 SHA256 c36789ec381fec09f519249744ea36a77e5534b69446a59ee73b06cac29542eb
 EBUILD numpy-1.3.0-r1.ebuild 4342 RMD160 879a352a8de2b08c574a65263397c994550ce98a SHA1 0c18d544b1cc67a99fc2ca8ed0b2611d0aa07b69 SHA256 f913bfe4f6e75b0e07d89d3a5428f7aa96a9aee41a9cfc684b34aa1bb77cc979
 EBUILD numpy-1.3.0-r2.ebuild 4871 RMD160 95857c55408844db31856efc0ed9dd76aa79d834 SHA1 7dfa21315306a13cfa2184a419d46034fea7ed2f SHA256 8fee38f0222015c2a9ec98c7dbf6dda4679553284ebce6b11575e9d0d47e238f
 EBUILD numpy-1.4.1.ebuild 4619 RMD160 c056baa71d237c299785fd8a547ef9a1220e3d14 SHA1 50a88d00b13231cdb4506e6eb36297bd03964891 SHA256 afba66d922a6918eb84f840e94bea77498f5c1492709c77e840d445a95cdcabf
-EBUILD numpy-1.5.0-r2.ebuild 4987 RMD160 2b33628bbcfc01fab68613402671383a774ce1bd SHA1 fde07c58147c3c1dee7cab761f875689adb11a4f SHA256 c51b1800504ade75ee6cf269558d2d49a9140f258ce2c83dd1449a82bc298b9d
 EBUILD numpy-1.5.1.ebuild 4933 RMD160 5629c11a26be08179cdb6651448ebf3178750d15 SHA1 e54833afd5cf8ab130d6c44c2e832b950741557c SHA256 2f2eccd1bb545a0558376983c3416f26c1c74b7d6ad88e50822f67f56ea13766
-MISC ChangeLog 17785 RMD160 debdf00bbe121df9d90ab6211f79fd4edee7cd2a SHA1 42010b5b83d71dd0b3370479c74ce9f3c9de1d40 SHA256 6e303b53249a1bf865b7f41bfcf67ec3605f7fdf524c62e3a9a9b15d3b3b9e25
+MISC ChangeLog 17929 RMD160 2614d261294b3832a8a82f5c2d12cdc0b155d05d SHA1 36fcfe08361dad016d3237699f714d1c994a32bc SHA256 84fbf4e2902d585454cb06e2c0c21773f17782626d101b5371f39144781f0eb8
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzmAXkACgkQ1ycZbhPLE2CdEwCgnjDxEWFi5+vCVkLh24E6Pfgs
-x7cAn1u/TlV9DY4kt+TSOw9orjx28EN5
-=ORQf
------END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.5.0-python3.patch b/dev-python/numpy/files/numpy-1.5.0-python3.patch
deleted file mode 100644
index c88c70e8fcf9..000000000000
--- a/dev-python/numpy/files/numpy-1.5.0-python3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Backport r8689 fixing infinite compile loop with Python3 and GCC-4.5
-
-http://projects.scipy.org/numpy/ticket/1604
-http://bugs.gentoo.org/show_bug.cgi?id=336781
-
---- numpy/distutils/command/config.py
-+++ numpy/distutils/command/config.py
-@@ -271,7 +271,7 @@
-         high = mid
-         # Binary search:
-         while low != high:
--            mid = (high - low) / 2 + low
-+            mid = (high - low) // 2 + low
-             try:
-                 self._compile(body % {'type': type_name, 'size': mid},
-                         headers, include_dirs, 'c')
diff --git a/dev-python/numpy/numpy-1.5.0-r2.ebuild b/dev-python/numpy/numpy-1.5.0-r2.ebuild
deleted file mode 100644
index 62b3e8e81ee2..000000000000
--- a/dev-python/numpy/numpy-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.5.0-r2.ebuild,v 1.7 2010/11/07 17:41:38 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils flag-o-matic toolchain-funcs versionator
-
-NP="${PN}-1.5"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${NP}.x/numpy-html.zip -> ${NP}-html.zip
-		http://docs.scipy.org/doc/${NP}.x/numpy-ref.pdf -> ${NP}-ref.pdf
-		http://docs.scipy.org/doc/${NP}.x/numpy-user.pdf -> ${NP}-user.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips -ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( dev-util/pkgconfig )
-	test? ( >=dev-python/nose-0.10 )"
-
-PYTHON_CFLAGS=("* + -fno-strict-aliasing")
-
-DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
-
-pkg_setup() {
-	python_pkg_setup
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	use lapack || return
-	[[ -z ${FC} ]] && FC=$(tc-getFC)
-	# when fortran flags are set, pic is removed.
-	FFLAGS="${FFLAGS} -fPIC"
-	NUMPY_FCONFIG="config_fc --noopt --noarch"
-	# workaround bug 335908
-	[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG="${NUMPY_FCONFIG} --fcompiler=gnu95"
-	export NUMPY_FCONFIG
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${NP}-html.zip -d html || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
-	epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
-	epatch "${FILESDIR}"/${P}-python3.patch # 336781
-
-	# Gentoo patch for ATLAS library names
-	sed -i \
-		-e "s:'f77blas':'blas':g" \
-		-e "s:'ptf77blas':'blas':g" \
-		-e "s:'ptcblas':'cblas':g" \
-		-e "s:'lapack_atlas':'lapack':g" \
-		numpy/distutils/system_info.py \
-		|| die "sed system_info.py failed"
-
-	if use lapack; then
-		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF
-			[atlas]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-			atlas_libs = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			lapack_libs = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			[blas_opt]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-			libraries = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			[lapack_opt]
-			library_dirs = $(pkg-config --libs-only-L \
-				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-			libraries = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.4.0-interix.patch
-}
-
-src_compile() {
-	distutils_src_compile ${NUMPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		# Disable tests with Python 3 until dev-python/nose supports Python 3.
-		[[ "$(python_get_version --major)" == 3 ]] && return
-
-		"$(PYTHON)" setup.py ${NUMPY_FCONFIG} build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile || die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
-		PYTHONPATH=python "$(PYTHON)" -c "import numpy; numpy.test()" 2>&1 | tee test.log
-		grep -Eq '^(ERROR|FAIL):' test.log && return 1
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install ${NUMPY_FCONFIG}
-
-	delete_txt() {
-		rm -f "${ED}"$(python_get_sitedir)/numpy/*.txt
-	}
-	python_execute_function -q delete_txt
-
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
-	doman numpy/f2py/f2py.1 || die "doman failed"
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/html || die
-		doins  "${DISTDIR}"/${NP}*pdf || die
-	fi
-}