diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-06-12 14:20:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-12 14:20:03 +0100 |
commit | 522b6bf7e1f6133c288b94a77fc5e3d8eef2c179 (patch) | |
tree | c6624f4b91276a0312ca31ebfa276732608dddba /dev-python/jellyfish | |
parent | 4d0ca679fbcb59301ffc7af98794c411c5061a0b (diff) |
gentoo auto-resync : 12:06:2023 - 14:20:02
Diffstat (limited to 'dev-python/jellyfish')
-rw-r--r-- | dev-python/jellyfish/Manifest | 5 | ||||
-rw-r--r-- | dev-python/jellyfish/files/jellyfish-0.11.2-maturin-1.patch | 33 | ||||
-rw-r--r-- | dev-python/jellyfish/jellyfish-0.11.1-r1.ebuild (renamed from dev-python/jellyfish/jellyfish-0.11.1.ebuild) | 5 | ||||
-rw-r--r-- | dev-python/jellyfish/jellyfish-0.11.2-r1.ebuild (renamed from dev-python/jellyfish/jellyfish-0.11.2.ebuild) | 6 |
4 files changed, 46 insertions, 3 deletions
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest index c4810046db3a..023133d4b8fa 100644 --- a/dev-python/jellyfish/Manifest +++ b/dev-python/jellyfish/Manifest @@ -1,3 +1,4 @@ +AUX jellyfish-0.11.2-maturin-1.patch 978 BLAKE2B 26f5192e08291a24d4298142d3173403670e6416bd4c7a7d48e33af2e41f57aae7d31f1ff7911a583c037f12f688fc33c321170921af42c94c2905be08704be1 SHA512 7c16a68f29ad9d53cf6bea89b670b6e3e312d9e65c583fa2fcb2499c40c892cc41e34ff5b0115d013c4d55a0d71ce3493f7a4b3cd0400626230d844275f61412 DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 @@ -48,6 +49,6 @@ DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788 -EBUILD jellyfish-0.11.1.ebuild 1555 BLAKE2B f404fd1cc3ddcb7305d19d1cf10af3ec6c1dd8844ee98f09cf525c932b2a6d45addc5738852e06443f0402b1400db6fa373bfcb6c7ca0a158dbc290f9df3e073 SHA512 c27849f5fdb9d12cd741ca2e9a6af29e0cc74fef5eb89bfef78e86d4510837dc0936723a0be4ebb8998e07739cfc322372e535865999cfa46a393173bc9fc45f -EBUILD jellyfish-0.11.2.ebuild 1660 BLAKE2B 01b02d4e4868cd246b66b462d682a25bf305037a8a2a44eccc7441b108f2cb3213ce9cde388ed989a9a674b72c319105b2bf8c16b44b4b098202cac48bd39e3c SHA512 331513f58a32c8f617013f12d2645ae635d165dd47fc06650bfc6477373c5b8bf005197fb587810326e4f429cde7869cf36736010462104ab27560da7da95c9f +EBUILD jellyfish-0.11.1-r1.ebuild 1628 BLAKE2B 9f38609df287fe9e54ce6dc0bad488292ec4805e0f8a19e0b625a4a23505dddf5cbd4631d43d91064029b59e6c2a72fb40f53bd3d199b76e1baf49172966918f SHA512 78ffabeac41637909f22bd482e201418c4eb092830fefe54e008042e8c9424d4c2ea44a2e261325ac7ca3f3dabbf23810ffa57a85847e7cde4232504d228060c +EBUILD jellyfish-0.11.2-r1.ebuild 1707 BLAKE2B abbec775f7d6a74dc3580b029a55ca621acd1d6eebfd4873103f59e24c16220a85bd3714a96f42afae2145e06ff60949172f789595297c82f2de55735d9fa8b3 SHA512 4945d4812e98c96e5c1ecaaeb7ddf8777e5c545d7325711c6eefadf2cc2dbac678a5eeb1f208c21aebdc5752ac10a4ef46f465dab70995cebbacb6c1b7ded95a MISC metadata.xml 504 BLAKE2B 65ba00e0a27d233e6850c5606eac6eacf7d1684bfeb64155c52cee5a196e54a0454465df8c310a91cf30d696b4812fa23014e3a8a483b197e8955a4ad751ee61 SHA512 51396a920abaed74a87aca55c00ee46404b4ed1773a4443eebe19b2e7b64b258b5b526a97bd4afc7e7aa495d7989192e3658105b69efba0bf280f57b52299738 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 <martino.mensio@open.ac.uk> +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 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 index 0bbe9beafb87..8ece7a8c62d3 100644 --- a/dev-python/jellyfish/jellyfish-0.11.2.ebuild +++ b/dev-python/jellyfish/jellyfish-0.11.2-r1.ebuild @@ -74,8 +74,12 @@ LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 " SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~riscv ~x86" +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" +) |