gentoo auto-resync : 19:06:2023 - 01:49:34

2 files changed, 76 insertions, 67 deletions

diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index 7a6670e8e1e5..fb277eee3039 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -64,5 +64,5 @@ DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-EBUILD adblock-0.6.0.ebuild 2304 BLAKE2B 04d80dfd8de940d2eea87aadf3ab83d8cbfe17bb3f7b02229939d5a60035110fb9581ca4632632d2ea7e3f3bbd5e28744d71ac0c1ee2ae8792d4e1b62b5b2914 SHA512 e77bca62154e5e6bdb9e81550eb1e5a010da1e636316b3e7bb3f55de7e31a357b3ee93f96acb40841085f5bb8ed7b67b1fcc16f2d2d79a1a5bb19352c4737db3
+EBUILD adblock-0.6.0.ebuild 2389 BLAKE2B edef896bd6fbcbb12ba09e7a44bbdafa0003909deb924ec1caf56dcd1db13691c70c69792a7d8f8348c8f2e04fe77d874867dc062e78dccf3f5946370843e58b SHA512 567f1c86d65e5953f367f28e1748eae5992b6295cb826815830edc94bfb7627de6f982aef6bb785f89334eaf941ab7416576b0d9c3cea9a7fe1f99fa222b28c4
 MISC metadata.xml 488 BLAKE2B 8c58b29bbc160b2139fc54058c48da79ae48963e2cfbf97b6eb6c78678b6c57d7ff63c32d65dd082b3ceaffc383c0b03b27467e331738b086bfd6c5ee45c6cc0 SHA512 1a5fb02550400b8a25118982cd9b3651b2ac236208b8f933438786ca18cd8dabc17fe98a447379a0067004f8429439e1af9567e7e04c6ed13100bbe6c6321b04
diff --git a/dev-python/adblock/adblock-0.6.0.ebuild b/dev-python/adblock/adblock-0.6.0.ebuild
index f47476143c35..5d279ff79974 100644
--- a/dev-python/adblock/adblock-0.6.0.ebuild
+++ b/dev-python/adblock/adblock-0.6.0.ebuild
@@ -4,83 +4,92 @@
 EAPI=8
 
 CRATES="
-	adblock-0.5.6
-	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.7.0
-	flate2-1.0.24
-	form_urlencoded-1.0.1
-	idna-0.2.3
-	indoc-1.0.6
-	itertools-0.10.3
-	libc-0.2.126
-	lock_api-0.4.7
-	matches-0.1.9
-	memchr-2.5.0
-	miniz_oxide-0.5.3
-	num-traits-0.2.15
-	once_cell-1.13.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	paste-1.0.7
-	percent-encoding-2.1.0
-	proc-macro2-1.0.40
-	psl-2.0.90
-	psl-types-2.0.10
-	pyo3-0.16.5
-	pyo3-build-config-0.16.5
-	pyo3-ffi-0.16.5
-	pyo3-macros-0.16.5
-	pyo3-macros-backend-0.16.5
-	quote-1.0.20
-	redox_syscall-0.2.13
-	regex-1.6.0
-	regex-syntax-0.6.27
-	rmp-0.8.11
-	rmp-serde-0.13.7
-	rmp-serde-0.15.5
-	scopeguard-1.1.0
-	seahash-3.0.7
-	serde-1.0.139
-	serde_derive-1.0.139
-	smallvec-1.9.0
-	syn-1.0.98
-	target-lexicon-0.12.4
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	twoway-0.2.2
-	unchecked-index-0.2.2
-	unicode-bidi-0.3.8
-	unicode-ident-1.0.2
-	unicode-normalization-0.1.21
-	unindent-0.1.9
-	url-2.2.2
-	windows-sys-0.36.1
-	windows_aarch64_msvc-0.36.1
-	windows_i686_gnu-0.36.1
-	windows_i686_msvc-0.36.1
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_msvc-0.36.1"
+	adblock@0.5.6
+	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.7.0
+	flate2@1.0.24
+	form_urlencoded@1.0.1
+	idna@0.2.3
+	indoc@1.0.6
+	itertools@0.10.3
+	libc@0.2.126
+	lock_api@0.4.7
+	matches@0.1.9
+	memchr@2.5.0
+	miniz_oxide@0.5.3
+	num-traits@0.2.15
+	once_cell@1.13.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.3
+	paste@1.0.7
+	percent-encoding@2.1.0
+	proc-macro2@1.0.40
+	psl-types@2.0.10
+	psl@2.0.90
+	pyo3-build-config@0.16.5
+	pyo3-ffi@0.16.5
+	pyo3-macros-backend@0.16.5
+	pyo3-macros@0.16.5
+	pyo3@0.16.5
+	quote@1.0.20
+	redox_syscall@0.2.13
+	regex-syntax@0.6.27
+	regex@1.6.0
+	rmp-serde@0.13.7
+	rmp-serde@0.15.5
+	rmp@0.8.11
+	scopeguard@1.1.0
+	seahash@3.0.7
+	serde@1.0.139
+	serde_derive@1.0.139
+	smallvec@1.9.0
+	syn@1.0.98
+	target-lexicon@0.12.4
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.0
+	twoway@0.2.2
+	unchecked-index@0.2.2
+	unicode-bidi@0.3.8
+	unicode-ident@1.0.2
+	unicode-normalization@0.1.21
+	unindent@0.1.9
+	url@2.2.2
+	windows-sys@0.36.1
+	windows_aarch64_msvc@0.36.1
+	windows_i686_gnu@0.36.1
+	windows_i686_msvc@0.36.1
+	windows_x86_64_gnu@0.36.1
+	windows_x86_64_msvc@0.36.1
+"
+
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=maturin
 PYTHON_COMPAT=( python3_{10..12} )
+
 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}.gh.tar.gz
-	$(cargo_crate_uris)"
+	${CARGO_CRATE_URIS}
+"
 S="${WORKDIR}/python-${P}"
 
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0"
+LICENSE="|| ( MIT Apache-2.0 )"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0
+	Unicode-DFS-2016
+"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~x86"