gentoo resync : 20.10.2021

4 files changed, 100 insertions, 209 deletions

diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index aad2d5f55ce8..e28e29e21461 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -1,11 +1,7 @@
-DIST adblock-0.3.10.crate 7678458 BLAKE2B f15dfe6ecaf1146ab0058afae6bcdc179a9c870c0bb00ea0061ac7726a77c89a44ccabb50eb29a77dcd72eeae6533e505ad34e0d9a75cc4bf9fa3d304e16a1a8 SHA512 fea38d9204d2ac7f8a289d3affad18bf814e9054c2955f8e259454913371d30751c6a090a0a09b844bda46083815c8a9a4326c8f9fa210ce71b5f9adef7b338a
 DIST adblock-0.3.13.crate 7691310 BLAKE2B 0d9958235c123ff09256f6512c04474c4dee10c855b7161e32f3dae517959bb16815adbc22787648a1441e04a0ae94b89369c6bf9e3c61715638a4c452676a1f SHA512 f534c49d60118e170f674415a20075f15a7e45187d9461a0025acaf3fb9a94388ed7f99d15484a0354d8953798dd8ae720ca77f6faa59551e9d99d937a3bdbb4
-DIST adblock-0.4.4.tar.gz 22207 BLAKE2B 8337b41627af07a83586c174c0ac446dc43d8a3031d7cc758dbd987685218983f355155b812c746f3b736a31fd5ab835ab59c37234bf04dad1ab2d3c48b13b2e SHA512 19d24fe79d798825bbe00efc552d7c7357073791e3b4cb591aa040bb44543a9fba3c872cbd5e77e1d7a07e459e2d3c33605cc0fe47466ba210b18dc0aafef395
 DIST adblock-0.5.0.tar.gz 23000 BLAKE2B 4d1e991341e605484df4c96b3ebffdad261a7c90d4aa1e14a8e6258b1a5368fdd3215a9ae3600560a082f91cc34d005b271f5904bb883f938bbe5451d4ad4e64 SHA512 5ae9c979a769fbfc89c26d2c5c40a1712f0573707840b3bf35acf7bd15d2c22f08dfdbd384ab0e886568aee686ef5da3ab5f1cb73bf66491831be24977e6173c
-DIST addr-0.11.8.crate 89500 BLAKE2B 365d96ae27f6e62e09c23362d667d7818b62e2c878ee6e4cde59016e19ee31ba320dca289c02aa0d542e0aab3e828c18d5e78c7f2c9b101ff86a8c370f91e5da SHA512 4ed5cfdd88e9a31b64a950824e2ebcbec8ad33612fbc815e9eb5225af38bd8dd4250b506fd089e8d32cd6e6003b60172b2c06e20228b993d0d11856fa4340fb5
 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.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
@@ -28,7 +24,6 @@ DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea
 DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
 DIST lock_api-0.4.3.crate 20351 BLAKE2B ffec5616daf545ed4d2ed7cd21fa6340b1892b76702a089474b58320b6379767efd249088f8638e087100a09e4610de7652b718b60c992c64a287c2ebc73b3b4 SHA512 4dda8d993138efe0ffc94206c576e52a879a6cc4e90ffc98caabdfe720649a34c0fda206c4a7b6cc3a99140e619de1da05864218cff6f702e5540165d30573c5
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
@@ -47,9 +42,7 @@ DIST pyo3-macros-0.13.2.crate 5434 BLAKE2B 881b49ad2f6dbf0f60f7d9d648beb1b2f1026
 DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9230a680f0da7f1231a1c509a7338713722a1a35e456faa81a36d21a16612a1c611b6ce5d018c87210b59e4153ba0addab568 SHA512 ee136e214a6f06b6dccec378d6a73a318408cd55795ffb00c18428b40cca1e2f45c3a98e85c82c68f0f2715b8187237f2bb3dd1e94b95288e2bed1bf6a6d042e
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
-DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
-DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rmp-0.8.10.crate 23541 BLAKE2B f51f12ac191a8cbb4377956bb15d774e464b94fde7abc3f008fd2b6be10ad027ef3a95e854c6461e393b3e1b4c42e43b3a594e9d05283782af8e0893c1d4d629 SHA512 54739648c57e5fd917c60e1f692f5a0e357a95e9b7b1cab08af99f5ac1000b53427a646b6ef019f1e3cbb3861218acf0e8e300133ede4426107045a0abacd87a
 DIST rmp-serde-0.13.7.crate 16676 BLAKE2B d30ee72fa0a1b897c4866ab53e39d673bed1828ca6b09ac9511b8cb34a1092ffcb8b5c34f2e97cbf3ef44b5ccf99a2b68c4e8a202066380fcbe114fc8286df25 SHA512 e2659afd22446e26190008bca8cbf147e09eaeacd0518d81fd26c12e26d9fc06b48844719827cc392a882bb927d62e1d7d946a0426f81eac36cc882d8b0c2d28
