gentoo auto-resync : 05:10:2022 - 19:20:12

6 files changed, 22 insertions, 24 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4742bbf08fc8..38bb6268ddad 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index c9f6e7400bf0..15ef48cff2ce 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -6,5 +6,5 @@ AUX clblas-2.12-reproducible-build.patch 669 BLAKE2B fb51f4ef1658becfa3e4e2e01af
 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 cec0747adb78993c459c5971ac7fed0fc983dd2a54a7f90fbcf89775a3b41b6c19410284574fead0f74e5ff034ece61860343a6d1f33b073aef54ff310aee891 SHA512 0083028d64757bca6b466b8a296c0e14a7a2e753098fdd86d45bf4b04b30b7f02e1fabc449eedf616880849fbb8035b87f248829e9e11b476b98561302a5727b
+EBUILD clblas-2.12-r1.ebuild 1983 BLAKE2B e966568ac14134dbd5d47cf76c561fb3d6d4319e5b762f0e5bdbf948a51c010bacb5bd48dce9ad9db65cffa52bab7efb3334214dfd446161a694706ad2656d0d SHA512 bd44a8e18aa8f289a7ef67c983c8633878b2d5a95937846b864446dcca2938f56e203c9128408c9a9f7d6a42837cfb1c3aeaa46e03730798517804b18004701a
 MISC metadata.xml 1030 BLAKE2B ab71e8e4f7afd42ee2b257d4c693a93f21161013a5a41626155866a4b02e50f321900ae5ae9f6a0e53faac7c5aed5d7593b765c28794f2d2e083870b01bb5207 SHA512 9dcb1147165ba6a8917256872552e9e2f7f1fdc3a504a9783f65a93436cfe4a53e99bea7197102ffdae1fd722c7b04f3fc9f3916fef14737719559a0a49b820e
diff --git a/sci-libs/clblas/clblas-2.12.ebuild b/sci-libs/clblas/clblas-2.12-r1.ebuild
index ccbad57cc802..15afdee6a00e 100644
--- a/sci-libs/clblas/clblas-2.12.ebuild
+++ b/sci-libs/clblas/clblas-2.12-r1.ebuild
@@ -1,36 +1,39 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..11} )
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="dev-libs/mathjax"
+DOCS_CONFIG_NAME="clBLAS.doxy"
+DOCS_DIR="doc"
 
-inherit python-any-r1 toolchain-funcs cmake
+inherit python-any-r1 toolchain-funcs cmake docs
 
 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"
+S="${WORKDIR}/${MYPN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/2" # soname version
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client doc examples ktest performance test"
+IUSE="+client 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 )"
+BDEPEND="${PYTHON_DEPS}
+	client? ( virtual/pkgconfig )
+"
 
-S="${WORKDIR}/${MYPN}-${PV}"
 CMAKE_USE_DIR="${S}/src"
 
 PATCHES=(
@@ -62,12 +65,7 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-
-	if use doc; then
-		cd doc || die
-		doxygen clBLAS.doxy || die
-		HTML_DOCS=( doc/html/. )
-	fi
+	docs_compile
 }
 
 src_install() {
diff --git a/sci-libs/kissfft/Manifest b/sci-libs/kissfft/Manifest
index 4b3f2ffd4ac5..185e6e49c89c 100644
--- a/sci-libs/kissfft/Manifest
+++ b/sci-libs/kissfft/Manifest
@@ -1,4 +1,4 @@
 DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708
-EBUILD kissfft-131.1.0.ebuild 1320 BLAKE2B e6e888cf80e0538104792b70e26d429ee339b7c018d3c22550714e0462134b11210c8212b9a493e8a22bd4892b8c3ad20da62d18c19831566b8ac54b6c5db0f2 SHA512 a0e4f4c0942caccf965fb20e934b69db86d0894ade322435ccf58c9a9ba6c713062db0d21aa311cdfee051426245ba13aba05e7fb08144165acb3565f75ae259
-EBUILD kissfft-9999.ebuild 1321 BLAKE2B ebb2b52af3e118da353e46dd2e3842507d80d26f37c1371d6c771125c5e1792f198f1d238c9b953f865e18c5b0c9dea0a3d5a672fb536dba4fac676cb631dd2e SHA512 8e3193cc6dcd84fd361fa074ea477d76b9ed6fc6ac220fcdd43c17757b6fbd249734f9ad3643631b7acd935a1f593fcca0d042a8b32c079f59b8f297e29d2196
+EBUILD kissfft-131.1.0.ebuild 1328 BLAKE2B f9c7cef485206460c010c39e770cca41f7b5ab1bd0d74622622ea0a5d83d1b0500faac1398694769039c6e17456249cc526ebe45adb4d6bd672f99afa161a405 SHA512 7af4c3b278ed86de86a5b340a9e1312092f5d102f39dc0876dbcece51084e64096c21a81b9939b40d90c6f27d318c4398f8cbb63bd171589ee4f6cd2d52b47c5
+EBUILD kissfft-9999.ebuild 1329 BLAKE2B 0194298e0288314703e52bc8d91cc3efe8e25750b946bd1a3826e646e19c8d0bb35c05328b1824450f5b5bc7eb7d08450ddd81109dbc23ca80e732f9a24759f6 SHA512 445cb291ae26e86fe1006008f57851a4930fea56c470afade18f7a69c6cdcfee731b92833acfca0483f62306662163b24cf9e4dbb7211da8f623df276d954cc4
 MISC metadata.xml 408 BLAKE2B 14d2f480a1f7bf7bdb5bd52ae17e4746bf7413fdf7e73de686dbd1d05371dddf1d079f1d621afd2e28e9aec8c4be73f51964aff0a6b1896c5ca7398a97d2afee SHA512 390bd36cd3c2481e38808cc85cf362a67337240295ed0fdf24b9b4617fd5b93cef607eaa10f76b4dc234eb4f75055e404898f8b1fb773441707952b9512142a7
diff --git a/sci-libs/kissfft/kissfft-131.1.0.ebuild b/sci-libs/kissfft/kissfft-131.1.0.ebuild
index 76993eb680fd..900a50486450 100644
--- a/sci-libs/kissfft/kissfft-131.1.0.ebuild
+++ b/sci-libs/kissfft/kissfft-131.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-any-r1 toolchain-funcs
 
@@ -33,7 +33,7 @@ DEPEND="
 "
 
 python_check_deps() {
-	has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
+	python_has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {
diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild
index bc06fee4c8e0..814cce24e11a 100644
--- a/sci-libs/kissfft/kissfft-9999.ebuild
+++ b/sci-libs/kissfft/kissfft-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-any-r1 toolchain-funcs
 
@@ -33,7 +33,7 @@ DEPEND="
 "
 
 python_check_deps() {
-	has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
+	python_has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {