[gentoo-commits] proj/sci:master commit in: sci-libs/openblas/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     a01282d0107acf25637e0fff53dfa34cf2ef204b
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 12 19:27:53 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 19:27:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a01282d0

sci-libs/openblas: Version bump. Link latest version to live one

Package-Manager: portage-2.2.01.21418-prefix

---
 sci-libs/openblas/ChangeLog                        |    8 +-
 sci-libs/openblas/openblas-0.2.3.ebuild            |  131 --------------------
 sci-libs/openblas/openblas-0.2.4-r1.ebuild         |  131 --------------------
 sci-libs/openblas/openblas-0.2.4.ebuild            |  131 --------------------
 ...openblas-0.2.2.ebuild => openblas-0.2.5.ebuild} |    0
 sci-libs/openblas/openblas-9999.ebuild             |    6 +-
 6 files changed, 11 insertions(+), 396 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index bcfe190..879560b 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.5 (12 Dec 2012)
+
+  12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +openblas-0.2.5.ebuild,
+  -openblas-0.2.2.ebuild, -openblas-0.2.3.ebuild, -openblas-0.2.4-r1.ebuild,
+  -openblas-0.2.4.ebuild, openblas-9999.ebuild:
+  sci-libs/openblas: Version bump. Link latest version to live one
+
 *openblas-0.2.4-r1 (15 Oct 2012)
 
   15 Oct 2012; Andrea Arteaga <spiros@gentoo.com> +openblas-0.2.4-r1.ebuild:
@@ -95,4 +102,3 @@
   23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> +openblas-9999.ebuild,
   +files/openblas-sharedlibs.patch, +metadata.xml:
   Initial import
-

diff --git a/sci-libs/openblas/openblas-0.2.3.ebuild b/sci-libs/openblas/openblas-0.2.3.ebuild
deleted file mode 100644
index 27d5bb6..0000000
--- a/sci-libs/openblas/openblas-0.2.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	_SCM=git-2
-	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-	CID="e552452" # commit ID
-fi
-
-inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
-	# respect LDFLAGS
-	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
-	# respect CFLAGS only if dynamic flag not enabled
-	if ! use dynamic; then
-		sed -i \
-			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
-			Makefile.rule || die
-	fi
-	# fix executable stacks
-	local i
-	for i in $(find . -name \*.S); do
-		cat >> ${i} <<-EOF
-			#if defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-}
-
-src_configure() {
-	local use_openmp=$(use openmp && echo 1)
-	use threads && use openmp && use_openmp="" && \
-		einfo "openmp and threads enabled: using threads"
-	sed -i \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
-		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
-		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
-		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
-		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
-		Makefile.rule || die
-}
-
-src_compile() {
-	mkdir solibs
-	emake libs shared && mv *$(get_libname) solibs/
-	use static-libs && emake clean && emake libs NEED_PIC=
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	local profname=${PN} threads
-	use int64 && profname=${profname}-int64
-	if use threads; then
-		threads="-pthread"
-		profname=${profname}-threads
-	elif use openmp; then
-		profname=${profname}-openmp
-	fi
-
-	dolib.so solibs/lib*$(get_libname)
-	use static-libs && dolib.a lib*.a
-
-	# create pkg-config file and associated eselect file
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas ${threads}
-		Libs.private: -lm
-	EOF
-
-	alternatives_for blas ${profname} 0 \
-		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
-
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-		insinto /usr/include/${PN}
-		doins cblas.h common*.h config.h param.h
-		alternatives_for cblas ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
-			/usr/include/cblas.h ${PN}/cblas.h
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		for d in *.dylib ; do
-			ebegin "Correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
-}

