bump

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 153 insertions, 3 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index da50f64fa579..13560a76b2fd 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.237 2014/08/14 06:23:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.238 2014/08/22 11:09:44 idella4 Exp $
+
+*numpy-1.8.2 (22 Aug 2014)
+
+  22 Aug 2014; Ian Delaney <idella4@gentoo.org> +numpy-1.8.2.ebuild,
+  numpy-1.8.1.ebuild:
+  bump
 
   14 Aug 2014; Justin Lecher <jlec@gentoo.org> numpy-1.8.1.ebuild:
   Fix doc installation patrh, #519236; thanks ero-sennin for the patch
diff --git a/dev-python/numpy/numpy-1.8.1.ebuild b/dev-python/numpy/numpy-1.8.1.ebuild
index 9759b430be2e..1d9a0274aad3 100644
--- a/dev-python/numpy/numpy-1.8.1.ebuild
+++ b/dev-python/numpy/numpy-1.8.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.1.ebuild,v 1.2 2014/08/14 06:23:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.1.ebuild,v 1.3 2014/08/22 11:09:44 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
 
 FORTRAN_NEEDED=lapack
 
diff --git a/dev-python/numpy/numpy-1.8.2.ebuild b/dev-python/numpy/numpy-1.8.2.ebuild
new file mode 100644
index 000000000000..b1d7aec2aa44
--- /dev/null
+++ b/dev-python/numpy/numpy-1.8.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.2.ebuild,v 1.1 2014/08/22 11:09:44 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+
+DOC_PV="1.8.1"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${P/2/1}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${P/2/1}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${P2/1}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# 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
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/*
+		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt
+	doman numpy/f2py/f2py.1
+}