[gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.0.4-r2.ebuild ChangeLog numpy-1.1.0.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    08/06/22 11:13:02

  Modified:             numpy-1.0.4-r2.ebuild ChangeLog
  Added:                numpy-1.1.0.ebuild
  Log:
  Version bump and added more configuration for better multiple lapack implementations
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.11                 dev-python/numpy/numpy-1.0.4-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild?r1=1.10&r2=1.11

Index: numpy-1.0.4-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- numpy-1.0.4-r2.ebuild	20 May 2008 13:52:31 -0000	1.10
+++ numpy-1.0.4-r2.ebuild	22 Jun 2008 11:13:01 -0000	1.11
@@ -1,16 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild,v 1.10 2008/05/20 13:52:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild,v 1.11 2008/06/22 11:13:01 bicatali Exp $
 
 NEED_PYTHON=2.3
 
 inherit distutils eutils flag-o-matic fortran
 
-MY_P=${P/_beta/b}
-MY_P=${MY_P/_}
-
 DESCRIPTION="Fast array and numerical python library"
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
 HOMEPAGE="http://numeric.scipy.org/"
 
 RDEPEND="!dev-python/f2py
@@ -24,8 +21,6 @@
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 LICENSE="BSD"
 
-S="${WORKDIR}/${MY_P}"
-
 # whatever LDFLAGS set will break linking
 # see progress in http://projects.scipy.org/scipy/numpy/ticket/573
 if [ -n "${LDFLAGS}" ]; then
@@ -76,29 +71,20 @@
 	# Detect phenom and nocona hardware correctly.  Bug #183236.
 	epatch "${FILESDIR}"/${P}-cpuinfo.patch
 
-	# Gentoo patch for ATLAS library and include dirs
-	sed -i \
-		-e "s:'f77blas':'blas':g" \
-		-e "s:'ptf77blas':'blas':g" \
-		-e "s:'ptcblas':'cblas':g" \
-		-e "s:'lapack_atlas':'lapack':g" \
-		-e "s:'atlas\*',:'','atlas\*',:g" \
-		numpy/distutils/system_info.py \
-		|| die "sed system_info.py failed"
-
-	cat > site.cfg <<-EOF
-		[DEFAULT]
-		library_dirs = /usr/$(get_libdir)
-		include_dirs = /usr/include
-	EOF
-
 	if use lapack; then
+		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
 		# cblas and lapack libraries under the name of atlas
-		# otherwise scipy will not create fast _dotblas
+		# otherwise fast _dotblas is not built
 		cat >> site.cfg <<-EOF
 			[atlas]
-			atlas_libs = $(pkg-config --libs-only-l cblas lapack \
-				| sed -e 's/^-l//' -e 's/ -l/,/g')
+			include_dirs = $(pkg-config --cflags-only-I cblas lapack \
+				| sed -e 's/^-I//' -e 's/ -I/:/g')
+			library_dirs = $(pkg-config --libs-only-L cblas lapack \
+				| sed -e 's/^-L//' -e 's/ -L/:/g')
+			atlas_libs = $(pkg-config --libs-only-l cblas \
+				| 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')
 		EOF
 	else
 		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
@@ -137,9 +123,11 @@
 }
 
 pkg_postinst() {
-	if ! built_with_use sys-devel/gcc fortran && ! has_version dev-lang/ifc; then
+	if  ! built_with_use sys-devel/gcc fortran &&
+		! has_version dev-lang/ifc
+	then
 		ewarn "To use numpy's f2py you need a fortran compiler."
-		ewarn "You can either set USE=fortran flag and re-emerge gcc,"
-		ewarn "or emerge dev-lang/ifc"
+		ewarn "You can either set USE=fortran flag and re-install gcc,"
+		ewarn "or install dev-lang/ifc"
 	fi
 }



1.61                 dev-python/numpy/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.60&r2=1.61

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog	20 May 2008 13:52:31 -0000	1.60
+++ ChangeLog	22 Jun 2008 11:13:01 -0000	1.61
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.60 2008/05/20 13:52:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.61 2008/06/22 11:13:01 bicatali Exp $
+
+*numpy-1.1.0 (22 Jun 2008)
+
+  22 Jun 2008; Sébastien Fabbro <bicatali@g.o>
+  +files/numpy-1.1.0-f2py.patch, numpy-1.0.4-r2.ebuild, +numpy-1.1.0.ebuild:
+  Version bump and added more configuration for better multiple lapack
+  implementations
 
   20 May 2008; Sébastien Fabbro <bicatali@g.o>
   +files/numpy-1.0.4-cpuinfo.patch, -files/numpy-1.0.4-nocona-cpuinfo.patch,



1.1                  dev-python/numpy/numpy-1.1.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.1.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.1.0.ebuild?rev=1.1&content-type=text/plain

Index: numpy-1.1.0.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.1.0.ebuild,v 1.1 2008/06/22 11:13:01 bicatali Exp $

NEED_PYTHON=2.4

inherit distutils eutils flag-o-matic fortran

DESCRIPTION="Fast array and numerical python library"
SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
HOMEPAGE="http://numeric.scipy.org/"

RDEPEND="!dev-python/f2py
	lapack? ( virtual/cblas virtual/lapack )"

DEPEND="${RDEPEND}
	lapack? ( dev-util/pkgconfig )"

IUSE="lapack"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
LICENSE="BSD"

# whatever LDFLAGS set will break linking
# see progress in http://projects.scipy.org/scipy/numpy/ticket/573
if [ -n "${LDFLAGS}" ]; then
	append-ldflags -shared
else
	LDFLAGS="-shared"
fi

pkg_setup() {
	# 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
	FORTRAN="gfortran g77 ifc"
	fortran_pkg_setup
	local fc=
	case ${FORTRANC} in
		gfortran) fc=gnu95 ;;
		g77) fc=gnu ;;
		ifc|ifort)
			if use ia64; then
				fc=intele
			elif use amd64; then
				fc=intelem
			else
				fc=intel
			fi
			;;
		*)	eerror "Unknown fortran compiler: ${FORTRANC}"
			die "numpy_fortran_setup failed" ;;
	esac

	# when fortran flags are set, pic is removed.
	use amd64 && FFLAGS="${FFLAGS} -fPIC"
	export NUMPY_FCONFIG="config_fc --fcompiler=${fc}"
}

