gentoo resync : 25.09.2021

5 files changed, 2 insertions, 106 deletions

diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 6e1ec17c57ad..e08a35f20c89 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,8 +1,4 @@
-AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
-AUX scikit-build-0.11.1-py310.patch 915 BLAKE2B 8ae5eb217482f0dfbcf966bbee65e9e2e2d7e74bff1970b6417789ca5c93881958640213ffe6c496a4a7f6578101fb51976528474cb3c8147302ec9221d9d1be SHA512 98bac74f6715320666be75455515efe35b208bc26209323453589cfb0c83ece5acefcaa5d17f625dd9ebb5970c06a3ba69334d140525d6b944066e50efdce22e
 AUX scikit-build-0.12.0-tests-no-coverage.patch 270 BLAKE2B d7cba4096ffb66c98837da997024ee87bb3fd878a6492fbd63088aab294048e700652a82cd3e27bb8e55ea5fdeeda4240971a32b6c7644f2c51ab7c42da1abea SHA512 f52a6096a4840baa743b90296b98f55963c13990ce795cb0ff9ad11256196d9d5164d3118bb48e8e10779e55f2341309de71a3ee47cbde326280de0064f1b21a
-DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
 DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9
-EBUILD scikit-build-0.11.1.ebuild 1417 BLAKE2B 0877d71bb33439613b60fa747490cfac5898644d042d79966eeee192bc7133e0de6ad85c4e38405748d3f4c600c3d0d91356c4f4aeb23e494dfd09086c3e496d SHA512 24ceae6bef1bb7197571433d3adaf89feb021ed8c5a3ffb3994657d4c43a77e1fb38e76c09cf0d3785f1abc19cb9c7e02f1d6bb70dea5bba2d2cb56376f6d0b4
-EBUILD scikit-build-0.12.0.ebuild 1521 BLAKE2B 0e2c509a1204b74ad5af8a01386ce5769a1010f329fcb72f23530dbf48ef3ce66e297cae9f2d3cf017af11ec465678db7f04036682296c1d5fc405a2da1bdbeb SHA512 a613584bf99e3c45f1923ae170742e935c6def75d62bbc085255992001844e78eca5a035a90a0bef368e34a4e4da5baf59c7e6f1557cff3323385fcc5ce6fc1f
+EBUILD scikit-build-0.12.0.ebuild 1519 BLAKE2B c6d562e747b6e5372c617a18d32f93af0a94569f62a08ee9fa8dfb7c12a72addfd1ada5624a185a1ad742b777dbe8281f842e71d6c897e35d2073f8b81e8b616 SHA512 41c09a5e160df37d63469e5211f9e9455eac81e913b173880e45c45d28ce098752dc324ff5e1c04539b9ac7f5187c208846bb078818690c60a1251e81cbf3afc
 MISC metadata.xml 408 BLAKE2B 4cdf98a2ac7e4bd6e1276e0ceadb3ac7849a81c5a9931b1ea5b3087cd7ced5072c390f1b77791732a3470f2cfba6a0537732f3632a156887d7c4046235062d3a SHA512 deb17b2d33bab0a1f713edd2e10b643b8801b3c04b142dd37530d5335bfde5be6e8ffb99177170a8c24380c2958164bec95db50538993fdb681aa1d0408ebf3e
diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
deleted file mode 100644
index f48ad9340754..000000000000
--- a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 094ed23..a58cb85 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -41,7 +41,6 @@ import skbuild
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = [
--    'cmake',
-     'sphinx.ext.autodoc',
-     'sphinx.ext.viewcode',
-     'sphinx_issues'
-@@ -291,4 +290,4 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
- if not on_rtd:  # only import and set the theme if we're building docs locally
-     import sphinx_rtd_theme
-     html_theme = 'sphinx_rtd_theme'
--    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-\ No newline at end of file
-+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch b/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
deleted file mode 100644
index fa00556f9add..000000000000
--- a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c1677527af3f7afd48ebbe1b2338ac822f64c524 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 19 Jun 2021 19:27:09 +0200
-Subject: [PATCH] fix: fix regex in test_get_python_version for Python 3.10
-
-Fix the regular expression in test_get_python_version to permit
-the minor version to contain more than one digit.  This fixes the test
-on Python 3.10.
----
- tests/test_cmaker.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
-index d63059c..52d0028 100644
---- a/tests/test_cmaker.py
-+++ b/tests/test_cmaker.py
-@@ -21,7 +21,7 @@ from . import _tmpdir, get_cmakecache_variables
- 
- 
- def test_get_python_version():
--    assert re.match(r'^[23](\.?)[0-9]$', CMaker.get_python_version())
-+    assert re.match(r'^[23](\.?)\d+$', CMaker.get_python_version())
- 
- 
- def test_get_python_include_dir():
--- 
-2.32.0
-
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
deleted file mode 100644
index 1d799fe0cd23..000000000000
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="https://github.com/scikit-build/scikit-build"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]"
-
-DEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.0-docs.patch"
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# sandbox violations
-		tests/test_hello_cpp.py::test_hello_develop
-		tests/test_issue274_support_default_package_dir.py
-		tests/test_issue274_support_one_package_without_package_dir.py
-		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/scikit-build/scikit-build-0.12.0.ebuild b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
index 88ffae1649ec..19e0c60df628 100644
--- a/dev-python/scikit-build/scikit-build-0.12.0.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]