gentoo resync : 29.12.2022

4 files changed, 10 insertions, 123 deletions

diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index ffb51a3ad696..0d3d8a78e290 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -1,5 +1,5 @@
 DIST adblock-0.4.3.crate 7700164 BLAKE2B 836e8b60366c0bb23702883a8d9aef7eaa54dff6996ebb6a82f39880d93edb23f93e23299085a1756bb22115633f4534cd7ba0379e1dcb1ff6b1880d3e5576f4 SHA512 3fe7e139a6376ab2becfef7db9f54c850442dcbb44a61e2a116a1be6a59ab214659293f513f3c6daf7855d677b761f19ce99cf3be444d8f03c1dae90aa915f98
-DIST adblock-0.5.2.tar.gz 24574 BLAKE2B 84efcd6c6bc60030aee76eaa80acf67640d97ec1b386dc18aaf92c79b8ff60b35f545b4cf8980a1ab55f558939541f31dc8889073f1b3fd68d90ba6221a1f284 SHA512 f69bbde5a510882cd71454153ed12f0697517e030f9fb6774c5b166daf0db9f754a965085fc5e612c7dd3d093a31e22c1a9c064b167429d2aae4e93e3ca7bf7e
+DIST adblock-0.5.2.gh.tar.gz 24574 BLAKE2B 84efcd6c6bc60030aee76eaa80acf67640d97ec1b386dc18aaf92c79b8ff60b35f545b4cf8980a1ab55f558939541f31dc8889073f1b3fd68d90ba6221a1f284 SHA512 f69bbde5a510882cd71454153ed12f0697517e030f9fb6774c5b166daf0db9f754a965085fc5e612c7dd3d093a31e22c1a9c064b167429d2aae4e93e3ca7bf7e
 DIST addr-0.14.0.crate 90210 BLAKE2B a0dcb422d853b76187542aaa2880aafade57716130a38172a91fd4d3d0c51d9e7f2b23eec5af84b188b8b661c48f46fab25797489a3bd5c84e0732b326178877 SHA512 18d6cecbbeb2ea11f2b4f40356d8a2de5aad45e57ac5f13dc9cd98cff4250b7612aadfb73935775c657e728ca10bc8313e601354f239a96e63ef90a8d2f6b870
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
@@ -62,6 +62,5 @@ DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD adblock-0.5.2-r1.ebuild 2071 BLAKE2B 210d0b460aa10383bc0a31452dc9250385b7515df1cd172f56c7e7eaebbef2fa794de7e36cd01c78094786f150e94420a7917d712fb55f1eea2cebb5f42104fb SHA512 3178622f451f8e0f3e90e11a4142de059ae9e4c2875bb2c40605d9daad623364519ec08d8d0618e2b701c2e1939f7910710a922899c1981ab68424ba761ef6c1
-EBUILD adblock-0.5.2.ebuild 2280 BLAKE2B be395166166b36a270a3b66e599769766ff9cfe2d2946ffd1f3ca32c346e584235e14bb90719562642631a03de562660cf993d3315d0ea3bb089f3073776d1c9 SHA512 b55db2898c5b4e765f17fe1d3cbc74882a885c7beb6651de09907ceaea83d35e8b846f7dad19eb8c7c01bcc9207120160c59679ab65e32cb51ff31e8f36f71c7
-MISC metadata.xml 488 BLAKE2B c6813b6b4c00dc1282ab21a9e37b4c035c9d75cdd1c0bf0a2903e4f40d074eedf5ae972b68aac91f46146e339bcd3cf799c45b96c94e6209d100811c2254daff SHA512 3f62c544ec8f4b2da7f04e3af1a81a702d719a0957a187ace37e638c1f00e0d3dbc67728e6915a05a6cb0bcb46366670c2e0a5837734cd0a51b7c3b021d4ffae
+EBUILD adblock-0.5.2-r1.ebuild 2073 BLAKE2B a6b7e55196ecb26b3a6bf9f7793b11f6a4396706e21c97293cc8b4e8be0e6e4092837c59e0fc035f848e1dab529f4dfe1f243b3f2046789bbf39c70a68d51d14 SHA512 3d18a98f2fb9c94a6ab1589a0cc728a4389f20dcf228e70e9737671e3c86f646cd740d0da40d1fea82443ce56b3b93983e799f5f01d672f124ab33837f2e3f37
+MISC metadata.xml 488 BLAKE2B 8c58b29bbc160b2139fc54058c48da79ae48963e2cfbf97b6eb6c78678b6c57d7ff63c32d65dd082b3ceaffc383c0b03b27467e331738b086bfd6c5ee45c6cc0 SHA512 1a5fb02550400b8a25118982cd9b3651b2ac236208b8f933438786ca18cd8dabc17fe98a447379a0067004f8429439e1af9567e7e04c6ed13100bbe6c6321b04
diff --git a/dev-python/adblock/adblock-0.5.2-r1.ebuild b/dev-python/adblock/adblock-0.5.2-r1.ebuild
index 2e432744ce79..5042cc5a0039 100644
--- a/dev-python/adblock/adblock-0.5.2-r1.ebuild
+++ b/dev-python/adblock/adblock-0.5.2-r1.ebuild
@@ -68,19 +68,19 @@ CRATES="
 	winapi-i686-pc-windows-gnu-0.4.0
 	winapi-x86_64-pc-windows-gnu-0.4.0"
 DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cargo distutils-r1
 
 DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
 HOMEPAGE="https://github.com/ArniDagur/python-adblock"
 SRC_URI="
