gentoo new year resync : 01.01.2021

12 files changed, 163 insertions, 194 deletions

diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index e52e6cd3c2d3..e5ff9a1139e2 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -1,9 +1,10 @@
-AUX clblas-2.10-disable-multilib-cflags.patch 854 BLAKE2B 1f639c6a8d010f7afab50c208613ca837960981ac0fe3eb688cd632fbf29a75e34df8c2bd3544a9f20dca02cb91b85cc8f1708bc031564f9101bd75b4a7eaedd SHA512 39d144be9667b907bdbf1d0d48684196a959801126fa4a9f3b376a1824eaecfc3a5cb3e7d6b8c233e0f8e807b1b241449f6e9554c46ee49d6eca30779c860bff
-AUX clblas-2.10-fix-blas-dot-calls.patch 2732 BLAKE2B 8e92b645d36b314c8bed51a4fbe03a2ca56a739540bc27a2ec1bfeeb3a396834b93167e5f81fbcade118d500fa4088d83e086bb7c5f14a7baa2e3903a3e3a177 SHA512 07c1ac79cf9e9432f0f01cfc01c88c88bf4d733de259236eb1087c7e6b6f0539987cb2caf576ec6db24e6efb15de2d1655bdc5afcbd6512e3d15acedbcfbd995
-AUX clblas-2.10-fix-doxygen-output-dir.patch 639 BLAKE2B 2fc330008b347bfccf19b2d9b8e41129ed69dd3bd1419734497fbfdf49ad233227676f41407304616fb6f0cd8e843fb1c8e3bbb06eb82b802d77bb0e25f56675 SHA512 295dfccb9cd860f354abe775c142e0d68b31d2bc25f427b5b8ec4103865e73ce3a4d43967834eaaf3e40f978f48dddcdac1451138b4d53d5f973321d7f27aa74
-AUX clblas-2.10-fix-pthread-linkage.patch 684 BLAKE2B 6f50b130f57a3a36a202c516bd9413f6ce36490a344b5a2ab130076f88b71b381ba1afe4cdd7c71315b60b46c8b783387f1ef78c148dc16d285e033391d9a006 SHA512 ae42cb7a59caa407df20ec3cfd8e593003bd2653dd43471c39591907159bc6b557c1b7fc4062f662b5986de8fd89cf9b2a287f4b6116701b55baf3ad6acab273
-AUX clblas-2.10-use-boost-dynamic-libs.patch 579 BLAKE2B bd7d7913b72baf15dd733a75050a5981c369fd42ea9c4ad2e6edcc084d52476b65a0b7269ce6c6083fc8fd86c2e2df0716cf0db9a645918c55b52e23165aebd1 SHA512 a07163684bcf69dba8c2df69d120a25ca7186104d40c27bf4d0267a21320460f3585d3fb1fb132df5cc5a1bca2905623c0285bffceb125c1f7d89129a3cc4f65
-AUX clblas-2.10-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744
-DIST clblas-2.10.tar.gz 1154117 BLAKE2B 67035b03ab3a8fa07f32cb8d1d40af39fd885ceb21d9754f8a49a62adcfacbeeec703dfdae922ec0fc915a2dcadff2fc2f07a6c5ced74db3da6cd85c6c63f4d5 SHA512 5ed43104aae565292e0df4cc9e014cf483ccc0ff89257ebb5817f6508bfc9593585ed658da639f2167fbfb5d92ef116be4d5de3694f56e1a1e228bd42b1c05c6
-EBUILD clblas-2.10.ebuild 2374 BLAKE2B 87793a3a270e7079eca8c29429395b3f6f9ad1312fc8dd13af70b05842673852d2a4a0c139aecbf161a8e35a10937f64fe75cc448287f6eb5412309c3b9bb29b SHA512 051e69dc0fc3b07936d1e3ff3040440d97e53451e05f39ed104512ec4296041b1320f2d589b6b41aaab704e358a4e4d32a49bbafa73a30f388146b99b0d4f66a
+AUX clblas-2.12-Detect-CBLAS-when-building-the-client.patch 631 BLAKE2B 61ebeed443138fc49e6c30fc593eeebe6a265937766c4aac346a82fc2e7630b4c2bfaf3910250dbca648b78e5f5c1c17a339c176a84a13dd5e9cc3f7121f475e SHA512 749aadc8eb17643d4853473e68c2ac3c45f3d958f9bb04bb893da20f0a095bbc3cbffbf37e89e13d09cf43ca31a00178d974984bba6bb0149b9d0163b263833d
+AUX clblas-2.12-disable-multilib-cflags.patch 1132 BLAKE2B efcd473b84abf17b6a708b1e93250312b84ffce55d599b41d55214ad8b0a8465852ef0556763fe76c5f32abe5d2074d26cde431570d81ab345c3488cdec9e15f SHA512 1ba6c93c65a28565ef3dfb40b527233505ae6f94fc3dc1dff5cf4e68b67763188ee85fc51aeca61f607816cfac1b0d74cfb8c8777b84484225359161feb3897e
+AUX clblas-2.12-fix-doxygen-output-dir.patch 639 BLAKE2B 2fc330008b347bfccf19b2d9b8e41129ed69dd3bd1419734497fbfdf49ad233227676f41407304616fb6f0cd8e843fb1c8e3bbb06eb82b802d77bb0e25f56675 SHA512 295dfccb9cd860f354abe775c142e0d68b31d2bc25f427b5b8ec4103865e73ce3a4d43967834eaaf3e40f978f48dddcdac1451138b4d53d5f973321d7f27aa74
+AUX clblas-2.12-fix-pthread-linkage.patch 702 BLAKE2B a2b03a94fe7298d3524a0aa4b9bc20e5c46f74b2176fb2c1b388486a156ceefaace5ca85690221f660538f5ace43baf273c2187851ca483b09f000f02a84fac0 SHA512 5855c4c59126020a561c514182030f9c185d4d94de497c146471c2e185a9cf0b80844dcdf8132fda74cbcbe619c73bbcc7866b41c71c5a722438968c59c5c149
+AUX clblas-2.12-reproducible-build.patch 669 BLAKE2B fb51f4ef1658becfa3e4e2e01af0d862600c803052eee5997888377fd5451f95c33c1cb41cf74fda7d497a1887c651ff7449d210d8685a4f0d920c2f8c8ce5b3 SHA512 51123396efa541a510fa778c2e59ed7911aacaf1d5b6b624082bb994e5c04237c62384aaa685a49d9eefbd83efa216de3df4210f00f419b45ae73b55885b71f6
+AUX clblas-2.12-use-boost-dynamic-libs.patch 597 BLAKE2B c65bfa09a6636041ef1816dc55c0a0874f747d49eb1ea5934dca5080dd86215ea40933cd156c2015eb73ba31a0c563343adf7048ac0eed03abfb3edbbeac6b46 SHA512 d32230ea4a707a78fd0e7d081176ee3d3cf814c749ae3eee4d4c1be8e08687eee458e1d538874ce47537a32832adaace8bf8918bf3ec37a3b63dcc35ce7f68d4
+AUX clblas-2.12-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744
+DIST clblas-2.12.tar.gz 1157445 BLAKE2B 27352a7775db94808ce21f2b4a39fe505d4f37be4305dc7fb5a4068a86d3f51a9e4863931f634150762b31256f9f7e8e5d0d8b70f404b5a9ddb8a489b800aea6 SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72
+EBUILD clblas-2.12.ebuild 2015 BLAKE2B 0975f9088a4e4ebd8ecdfe22dc3337cddb63cdad5c228d471d6a22e88c09c48c08e3a05ee96143f7f2716f8070f7a354986f5be7de243cbc09b375970f4e1aef SHA512 a570b15291defd8d14c6a7b3fa491e4f4903f952118b5e055ea26dc064e42f11e472178695a7b4c47264834e72fa7a04279c357c83f91fcf6ab33b872d6959fe
 MISC metadata.xml 1029 BLAKE2B 9f21ddf2d9d08fccdf4f40c7324feaa5dc003a8ee0abe35f6158e3d9f507edb593f89216802ea04192486615ef5effb9ce5d70d42d4da5000c246be4db5c4e48 SHA512 62e2f6461060977e68d8f175f40d8de1801f5c4f635e33817ffb04dba9b8a19747bcd99206972e21b8780f5f0499290ff8b0d46bf5bdc1463659a8dd5cebb483
