sci-libs/openblas: version bump

7 files changed, 33 insertions, 306 deletions

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index b31db974e..198533a79 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.2 (09 Jul 2012)
+
+  09 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> -openblas-0.1.1.ebuild,
+  -files/openblas-sharedlibs-0.1.patch, -openblas-0.2.0.ebuild,
+  +openblas-0.2.2.ebuild, openblas-9999.ebuild:
+  Version bump
+
   27 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org>
   files/openblas-sharedlibs-0.2.patch:
   sci-libs/openblas: fixed soname
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index d77f90156..836733108 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,2 +1 @@
-DIST openblas-0.1.1.tbz2 1657574 SHA256 0ab5f5b2ef7f3754977abf38686d8597a1296e91a27553867ece78357c453668 SHA512 834f1a2cfa03bafe484f59d6a7eea845f22210cacac52c605f09a5c939395f153e9213dc8f3abfccd133fb2efaeaf69d5053ad5cd90703a8eefd2877d4288981 WHIRLPOOL 1a2e4fe4616f9af453e1cbfaddfe103c7f73373d831f8a0dfc367c67c8d162ffbe911aa4a4f0ed26b2b44fb1e777ef6bddb1b785b4e8f879b7255a629d00b6c0
-DIST openblas-0.2.0.tar.gz 3230656 RMD160 8c032874db2daf0d5edd855b626ead86be2bd44a SHA1 76f6fd7463d5972d4a992357e2016212b2696f0f SHA256 5b2fc651e1631322ed2b4fca45af605e571eafda43f7d1fbb28a9805666fdf2e SHA512 6c0b8223e059dc3845dce623dc737b1914e14041c509f711b11d638241d2fc72c4b702b3fca31c2642b2fdd631ebf89ddec72bedac461559ff0e1b49db06c07e WHIRLPOOL f9c7dfdb8f6aea39713521c8494b3cc9809394882d3fdd0c4a5d2b08fbb5088c3f8fe30219b3d27cce3e454243eeb7771bf7bf77e9e4d8cae0d0f0cd5ec5fac8
+DIST openblas-0.2.2.tar.gz 3230868 SHA256 19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e SHA512 9d39c6a2dac7b45d2f6e0361adc7ad057c9f2d1ea67c6b00779b95dcdcb7ff37566075684f260d1387e713cb0607493a7c76088326b1a4099b8f363189cb7170 WHIRLPOOL 7c8cc9eaf895ea9586e1e9e557d537521bf2d7cb1600c49271689d1cdbe14a41198c3a73b20d2db33a10066e2466e4f4b11106fbad4dd840e0c0cf9cd215d25f
diff --git a/sci-libs/openblas/files/openblas-sharedlibs-0.1.patch b/sci-libs/openblas/files/openblas-sharedlibs-0.1.patch
deleted file mode 100644
index c2e658072..000000000
--- a/sci-libs/openblas/files/openblas-sharedlibs-0.1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- exports/Makefile.orig	2010-11-12 05:30:06.000000000 +0000
-+++ exports/Makefile	2010-11-12 06:33:41.000000000 +0000
-@@ -97,10 +97,10 @@
- so : ../$(LIBSONAME)
- 
- ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
--	$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
--	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
--	-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
--	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
-+	$(CC) $(LDFLAGS) -shared  \
-+	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive -Wl,--soname=$(LIBSONAME) \
-+	-Wl,--retain-symbols-file=linux.def $(EXTRALIB) -o ../$(LIBSONAME)
-+	$(CC) $(CFLAGS) -w linktest.c ../$(LIBSONAME) $(FEXTRALIB) -o linktest && echo OK.
- 	rm -f linktest
- 
- endif
-@@ -110,10 +110,10 @@
- so : ../$(LIBSONAME)
- 
- ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
--	$(CC) $(CFLAGS)  -shared -o ../$(LIBSONAME) \
--	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
--	-Wl,--retain-symbols-file=linux.def $(EXTRALIB)
--	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
-+	$(CC) $(LDFLAGS)  -shared \
-+	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive -Wl,--soname=$(LIBSONAME) \
-+	-Wl,--retain-symbols-file=linux.def $(EXTRALIB) -o ../$(LIBSONAME)
-+	$(CC) $(CFLAGS) -w linktest.c ../$(LIBSONAME) $(FEXTRALIB) -o linktest && echo OK.
- 	rm -f linktest
- 
- endif
-@@ -129,9 +129,9 @@
- ifeq ($(OSNAME), SunOS)
- 
- so : ../$(LIBSONAME)
--	$(CC) $(CFLAGS)  -shared -o ../$(LIBSONAME) \
--	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
--	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
-+	$(CC) $(LDFLAGS) -shared -Wl,--soname=$(LIBSONAME) \
-+	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB) -o ../$(LIBSONAME) 
-+	$(CC) $(CFLAGS) -w  linktest.c ../$(LIBSONAME) $(FEXTRALIB) -o linktest && echo OK.
- 	rm -f linktest
- 
- endif
diff --git a/sci-libs/openblas/openblas-0.1.1.ebuild b/sci-libs/openblas/openblas-0.1.1.ebuild
deleted file mode 100644
index 09b6092dd..000000000
--- a/sci-libs/openblas/openblas-0.1.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs alternatives-2 multilib
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="http://soc.dev.gentoo.org/~spiros/repository/${P}.tbz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.1,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*\(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 -lm ${threads}
-	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.0.ebuild b/sci-libs/openblas/openblas-0.2.0.ebuild
deleted file mode 100644
index 61b59d42d..000000000
--- a/sci-libs/openblas/openblas-0.2.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs alternatives-2 multilib
-
-# commit ID
-CID="23a7062"
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-
-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.2.ebuild
new file mode 120000
index 000000000..2381753b7
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.2.ebuild
@@ -0,0 +1 @@
+openblas-9999.ebuild
\ No newline at end of file
diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 393818d9c..092af350b 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -4,22 +4,31 @@
 
 EAPI=4
 
-inherit eutils toolchain-funcs alternatives-2 git-2 multilib
+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="4933d61" # commit ID
+fi
+
+inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-EGIT_REPO_URI="git://github.com/xianyi/OpenBLAS.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 
 IUSE="+incblas int64 dynamic openmp static-libs threads"
 
 RDEPEND="virtual/fortran"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MYPN}"
+S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
@@ -48,6 +57,7 @@ src_configure() {
 		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):" \
@@ -90,30 +100,30 @@ src_install() {
 		Description: ${DESCRIPTION}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas -lm ${threads}
+		Libs: -L\${libdir} -lopenblas ${threads}
+		Libs.private: -lm
 	EOF
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-	fi
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
 
 	alternatives_for blas ${profname} 0 \
-		"/usr/$(get_libdir)/pkgconfig/blas.pc" "${profname}.pc"
+		/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"
+			/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}"
+			ebegin "Correcting install_name of ${d}"
 			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
 			eend $?
 		done