commit: f9c61a9fb3165f522579b530ffab4460c06b2353 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jun 12 10:58:05 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jun 12 10:58:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c61a9f
dev-python/jellyfish: Backport a maturin build fix Backport a build fix for maturin compatibility. It fixes a bug that could result in a broken package being installed. Thanks to Sam for finding the commit. Closes: https://bugs.gentoo.org/905962 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../files/jellyfish-0.11.2-maturin-1.patch | 33 ++++++++++++++++++++++ ...sh-0.11.1.ebuild => jellyfish-0.11.1-r1.ebuild} | 5 ++++ ...sh-0.11.2.ebuild => jellyfish-0.11.2-r1.ebuild} | 4 +++ 3 files changed, 42 insertions(+) diff --git a/dev-python/jellyfish/files/jellyfish-0.11.2-maturin-1.patch b/dev-python/jellyfish/files/jellyfish-0.11.2-maturin-1.patch new file mode 100644 index 000000000000..b05b3c2d04da --- /dev/null +++ b/dev-python/jellyfish/files/jellyfish-0.11.2-maturin-1.patch @@ -0,0 +1,33 @@ +From 2ebc2c647eafce3036d12814b0247cdd55e0be4d Mon Sep 17 00:00:00 2001 +From: Martino Mensio <[email protected]> +Date: Tue, 11 Apr 2023 00:19:05 +0200 +Subject: [PATCH] fixed python 3.11 on musllinux (#184) + +--- + Cargo.toml | 3 --- + pyproject.toml | 1 + + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index d28cc66..b8e68c6 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -9,9 +9,6 @@ license = "MIT" + readme = "README.md" + + +-[package.metadata.maturin] +-name = "jellyfish._rustyfish" +- + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + [lib] + name = "jellyfish" +diff --git a/pyproject.toml b/pyproject.toml +index b11cea5..08e1912 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -24,3 +24,4 @@ repository = "https://github.com/jamesturk/jellyfish/"; + [tool.maturin] + features = ["pyo3/extension-module", "python"] + python-source = "python" ++module-name = "jellyfish._rustyfish" diff --git a/dev-python/jellyfish/jellyfish-0.11.1.ebuild b/dev-python/jellyfish/jellyfish-0.11.1-r1.ebuild similarity index 95% rename from dev-python/jellyfish/jellyfish-0.11.1.ebuild rename to dev-python/jellyfish/jellyfish-0.11.1-r1.ebuild index fb59e29a6fc2..956bf17c0e77 100644 --- a/dev-python/jellyfish/jellyfish-0.11.1.ebuild +++ b/dev-python/jellyfish/jellyfish-0.11.1-r1.ebuild @@ -3,6 +3,7 @@ EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=maturin PYTHON_COMPAT=( python3_{9..11} ) @@ -74,3 +75,7 @@ KEYWORDS="amd64 ~ppc64 ~riscv x86" QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/jellyfish/_rustyfish.*.so" distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}/${PN}-0.11.2-maturin-1.patch" +) diff --git a/dev-python/jellyfish/jellyfish-0.11.2.ebuild b/dev-python/jellyfish/jellyfish-0.11.2-r1.ebuild similarity index 97% rename from dev-python/jellyfish/jellyfish-0.11.2.ebuild rename to dev-python/jellyfish/jellyfish-0.11.2-r1.ebuild index 0bbe9beafb87..d14a3c64b4dd 100644 --- a/dev-python/jellyfish/jellyfish-0.11.2.ebuild +++ b/dev-python/jellyfish/jellyfish-0.11.2-r1.ebuild @@ -79,3 +79,7 @@ KEYWORDS="~amd64 ~ppc64 ~riscv ~x86" QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/jellyfish/_rustyfish.*.so" distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}/${P}-maturin-1.patch" +)
