diff options
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/Manifest.gz | bin | 269980 -> 269977 bytes | |||
| -rw-r--r-- | dev-python/ansible-compat/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/ansible-compat/ansible-compat-4.1.11.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/mkdocs-ansible/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/mkdocs-ansible/files/mkdocs-ansible-24.2.1-prune_deps.patch | 10 | ||||
| -rw-r--r-- | dev-python/mkdocs-ansible/mkdocs-ansible-24.2.1.ebuild | 41 | ||||
| -rw-r--r-- | dev-python/orjson/Manifest | 14 | ||||
| -rw-r--r-- | dev-python/orjson/orjson-3.9.12.ebuild | 93 | ||||
| -rw-r--r-- | dev-python/orjson/orjson-3.9.14.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/pyotherside/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/pyotherside/files/pyotherside-1.6.0-qt6.5.patch | 34 | ||||
| -rw-r--r-- | dev-python/pyotherside/pyotherside-1.6.0-r1.ebuild | 106 | ||||
| -rw-r--r-- | dev-python/pyotherside/pyotherside-1.6.0.ebuild | 15 |
13 files changed, 210 insertions, 116 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz Binary files differindex 333d68262263..0ef7cb5022fd 100644 --- a/dev-python/Manifest.gz +++ b/dev-python/Manifest.gz diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest index 6520ddbb2001..51b86c36a3b6 100644 --- a/dev-python/ansible-compat/Manifest +++ b/dev-python/ansible-compat/Manifest @@ -1,3 +1,3 @@ DIST ansible-compat-4.1.11.tar.gz 73021 BLAKE2B 4d62c6c6739ae5dcfe98347eac268f6976f12cabcf8706f89ebaed2a6750a47faaf53ce5585ee2d6a2cf8a92add9f8f74bd050e44fa6f5515a9b77a7f49979c5 SHA512 0e8de16ef0da9a036595dadbdfa5fd776f8edf0d2c16e8e2759a0e1b07f0d0fffc22a8c7be17aefb73312f3c8f56d48fdf097c527fa3b8919907923fffc44fa7 -EBUILD ansible-compat-4.1.11.ebuild 1619 BLAKE2B e756412379b3f52616eff8d6078ecd6c8f9ec192f949d22a1fa9307da3d3cfbc3593e6cbeae51104f04e82c4cb153b65af390598eb06598901cd344db48e0f99 SHA512 0c392e054e82cd3f8db7b694927af59b290e04928c5a946b9dbcb9eb9c8f6ab51fea575753bdf5e171c63bdff0f160fde69311346335e63af0cd6cc98e648dc7 +EBUILD ansible-compat-4.1.11.ebuild 1619 BLAKE2B 22c41b5db373e04bb97cd852d6d3fc42df162af87a3591b820e1a45d2c16e80b79754e1308b048bd77bc9a5bc3e446516b623e34a5ea1430706136bb789a991b SHA512 3547fe5fc8253cec2716d84915894f4d813734b7bbdbfbea8279fccd21ea45476f709aebe897727da77658d3f8037fb36b1445dc0b90b6eaa17f26163f6280b7 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d diff --git a/dev-python/ansible-compat/ansible-compat-4.1.11.ebuild b/dev-python/ansible-compat/ansible-compat-4.1.11.ebuild index 6a167b762a67..677d014c9062 100644 --- a/dev-python/ansible-compat/ansible-compat-4.1.11.ebuild +++ b/dev-python/ansible-compat/ansible-compat-4.1.11.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi diff --git a/dev-python/mkdocs-ansible/Manifest b/dev-python/mkdocs-ansible/Manifest index c8c17369f419..63235bdcbe59 100644 --- a/dev-python/mkdocs-ansible/Manifest +++ b/dev-python/mkdocs-ansible/Manifest @@ -1,4 +1,7 @@ AUX mkdocs-ansible-0.2.0-prune_deps.patch 465 BLAKE2B 630427ef0be26647f36aa2df22ea5b2f1f48dcef9cd2c2b8ace939c3ac818196028518c8fac9f7dbec1bd24673bf470a8f6010b1258e73a677cd9777015fe75e SHA512 e71ee573a1a8504ca97bd4934094ba03f359f487d795913ff99545d4659831eb03124a36928f25892a1a67bb7127154543896fae8ebac46741c9382820d2ad0c +AUX mkdocs-ansible-24.2.1-prune_deps.patch 258 BLAKE2B e97767d69612859ffea82e6cc4efe76453ad313ed80e41c74b633360bf42b853188c1ffffd4d0ac0e7c040f13b46045ec62635dd0fc493e88f86620a54359458 SHA512 a14f8819d9c80765746a69aa76704cd53a2bcd8d4d164aa7a652ecf603a894ebdce08a8486d1a2654c4efd4de425e7a51ca152656b30572d4685e294e3df7a29 DIST mkdocs-ansible-0.2.0.tar.gz 29254 BLAKE2B 3d9582c50a3e6abad56bae2f78ff2970b96b768fd8dbc0aa60d15a0acfc23535acae42b7b7f585db3165bf658b3f18c483484b630b350aff97ebb97edb2abcae SHA512 8e0a3b447a4a31f3d48fef5e381d01e0f2ebee2dd317a699b30e83e483234ebac1ad265f66f15dfa92c52f6c1c4a0a77aacef2915b0a60b11ffe5960cd774820 +DIST mkdocs-ansible-24.2.1.tar.gz 44750 BLAKE2B 364ac6ee1b044309eaf3cd15c4944fd678680f17fdf35dc610522ff751ee8136c52fd7a1dfbe735c897f93ea9566e7bc986af3c6f18e90ad9945b3580bbb3eb2 SHA512 d01eec55638e34b83c06c7c4f3163d5c44fac373fb1ed099b9a63c59af27efebd85b655f1f9558add5ddc968abe1d1d28d326b0fe500e395035c62e006653b27 EBUILD mkdocs-ansible-0.2.0.ebuild 1255 BLAKE2B 5b6a49a0742a6ccf064af59d2b88cdf89d1fea0d4bfc265ea462d4672b9f4ecb9e8936c57df099fb936ada5860eaf4f7e5f8ac9ac69bb0a95bfd2f36c49dd381 SHA512 30cd062968228cf60d8432cb227d24d8cb0e2b068c72345f845f1a17c40ff97d2e780d9962a803569691de260219a09fade16c86c745875a0fdd690b9c96ebc0 +EBUILD mkdocs-ansible-24.2.1.ebuild 1256 BLAKE2B 1bee16fc9b0209946b301dbfeb64e8cefcb91a83978517d685cb1b93f52be70b6a6a00785787e0b929e2d85a91e677c26f66ec570b219734b201f37b36c7f403 SHA512 cb6afc448fe5a7e9dd1ed9c2ac46c8defdb6b2d65124f832737428cdb8f1fe93a8d25a9efe235e2098f34f55e5ec89f8946695466731d52b2a737a5af2d02a72 MISC metadata.xml 409 BLAKE2B 7552f90e363cbe4b38bedae3630074db6b4b3fd75a13d3e34740470490b49f3cc553cb76d87bae5bfdf247b5e8ab57da2888ff12723bac72999c23484350485f SHA512 70fb7dfda89462823c26b7058a941d405015a46bd0445f0c75c5adeb659122d5d558b6e757ab20224725e8eaff5390bc3b0ce7e2bf7b56dd9982c04fc59a59e7 diff --git a/dev-python/mkdocs-ansible/files/mkdocs-ansible-24.2.1-prune_deps.patch b/dev-python/mkdocs-ansible/files/mkdocs-ansible-24.2.1-prune_deps.patch new file mode 100644 index 000000000000..ecddf3a347b3 --- /dev/null +++ b/dev-python/mkdocs-ansible/files/mkdocs-ansible-24.2.1-prune_deps.patch @@ -0,0 +1,10 @@ +As of 24.2.1, no mention of pipdeptree anywhere in the actual code. + +--- a/.config/requirements.in ++++ b/.config/requirements.in +@@ -11,5 +11,4 @@ + mkdocstrings-python>=0.8.3 + mkdocstrings>=0.21.2 + pillow>=9.4.0 +-pipdeptree>=2.4.0 + pymdown-extensions>=9.9.2 diff --git a/dev-python/mkdocs-ansible/mkdocs-ansible-24.2.1.ebuild b/dev-python/mkdocs-ansible/mkdocs-ansible-24.2.1.ebuild new file mode 100644 index 000000000000..34f274f4ed90 --- /dev/null +++ b/dev-python/mkdocs-ansible/mkdocs-ansible-24.2.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Ansible theme for MkDocs" +HOMEPAGE=" + https://github.com/ansible/mkdocs-ansible/ + https://pypi.org/project/mkdocs-ansible/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +RDEPEND=" + >=dev-python/markdown-exec-1.3.0[${PYTHON_USEDEP}] + >=dev-python/markdown-include-0.8.1[${PYTHON_USEDEP}] + >=dev-python/mkdocs-gen-files-0.4.0[${PYTHON_USEDEP}] + >=dev-python/mkdocs-htmlproofer-plugin-0.10.2[${PYTHON_USEDEP}] + >=dev-python/mkdocs-material-extensions-1.1.1[${PYTHON_USEDEP}] + >=dev-python/mkdocs-material-9.0.13[${PYTHON_USEDEP}] + >=dev-python/mkdocs-minify-plugin-0.6.2[${PYTHON_USEDEP}] + >=dev-python/mkdocs-monorepo-plugin-1.0.4[${PYTHON_USEDEP}] + >=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}] + >=dev-python/mkdocstrings-python-0.8.3[${PYTHON_USEDEP}] + >=dev-python/mkdocstrings-0.21.2[${PYTHON_USEDEP}] + >=dev-python/pillow-9.4.0[${PYTHON_USEDEP}] + >=dev-python/pymdown-extensions-9.9.2[${PYTHON_USEDEP}] + >=media-gfx/cairosvg-2.6.0[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}"/${PN}-24.2.1-prune_deps.patch +) diff --git a/dev-python/orjson/Manifest b/dev-python/orjson/Manifest index df78ccf9a1ae..4f3e6387463c 100644 --- a/dev-python/orjson/Manifest +++ b/dev-python/orjson/Manifest @@ -1,4 +1,3 @@ -DIST ahash-0.8.6.crate 42780 BLAKE2B ce2fb8201a484715d42bbd9ca1bfe2d5f541d90e3619ebd437c34a018920b679d5a11f9e96be48fbdabd2e98a379c0395d118616f21eb9004724d8fcb04b2b2b SHA512 46428b27e96be1f30058b9383a94988beeb5064dfb4df04d6959b451d0c77ef69fc51f07fdf9511ab9728295eb6beee7783c31a2297f9e473fc537883e722b73 DIST ahash-0.8.8.crate 43028 BLAKE2B 598a7f2ef74a9470913d2d4e46d1652a8ea7ccd9843778b7f2f4d9f41703ba4cae552aca8205fef6ff8f601d919a5f141391a942e13e5285c7e053cbbbe4afcc SHA512 b54c8c2cfde8115d2108dca36ab698d1b43eb015caa36e6d02288ff21a67ff54144affd406af704107689888f52548203731d3793e5b881bd267b2f803f478cb DIST ahash-0.8.9.crate 43050 BLAKE2B 81e2212602ced9e9cb7bd4a3d62fb5a9a3b382cf367c653907314f9a1870b20ec0de5ce6154e73941628daadac3f97322d4aa58b41e5d5d16592d6587321ac2e SHA512 54a338c08a42fb0da205eb82d23cf03ae7da3f4772f685f798e748dcfec1794a34f8104af27abc961b3e04d0ce5d79fc5b86d4249cd7a6f1b78f65bd44104814 DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac @@ -10,7 +9,6 @@ DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 DIST cc-1.0.86.crate 72973 BLAKE2B 9f9f2e974b38d2fa6d4c789342aeea952c41bc475cfb0f6fbb24b63fc1e5766c228d371e975099c1ebff0d7779196f70a95249e94dbe965bfd55931c704135b5 SHA512 00fcbbfd92dcfaf6e2d2792bb5559fd3f9afeeb7083f08a128f468ecb05e961cd53563277f94c97a1bdff700844f2ddcb4db3670cc219bf409ce7489ad284ea1 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 DIST chrono-0.4.34.crate 228932 BLAKE2B a2feab8d8b079209f8661fd8c5069f2a5fc3e5b0a6233187ace16f8f2ad8b4a147253e47af306cb31aacd82bdf490a8c8a171ad702b8dc22f9b934205d080c55 SHA512 2aaccde5e5ecaec744613429f807b3c34b92632973de7fdbdafd7ca510b917a23a0abc92a6497754d0d3368d684305648aec1fa2a0a61c88a100a20fab2348f1 DIST compact_str-0.7.1.crate 57246 BLAKE2B 2da5cfdc91d417294ca87ce834e8006d3426aff4cb22945e6744ace7d22c940f0181a75f25e6acc41efb5d83bf6ba4ee0876db3ce5cc05b9524a9868dcb8c7c9 SHA512 29ed591024f8f1b478722384664f5700fbde97b44af82fa32a8d1ccdedca9dc425555f9e5a4431a6c954d58cd90d60a25a9ed7f18773ede13edfc68094a23275 DIST const-random-0.1.17.crate 6640 BLAKE2B baf09fa4899f09a5ef78b97a0f1e19ac0a405c3072f63cf1b21de744bccdacc5d6e098bd3144e7b80d91dd9eec5cd0c4d0db63b2a91a790940f56e0b6e13d480 SHA512 a49c2531a073158b008e7ca506e9e9e302025f9af0a2dde078827b769ce662101ba0fd866dbbcb50dbaaa20abcb9e70aeff00c4fd2cade56a690ac092d11fda1 @@ -20,18 +18,13 @@ DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49 DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 DIST itoap-1.0.1.crate 83316 BLAKE2B db0d9f712155bfe4285c3d3debf314da2d64ffd127d6b9dd471074eb7e5dcda41f1e5b04bdad63e0fbd695043eff21956709ffdf2cdd7fc5b329d1d79ee69fc6 SHA512 ed15ba3e1ee1ef5f1658fbb47e8cba66e62acf05d8ac45340e15ace24c86e5adf072b52bfb90ebc5e90f31a9a8e91ada23d4322db9a87bb966922afdd4775840 -DIST libc-0.2.152.crate 740278 BLAKE2B 8eecde477063207d77b6894d6f9194c8dd10e55b69585e3d66296eaa0b9d3f6e2d033e667207182bf4c3cf31f6d38820c9187b2006f4b5ebee898adafb4b2751 SHA512 1722f6f52077efab90026aae3d10306f8c38ebba95366593c3c1adf707fae121ab450064ad9e8be5a667caf6af0b90fad4d1ca1009db0f2220093c44e33c4b5c DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 -DIST no-panic-0.1.28.crate 11616 BLAKE2B 6cf81300705e5e0045959be64c2b9151fac30be13f3c9c985d87e7c0e6959e308f03d0b99777194de5b6662b18450ff27e5b4cd2ad2590ae847f2d5a2550031e SHA512 0a08b68b6af9986414181b94e0133d7b6ac673870ee4353f2858720b82555c8ef4697b148e7dbbffd99c2f69cb0ddd3809c6fce9b33331b038223d6606c34de4 DIST no-panic-0.1.29.crate 11689 BLAKE2B 15c88784de85c159d65c7f7cab968692cba303abac1bbbdeb0c92014df51932094a4e12e2df253256cea9fcfb08f339514d67f08bb549e89fb16301a7e9432b9 SHA512 647d5ade614f7dfe0eb8b1ae8a78897ce61e15cffbafb889e7a5271c90cf6b40d3c37ef94c600b2058207cc45465c0553aea9c9e17eee93963672bcff9913354 -DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c -DIST orjson-3.9.12.tar.gz 4821075 BLAKE2B 893eb8847cb97cf4468b1143f6fd6e1bc2f3efa81fc44d39c55660681a0a449c578431536a413415c4c4f8e69aac51a00fe5f0ff4b874f2ef94efc6d36e782cd SHA512 b2689d92b34b6c818e5a798e6de08d693e3a6b04f205d943fb8960727153635faf7118d33ea78a79ce09aa0b066b07d431b27871a61a8de536f64a80f6bab387 DIST orjson-3.9.14.tar.gz 12356417 BLAKE2B 9336d3b70aa3174c6314cd436bb1504195bf2090f1f7f2992361a1413c5a82d35908eeab76ae116e1e21a7adf1295280bc4bb8449a57a7b91021c645f4f04db8 SHA512 e390bc73ddc0efd34590e404f59a759b7022a2b3aa1f8d2e7ecbebf870002a9b9d311554e2a35ec073ba35b76c5c656ed63f79f34efe0da1c0a32228d5c4d31b DIST orjson-3.9.15.tar.gz 4854933 BLAKE2B e03720bd2977b02e9025cbcaf5aa64c73eb0dd90b328a4a2a385bd113f75a642e5aacf1c38d6509f67ff0f13eef8b8682572087c07d2d19b6e0c704c8ed77ec0 SHA512 ad6a7bbb8ffbf1eff05fd421527264336a844133dd8c19303cd22d767ad5f76047191beba8b45b1eed79c7024099a9e04529c40d669db76475191c67a42fc183 DIST page_size-0.6.0.crate 8479 BLAKE2B c90699135f158a0dea1acf80acfab002a4f4971188dac853af03c0bb79c2ad5b67f4decf7df5157f390cc3fa5b62a265c6e7948ce9ca9e7f2dc3595c60f07ac1 SHA512 204faf102760e9f3edc480302a7d7e6b995b7a40850372ebb332cab82b9c8301e761351c7abce93bde9473ad9e944bb07e6c4447d4ee1891f5ae2c261b74b8e5 -DIST proc-macro2-1.0.76.crate 45660 BLAKE2B 40b538d9d9fec10b9e4b147ce0a86efb10feedf9e0452e5568e8ad7d2b88a201ca6ffd2cd62d8815a1ee72d557fe6280120a913868c3d868c1235686742cd8b8 SHA512 2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247 DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769 DIST pyo3-build-config-0.20.2.crate 30029 BLAKE2B 846eb95d1417a658763417a2750dca1c55201105a3978d61b1db5e3962680ede188f8285dd7deec778ea9860d43e40513b88f5a54f0b1881b08416760bdbbedf SHA512 9dbc669ec69d38716c3909fa8f3b6c5be13c717b20bfd5dd11edab59b8eb35247d7996acd260fec88f92eb3e71248c86e9b40c1a700827889e2990bba20ecddf DIST pyo3-ffi-0.20.2.crate 64601 BLAKE2B cf1141ad34a13dcb46de0d1e15dda192ca41a7441bfc92a9295861876dcc690d1d5d6d39dafa51cd70c4627353efa91563eaefee8c39f655d12818003f9524da SHA512 ee6386b6fdb80689d104f9cd5229f02e1893d00a52be710bd36882c47305abbe24ef2f3cdef8200fddc0bb97e29001fa3a2fd9d3d2673ecd9a104a070420d01e @@ -39,17 +32,13 @@ DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5 DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4 -DIST serde-1.0.195.crate 76856 BLAKE2B 6a80b59335f222ae48d5e377c30611f30fe6416e6853ca47a39016e21f649cb9dfbe4964ce19e5da977fb9a963228a6a81c1e85af99ae12d7a0a5722901aa2f5 SHA512 0002ecb933d08fbdc8585ee74efb4048d385459f629261f5a4a8401b794f1c02b8296db79f479013a0b2a47ba99bee6c02d60d0fc2454e32f1b038b4071e8727 DIST serde-1.0.196.crate 77097 BLAKE2B 22403615511a7621a9d8d54fd2dcc63878cd2de0e43bff6b7921db85e19f34ee5022eb1086890edb6987428cbb707a59277ae007d1536b5d80a7da615fc3f36a SHA512 0917aa36d855ca77726d538fb7fcfcf629722c784d747b3869c0d69444c447d7b1fab556a9eb9594ddf6cc508df636fdde051a1c3909f9c691e4921946ebda19 DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 -DIST serde_derive-1.0.195.crate 55687 BLAKE2B 4da7916e36f71dfe82defa6c45b3075395cae54631cdff08a4607e962290020e7214288258fd316439c02536073325f5902e7b00144f97269a207fc453496599 SHA512 8a82ae4e7cfe0c3ac27688cc95d74bf4c2e10c1fe845ab28fb57579b2f47f36d13218c2ae603f93f00114065d47c3e46166dea39b205be673f443c34305dacce DIST serde_derive-1.0.196.crate 55775 BLAKE2B 3d06b3896f0cdd1b1acdcd0046bdbfd1e8a298d6f07d12a2326ff144baaac07fcbd4af1d18b8b1188d4cc192e253fcd79860d1dbb2ecb148025449c0ac954c72 SHA512 f4df7f835e8416e4662c62a46d5f6e6d45ffd103812d681b220f8080310720e27f738a34a8e622df722fed55a1d8c654dd4abfbd78d1fdc871306bf3985baf22 DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 -DIST serde_json-1.0.111.crate 146447 BLAKE2B a3509185e78c438f495ee9d5b5b7c23cd3b565d45178500f2b9ceb8cc8b1cc509b8d25d217f2c98bb597bab205566d660c3f60506c836da903c52206e6fb160e SHA512 11851e34a9a40de32654a12ada1d1bd01abb11531c5804f5d0747bbb01bf59025dd92be916104fbc278bbba5c89c77920941b83c0ac2f0da23f5d61a7788e83f DIST serde_json-1.0.113.crate 146970 BLAKE2B 8d80b0fc913ba4f008175c6b89955870af6476dc8bae0cd711b748cd0a2bf67b1299396bbd492a1ae5a4ff8050fddc85f0a0ab54f7b24e27529ead3e3d7c920e SHA512 82571b025cd598fca635f18881b52db2364e07eff1b961ca7e3b0591dd41f95503f7188ef1ee6fbc060b9a2360cacbc8a5b85c01fef7879ae3392b29c0004b34 DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436 DIST simdutf8-0.1.4.crate 28621 BLAKE2B 94ab48bc899e603acf3805dd45ae8489d565aa39ff79606e80a1731b59d11f429d71bb6c65becf3ceab123767f2d20612cb9f86410fd1aad00d0a796091ad045 SHA512 9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c -DIST smallvec-1.12.0.crate 34947 BLAKE2B 545a301fa8580381c61b7dd69fa727921d0ee4868c5fd68a5a89149b7cc1482f8b85eb68bed2485f54d784c8877b2968139683270590ceee7ef9cc6c39ec2cb7 SHA512 6a3c61d1c60339feefbd02f5ce097302cf9c1e10ca14759cbeeefb2ec0167643549bbaa39008857c875166df7d9b11945f65ebd777931279d98275cc36315eaf DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 @@ -65,7 +54,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d -EBUILD orjson-3.9.12.ebuild 1802 BLAKE2B c7145243f5ecf06ff733035071b1d3351a34c7d10204bbe4a48460247bb6b96892f3ed751a7e790259769d4f8a75935a7d027b45287eede3fc1ef85e3a6d5e8e SHA512 d3735ae884ec4127e9020ba71c7655ace3c85e744405e903b064052c3a5732431e2eed88456179f9c00092994579325d553dac4247566c1d4dd34a61012af315 -EBUILD orjson-3.9.14.ebuild 1926 BLAKE2B 629c03176c59421793927d47314ef4e313552a31e1f57f79aa46bc58b200e10bbaaafb2f05108c3afa2182d39363950f69136a6c97ec2d4ac4f462596a95f232 SHA512 7fc73c12c10d84eee4595228f79028f8d52919765e4b23dbdae9f08e40425d90d15ea5bce9db9b54656bdfc90a2dfabb9a7431045db9b1402554e7ab981cf282 +EBUILD orjson-3.9.14.ebuild 1924 BLAKE2B 3d9cd3b4944c2f34cb02851bfb284e24da37290d02be285c495cb7a94d597fc00d0009631e465943e5d0cbe81bc14b1e5cffd588f70464e8e31e2f72e488f6b8 SHA512 733a3c4d4e2c2ddde90645a113dc1ac857bb54278bbd243e5dc9a9c3f95051a49d0a9b508b1a79d47711a05915104d57d2cad676cc31a01fa4bfb9c0eb495c80 EBUILD orjson-3.9.15.ebuild 1828 BLAKE2B 8681748790a79f8828cba9c7fedef8e3007c5dc55d9c7c8844c02c52ba9715976140d7cd5bc8b0b44347fb8e9e5a4b7fc9d63adfc0dd34003f8a0477cb666f2b SHA512 6cf350ed043464a9a599dd381090ef140ae88e3bc4c1d7ea9100090fa53a12f372bf677647315e0944f08ef111e331db3a6a517361b1d21ee63ec3e8d60951ae MISC metadata.xml 360 BLAKE2B b19f85a4e5055dc309e35bf1706b10ebcc1961c96884bec0c9efd7ee7bf58adf53c0f61d8c1d1094c38f0e0bf78fa00c5be1e7ee58c85939ac1c6fff40fcbd07 SHA512 e168db6bda3fbb7f801aeb7a91733fad54441e21913a16447e7b8fc694fdeb0fe3216c15de2864efbf92f2ca8e1a0743eb3d62e8c250648e91be68a465c21ae0 diff --git a/dev-python/orjson/orjson-3.9.12.ebuild b/dev-python/orjson/orjson-3.9.12.ebuild deleted file mode 100644 index 50302f969389..000000000000 --- a/dev-python/orjson/orjson-3.9.12.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=maturin -PYTHON_COMPAT=( python3_{10..12} ) - -CRATES=" - ahash@0.8.6 - arrayvec@0.7.4 - associative-cache@2.0.0 - autocfg@1.1.0 - beef@0.5.2 - bytecount@0.6.7 - castaway@0.2.2 - cc@1.0.83 - cfg-if@1.0.0 - chrono@0.4.31 - compact_str@0.7.1 - const-random-macro@0.1.16 - const-random@0.1.17 - crunchy@0.2.2 - encoding_rs@0.8.33 - getrandom@0.2.12 - itoa@1.0.10 - itoap@1.0.1 - libc@0.2.152 - no-panic@0.1.28 - num-traits@0.2.17 - once_cell@1.19.0 - proc-macro2@1.0.76 - pyo3-build-config@0.20.2 - pyo3-ffi@0.20.2 - quote@1.0.35 - rustversion@1.0.14 - ryu@1.0.16 - serde@1.0.195 - serde_derive@1.0.195 - serde_json@1.0.111 - simdutf8@0.1.4 - smallvec@1.12.0 - static_assertions@1.1.0 - syn@2.0.48 - target-lexicon@0.12.13 - tiny-keccak@2.0.2 - unicode-ident@1.0.12 - version_check@0.9.4 - wasi@0.11.0+wasi-snapshot-preview1 - zerocopy-derive@0.7.32 - zerocopy@0.7.32 -" - -inherit cargo distutils-r1 pypi - -DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy" -HOMEPAGE=" - https://github.com/ijl/orjson/ - https://pypi.org/project/orjson/ -" -SRC_URI+=" - ${CARGO_CRATE_URIS} -" - -LICENSE="|| ( Apache-2.0 MIT )" -# Dependent crate licenses -LICENSE+=" - Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 MIT Unicode-DFS-2016 - || ( Apache-2.0 Boost-1.0 ) -" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" - -BDEPEND=" - test? ( - dev-python/arrow[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' 'python3*') - ) -" - -QA_FLAGS_IGNORED=".*" - -distutils_enable_tests pytest - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -s -} diff --git a/dev-python/orjson/orjson-3.9.14.ebuild b/dev-python/orjson/orjson-3.9.14.ebuild index 0ba32561aaf7..7f17f7042cdc 100644 --- a/dev-python/orjson/orjson-3.9.14.ebuild +++ b/dev-python/orjson/orjson-3.9.14.ebuild @@ -74,7 +74,7 @@ LICENSE+=" || ( Apache-2.0 Boost-1.0 ) " SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" BDEPEND=" >=virtual/rust-1.72 diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest index 139447fb794b..439546fba549 100644 --- a/dev-python/pyotherside/Manifest +++ b/dev-python/pyotherside/Manifest @@ -1,3 +1,5 @@ +AUX pyotherside-1.6.0-qt6.5.patch 1745 BLAKE2B ed4b87ad3379b9a24534c44bf34e8b94f6aa14a90551cbfee8ee7bcc3ca15ff2e9a3e29b5de83567071132c4a56fdae99939b9c7e581a1516d5716927a660cb2 SHA512 2f214a6475742d205ef641495fc52857ff56fed056fce7e7b7303c3b00371d419de1472592c3da1f4d40889d7871840f2e0448548fdb54637070e70753d3e518 DIST pyotherside-1.6.0.tar.gz 183645 BLAKE2B e2a12a9a96f3672a5e322c9f2e84d485b8086bdcacfc6586e0c23f6dd730d3e66cea66618540fd9a304480a9ab86386e2fe0136047c59f70bfa3b5cff9e8e76e SHA512 57835db9d65fae10e6b3ec8ab37793e316324e7a819a1045436adf9eabdee11ccf3090a4db0302283b236e77e5e0bd14cf92ed1430835ccc324e50085a872787 -EBUILD pyotherside-1.6.0.ebuild 1262 BLAKE2B 2bff5a8d65ccfe2b214fc8382ba187cd17afb8cd2b42b03b21597e2169b3113e74c080cc0a9ae7e85ff57d888b127432f0361e99ca9e1b97f68cd3aebfa0feaf SHA512 13411b2916ca77f278643e68951a7f7becb61e59df16e472746aa821d216223bf5254d5e869d925e7d96f3fd3970aeba4cbf7da2c2fc4e5d0db9345ac696d72c +EBUILD pyotherside-1.6.0-r1.ebuild 1965 BLAKE2B 798b2305c0feeae69a9699dad74e2238ed6737ec40bf2409eaeee2e613a5b7a905ac915e3c6b13f9348f916405e3dfbe10ecd59865bf093f3ff3480f62319215 SHA512 9506d25c5faa9521ed5956a0173bc1823d738d007df31eb8eaf71c0cd7c069e92aa93ad709479877a49ff9422832a8e1c88b62edc5a243a228b4d4f8ac102729 +EBUILD pyotherside-1.6.0.ebuild 1303 BLAKE2B aabb06d23f6b2a81f83b7f365b233d7ec6197c60a397a8399c395a723a95106daa8ec2a3f044933fef452a9e99e0cd23b2d74c3ad0b98c2c332145251114013b SHA512 e04da50c62fde18ef9a082fd85118d03f3446afb8724f1c1727fc43d0a644d375c551b039ea5dd33a94888ac78f789233557deb683d6bee9ed65c5f30e6c3d4b MISC metadata.xml 326 BLAKE2B c323223e1038b40f67b25b1f13a4f5fec61175ef0b73bd3ec3a4228bb51b0a41e0f27ca2f47ec9f2b595e07a83358c74f254054d06b4488ff25d2a1c046899b4 SHA512 9d4649f09f1a00a9aa4a8eeb4e535ceff6b924253cd3ac93a8c0d1f6fe2a94c02a7f14f5b722b7b39744ab7331cd3efb57dc59bcb7ab6fb5ce59f692c0f2718a diff --git a/dev-python/pyotherside/files/pyotherside-1.6.0-qt6.5.patch b/dev-python/pyotherside/files/pyotherside-1.6.0-qt6.5.patch new file mode 100644 index 000000000000..08844cc8338d --- /dev/null +++ b/dev-python/pyotherside/files/pyotherside-1.6.0-qt6.5.patch @@ -0,0 +1,34 @@ +From 45044252aaf73262cd46443acd049e7afcdf072b Mon Sep 17 00:00:00 2001 +From: Thomas Perl <m@thp.io> +Date: Sat, 2 Dec 2023 18:46:06 +0100 +Subject: [PATCH] Fix build error with Qt >= 6.5 (fixes #128) + +--- a/src/qpython_priv.cpp ++++ b/src/qpython_priv.cpp +@@ -405,8 +405,25 @@ pyotherside_QObjectMethod_call(PyObject *callable_object, PyObject *args, PyObje + } + + QVariant result; ++#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) ++ QGenericReturnArgument returnArg = Q_RETURN_ARG(QVariant, result); ++#else ++ /** ++ * Starting with Qt 6.5, Q_RETURN_ARG() expands to a QMetaMethodReturnArgument, ++ * whereas previously it returned a QGenericReturnArgument. Since we are using ++ * the old, deprecated QMetaMethod::invoke() functions, and those take a ++ * QGenericReturnArgument and not a QMetaMethodReturnArgument, we need to ++ * create the QGenericReturnArgument ourselves by emulating what Q_RETURN_ARG() ++ * does in old Qt versions before 6.5. ++ * ++ * See also: ++ * https://bugreports.qt.io/browse/QTBUG-113147 ++ * https://github.com/thp/pyotherside/issues/128 ++ **/ ++ QGenericReturnArgument returnArg {QT_STRINGIFY(QVariant), &result}; ++#endif + if (method.invoke(o, Qt::DirectConnection, +- Q_RETURN_ARG(QVariant, result), genericArguments.value(0), ++ returnArg, genericArguments.value(0), + genericArguments.value(1), genericArguments.value(2), + genericArguments.value(3), genericArguments.value(4), + genericArguments.value(5), genericArguments.value(6), diff --git a/dev-python/pyotherside/pyotherside-1.6.0-r1.ebuild b/dev-python/pyotherside/pyotherside-1.6.0-r1.ebuild new file mode 100644 index 000000000000..44c3228186f8 --- /dev/null +++ b/dev-python/pyotherside/pyotherside-1.6.0-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit multibuild qmake-utils python-single-r1 + +DESCRIPTION="Asynchronous Python 3 Bindings for Qt" +HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/" +SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +IUSE="qt5 qt6" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( qt5 qt6 )" + +RDEPEND=" + ${PYTHON_DEPS} + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtsvg:5 + ) + qt6? ( + dev-qt/qtbase:6[opengl] + dev-qt/qtdeclarative:6[opengl] + dev-qt/qtquick3d:6[opengl] + dev-qt/qtsvg:6 + )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-qt6.5.patch +) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) + python_setup +} + +src_prepare() { + default + sed -i -e "s/qtquicktests//" pyotherside.pro || die + multibuild_copy_sources +} + +src_configure() { + myconfigure() { + pushd "${BUILD_DIR}" > /dev/null || die + + if [[ "${MULTIBUILD_VARIANT}" == qt5 ]]; then + eqmake5 + elif [[ "${MULTIBUILD_VARIANT}" == qt6 ]]; then + eqmake6 + else + # This should never happen if REQUIRED_USE is enforced + die "Neither Qt5 nor Qt6 support enabled, aborting" + fi + popd > /dev/null || die + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + mycompile() { + pushd "${BUILD_DIR}" > /dev/null || die + + emake + + popd > /dev/null || die + } + + multibuild_foreach_variant mycompile +} + +src_test() { + mytest() { + pushd "${BUILD_DIR}" > /dev/null || die + + QT_QPA_PLATFORM="offscreen" tests/tests || die + + popd > /dev/null || die + } + + multibuild_foreach_variant mytest +} + +src_install() { + myinstall() { + pushd "${BUILD_DIR}" > /dev/null || die + + emake install INSTALL_ROOT="${D}" + + popd > /dev/null || die + } + + multibuild_foreach_variant myinstall +} diff --git a/dev-python/pyotherside/pyotherside-1.6.0.ebuild b/dev-python/pyotherside/pyotherside-1.6.0.ebuild index 41263ea70ea1..f151aceda94f 100644 --- a/dev-python/pyotherside/pyotherside-1.6.0.ebuild +++ b/dev-python/pyotherside/pyotherside-1.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit qmake-utils python-single-r1 @@ -19,9 +19,7 @@ IUSE="+qt5 qt6" REQUIRED_USE="${PYTHON_REQUIRED_USE} ^^ ( qt5 qt6 )" -# qt6 TODO: -# - check if all qt6 deps are okay yet -# - multibuild for both qt5 and qt6 if requested +# TODO: multibuild for both qt5 and qt6 if requested RDEPEND=" ${PYTHON_DEPS} qt5? ( @@ -33,11 +31,16 @@ RDEPEND=" ) qt6? ( dev-qt/qtbase:6[opengl] - dev-qt/qtdeclarative:6 + dev-qt/qtdeclarative:6[opengl] + dev-qt/qtquick3d:6[opengl] dev-qt/qtsvg:6 )" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-qt6.5.patch +) + src_prepare() { default sed -i -e "s/qtquicktests//" pyotherside.pro || die |