diff --git a/sci-libs/clblas/clblas-2.10.ebuild b/sci-libs/clblas/clblas-2.10.ebuild
deleted file mode 100644
index 112150552dc8..000000000000
--- a/sci-libs/clblas/clblas-2.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FORTRAN_NEEDED=test
-
-inherit cmake-utils python-single-r1 toolchain-funcs fortran-2
-
-MYPN="clBLAS"
-
-DESCRIPTION="Library containing BLAS routines for OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clBLAS"
-SRC_URI="https://github.com/clMathLibraries/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/2" # soname version
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client doc examples ktest performance test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="performance? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	virtual/opencl
-	doc? ( dev-libs/mathjax )
-	performance? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-	   dev-cpp/gtest
-	   dev-libs/boost
-	   virtual/pkgconfig
-	   virtual/blas
-	)
-"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-CMAKE_USE_DIR="${S}/src"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable-multilib-cflags.patch
-	"${FILESDIR}"/${P}-fix-blas-dot-calls.patch
-	"${FILESDIR}"/${P}-fix-doxygen-output-dir.patch
-	"${FILESDIR}"/${P}-fix-pthread-linkage.patch
-	"${FILESDIR}"/${P}-use-boost-dynamic-libs.patch
-	"${FILESDIR}"/${P}-use-system-mathjax.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_RUNTIME=ON
-		-DBUILD_SAMPLE=OFF
-		-DBUILD_CLIENT="$(usex client)"
-		-DBUILD_KTEST="$(usex ktest)"
-		-DBUILD_PERFORMANCE="$(usex performance)"
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_TEST=ON
-			-DUSE_SYSTEM_GTEST=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=( -DBUILD_TEST=OFF	)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cd doc
-		doxygen clBLAS.doxy || die
-	fi
-}
-
-src_test() {
-	pushd "${BUILD_DIR}/staging" > /dev/null
-	LD_LIBRARY_PATH="${BUILD_DIR}/library:${LD_LIBRARY_PATH}" \
-				   ./test-short
-	popd > /dev/null
-
-	# horrible hack to avoid installing compiled tests
-	# this will trigger some overcompilation
-	mycmakeargs+=( -DBUILD_TEST=OFF	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	cmake-utils_src_install
-	dodoc CHANGELOG  CONTRIBUTING.md NOTICE  README.md
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r src/samples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/clblas/clblas-2.12.ebuild b/sci-libs/clblas/clblas-2.12.ebuild
new file mode 100644
index 000000000000..700aa880f9f3
--- /dev/null
+++ b/sci-libs/clblas/clblas-2.12.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 toolchain-funcs cmake
+
+MYPN="clBLAS"
+
+DESCRIPTION="Library containing BLAS routines for OpenCL"
+HOMEPAGE="https://github.com/clMathLibraries/clBLAS"
+SRC_URI="https://github.com/clMathLibraries/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/2" # soname version
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client doc examples ktest performance test"
+# the testsuite is hopelessly broken and upstream is pretty much dead
+RESTRICT="test"
+
+RDEPEND="
+	virtual/opencl
+	client? ( virtual/cblas )
+	doc? ( dev-libs/mathjax )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	client? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/${MYPN}-${PV}"
+CMAKE_USE_DIR="${S}/src"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12-disable-multilib-cflags.patch
+	"${FILESDIR}"/${PN}-2.12-fix-pthread-linkage.patch
+	"${FILESDIR}"/${PN}-2.12-fix-doxygen-output-dir.patch
+	"${FILESDIR}"/${PN}-2.12-use-system-mathjax.patch
+	"${FILESDIR}"/${PN}-2.12-reproducible-build.patch
+	"${FILESDIR}"/${PN}-2.12-use-boost-dynamic-libs.patch
+	"${FILESDIR}"/${PN}-2.12-Detect-CBLAS-when-building-the-client.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_RUNTIME=ON
+		-DBUILD_SAMPLE=OFF
+		# tests are beyond repair
+		-DBUILD_TEST=OFF
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_KTEST=$(usex ktest)
+		-DBUILD_PERFORMANCE=$(usex performance)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	use client && mycmakeargs+=(
+		-DNetlib_LIBRARIES="$($(tc-getPKG_CONFIG) --libs cblas blas)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cd doc || die
+		doxygen clBLAS.doxy || die
+		HTML_DOCS=( doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc CHANGELOG CONTRIBUTING.md NOTICE README.md
+	if use examples; then
+		docinto examples
+		dodoc -r src/samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch b/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch
deleted file mode 100644
index a7e59d913f06..000000000000
--- a/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: disable multilib flags
-Author: Ghislain Antony Vaillant <ghisvail@gmail.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -296,9 +296,9 @@
-     # Don't use -rpath.
-     set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
- 
--    set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
--    set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
--    set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
-+    #set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
-+    #set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
-+    #set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
- 
-     if(TARGET_PLATFORM EQUAL 32)
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin")
diff --git a/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch b/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch
deleted file mode 100644
index cc2c6c3c1766..000000000000
--- a/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/src/tests/correctness/blas-lapack.c b/src/tests/correctness/blas-lapack.c
-index 9687bdf..54666b1 100644
---- a/src/tests/correctness/blas-lapack.c
-+++ b/src/tests/correctness/blas-lapack.c
-@@ -655,7 +655,7 @@ complex cdotu( int n, complex *x, int incx, complex *y, int incy)
-     #elif defined( __APPLE__)
-         cblas_cdotu_sub(n, x, incx, y, incy, &ans);
-     #else
--        cdotusub_(&n, x, &incx, y, &incy, &ans);
-+        ans = cdotu_(&n, x, &incx, y, &incy);
-     #endif
- 
-     return ans;
-@@ -670,7 +670,7 @@ doublecomplex zdotu( int n, doublecomplex *x, int incx,  doublecomplex *y, int i
-     #elif defined(__APPLE__)
-         cblas_zdotu_sub(n, x, incx, y, incy, &ans);
-     #else
--        zdotusub_(&n, x, &incx, y, &incy, &ans);
-+        ans = zdotu_(&n, x, &incx, y, &incy);
-     #endif
- 
-     return ans;
-@@ -685,7 +685,7 @@ complex cdotc( int n, complex *x, int incx, complex *y, int incy)
-     #elif defined(__APPLE__)
-         cblas_cdotc_sub(n, x, incx, y, incy, &ans);
-     #else
--        cdotcsub_(&n, x, &incx, y, &incy, &ans);
-+        ans = cdotc_(&n, x, &incx, y, &incy);
-     #endif
- 
-     return ans;
-@@ -700,7 +700,7 @@ doublecomplex zdotc( int n, doublecomplex *x, int incx,  doublecomplex *y, int i
-     #elif defined(__APPLE__)
-         cblas_zdotc_sub(n, x, incx, y, incy, &ans);
-     #else
--        zdotcsub_(&n, x, &incx, y, &incy, &ans);
-+        ans = zdotc_(&n, x, &incx, y, &incy);
-     #endif
- 
-     return ans;
-diff --git a/src/tests/correctness/blas-lapack.h b/src/tests/correctness/blas-lapack.h
-index d2db1aa..8619e1e 100644
---- a/src/tests/correctness/blas-lapack.h
-+++ b/src/tests/correctness/blas-lapack.h
-@@ -1170,10 +1170,10 @@ double ddot_(int *n, double *x, int *incx, double* y, int *incy);
-     complex cdotc_(int *n, complex *x, int *incx, complex* y, int *incy);
-     doublecomplex zdotc_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
- #else
--    void cdotusub_(int *n, complex *x, int *incx, complex* y, int *incy, complex *ans);
--    void zdotusub_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy, doublecomplex *ans);
--    void cdotcsub_(int *n, complex *x, int *incx, complex* y, int *incy, complex *ans);
--    void zdotcsub_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy, doublecomplex *ans);
-+    complex cdotu_(int *n, complex *x, int *incx, complex* y, int *incy);
-+    doublecomplex zdotu_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
-+    complex cdotc_(int *n, complex *x, int *incx, complex* y, int *incy);
-+    doublecomplex zdotc_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
- #endif
- 
- void sswap_(int *n, float *x, int *incx, float* y, int *incy);
diff --git a/sci-libs/clblas/files/clblas-2.12-Detect-CBLAS-when-building-the-client.patch b/sci-libs/clblas/files/clblas-2.12-Detect-CBLAS-when-building-the-client.patch
new file mode 100644
index 000000000000..bfe94dfd7074
--- /dev/null
+++ b/sci-libs/clblas/files/clblas-2.12-Detect-CBLAS-when-building-the-client.patch
@@ -0,0 +1,24 @@
+From: Ghislain Antony Vaillant <ghisvail@gmail.com>
+Date: Sat, 21 Jan 2017 16:49:27 +0000
+Subject: Detect CBLAS when building the client
+
+---
+ src/CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index bf351c1..28d6a60 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -267,10 +267,7 @@ if( BUILD_TEST )
+ endif( )
+ 
+ if( BUILD_CLIENT )
+-    if( NETLIB_FOUND )
+-    else( )
+-        message( WARNING "Not find Netlib; BUILD_CLIENT needs the Netlib CBLAS library" )
+-    endif()
++    find_package( Netlib COMPONENTS BLAS REQUIRED )
+ endif()
+ 
+ 
diff --git a/sci-libs/clblas/files/clblas-2.12-disable-multilib-cflags.patch b/sci-libs/clblas/files/clblas-2.12-disable-multilib-cflags.patch
new file mode 100644
index 000000000000..8e8f14871ef1
--- /dev/null
+++ b/sci-libs/clblas/files/clblas-2.12-disable-multilib-cflags.patch
@@ -0,0 +1,26 @@
+Description: disable multilib flags
+Author: Ghislain Antony Vaillant <ghisvail@gmail.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -305,18 +305,6 @@
+     # Don't use -rpath.
+     set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
+ 
+-    # Need to determine the target machine of the C compiler, because
+-    # the '-m32' and '-m64' flags are supported on x86 but not on e.g. ARM.
+-    exec_program( "${CMAKE_C_COMPILER} -dumpmachine"
+-        OUTPUT_VARIABLE CMAKE_C_COMPILER_MACHINE )
+-    message( STATUS "CMAKE_C_COMPILER_MACHINE: ${CMAKE_C_COMPILER_MACHINE}" )
+-    # The "86" regular expression matches x86, x86_64, i686, etc.
+-    if(${CMAKE_C_COMPILER_MACHINE} MATCHES "86")
+-        set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
+-        set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
+-        set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
+-    endif()
+-
+     if(TARGET_PLATFORM EQUAL 32)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin")
+     endif()
diff --git a/sci-libs/clblas/files/clblas-2.10-fix-doxygen-output-dir.patch b/sci-libs/clblas/files/clblas-2.12-fix-doxygen-output-dir.patch
index 31abb89b1c3a..31abb89b1c3a 100644
--- a/sci-libs/clblas/files/clblas-2.10-fix-doxygen-output-dir.patch
+++ b/sci-libs/clblas/files/clblas-2.12-fix-doxygen-output-dir.patch
diff --git a/sci-libs/clblas/files/clblas-2.10-fix-pthread-linkage.patch b/sci-libs/clblas/files/clblas-2.12-fix-pthread-linkage.patch
index aa99529df034..c920c8140d8d 100644
--- a/sci-libs/clblas/files/clblas-2.10-fix-pthread-linkage.patch
+++ b/sci-libs/clblas/files/clblas-2.12-fix-pthread-linkage.patch
@@ -5,9 +5,9 @@ Forwarded: no
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/library/CMakeLists.txt
 +++ b/src/library/CMakeLists.txt
-@@ -888,6 +888,10 @@
+@@ -889,6 +889,10 @@
  set_target_properties( clBLAS PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
- target_link_libraries(clBLAS ${OPENCL_LIBRARIES} ${MATH_LIBRARY})
+ target_link_libraries(clBLAS ${OPENCL_LIBRARIES} ${MATH_LIBRARY} ${THREAD_LIBRARY})
  
 +set(THREADS_PREFER_PTHREAD_FLAG ON)
 +find_package(Threads REQUIRED)
diff --git a/sci-libs/clblas/files/clblas-2.12-reproducible-build.patch b/sci-libs/clblas/files/clblas-2.12-reproducible-build.patch
new file mode 100644
index 000000000000..9d7c2b771e41
--- /dev/null
+++ b/sci-libs/clblas/files/clblas-2.12-reproducible-build.patch
@@ -0,0 +1,17 @@
+Description: make package build reproducible
+ By disabling the HTML timestamp setting in Doxygen.
+Author: Ghislain Antony Vaillant <ghisvail@gmail.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/clBLAS.doxy
++++ b/doc/clBLAS.doxy
+@@ -974,7 +974,7 @@
+ # page will contain the date and time when the page was generated. Setting 
+ # this to NO can help when comparing the output of multiple runs.
+ 
+-HTML_TIMESTAMP         = YES
++HTML_TIMESTAMP         = NO
+ 
+ # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+ # documentation will contain sections that can be hidden and shown after the 
diff --git a/sci-libs/clblas/files/clblas-2.10-use-boost-dynamic-libs.patch b/sci-libs/clblas/files/clblas-2.12-use-boost-dynamic-libs.patch
index 57c585da11fc..64388c90dc48 100644
--- a/sci-libs/clblas/files/clblas-2.10-use-boost-dynamic-libs.patch
+++ b/sci-libs/clblas/files/clblas-2.12-use-boost-dynamic-libs.patch
@@ -5,12 +5,12 @@ Forwarded: no
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -270,7 +270,7 @@
+@@ -279,7 +279,7 @@
  
  # Find Boost on the system, and configure the type of boost build we want
  set( Boost_USE_MULTITHREADED ON )
 -set( Boost_USE_STATIC_LIBS   ON )
 +set( Boost_USE_STATIC_LIBS   OFF )
  set( Boost_DETAILED_FAILURE_MSG   ON )
- set( Boost_DEBUG ON )
- set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" )
+ # set( Boost_DEBUG ON )
+ set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" "1.60.0" "1.60" )
diff --git a/sci-libs/clblas/files/clblas-2.10-use-system-mathjax.patch b/sci-libs/clblas/files/clblas-2.12-use-system-mathjax.patch
index 775a669e96a8..775a669e96a8 100644
--- a/sci-libs/clblas/files/clblas-2.10-use-system-mathjax.patch
+++ b/sci-libs/clblas/files/clblas-2.12-use-system-mathjax.patch