-	https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
 	$(cargo_crate_uris)"
 S="${WORKDIR}/python-${P}"
 
 LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 BDEPEND="test? ( dev-python/toml[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/adblock/adblock-0.5.2.ebuild b/dev-python/adblock/adblock-0.5.2.ebuild
deleted file mode 100644
index d6c36e71b226..000000000000
--- a/dev-python/adblock/adblock-0.5.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adblock-0.4.3
-	addr-0.14.0
-	adler-1.0.2
-	aho-corasick-0.7.18
-	autocfg-1.1.0
-	base64-0.13.0
-	bitflags-1.3.2
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	crc32fast-1.3.2
-	either-1.6.1
-	flate2-1.0.22
-	form_urlencoded-1.0.1
-	idna-0.2.3
-	indoc-0.3.6
-	indoc-impl-0.3.6
-	instant-0.1.12
-	itertools-0.10.3
-	libc-0.2.118
-	lock_api-0.4.6
-	matches-0.1.9
-	memchr-2.4.1
-	miniz_oxide-0.4.4
-	num-traits-0.2.14
-	once_cell-1.9.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	paste-0.1.18
-	paste-impl-0.1.18
-	percent-encoding-2.1.0
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.36
-	psl-2.0.71
-	psl-types-2.0.10
-	pyo3-0.15.1
-	pyo3-build-config-0.15.1
-	pyo3-macros-0.15.1
-	pyo3-macros-backend-0.15.1
-	quote-1.0.15
-	redox_syscall-0.2.10
-	regex-1.5.4
-	regex-syntax-0.6.25
-	rmp-0.8.10
-	rmp-serde-0.13.7
-	rmp-serde-0.15.5
-	scopeguard-1.1.0
-	seahash-3.0.7
-	serde-1.0.136
-	serde_derive-1.0.136
-	smallvec-1.8.0
-	syn-1.0.86
-	tinyvec-1.5.1
-	tinyvec_macros-0.1.0
-	twoway-0.2.2
-	unchecked-index-0.2.2
-	unicode-bidi-0.3.7
-	unicode-normalization-0.1.19
-	unicode-xid-0.2.2
-	unindent-0.1.7
-	url-2.2.2
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cargo python-r1
-
-DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
-HOMEPAGE="https://github.com/ArniDagur/python-adblock"
-SRC_URI="
-	https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="Apache-2.0 BSD MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/maturin
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED=".*/site-packages/${PN}/${PN}.abi3.so"
-
-src_compile() {
-	maturin build $(usev !debug --release) --no-sdist --skip-auditwheel || die
-
-	mv target/$(usex debug{,} release)/lib${PN}.so ${PN}/${PN}.abi3.so || die
-}
-
-src_test() {
-	python_foreach_impl epytest
-}
-
-src_install() {
-	python_foreach_impl python_domodule ${PN}
-
-	dodoc CHANGELOG.md README.md
-}
diff --git a/dev-python/adblock/metadata.xml b/dev-python/adblock/metadata.xml
index 64e24f8f95d2..d961806e1925 100644
--- a/dev-python/adblock/metadata.xml
+++ b/dev-python/adblock/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>steils@gentoo.org</email>
-		<name>Stefan Strogin</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ArniDagur/python-adblock</remote-id>
 		<remote-id type="pypi">adblock</remote-id>