@@ -71,6 +64,5 @@ DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e70
 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.4.4.ebuild 2226 BLAKE2B 6a2acd3a1a33c0ddee363d982d4b99566e555d6f699c573d52feab38f681f48e04c4065f48638c90c5ce15da629cec77a5c4284e939db25e91416d526f61250a SHA512 c95ef87d201e3cf5649dbac9ee55616bdfa6c3cf41811c9b0a0d75e5e1f58971a05ff97fd494a8778f774521ac1e983cc34119f9af4f41d124eed636a820b4cd
-EBUILD adblock-0.5.0.ebuild 2294 BLAKE2B 3272ad30dafb7e7226378de6966b979f14479381515fe672d73f728ff338bd48b9e99ed4b7dde419b9b2676cb1a6a5e95f4c793819495d958c8ce15874c432d3 SHA512 8738a2bf2fd43c0230fab3316a43cb7c9512ddae5bd75d9c8f6bb4fa0ee58bb3e546505774887307082cd47b134967059508992ba2184777683eadad6f825732
-MISC metadata.xml 382 BLAKE2B a0d02a0871d0fa0095ef179bf1f5849bde21107803ecb9705e882465969743ceb589729d03f00f4e5fa6443af554634bf3ae692c7a7ff75d67a0797fbb74f1f5 SHA512 df41f0e0f9e66d24b6dc7a3e9bfa3a96a3171807fcf4d563bcf856c80c0977c24b829a043efb762d6cb3cf2d6528e12d4789af6d67984d23b46b07f90b6ac5e4
+EBUILD adblock-0.5.0.ebuild 2450 BLAKE2B 456f8821c6df89a29e3e07dfecd62d3dcd7868085ddb7b4806f9e97a5436fb2750b89769a76ca0a9fc0c93ebb40bd5ff4949177b126f8e9f59498216f585d9ed SHA512 61a1a8a2804e54602a6ab1d98c6e5d546ebd8884f477ec8f7dabe5438ce8c9258ce3e0d2d94b6dff760e32da9c1280a1d647f3b22c9f2c5eebdc47c3d6530097
+MISC metadata.xml 488 BLAKE2B c6813b6b4c00dc1282ab21a9e37b4c035c9d75cdd1c0bf0a2903e4f40d074eedf5ae972b68aac91f46146e339bcd3cf799c45b96c94e6209d100811c2254daff SHA512 3f62c544ec8f4b2da7f04e3af1a81a702d719a0957a187ace37e638c1f00e0d3dbc67728e6915a05a6cb0bcb46366670c2e0a5837734cd0a51b7c3b021d4ffae
diff --git a/dev-python/adblock/adblock-0.4.4.ebuild b/dev-python/adblock/adblock-0.4.4.ebuild
deleted file mode 100644
index 0d8540825fd7..000000000000
--- a/dev-python/adblock/adblock-0.4.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adblock-0.3.10
-addr-0.11.8
-adler-1.0.2
-aho-corasick-0.7.15
-autocfg-1.0.1
-base64-0.13.0
-bitflags-1.2.1
-byteorder-1.4.3
-cfg-if-1.0.0
-crc32fast-1.2.1
-ctor-0.1.20
-either-1.6.1
-flate2-1.0.20
-form_urlencoded-1.0.1
-ghost-0.1.2
-idna-0.2.2
-indoc-0.3.6
-indoc-impl-0.3.6
-instant-0.1.9
-inventory-0.1.10
-inventory-impl-0.1.10
-itertools-0.9.0
-libc-0.2.93
-lock_api-0.4.3
-matches-0.1.8
-memchr-2.3.4
-miniz_oxide-0.4.4
-num-traits-0.2.14
-once_cell-1.7.2
-parking_lot-0.11.1
-parking_lot_core-0.8.3
-paste-0.1.18
-paste-impl-0.1.18
-percent-encoding-2.1.0
-proc-macro-hack-0.5.19
-proc-macro2-1.0.26
-psl-2.0.18
-psl-types-2.0.7
-pyo3-0.13.2
-pyo3-macros-0.13.2
-pyo3-macros-backend-0.13.2
-quote-1.0.9
-redox_syscall-0.2.5
-regex-1.4.5
-regex-syntax-0.6.23
-rmp-0.8.10
-rmp-serde-0.13.7
-scopeguard-1.1.0
-seahash-3.0.7
-serde-1.0.125
-serde_derive-1.0.125
-smallvec-1.6.1
-syn-1.0.69
-tinyvec-1.2.0
-tinyvec_macros-0.1.0
-twoway-0.2.1
-unchecked-index-0.2.2
-unicode-bidi-0.3.5
-unicode-normalization-0.1.17
-unicode-xid-0.2.1
-unindent-0.1.7
-url-2.2.1
-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,9} )
-
-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 ${CRATES})"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	dev-util/maturin
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-QA_FLAGS_IGNORED="usr/lib.*/libadblock.so"
-QA_SONAME="${QA_FLAGS_IGNORED}"
-
-src_compile() {
-	maturin build $(usex debug "" --release) || die
-	unzip "target/wheels/${P}-*.whl" adblock/adblock.abi3.so || die
-}
-
-src_install() {
-	python_foreach_impl python_domodule adblock
-	dolib.so target/release/libadblock.so
-	dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-	python_foreach_impl epytest
-}
diff --git a/dev-python/adblock/adblock-0.5.0.ebuild b/dev-python/adblock/adblock-0.5.0.ebuild
index 5ef500a3655d..42b1caa1add8 100644
--- a/dev-python/adblock/adblock-0.5.0.ebuild
+++ b/dev-python/adblock/adblock-0.5.0.ebuild
@@ -1,113 +1,120 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CRATES="
-adblock-0.3.13
-addr-0.14.0
-adler-1.0.2
-aho-corasick-0.7.18
-autocfg-1.0.1
-base64-0.13.0
-bitflags-1.2.1
-byteorder-1.4.3
-cfg-if-1.0.0
-crc32fast-1.2.1
-ctor-0.1.20
-either-1.6.1
-flate2-1.0.20
-form_urlencoded-1.0.1
-ghost-0.1.2
-idna-0.2.2
-indoc-0.3.6
-indoc-impl-0.3.6
-instant-0.1.9
-inventory-0.1.10
-inventory-impl-0.1.10
-itertools-0.9.0
-libc-0.2.93
-lock_api-0.4.3
-matches-0.1.8
-memchr-2.4.0
-miniz_oxide-0.4.4
-num-traits-0.2.14
-once_cell-1.7.2
-parking_lot-0.11.1
-parking_lot_core-0.8.3
-paste-0.1.18
-paste-impl-0.1.18
-percent-encoding-2.1.0
-proc-macro-hack-0.5.19
-proc-macro2-1.0.26
-psl-2.0.18
-psl-types-2.0.7
-pyo3-0.13.2
-pyo3-macros-0.13.2
-pyo3-macros-backend-0.13.2
-quote-1.0.9
-redox_syscall-0.2.5
-regex-1.5.4
-regex-syntax-0.6.25
-rmp-0.8.10
-rmp-serde-0.13.7
-scopeguard-1.1.0
-seahash-3.0.7
-serde-1.0.125
-serde_derive-1.0.125
-smallvec-1.6.1
-syn-1.0.69
-tinyvec-1.2.0
-tinyvec_macros-0.1.0
-twoway-0.2.1
-unchecked-index-0.2.2
-unicode-bidi-0.3.5
-unicode-normalization-0.1.17
-unicode-xid-0.2.1
-unindent-0.1.7
-url-2.2.1
-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,9} )
-
+	adblock-0.3.13
+	addr-0.14.0
+	adler-1.0.2
+	aho-corasick-0.7.18
+	autocfg-1.0.1
+	base64-0.13.0
+	bitflags-1.2.1
+	byteorder-1.4.3
+	cfg-if-1.0.0
+	crc32fast-1.2.1
+	ctor-0.1.20
+	either-1.6.1
+	flate2-1.0.20
+	form_urlencoded-1.0.1
+	ghost-0.1.2
+	idna-0.2.2
+	indoc-0.3.6
+	indoc-impl-0.3.6
+	instant-0.1.9
+	inventory-0.1.10
+	inventory-impl-0.1.10
+	itertools-0.9.0
+	libc-0.2.93
+	lock_api-0.4.3
+	matches-0.1.8
+	memchr-2.4.0
+	miniz_oxide-0.4.4
+	num-traits-0.2.14
+	once_cell-1.7.2
+	parking_lot-0.11.1
+	parking_lot_core-0.8.3
+	paste-0.1.18
+	paste-impl-0.1.18
+	percent-encoding-2.1.0
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.26
+	psl-2.0.18
+	psl-types-2.0.7
+	pyo3-0.13.2
+	pyo3-macros-0.13.2
+	pyo3-macros-backend-0.13.2
+	quote-1.0.9
+	redox_syscall-0.2.5
+	regex-1.5.4
+	regex-syntax-0.6.25
+	rmp-0.8.10
+	rmp-serde-0.13.7
+	scopeguard-1.1.0
+	seahash-3.0.7
+	serde-1.0.125
+	serde_derive-1.0.125
+	smallvec-1.6.1
+	syn-1.0.69
+	tinyvec-1.2.0
+	tinyvec_macros-0.1.0
+	twoway-0.2.1
+	unchecked-index-0.2.2
+	unicode-bidi-0.3.5
+	unicode-normalization-0.1.17
+	unicode-xid-0.2.1
+	unindent-0.1.7
+	url-2.2.1
+	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 ${CRATES})"
+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 MIT )"
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
+BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/maturin
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+	)"
 
