gentoo resync : 02.08.2019

4 files changed, 18 insertions, 112 deletions

diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index aad287883f3e..60a690d43e9b 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,6 +1,4 @@
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
-DIST openblas-0.3.5.tar.gz 11853101 BLAKE2B a9b249bc397fcb1d80401d1c60c6985803016e4fd0908649fe6386ae84a09a53569814b3af65fd8fbfa92f2cdd5d4af313ba91a80f7daa7e481a7941cbb9af2c SHA512 15520c3eca79b002f1afbee64257afa24705dec667a89bd46acfcdae426e29342816fb586db98ff256fcc9d0fd744b14b347fed23995958e7646a5e3e7310cf4
 DIST openblas-0.3.6.tar.gz 11923774 BLAKE2B 0133b83a4449fd7f86d6379129be4e4477df338d0a402a7787eec317838922b175315c6e6b014a2c7ed6aa1c58509a28f6b48c641e043af067434c4315f1fdb1 SHA512 e432ae8bfbdc8e8c6336553e05181ab38576164c140ef2a6ddb2a66479f724bd4e60a2c90f7bc15bf18eefa7045e7775dedae421fb71296b8d250132c2407b07
-EBUILD openblas-0.3.5.ebuild 3221 BLAKE2B d4331c0020077a88662d3c996f3f6dec4d5de177dbef427b77a9943381c7cbb0b1e8dbc7f99079e1aead19485e79ab526d21a2e975276b3a5d1b6cc6b7828d4b SHA512 4dac7b61401cf93a4ad9cb817ba591d5852353984601608d7330ac716ab8157c7fc050fb12b56c7b36d30994ca94be032f585c1741945a779b18f4c4926cb7a1
-EBUILD openblas-0.3.6.ebuild 3221 BLAKE2B d4331c0020077a88662d3c996f3f6dec4d5de177dbef427b77a9943381c7cbb0b1e8dbc7f99079e1aead19485e79ab526d21a2e975276b3a5d1b6cc6b7828d4b SHA512 4dac7b61401cf93a4ad9cb817ba591d5852353984601608d7330ac716ab8157c7fc050fb12b56c7b36d30994ca94be032f585c1741945a779b18f4c4926cb7a1
-MISC metadata.xml 871 BLAKE2B 80b2e7933a3ace1dd587c566c106c4b6804a3526b4bf17d8429ab7cf4eb722d8f03d3f1c39eca7ca19f4ef6d39965af5aecd574c55f156577eecd4785207f431 SHA512 b7c5e3332d37d710f4e5978df7eeade29947654adcfa23eb5a533c6333fe7c528f0b821c16560e0a74bd4437a9957f4365bc8fe264e0256b4559eaa7fcd5657f
+EBUILD openblas-0.3.6.ebuild 3508 BLAKE2B f0aad5a9f8977bea411144cc47d977e8fdf83e76a8475bbfec70efabfdb9db8c880ffe2cd03276e94f553f5dce9229719193b05c8b91d59cf12e2e437427bc3a SHA512 c74c40f9b3a9b7b3cc1adf697af94b87bb4f090f921b5084b7a20a429f8ab5276cfb637b89a312639d951e8fc78b5ae5063f6e6de58ae5afc8e36885ec699c0a
+MISC metadata.xml 945 BLAKE2B 19efdde0fefe0a22b2b9a1ceee091c037f6e1be3c9611263daf977b81a0620fe1e603cfa94277adbdef2bbfc47ab69488502f2f73fa61ec203193a90f87d9a19 SHA512 596ed3aca0e52076aac15a3ff3a10dd40a8da00b1069b2b120a690a91a735f4009f87cf5ef2236f2069883c7a39d3e0f4079148a171e3560f53cee180514326b
diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 987eb126d9c1..95b34d1ccda3 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -17,6 +17,7 @@
 		<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>
 	</use>
 	<upstream>
 		<remote-id type="github">xianyi/OpenBLAS</remote-id>
diff --git a/sci-libs/openblas/openblas-0.3.5.ebuild b/sci-libs/openblas/openblas-0.3.5.ebuild
deleted file mode 100644
index ba14ee30b531..000000000000
--- a/sci-libs/openblas/openblas-0.3.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-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"
-REQUIRED_USE="?? ( openmp pthread serial )"
-
-RDEPEND="
-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=()
-	use dynamic && \
-		flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1 )
-	if use openmp; then
-		flags+=( USE_THREAD=1 USE_OPENMP=1 )
-	elif use pthread; then
-		flags+=( USE_THREAD=1 USE_OPENMP=0 )
-	else
-		flags+=( USE_THREAD=0 ) # serial
-	fi
-	flags+=( DESTDIR="${D}" PREFIX="${EPREFIX}/usr" )
-	flags+=( OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} )
-	flags+=( OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) )
-	echo "${flags[@]}"
-}
-
-src_unpack () {
-	default
-	find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
-		mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
-}
-
-src_compile () {
-	emake $(openblas_flags)
-	emake -Cinterface shared-blas-lapack $(openblas_flags)
-}
-
-src_install () {
-	emake install $(openblas_flags)
-
-	if use eselect-ldso; then
-		dodir /usr/$(get_libdir)/blas/openblas/
-		insinto /usr/$(get_libdir)/blas/openblas/
-		doins interface/libblas.so.3
-		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
-		doins interface/libcblas.so.3
-		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
-		dodir /usr/$(get_libdir)/lapack/openblas/
-		insinto /usr/$(get_libdir)/lapack/openblas/
-		doins interface/liblapack.so.3
-		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
-	fi
-}
-
-pkg_postinst () {
-	use eselect-ldso || return
-	local libdir=$(get_libdir) me="openblas"
-
-	# check blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm () {
-	if use eselect-ldso; then
-		eselect blas validate
-		eselect lapack validate
-	fi
-}
diff --git a/sci-libs/openblas/openblas-0.3.6.ebuild b/sci-libs/openblas/openblas-0.3.6.ebuild
index ba14ee30b531..19c3b79f2584 100644
--- a/sci-libs/openblas/openblas-0.3.6.ebuild
+++ b/sci-libs/openblas/openblas-0.3.6.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
@@ -10,7 +11,7 @@ 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"
+IUSE="dynamic openmp pthread serial static-libs eselect-ldso index-64bit"
 REQUIRED_USE="?? ( openmp pthread serial )"
 
 RDEPEND="
@@ -27,6 +28,7 @@ openblas_flags() {
 	use dynamic && \
 		flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1 )
 	if use openmp; then
+		tc-check-openmp
 		flags+=( USE_THREAD=1 USE_OPENMP=1 )
 	elif use pthread; then
 		flags+=( USE_THREAD=1 USE_OPENMP=0 )
@@ -41,13 +43,18 @@ openblas_flags() {
 
 src_unpack () {
 	default
-	find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
-		mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+	mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+	if use index-64bit; then
+		cp -aL "${S}" "${S}-index-64bit" || die
+	fi
 }
 
 src_compile () {
 	emake $(openblas_flags)
 	emake -Cinterface shared-blas-lapack $(openblas_flags)
+	if use index-64bit; then
+		emake -C"${S}-index-64bit" $(openblas_flags) INTERFACE64=1 LIBPREFIX=libopenblas64
+	fi
 }
 
 src_install () {
@@ -66,6 +73,11 @@ src_install () {
 		doins interface/liblapack.so.3
 		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
 	fi
+
+	if use index-64bit; then
+		insinto /usr/$(get_libdir)/
+		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+	fi
 }
 
 pkg_postinst () {