src_unpack() {
	unpack ${A}
	cd "${S}"

	# Fix some paths and docs in f2py
	epatch "${FILESDIR}"/${P}-f2py.patch

	if use lapack; then
		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
		# cblas and lapack libraries under the name of atlas
		# otherwise fast _dotblas is not built
		cat >> site.cfg <<-EOF
			[atlas]
			include_dirs = $(pkg-config --cflags-only-I cblas lapack \
				| sed -e 's/^-I//' -e 's/ -I/:/g')
			library_dirs = $(pkg-config --libs-only-L cblas lapack \
				| sed -e 's/^-L//' -e 's/ -L/:/g')
			atlas_libs = $(pkg-config --libs-only-l cblas \
				| 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')
		EOF
	else
		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
	fi
}

src_compile() {
	# when fortran flags are set, pic is removed but unfortunately needed
	distutils_src_compile ${NUMPY_FCONFIG}
}

src_test() {
	"${python}" setup.py ${NUMPY_FCONFIG} install \
		--home="${S}"/test \
		--no-compile \
		|| die "install test failed"

	pushd "${S}"/test/lib*/python
	PYTHONPATH=. "${python}" -c "import numpy; numpy.test(10,3)" 2>&1 \
		| tee test.log
	grep -q '^OK$' test.log || die "test failed"
	popd

	rm -rf test
}

src_install() {
	distutils_src_install ${NUMPY_FCONFIG}

	docinto numpy
	dodoc numpy/doc/*txt || die "dodoc failed"

	docinto f2py
	dodoc numpy/f2py/docs/*txt || die "dodoc f2py failed"
	doman numpy/f2py/f2py.1 || die "doman failed"
}

pkg_postinst() {
	if  ! built_with_use sys-devel/gcc fortran &&
		! has_version dev-lang/ifc
	then
		ewarn "To use numpy's f2py you need a fortran compiler."
		ewarn "You can either set USE=fortran flag and re-install gcc,"
		ewarn "or install dev-lang/ifc"
	fi
}



-- 
gentoo-commits@l.g.o mailing list