-QA_FLAGS_IGNORED="usr/lib.*/libadblock.so
-	usr/lib/python3.*/site-packages/adblock/adblock.abi3.so"
-QA_SONAME="${QA_FLAGS_IGNORED}"
+QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/adblock/adblock.abi3.so"
 
 src_compile() {
-	maturin build $(usex debug "" --release) --no-sdist || die
-	unzip "target/wheels/${P}-*.whl" adblock/adblock.abi3.so || die
-}
+	maturin build $(usev !debug --release) --no-sdist || die
 
-src_install() {
-	python_foreach_impl python_domodule adblock
-	dolib.so target/release/libadblock.so
-	dodoc CHANGELOG.md README.md
+	mv target/$(usex debug{,} release)/libadblock.so \
+		adblock/adblock.abi3.so || die
 }
 
 src_test() {
+	local EPYTEST_DESELECT=(
+		# tests if python-3.10 >= 3.6, but results in 3.1 < 3.6
+		tests/test_metadata.py::test_required_python_version
+	)
+
 	python_foreach_impl epytest
 }
+
+src_install() {
+	python_foreach_impl python_domodule adblock
+
+	dodoc CHANGELOG.md README.md
+}
diff --git a/dev-python/adblock/metadata.xml b/dev-python/adblock/metadata.xml
index cc85ade15283..64e24f8f95d2 100644
--- a/dev-python/adblock/metadata.xml
+++ b/dev-python/adblock/metadata.xml
@@ -5,6 +5,10 @@
 		<email>steils@gentoo.org</email>
 		<name>Stefan Strogin</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ArniDagur/python-adblock</remote-id>
 		<remote-id type="pypi">adblock</remote-id>