diff --git a/sci-libs/openblas/openblas-0.2.4-r1.ebuild b/sci-libs/openblas/openblas-0.2.4-r1.ebuild
deleted file mode 100644
index 759c758..0000000
--- a/sci-libs/openblas/openblas-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	_SCM=git-2
-	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-	CID="ea9a46c" # commit ID
-fi
-
-inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
-	# respect LDFLAGS
-	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
-	# respect CFLAGS only if dynamic flag not enabled
-	if ! use dynamic; then
-		sed -i \
-			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
-			Makefile.rule || die
-	fi
-	# fix executable stacks
-	local i
-	for i in $(find . -name \*.S); do
-		cat >> ${i} <<-EOF
-			#if defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-}
-
-src_configure() {
-	local use_openmp=$(use openmp && echo 1)
-	use threads && use openmp && use_openmp="" && \
-		einfo "openmp and threads enabled: using threads"
-	sed -i \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
-		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
-		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
-		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
-		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
-		Makefile.rule || die
-}
-
-src_compile() {
-	mkdir solibs
-	emake libs shared && mv *$(get_libname) solibs/
-	use static-libs && emake clean && emake libs NEED_PIC=
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	local profname=${PN} threads
-	use int64 && profname=${profname}-int64
-	if use threads; then
-		threads="-pthread"
-		profname=${profname}-threads
-	elif use openmp; then
-		profname=${profname}-openmp
-	fi
-
-	dolib.so solibs/lib*$(get_libname)
-	use static-libs && dolib.a lib*.a
-
-	# create pkg-config file and associated eselect file
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas ${threads}
-		Libs.private: -lm
-	EOF
-
-	alternatives_for blas ${profname} 0 \
-		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
-
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-		insinto /usr/include/${PN}
-		doins cblas.h common*.h config.h param.h
-		alternatives_for cblas ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
-			/usr/include/cblas.h ${PN}/cblas.h
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		for d in *.dylib ; do
-			ebegin "Correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
-}

diff --git a/sci-libs/openblas/openblas-0.2.4.ebuild b/sci-libs/openblas/openblas-0.2.4.ebuild
deleted file mode 100644
index 4197eda..0000000
--- a/sci-libs/openblas/openblas-0.2.4.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	_SCM=git-2
-	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-	CID="be853da" # commit ID
-fi
-
-inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
-	# respect LDFLAGS
-	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
-	# respect CFLAGS only if dynamic flag not enabled
-	if ! use dynamic; then
-		sed -i \
-			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
-			Makefile.rule || die
-	fi
-	# fix executable stacks
-	local i
-	for i in $(find . -name \*.S); do
-		cat >> ${i} <<-EOF
-			#if defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-}
-
-src_configure() {
-	local use_openmp=$(use openmp && echo 1)
-	use threads && use openmp && use_openmp="" && \
-		einfo "openmp and threads enabled: using threads"
-	sed -i \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
-		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
-		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
-		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
-		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
-		Makefile.rule || die
-}
-
-src_compile() {
-	mkdir solibs
-	emake libs shared && mv *$(get_libname) solibs/
-	use static-libs && emake clean && emake libs NEED_PIC=
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	local profname=${PN} threads
-	use int64 && profname=${profname}-int64
-	if use threads; then
-		threads="-pthread"
-		profname=${profname}-threads
-	elif use openmp; then
-		profname=${profname}-openmp
-	fi
-
-	dolib.so solibs/lib*$(get_libname)
-	use static-libs && dolib.a lib*.a
-
-	# create pkg-config file and associated eselect file
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas ${threads}
-		Libs.private: -lm
-	EOF
-
-	alternatives_for blas ${profname} 0 \
-		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
-
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-		insinto /usr/include/${PN}
-		doins cblas.h common*.h config.h param.h
-		alternatives_for cblas ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
-			/usr/include/cblas.h ${PN}/cblas.h
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		for d in *.dylib ; do
-			ebegin "Correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
-}

diff --git a/sci-libs/openblas/openblas-0.2.2.ebuild b/sci-libs/openblas/openblas-0.2.5.ebuild
similarity index 100%
rename from sci-libs/openblas/openblas-0.2.2.ebuild
rename to sci-libs/openblas/openblas-0.2.5.ebuild

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 092af35..5011871 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-	CID="4933d61" # commit ID
 fi
 
 inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
@@ -28,7 +27,10 @@ IUSE="+incblas int64 dynamic openmp static-libs threads"
 RDEPEND="virtual/fortran"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch