From ac2ece26e61f211aa4fa7cfcd836db96e72d49c6 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Tue, 10 Feb 2026 07:19:54 +0000 Subject: Adding metadata --- dev-python/blake3/Manifest | 1 - dev-python/blake3/blake3-1.0.7.ebuild | 135 ------------------- dev-python/blake3/blake3-1.0.8-r1.ebuild | 144 +++++++++++++++++++++ .../files/blake3-1.0.8-use-installed-library.patch | 49 +++++++ dev-python/langdetect/Manifest | 2 + .../files/langdetect-1.0.9-explicit-config.patch | 13 -- dev-python/langdetect/langdetect-1.0.9.ebuild | 4 +- dev-python/langdetect/metadata.xml | 10 +- 8 files changed, 202 insertions(+), 156 deletions(-) delete mode 100644 dev-python/blake3/blake3-1.0.7.ebuild create mode 100644 dev-python/blake3/blake3-1.0.8-r1.ebuild create mode 100644 dev-python/blake3/files/blake3-1.0.8-use-installed-library.patch delete mode 100644 dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch (limited to 'dev-python') diff --git a/dev-python/blake3/Manifest b/dev-python/blake3/Manifest index 073daa729e0b..e058da92fc31 100644 --- a/dev-python/blake3/Manifest +++ b/dev-python/blake3/Manifest @@ -2,7 +2,6 @@ DIST arrayref-0.3.9.crate 9186 BLAKE2B 8d7443944c81bf849fbb8a4e09ee379134c173dec DIST arrayvec-0.7.6.crate 31237 BLAKE2B b9d1df7e3ec47d434a2606fe9540e37e02351873b376a4e113b54461288e9ab20e02285eed5c4bc0f052ec4d6b3c804044413490ea706c31a852624b03bde7bb SHA512 b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8 DIST autocfg-1.5.0.crate 18729 BLAKE2B 27580e39b366c6fca02c9db09997b6415c409f12068f1249184268bf96fd85ba659e25ec730f99e10caf452f96c486f3d7442bf09c4552b5f39519b21d6f88cc SHA512 f279856f234d39d369623576acf9546a1ca24d7fe449f36d4fb93ea75a7efaf2c4015b9616a69bbbed358c5e5882e16b045352f046aa4c049b3d13b1e8257b08 DIST blake3-1.8.2.crate 205967 BLAKE2B ec9afd8f3fda5ac545fae869e4af941a4ae30473cb3e5a0b0f128c1dbf0c6231e3cf87decdfc765b69b99e2b2879f3f345ff7bf738911557740fb0445c9e028c SHA512 8635c3ac12c7f333912a6f42c75499395d6178a0dca810d9199bb533facb409970b17bff4b7f55731a7d5d75932e62b236e1651ed0388e2796024bd7dd2852b8 -DIST blake3-py-1.0.7.gh.tar.gz 114424 BLAKE2B 4aea5de0f99b5e098b0e45f0db02f15df53a3e73dbaf94aa9d2177c81b00069aec95e1912a5247d7adebbcac2dc4a2dca01e8544ad8434c0ec7bfba5832b9194 SHA512 326cbccb2415e388b310be57e7ed694c86fb808d075dc6093a2a9eb92d71201531e813945fe56235bc3916305a4595f42c5d6a2221ab0e62f16f3ffd98428690 DIST blake3-py-1.0.8.gh.tar.gz 115913 BLAKE2B e946f3bffb77c3fce916845726531b2876bbeb80775a96799cc9d9d212fd1828715343dd02bddf138f48dd8ab46f217c493769a214bd609bfb65d4d67ebedb43 SHA512 76682f021f465b523c8d71d4862898fe3e77ce2e31bf964682be9bda795c1364cf9103c57659a9ad6f0adbc97abc002bb9f773ba038b091367fdf83939d71452 DIST cc-1.2.39.crate 90774 BLAKE2B 03c02839a1e464a32a6a6e532e1c7505d7c062facbfa3bfb0e69070d336922e247da8a63876e90f5f31c3c13085500fbf6a0736609db6c840d889e281d345892 SHA512 73f580f1bc1cab96a54a86025957cd846f7a3629f43b3b51b81e336a10cbbe81be6936afcef42118ad9b85184bf3b4dac2c151a62018f75b6b517ff294827954 DIST cfg-if-1.0.3.crate 8719 BLAKE2B 5cd0ac122110740895b45cdf8e0f738f2de1882d5a06c696d08e906765e4ddcd72a866dcc115da52d9fece205c9ad15dc25ad98dff36b32517012a7586e986ee SHA512 afe424a191c2aaaffec3d114e0116d0324d12117aeb22df78e47ad6752444bc5acb074ab0a174476b71e584a37743f9dcc2b0e8036d590fcc5afc7c55f86122b diff --git a/dev-python/blake3/blake3-1.0.7.ebuild b/dev-python/blake3/blake3-1.0.7.ebuild deleted file mode 100644 index 0aabf9384bf4..000000000000 --- a/dev-python/blake3/blake3-1.0.7.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CARGO_OPTIONAL=1 -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..14} ) - -RUST_MIN_VER="1.80.0" -CRATES=" - arrayref@0.3.9 - arrayvec@0.7.6 - autocfg@1.5.0 - blake3@1.8.2 - cc@1.2.39 - cfg-if@1.0.3 - constant_time_eq@0.3.1 - crossbeam-deque@0.8.6 - crossbeam-epoch@0.9.18 - crossbeam-utils@0.8.21 - either@1.15.0 - find-msvc-tools@0.1.2 - heck@0.5.0 - hex@0.4.3 - indoc@2.0.6 - libc@0.2.176 - memmap2@0.9.8 - memoffset@0.9.1 - once_cell@1.21.3 - portable-atomic@1.11.1 - proc-macro2@1.0.101 - pyo3-build-config@0.26.0 - pyo3-ffi@0.26.0 - pyo3-macros-backend@0.26.0 - pyo3-macros@0.26.0 - pyo3@0.26.0 - quote@1.0.41 - rayon-core@1.13.0 - rayon@1.11.0 - shlex@1.3.0 - syn@2.0.106 - target-lexicon@0.13.3 - unicode-ident@1.0.19 - unindent@0.2.4 -" - -inherit cargo distutils-r1 - -MY_P=blake3-py-${PV} -DESCRIPTION="Python bindings for the BLAKE3 cryptographic hash function" -HOMEPAGE=" - https://github.com/oconnor663/blake3-py/ - https://pypi.org/project/blake3/ -" -SRC_URI=" - https://github.com/oconnor663/blake3-py/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz - rust? ( - ${CARGO_CRATE_URIS} - ) -" -S=${WORKDIR}/${MY_P} - -LICENSE=" - || ( CC0-1.0 Apache-2.0 ) - rust? ( -" -# Dependent crate licenses -LICENSE+=" - Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-3.0 - || ( Apache-2.0 CC0-1.0 MIT-0 ) -" -LICENSE+=" - ) -" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+rust" - -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/typing-extensions-4.6.0[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - rust? ( - ${RUST_DEPEND} - dev-util/maturin[${PYTHON_USEDEP}] - ) - !rust? ( - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - ) -" - -QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/blake3/blake3.*.so" - -EPYTEST_PLUGINS=() -distutils_enable_tests pytest - -pkg_setup() { - use rust && rust_pkg_setup -} - -src_unpack() { - # Do this unconditionally as it has sensible behaviour even - # w/ USE=-rust. - cargo_src_unpack -} - -src_prepare() { - # sed the package name and version to improve compatibility - sed -e 's:blake3_experimental_c:blake3:' \ - -e "s:0[.]0[.]1:${PV}:" \ - -i c_impl/setup.py || die - - distutils-r1_src_prepare -} - -python_compile() { - local DISTUTILS_USE_PEP517=$(usex rust maturin setuptools) - - if ! use rust; then - cd c_impl || die - fi - distutils-r1_python_compile - if ! use rust; then - cd - >/dev/null || die - fi -} diff --git a/dev-python/blake3/blake3-1.0.8-r1.ebuild b/dev-python/blake3/blake3-1.0.8-r1.ebuild new file mode 100644 index 000000000000..e6c43c7b5cc7 --- /dev/null +++ b/dev-python/blake3/blake3-1.0.8-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 2022-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CARGO_OPTIONAL=1 +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..14} ) + +RUST_MIN_VER="1.80.0" +CRATES=" + arrayref@0.3.9 + arrayvec@0.7.6 + autocfg@1.5.0 + blake3@1.8.2 + cc@1.2.39 + cfg-if@1.0.3 + constant_time_eq@0.3.1 + crossbeam-deque@0.8.6 + crossbeam-epoch@0.9.18 + crossbeam-utils@0.8.21 + either@1.15.0 + find-msvc-tools@0.1.2 + heck@0.5.0 + hex@0.4.3 + indoc@2.0.6 + libc@0.2.176 + memmap2@0.9.8 + memoffset@0.9.1 + once_cell@1.21.3 + portable-atomic@1.11.1 + proc-macro2@1.0.101 + pyo3-build-config@0.26.0 + pyo3-ffi@0.26.0 + pyo3-macros-backend@0.26.0 + pyo3-macros@0.26.0 + pyo3@0.26.0 + quote@1.0.41 + rayon-core@1.13.0 + rayon@1.11.0 + shlex@1.3.0 + syn@2.0.106 + target-lexicon@0.13.3 + unicode-ident@1.0.19 + unindent@0.2.4 +" + +inherit cargo distutils-r1 + +MY_P=blake3-py-${PV} +DESCRIPTION="Python bindings for the BLAKE3 cryptographic hash function" +HOMEPAGE=" + https://github.com/oconnor663/blake3-py/ + https://pypi.org/project/blake3/ +" +SRC_URI=" + https://github.com/oconnor663/blake3-py/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz + rust? ( + ${CARGO_CRATE_URIS} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE=" + || ( CC0-1.0 Apache-2.0 ) + rust? ( +" +# Dependent crate licenses +LICENSE+=" + Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-3.0 + || ( Apache-2.0 CC0-1.0 MIT-0 ) +" +LICENSE+=" + ) +" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+rust" + +DEPEND=" + !rust? ( dev-libs/blake3:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + ${DEPEND} + rust? ( + ${RUST_DEPEND} + dev-util/maturin[${PYTHON_USEDEP}] + ) + !rust? ( + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ) + test? ( + dev-python/numpy[${PYTHON_USEDEP}] + ) +" + +QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/blake3/blake3.*.so" + +EPYTEST_PLUGINS=() +distutils_enable_tests pytest + +pkg_setup() { + use rust && rust_pkg_setup +} + +src_unpack() { + # Do this unconditionally as it has sensible behaviour even + # w/ USE=-rust. + cargo_src_unpack +} + +PATCHES=( + # Link against shared blake3 library. Bug 943281. + "${FILESDIR}/${P}-use-installed-library.patch" +) + +src_prepare() { + distutils-r1_src_prepare + + # sed the package name and version to improve compatibility + sed -e 's:blake3_experimental_c:blake3:' \ + -e "s:0[.]0[.]1:${PV}:" \ + -i c_impl/setup.py || die + + # remove vendored C sources to ensure we don't use accidentally + rm -r c_impl/vendor || die +} + +python_compile() { + local DISTUTILS_USE_PEP517=$(usex rust maturin setuptools) + + if ! use rust; then + export FORCE_SYSTEM_BLAKE3=1 + cd c_impl || die + fi + distutils-r1_python_compile + if ! use rust; then + cd - >/dev/null || die + fi +} diff --git a/dev-python/blake3/files/blake3-1.0.8-use-installed-library.patch b/dev-python/blake3/files/blake3-1.0.8-use-installed-library.patch new file mode 100644 index 000000000000..5f96470ad213 --- /dev/null +++ b/dev-python/blake3/files/blake3-1.0.8-use-installed-library.patch @@ -0,0 +1,49 @@ +# Link against shared blake3 library. Gentoo bug 943281. +# Set FORCE_SYSTEM_BLAKE3=1 to force use of installed system library. + +diff --git a/c_impl/setup.py b/c_impl/setup.py +index 417385b..2a664f0 100644 +--- a/c_impl/setup.py ++++ b/c_impl/setup.py +@@ -69,6 +69,9 @@ def is_aarch64(): + def force_intrinsics(): + return os.environ.get("FORCE_INTRINSICS") == "1" + ++def force_system_blake3(): ++ # force use of system library for blake3 ++ return os.environ.get("FORCE_SYSTEM_BLAKE3") == "1" + + def compile_x86_intrinsics(): + object_files = [] +@@ -203,9 +206,17 @@ def prepare_extension(): + "vendor/blake3_dispatch.c", + "vendor/blake3_portable.c", + ] ++ include_dirs=[ ++ "vendor", ++ ], ++ extra_link_args = [ "-lblake3" ] + target = platform.machine() + extra_objects = [] +- if is_macos(): ++ if force_system_blake3(): ++ print("using installed system library") ++ sources = sources[:1] ++ include_dirs = [] ++ elif is_macos(): + # On macOS we build a "universal" binary containing both x86 and ARM + # code. + extra_objects = compile_macos_universal_staticlib() +@@ -239,10 +250,9 @@ def prepare_extension(): + return setuptools.Extension( + "blake3", + sources=sources, +- include_dirs=[ +- "vendor", +- ], ++ include_dirs=include_dirs, + extra_objects=extra_objects, ++ extra_link_args=extra_link_args, + define_macros=[ + ("SETUP_PY_VERSION", escape_preprocessor_string(VERSION)), + ("SETUP_PY_DESCRIPTION", escape_preprocessor_string(DESCRIPTION)), diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest index a11d7c268c91..d12ab8aeaca8 100644 --- a/dev-python/langdetect/Manifest +++ b/dev-python/langdetect/Manifest @@ -1 +1,3 @@ DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db +EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9cd8a2a93a8d45bf51fe2324402b175d641762ea591fcb99459427f977a95eccffa6ca4777ca4df39814eea6eac62711567faa654456d32f79023a4685804504 SHA512 d973b85ba1a44389a4275f02a779a93a005f7c2e096467b94b072862e4984d5b42cf33f9821ac68aa5b85b12c98983a90b96049989d8c84497969174b6bb838e +MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45 diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch deleted file mode 100644 index 637368d2f237..000000000000 --- a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix "Package 'langdetect.profiles' is absent from the `packages` configuration." - ---- a/setup.py -+++ b/setup.py -@@ -18,7 +18,7 @@ setup( - author_email='michal.danilak@gmail.com', - url='https://github.com/Mimino666/langdetect', - keywords='language detection library', -- packages=['langdetect', 'langdetect.utils', 'langdetect.tests'], -+ packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'], - include_package_data=True, - install_requires=['six'], - license='MIT', diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild index 7100f5f39dd8..271137de443d 100644 --- a/dev-python/langdetect/langdetect-1.0.9.ebuild +++ b/dev-python/langdetect/langdetect-1.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2025 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,6 +19,4 @@ KEYWORDS="~amd64" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" ) - distutils_enable_tests unittest diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml index c0f74ac187e2..020e07f2a3dd 100644 --- a/dev-python/langdetect/metadata.xml +++ b/dev-python/langdetect/metadata.xml @@ -2,9 +2,11 @@ - pastalian46@gmail.com - Takuya Wakazono + marcin.deranek@slonko.net + Marcin Deranek - - gentoo-guru-overlay + + https://github.com/Mimino666/langdetect/issues + + slonko-overlay \ No newline at end of file -- cgit v1.3