a blind attempt to get from a pull-push confusion

6 files changed, 68 insertions, 52 deletions

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 0cb3791ef..b31db974e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org>
+  files/openblas-sharedlibs-0.2.patch:
+  sci-libs/openblas: fixed soname
+
+*openblas-0.2.0 (26 Jun 2012)
+
+  26 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> -openblas-0.1.ebuild,
+  +openblas-0.2.0.ebuild, +files/openblas-sharedlibs-0.2.patch,
+  openblas-9999.ebuild, -files/openblas-sharedlibs.patch:
+  Version bump. Adapted patch. More prefix keywords
+
   07 May 2012; Andrea Arteaga <andyspiros@gmail.com>
   -openblas-0.1_alpha2.ebuild -openblas-0.1_alpha25.ebuild:
   Cleaned up old versions.
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 0a204833b..d77f90156 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,2 +1,2 @@
 DIST openblas-0.1.1.tbz2 1657574 SHA256 0ab5f5b2ef7f3754977abf38686d8597a1296e91a27553867ece78357c453668 SHA512 834f1a2cfa03bafe484f59d6a7eea845f22210cacac52c605f09a5c939395f153e9213dc8f3abfccd133fb2efaeaf69d5053ad5cd90703a8eefd2877d4288981 WHIRLPOOL 1a2e4fe4616f9af453e1cbfaddfe103c7f73373d831f8a0dfc367c67c8d162ffbe911aa4a4f0ed26b2b44fb1e777ef6bddb1b785b4e8f879b7255a629d00b6c0
-DIST openblas-0.1.tbz2 1638384 SHA256 c20d5cca807d1a47c76bd6ed4d05e4f265584bb7ac5b777245616738c8388097 SHA512 76ee80bb85c066ddd175776cdd6d7a4707d0dad34028cf656a51ffac88289b28ddcfd96aff4915c412a457225ed14ab9c0bfea7cc64c0c80227157a404d20d21 WHIRLPOOL bb3b3fa522ad0e82c9ab4ee1bd4370ab96010537a1b3656c5d7eb87b6ac8aed15cdf4e9f107f47a4bcd6036e6dcb88f4d87318f805c895d5f92cd8a98a5f0cfe
+DIST openblas-0.2.0.tar.gz 3230656 RMD160 8c032874db2daf0d5edd855b626ead86be2bd44a SHA1 76f6fd7463d5972d4a992357e2016212b2696f0f SHA256 5b2fc651e1631322ed2b4fca45af605e571eafda43f7d1fbb28a9805666fdf2e SHA512 6c0b8223e059dc3845dce623dc737b1914e14041c509f711b11d638241d2fc72c4b702b3fca31c2642b2fdd631ebf89ddec72bedac461559ff0e1b49db06c07e WHIRLPOOL f9c7dfdb8f6aea39713521c8494b3cc9809394882d3fdd0c4a5d2b08fbb5088c3f8fe30219b3d27cce3e454243eeb7771bf7bf77e9e4d8cae0d0f0cd5ec5fac8
diff --git a/sci-libs/openblas/files/openblas-sharedlibs-0.2.patch b/sci-libs/openblas/files/openblas-sharedlibs-0.2.patch
new file mode 100644
index 000000000..a66b31457
--- /dev/null
+++ b/sci-libs/openblas/files/openblas-sharedlibs-0.2.patch
@@ -0,0 +1,45 @@
+--- exports/Makefile.orig	2012-06-26 10:24:20.154182394 -0700
++++ exports/Makefile	2012-06-26 10:28:59.894394334 -0700
+@@ -106,9 +106,9 @@
+ so : ../$(LIBSONAME)
+ 
+ ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
+-	$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
++	$(CC) $(LDFLAGS) -shared \
+ 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
+-	-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
++	-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBSONAME) $(EXTRALIB) -o ../$(LIBSONAME)
+ 	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
+ 	rm -f linktest
+ 
+@@ -119,9 +119,9 @@
+ so : ../$(LIBSONAME)
+ 
+ ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
+-	$(CC) $(CFLAGS)  -shared -o ../$(LIBSONAME) \
++	$(CC) $(LDFLAGS)  -shared \
+ 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
+-	-Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB)
++	-Wl,--soname=$(LIBSONAME) -Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB) -o ../$(LIBSONAME)
+ 	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
+ 	rm -f linktest
+ 
+@@ -132,14 +132,15 @@
+ so : ../$(LIBSONAME)
+ 
+ ../$(LIBSONAME) :
+-	$(CC) -shared -o ../$(LIBSONAME) ../$(LIBNAME)
++	$(CC) -shared ../$(LIBNAME) -o ../$(LIBSONAME)
+ endif
+ 
+ ifeq ($(OSNAME), SunOS)
+ 
+ so : ../$(LIBSONAME)
+-	$(CC) $(CFLAGS)  -shared -o ../$(LIBSONAME) \
+-	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
++	$(CC) $(LDFLAGS)  -shared  \
++	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive -Wl,--soname=$\(LIBSONAME) $(EXTRALIB) \
++	-o ../$(LIBSONAME)
+ 	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
+ 	rm -f linktest
+ 
diff --git a/sci-libs/openblas/files/openblas-sharedlibs.patch b/sci-libs/openblas/files/openblas-sharedlibs.patch
deleted file mode 100644
index 3ebe3076a..000000000
--- a/sci-libs/openblas/files/openblas-sharedlibs.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 $(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.ebuild b/sci-libs/openblas/openblas-0.2.0.ebuild
index 09b6092dd..61b59d42d 100644
--- a/sci-libs/openblas/openblas-0.1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.0.ebuild
@@ -6,23 +6,26 @@ 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://soc.dev.gentoo.org/~spiros/repository/${P}.tbz2"
+SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
+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}/${P}"
+S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.1,aliasing}.patch
+	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
@@ -48,6 +51,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,7 +94,8 @@ src_install() {
 		Description: ${DESCRIPTION}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas -lm ${threads}
+		Libs: -L\${libdir} -lopenblas ${threads}
+		Libs.private: -lm
 	EOF
 
 	alternatives_for blas ${profname} 0 \
diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 6484a1e57..393818d9c 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MYPN}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
+	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