gentoo resync : 18.08.2019

3 files changed, 36 insertions, 27 deletions

diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 60a690d43e9b..bdc61767c453 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,4 +1,4 @@
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
 DIST openblas-0.3.6.tar.gz 11923774 BLAKE2B 0133b83a4449fd7f86d6379129be4e4477df338d0a402a7787eec317838922b175315c6e6b014a2c7ed6aa1c58509a28f6b48c641e043af067434c4315f1fdb1 SHA512 e432ae8bfbdc8e8c6336553e05181ab38576164c140ef2a6ddb2a66479f724bd4e60a2c90f7bc15bf18eefa7045e7775dedae421fb71296b8d250132c2407b07
-EBUILD openblas-0.3.6.ebuild 3508 BLAKE2B f0aad5a9f8977bea411144cc47d977e8fdf83e76a8475bbfec70efabfdb9db8c880ffe2cd03276e94f553f5dce9229719193b05c8b91d59cf12e2e437427bc3a SHA512 c74c40f9b3a9b7b3cc1adf697af94b87bb4f090f921b5084b7a20a429f8ab5276cfb637b89a312639d951e8fc78b5ae5063f6e6de58ae5afc8e36885ec699c0a
-MISC metadata.xml 945 BLAKE2B 19efdde0fefe0a22b2b9a1ceee091c037f6e1be3c9611263daf977b81a0620fe1e603cfa94277adbdef2bbfc47ab69488502f2f73fa61ec203193a90f87d9a19 SHA512 596ed3aca0e52076aac15a3ff3a10dd40a8da00b1069b2b120a690a91a735f4009f87cf5ef2236f2069883c7a39d3e0f4079148a171e3560f53cee180514326b
+EBUILD openblas-0.3.6.ebuild 3532 BLAKE2B b48e2a8dce76ebff23d42da60e867e97ceb5c2f7d9b610800472e8765373dc8547f86065bc35d3924e402b3f4d47650596a457845b2c5062e22f377318ada101 SHA512 0ac456ebe0043cd37be9e40186283895ed09c9bbdad9259b918b40053d3b083ef9df341e2806f7d140cb63dc39182b785e0da556d594edd1150f424c972b18b5
+MISC metadata.xml 884 BLAKE2B a2fa7ef571e7fa3a5390f73e40f58fe54b156e9a706c046e88b844de341b0689b8a5fe996fa31ea48f913bfbf064271983d065dd1ada7109212240bcb766317a SHA512 088a07f3bb464717bd8403c9547def9c361b1d0c9f3e5d3398d93c7d8f7b54b4ec47ec82b4d72409ad926a6e49fc297cdbe43b7ea199cf1d64ac27091930868d
diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 95b34d1ccda3..fa16b081f106 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -14,10 +14,9 @@
 	</longdescription>
 	<use>
 		<flag name="dynamic">Build dynamic architecture detection at run time (for multi targets)</flag>
-		<flag name="pthread">Build with pthread threadding model</flag>
-		<flag name="serial">Build without multi-thraedding</flag>
 		<flag name="eselect-ldso">Enable BLAS/LAPACK runtime switching</flag>
 		<flag name="index-64bit">Compile a separate INTERFACE64 OpenBLAS</flag>
+		<flag name="pthread">Build with pthread threading model</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">xianyi/OpenBLAS</remote-id>
diff --git a/sci-libs/openblas/openblas-0.3.6.ebuild b/sci-libs/openblas/openblas-0.3.6.ebuild
index 19c3b79f2584..f52bf5c6ece1 100644
--- a/sci-libs/openblas/openblas-0.3.6.ebuild
+++ b/sci-libs/openblas/openblas-0.3.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs
+inherit fortran-2 toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
@@ -11,34 +11,38 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="dynamic openmp pthread serial static-libs eselect-ldso index-64bit"
-REQUIRED_USE="?? ( openmp pthread serial )"
+IUSE="dynamic eselect-ldso index-64bit openmp pthread"
+REQUIRED_USE="?? ( openmp pthread )"
 
 RDEPEND="
-eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-				!app-eselect/eselect-cblas
-				>=app-eselect/eselect-lapack-0.2 )
-"
+	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
+			!app-eselect/eselect-cblas
+			>=app-eselect/eselect-lapack-0.2 )"
+
 DEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/shared-blas-lapack.patch" )
 
-openblas_flags() {
-	local flags=()
+pkg_setup() {
+	fortran-2_pkg_setup
+	use openmp && tc-check-openmp
+	export CC=$(tc-getCC) FC=$(tc-getFC)
+
 	use dynamic && \
-		flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1 )
+		export DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1
+
+	# disable submake with -j
+	export MAKE_NB_JOBS=-1
+
+	USE_THREAD=0
 	if use openmp; then
-		tc-check-openmp
-		flags+=( USE_THREAD=1 USE_OPENMP=1 )
+		USE_THREAD=1; USE_OPENMP=1;
 	elif use pthread; then
-		flags+=( USE_THREAD=1 USE_OPENMP=0 )
-	else
-		flags+=( USE_THREAD=0 ) # serial
+		USE_THREAD=1; USE_OPENMP=0;
 	fi
-	flags+=( DESTDIR="${D}" PREFIX="${EPREFIX}/usr" )
-	flags+=( OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} )
-	flags+=( OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) )
-	echo "${flags[@]}"
+	export USE_THREAD USE_OPENMP
+
+	export PREFIX="${EPREFIX}/usr"
 }
 
 src_unpack () {
@@ -50,15 +54,21 @@ src_unpack () {
 }
 
 src_compile () {
-	emake $(openblas_flags)
-	emake -Cinterface shared-blas-lapack $(openblas_flags)
+	emake
+	emake -Cinterface shared-blas-lapack
 	if use index-64bit; then
-		emake -C"${S}-index-64bit" $(openblas_flags) INTERFACE64=1 LIBPREFIX=libopenblas64
+		emake -C"${S}-index-64bit" INTERFACE64=1 LIBPREFIX=libopenblas64
 	fi
 }
 
+src_test() {
+	emake tests
+}
+
 src_install () {
-	emake install $(openblas_flags)
+	emake install DESTDIR="${D}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
+		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
+	dodoc GotoBLAS_*.txt *.md Changelog.txt
 
 	if use eselect-ldso; then
 		dodir /usr/$(get_libdir)/blas/openblas/