From c268590c556cb766e1ca3f55fde8a40cdde19c44 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Sep 2022 15:10:20 +0100 Subject: gentoo auto-resync : 27:09:2022 - 15:10:20 --- dev-python/Manifest.gz | Bin 262188 -> 262197 bytes dev-python/QtPy/Manifest | 2 +- dev-python/QtPy/QtPy-2.2.0.ebuild | 10 +- dev-python/ansible-compat/Manifest | 2 +- .../ansible-compat/ansible-compat-2.2.0.ebuild | 2 +- dev-python/ansible-pygments/Manifest | 2 +- .../ansible-pygments/ansible-pygments-0.1.1.ebuild | 2 +- dev-python/enrich/Manifest | 2 +- dev-python/enrich/enrich-1.2.7-r1.ebuild | 2 +- dev-python/pyside2-tools/Manifest | 2 + .../pyside2-tools/pyside2-tools-5.15.6.ebuild | 77 +++++++ dev-python/pyside2/Manifest | 2 + dev-python/pyside2/pyside2-5.15.6.ebuild | 224 +++++++++++++++++++++ dev-python/pyside6-tools/Manifest | 4 +- .../pyside6-tools/pyside6-tools-6.3.1.ebuild | 64 ------ .../pyside6-tools/pyside6-tools-6.3.2.ebuild | 64 ++++++ dev-python/pyside6/Manifest | 4 +- dev-python/pyside6/pyside6-6.3.1-r1.ebuild | 210 ------------------- dev-python/pyside6/pyside6-6.3.2.ebuild | 210 +++++++++++++++++++ dev-python/pytest-markdown/Manifest | 2 +- .../pytest-markdown-1.0.2-r1.ebuild | 2 +- dev-python/pytest-plus/Manifest | 2 +- dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild | 2 +- dev-python/rpy/Manifest | 4 +- dev-python/rpy/rpy-3.4.5.ebuild | 40 ---- dev-python/rpy/rpy-3.5.4.ebuild | 2 +- dev-python/shiboken2/Manifest | 3 + .../shiboken2-5.15.6-fix-pyside2-compile.patch | 11 + dev-python/shiboken2/shiboken2-5.15.6.ebuild | 173 ++++++++++++++++ dev-python/shiboken6/Manifest | 4 +- dev-python/shiboken6/shiboken6-6.3.1.ebuild | 168 ---------------- dev-python/shiboken6/shiboken6-6.3.2.ebuild | 168 ++++++++++++++++ dev-python/sphinx_ansible_theme/Manifest | 2 +- .../sphinx_ansible_theme-0.9.1.ebuild | 2 +- dev-python/subprocess-tee/Manifest | 2 +- .../subprocess-tee/subprocess-tee-0.3.5.ebuild | 2 +- 36 files changed, 958 insertions(+), 516 deletions(-) create mode 100644 dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild create mode 100644 dev-python/pyside2/pyside2-5.15.6.ebuild delete mode 100644 dev-python/pyside6-tools/pyside6-tools-6.3.1.ebuild create mode 100644 dev-python/pyside6-tools/pyside6-tools-6.3.2.ebuild delete mode 100644 dev-python/pyside6/pyside6-6.3.1-r1.ebuild create mode 100644 dev-python/pyside6/pyside6-6.3.2.ebuild delete mode 100644 dev-python/rpy/rpy-3.4.5.ebuild create mode 100644 dev-python/shiboken2/files/shiboken2-5.15.6-fix-pyside2-compile.patch create mode 100644 dev-python/shiboken2/shiboken2-5.15.6.ebuild delete mode 100644 dev-python/shiboken6/shiboken6-6.3.1.ebuild create mode 100644 dev-python/shiboken6/shiboken6-6.3.2.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index b7337ea94b95..2126408cce94 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest index 6a1d739a6516..d684840a5041 100644 --- a/dev-python/QtPy/Manifest +++ b/dev-python/QtPy/Manifest @@ -1,5 +1,5 @@ DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff DIST QtPy-2.2.0.tar.gz 51573 BLAKE2B 5db2be83c74fa241cbec6818fbf5b5a8ecf681fdb2813cd51b011342eb8f0f2463c0a9f251e791f6051fa3276ad1e502f7e51bf0dcd2d3192bd76d0119dc8b16 SHA512 b0e7696c7861942c16749dc5f5ccbfd038f7fc2b1defbf372885223c4100805cada9bbb2f5bdae1f1c642b52d480d6e0048e221d9efd3f3103da54e6e2bfd0ff EBUILD QtPy-2.1.0-r4.ebuild 5251 BLAKE2B fbbb485a5703c749cb2b8f54618120c816cea37965400161c725eb4257ae152d6cade5105d81eea9c82cf978e1f84f7780c2df60ad8026fc66dfc1e6004fbabb SHA512 3ac53baabe109d68d2b42ce1574de34046239c1cff8abe5ae1b724a55b26a626bdae094c028adc485893a5c07a9144a0f8d7ec65836d474d4807716281e911ad -EBUILD QtPy-2.2.0.ebuild 8482 BLAKE2B cdea24988f9b936a015640014ed173908c62dc16c36e1ca503406157f53534906cc915a85a70a40ba6322dc1456cbe3eb98bf8aec67db8e95be7df7622c5611f SHA512 805c373b9a132e901cc1a07f4bb41302f834a7f4f89dc78e61f058fc237dfb8ce022ba7bd436a16e2dc758f170d7b6ae0e2db67609456a65cc7cfc296c5915b3 +EBUILD QtPy-2.2.0.ebuild 8326 BLAKE2B ebd30af8ea43c9ea60226a831063edd33439a69bd8b9d345fb552a1932e3d3355ec1d82e3664d5a73b3a62ce3ca873ba7f38309f1a15b16555869bcc50739d08 SHA512 91662f66f5cd131afa5ecdf1b8af4af4c1773454bbe282b262c2d1d5d5ca159b08377b9fd9cc2c9dd232824002ad1bac56212573893384261624bc7306e61534 MISC metadata.xml 3206 BLAKE2B c5f30891361513c0f1242052e119558179485057e38bf41355c1bfff2de038054df314ea5a8c63616541c0c0f5b2f3835d74771cbc764047c8a5149529fa3598 SHA512 0eb58b11a04a1d55bf6496df37d05a1252a67ddf9ddeefba6642959f8c7ec243a32b587de9fc9507d56ac6eada5a5a5fd4e40b256ede0b0b02063151a4e386ea diff --git a/dev-python/QtPy/QtPy-2.2.0.ebuild b/dev-python/QtPy/QtPy-2.2.0.ebuild index 6c8adb1b00bf..3da0d633e745 100644 --- a/dev-python/QtPy/QtPy-2.2.0.ebuild +++ b/dev-python/QtPy/QtPy-2.2.0.ebuild @@ -27,11 +27,7 @@ _IUSE_QT_MODULES=" IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}" unset _IUSE_QT_MODULES -# PySide6 is not yet ready for python3_11 -REQUIRED_USE=" - || ( pyqt5 pyqt6 pyside2 pyside6 ) - pyside6? ( !python_targets_python3_11 ) -" +REQUIRED_USE="|| ( pyqt5 pyqt6 pyside2 pyside6 )" # These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds # Disable them for now, please check periodically if this is still up to date. @@ -95,7 +91,6 @@ RDEPEND=" dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,xml?] ) - !python_targets_python3_11? ( pyside6? ( dev-python/pyside6[${PYTHON_USEDEP}] dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?] @@ -103,7 +98,6 @@ RDEPEND=" dev-python/pyside6[sql?,svg?,testlib?,webchannel?,webengine?,websockets?] dev-python/pyside6[widgets?,xml?] ) - ) " # The QtPy testsuite skips tests for bindings that are not installed, so here we @@ -136,7 +130,6 @@ BDEPEND=" dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras] dev-python/pyside2[xml,xmlpatterns] ) - !python_targets_python3_11? ( pyside6? ( dev-python/pyside6[${PYTHON_USEDEP}] dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia] @@ -144,7 +137,6 @@ BDEPEND=" dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib] dev-python/pyside6[webchannel,webengine,websockets,widgets,xml] ) - ) ) " diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest index b324abec01fa..3950f13f3aa2 100644 --- a/dev-python/ansible-compat/Manifest +++ b/dev-python/ansible-compat/Manifest @@ -1,5 +1,5 @@ DIST ansible-compat-2.2.0.tar.gz 38772 BLAKE2B dbe74d23d2f2e4275bd9df2303417ea83517e780e65c6a34bd6ae1022be265ac816b50b309fc45f88e0c7fac7d7a22c83a826cc15be050698a6f35b267a36ac3 SHA512 3bd199431659ecba52743c6c985d2cdc6ee55396444241ba2456bc5430bbc87e26087dffbfff62ac341fa854e19baa0d7052cf79f20511222fd9e001dd020136 DIST ansible-compat-2.2.1.tar.gz 39126 BLAKE2B c4d0512606c99ba8f07e0287620c94af6b46d7bf0077f12dcbfd9689fc7106f164a87db25de1625249ac2930858bfa655bd93d83aba0d85ed4f8bdd42cd345dc SHA512 3e941eb2c5303f83b7e7c057d08801f192889b636d9c6e56a2ac21cf75144a52ba2916eaedeba7bf848dd268387bf4d3261541d75145b213cc3f6baca6a06e5e -EBUILD ansible-compat-2.2.0.ebuild 1841 BLAKE2B 9d81f9b4041f034954511e547812e6c1e3c702e691c175f7b3e4eef461a65602bf24ae37a696ea4619b2071bc9eb25d2bf4f064187bed74f4e19e2259433b394 SHA512 5541bc05ef4ce9299242feda4305b17ac250aa98a3b9d277c020a2f211128b93c30c2a5775a593d112436c76e9dbf64f1fa8efa6ad60cd916cf898eed67b6abb +EBUILD ansible-compat-2.2.0.ebuild 1840 BLAKE2B 11d1bc410ec521216457cfe2bbf90a26a67856d37415eba2f3c3ad7e303f617c60337f1aa8e27b5b74b0cd9e3a49a8f65c4778582cfb6941454ae7f6a3dc2a6c SHA512 70efd21b73ba994b081b73250b81b085b1de99c310b43875aae9ea403818efbda90a1364bcadd770371bf1e3ba28ab2664641d5cb103f1cf849f56828c9e3733 EBUILD ansible-compat-2.2.1.ebuild 1841 BLAKE2B 904c48ad161c04d567bcbcda9595c9a477645fc2e142611227719e11a8df77aa5a2715bb8fdc1a01013941759baad984f923e49a66a0c831b046a9abab9c0cbe SHA512 7d77e77637814d7df743ca402e38a2815526dfc629e46653283d9f804cf688f699e13a06df2cf4c10b345ec9b5631aafbed9673d402315caa90f6a007ce69803 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d diff --git a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild index 5abc44e6b8de..554f1e9d3524 100644 --- a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild +++ b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" RDEPEND=" >=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}] diff --git a/dev-python/ansible-pygments/Manifest b/dev-python/ansible-pygments/Manifest index f98cdd1aa895..e452b74c3d62 100644 --- a/dev-python/ansible-pygments/Manifest +++ b/dev-python/ansible-pygments/Manifest @@ -1,3 +1,3 @@ DIST ansible-pygments-0.1.1.tar.gz 8446 BLAKE2B ff631dd24c723035db7ab11a6c3fc0c90e8cebd72e6b0fa0d8b2c4bc4250ff5fb1e4180366e4ee084aab90bf24a8c3b2ecfad2c421b9f0cfdbf7675c94f0fcf7 SHA512 1ad2f4568d46d7fc617c6e674bcd9aea48e14307d91c476b51a04f778b452f18cb983d87d4872664d567b984193edee2af7964854fb2f3ae37ab4bce09c387d4 -EBUILD ansible-pygments-0.1.1.ebuild 555 BLAKE2B d3645ad63a74c5766e2d3ed63d6623b798f572b10c3d46755ccc60905a5b7084bba7c49cc72218827ab2194bba6a24eddbb0d5e6876f1297126aa4563dc308a8 SHA512 816f5fc2545ea172fc68083b6361a6a9c2c9196a883e6374be6ec27316d9e1bf58ebb83d4274eff24e8e7b5f9cfcc5209294f3d2b169585a032534664d964276 +EBUILD ansible-pygments-0.1.1.ebuild 554 BLAKE2B 6daa903a6ef61c18368db83b6136473b50c138f51a083b5df11b56581f2b20f60911218d10903423baaddee5ef1745964d082148d5cd7efe8953a23bfd2341ed SHA512 97309c601ac9b3a6b8ebde08f780d5a587b8e3cc8f5ca6387be75ef28683cf1347f2d02c57bf13be07ce5ea5c95260b9b1b4473c6e3780b27eb575dea0de4b09 MISC metadata.xml 786 BLAKE2B 5883f03ffc7b0850bc8ecc90c91a15a9498ced9ee196a4f8d2a97a77a41957cb05a40ebf671ddbdf226886b94e9a5e796376094924712544a07559e0858aa5a8 SHA512 c7736962fe565be524294a30630e7cfd2820d1e9ace6f6dbd307ad46a252947ce368057d5ea5d20889a5ccdbb7f3418496affad5f8ed345e0e0808bd4abbe4ed diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild index 5883dcff29a8..ab220457c355 100644 --- a/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild +++ b/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" # 2.11.0+ needed in order for tests to pass RDEPEND=">=dev-python/pygments-2.11.0[${PYTHON_USEDEP}]" diff --git a/dev-python/enrich/Manifest b/dev-python/enrich/Manifest index b86b2e235f5d..ee97ce529085 100644 --- a/dev-python/enrich/Manifest +++ b/dev-python/enrich/Manifest @@ -1,3 +1,3 @@ DIST enrich-1.2.7.tar.gz 16918 BLAKE2B f8fdcc9322a60d8885faf44efbbeaea2a423dea956941679f96560ed9c6b2db5ec3f143c241fa60d579034e0fdbf8b0e490f8c5dd38cd519a55964135623f804 SHA512 4e3d8598e82d7d013ff74dd325be02245086159fef819431a1ba7505e2e1557992ccbefc0b5a37d0e81487b4e378bef02179c6b74fd50528d6710ff297f0832a -EBUILD enrich-1.2.7-r1.ebuild 580 BLAKE2B 508b45b4873b77e68d71218f7105289109fdbc0ece6295ba19fc343b2226d3f0c4f2c510f837622ff93296bb8e93938fbdf023d1fbf5ee020a7d0e1eaf72e723 SHA512 da8ced3cc71c86b1a04474228f631476c104002683c1e16fbb0de560f88db8d320b97e0a222d45b765719a425a75843058f81e2e702624122d4540641f5aa0c4 +EBUILD enrich-1.2.7-r1.ebuild 579 BLAKE2B 6198cceccbfa4d0afa7346d290869a7d000a03b83677fb8eb44f30eb397ce15b4cd14e3f199bd6233e9419fbf8a364e084631f0781370cc7d198fcbb88bd4ced SHA512 ad1841ca495b1de58fe85f4fc876e1b3e5f49c5fdeaa500078fd03624efa122f102c7ef9a82d8e38c0e617238da1dc51a217fe25d255d9d4a916aec0426bc485 MISC metadata.xml 391 BLAKE2B c8e2ab1ee58575e9cf34a6873a1507d4eba04a61de74156aee7d2c5e16897c11da16b9b2deecfaa3740c501f869bf1b54e4dc597e57d8ae49464acc987154226 SHA512 bd76efefd66c46d17e9b31f674a4cc934e00f4322b1d90c6040a06c637b44985420226eea3202b6fa734983911ac3d1eb2436949bb99edc412e0f633a55d8358 diff --git a/dev-python/enrich/enrich-1.2.7-r1.ebuild b/dev-python/enrich/enrich-1.2.7-r1.ebuild index 78906bc4b6e3..832753f467a9 100644 --- a/dev-python/enrich/enrich-1.2.7-r1.ebuild +++ b/dev-python/enrich/enrich-1.2.7-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv ~x86" RDEPEND="dev-python/rich[${PYTHON_USEDEP}]" BDEPEND=" diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest index d3a9e2336d1f..661032ebdc51 100644 --- a/dev-python/pyside2-tools/Manifest +++ b/dev-python/pyside2-tools/Manifest @@ -1,4 +1,6 @@ AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3 +DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4 EBUILD pyside2-tools-5.15.5.ebuild 1654 BLAKE2B a995039b5d9df220c7a2b26d555d5ef0895f934ec47a86f05b6e1d5a20889c5621973289ec2318630f89d1af83b52d197ed96e32d911360837ff44c179224cf6 SHA512 aa5d0e12a94a9a11c87afdc582540bbd61ed821beaebdee89eb83ad33a4a1a420b4169806ea27584e0f74f638c49be45b61f7d2cff7161ee0d0498b62fef45aa +EBUILD pyside2-tools-5.15.6.ebuild 1657 BLAKE2B c9143047f921a8bb850212fe77b81c6b4d169487e83f3b69a833802c86ca0bee28e12193954adc9c9e22edc12ae1245971023b0addbd805fcb256c83f4528e66 SHA512 0a42d037bf09abed7fa6e0cefebd858c193552c8b9e0b145c6a6a97e1116fb3124d854b3e606029a1da2cf0297099b3798e27403dab3eae804d4922b08ff6171 MISC metadata.xml 512 BLAKE2B e06bacf79750f6cc22b41ade8840a01636793100a85cc469c19af1b4273ef33adb3dec755947057a892e88de4ac68e665fa0ccb265457dd09a502964bd991749 SHA512 d201e34b2d73fb308c6b5f14b2d0d292b453b5ef05c820efe429fcfa7259b23f17bc015c08b8f938a2df75f5b654cc1357632a786abfb555479e3f172feee3fd diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild new file mode 100644 index 000000000000..93f140bde892 --- /dev/null +++ b/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{8..11} ) +CMAKE_IN_SOURCE_BUILD=1 + +inherit cmake python-r1 + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)" +HOMEPAGE="https://wiki.qt.io/PySide2" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/${PN}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-python/pyside2-${PV}[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +DOCS=( README.md ) + +# the tools conflict with tools from QT +PATCHES=( + "${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch" +) + +src_prepare() { + cmake_src_prepare + + python_copy_sources +} + +src_configure() { + # The tests are only related to the tools that we don't install + local mycmakeargs=( + -DBUILD_TESTS=OFF + ) + + pyside-tools_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + ) + CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure + } + + python_foreach_impl pyside-tools_configure +} + +src_compile() { + pyside-tools_compile() { + CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile + } + + python_foreach_impl pyside-tools_compile +} + +src_install() { + pyside-tools_install() { + python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate" + } + + python_foreach_impl pyside-tools_install + + doman pylupdate/pyside2-lupdate.1 + einstalldocs +} diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest index 6fcb9e7aeb3c..f62839b194d1 100644 --- a/dev-python/pyside2/Manifest +++ b/dev-python/pyside2/Manifest @@ -2,5 +2,7 @@ AUX pyside2-5.15.2-python310.patch 508 BLAKE2B bdfc33975d1dd0c9eb73d1bae3ec2aff8 AUX pyside2-5.15.2-python311-fixups.patch 1962 BLAKE2B 37d91352ea09eaef6d36c600165e4fea74145b0fa05620e739254d3983acc501455154fc51ce3448aa4f60a00cd377f0896cb3dc14f1a921d6948dc53c500784 SHA512 39e999c80ed2717eaf59b47c12e64208d1b54d3d61daacf7a8ebeb4586f3b7312dd5db3fc53d4d2f3c426d80729e5d655e9b612153c704b40b7d261ddd57e580 AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a3190f924d8b20cf2140ad5342c2fa046ff7e6bec540bea9d7652116894e0cb7f5fa5ea73067212ca5b631382e7139d7786 SHA512 b88f300e4944cbb9adc8ac887e263e74e088a1b291000c86f6677a01241939e612fa5eebba3807fb2318477e68de241914832cc92ed0470726804d3098486120 DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3 +DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4 EBUILD pyside2-5.15.5.ebuild 9114 BLAKE2B acf0acd94e58949465895e7771fc771aed19dcb3dd4d319e575c8c2edf3820a7aea4b1793fb3627e26593e27a7d36ebe571d372f6e5e78670f49aac9fd609180 SHA512 ecb43e1bd5b621c3fe4d2db0b21b7ff7650bea5cc38e579527eda8ce3a59dffabb25e56a2424c0d0e3533d6e501c9f7af48aed7f15977abf179856445e4bb6b8 +EBUILD pyside2-5.15.6.ebuild 9117 BLAKE2B c33aee0626590a1d211a150cc00921898f4f52a16e3e335850978ba68ff1b88e53a38e9b3cd806501af4cd3f6b9eabf3be1161ade01225a46594dbedb1e6857f SHA512 0c82bd415a44a691b6f053903aca03ed0b6a67e0b8add3d4e151e30c7d629711aba6e708030ea43b914c8811892b25f0a84f25fda7b7e370e2264deb3cec1fb6 MISC metadata.xml 2255 BLAKE2B 00982d17109b327ce063f5ba53474603cc73ffb013268ec9f6b751a73792a790f56de285291e70ad12147c27ba97b516be1318df312483d67d72509f8e8d8655 SHA512 830f9510f5e141422cbbab356d34a34b631f948eea14bcc96badbef65ce10f56c648748edc4ddf06be77b1c597a7d12d4552bde122937eb4cda01b304a3193c7 diff --git a/dev-python/pyside2/pyside2-5.15.6.ebuild b/dev-python/pyside2/pyside2-5.15.6.ebuild new file mode 100644 index 000000000000..4959c6c0e286 --- /dev/null +++ b/dev-python/pyside2/pyside2-5.15.6.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{8..11} ) + +inherit cmake python-r1 virtualx + +# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" +# USE flag after an external "dev-qt/qtremoteobjects" package has been created. +# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. +# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once +# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. +# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note +# that the "PySide2/QtGui/CMakeLists.txt" and +# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by +# testing whether the "Qt5::Gui" list property defined by +# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation +# time contains the substring "opengles2". Since cmake does not permit +# properties to be overridden from the command line, these files must instead +# be conditionally patched to avoid these tests. An issue should be filed with +# upstream requesting a CLI-settable variable to control this. + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="Python bindings for the Qt framework" +HOMEPAGE="https://wiki.qt.io/PySide2" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/pyside2" + +# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details. +# Shall we allow essential modules to be disabled? They are: +# (core), gui, widgets, printsupport, sql, network, testlib, concurrent, +# x11extras (for X) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE=" + 3d charts +concurrent datavis designer gles2-only +gui help location + multimedia +network positioning +printsupport qml quick script scripttools + scxml sensors speech +sql svg test +testlib webchannel webengine websockets + +widgets +x11extras xml xmlpatterns +" + +# Manually reextract these requirements on version bumps by running the +# following one-liner from within "${S}": +# $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt +# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + 3d? ( gui network ) + charts? ( gui widgets ) + datavis? ( gui ) + designer? ( widgets xml ) + gles2-only? ( gui ) + help? ( widgets ) + location? ( positioning ) + multimedia? ( gui network widgets ) + printsupport? ( widgets ) + qml? ( gui network ) + quick? ( gui network qml widgets ) + scripttools? ( gui script widgets ) + speech? ( multimedia ) + sql? ( widgets ) + svg? ( widgets ) + testlib? ( widgets ) + webengine? ( + network + widgets? ( gui printsupport webchannel ) + ) + websockets? ( network ) + widgets? ( gui ) + x11extras? ( gui ) +" + +# Tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2):5" + +RDEPEND="${PYTHON_DEPS} + >=dev-python/shiboken2-${PV}[${PYTHON_USEDEP}] + dev-qt/qtcore:5 + dev-qt/qtopengl:5[gles2-only=] + dev-qt/qtserialport:5 + 3d? ( >=dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] ) + charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] ) + concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} ) + datavis? ( >=dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] ) + designer? ( >=dev-qt/designer-${QT_PV} ) + gui? ( >=dev-qt/qtgui-${QT_PV}[jpeg,gles2-only=] ) + help? ( >=dev-qt/qthelp-${QT_PV} ) + location? ( >=dev-qt/qtlocation-${QT_PV} ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml?,gles2-only=,widgets?] ) + network? ( >=dev-qt/qtnetwork-${QT_PV} ) + positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml?] ) + printsupport? ( >=dev-qt/qtprintsupport-${QT_PV}[gles2-only=] ) + qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + quick? ( + >=dev-qt/qtdeclarative-${QT_PV}[widgets?] + >=dev-qt/qtquickcontrols2-${QT_PV}[widgets?] + ) + script? ( >=dev-qt/qtscript-${QT_PV}[scripttools?] ) + scxml? ( >=dev-qt/qtscxml-${QT_PV} ) + sensors? ( >=dev-qt/qtsensors-${QT_PV}[qml?] ) + speech? ( >=dev-qt/qtspeech-${QT_PV} ) + sql? ( >=dev-qt/qtsql-${QT_PV} ) + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + testlib? ( >=dev-qt/qttest-${QT_PV} ) + webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml] ) + webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) + websockets? ( >=dev-qt/qtwebsockets-${QT_PV}[qml?] ) + widgets? ( >=dev-qt/qtwidgets-${QT_PV}[gles2-only=] ) + x11extras? ( >=dev-qt/qtx11extras-${QT_PV} ) + xml? ( >=dev-qt/qtxml-${QT_PV} ) + xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV}[qml?] ) +" +DEPEND="${RDEPEND} + test? ( x11-misc/xvfb-run ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.15.2-python310.patch" + "${FILESDIR}/${PN}-5.15.2-python311.patch" + "${FILESDIR}/${PN}-5.15.2-python311-fixups.patch" +) + +src_configure() { + # See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickControls2=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns) + ) + + pyside2_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" + -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" + ) + cmake_src_configure + } + python_foreach_impl pyside2_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + local -x PYTHONDONTWRITEBYTECODE + python_foreach_impl virtx cmake_src_test +} + +src_install() { + pyside2_install() { + cmake_src_install + python_optimize + + # Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig + # file for the current Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \ + "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die + + # Uniquify the PySide2 pkgconfig file for the current Python target, + # preserving an unversioned "pyside2.pc" file arbitrarily associated + # with the last Python target. (See the previously linked issue.) + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl pyside2_install + + # CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., pyside2-tools) to target one + # "libpyside2-*.so" library linked to one Python interpreter. See also: + # https://bugreports.qt.io/browse/PYSIDE-1053 + # https://github.com/leycec/raiagent/issues/74 + sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die +} diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest index 39c156c9dc0a..26492c230c1c 100644 --- a/dev-python/pyside6-tools/Manifest +++ b/dev-python/pyside6-tools/Manifest @@ -1,3 +1,3 @@ -DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321 -EBUILD pyside6-tools-6.3.1.ebuild 1361 BLAKE2B 3f66578d716c3c2cdbb06884c70111dcc100587ba297e234897a2e75932f7112892b5ebb4d565349f7a83421ba0ea1f9b8eb26daef8ed5c8e920dd4ceab63c5f SHA512 61d6e9460d267120ffcbb2c3f3d514599a8d36c0a86e933953fc184419ab913fef5dc184fcea189ee0cc79f0736d9f1a2aed2570c675bce7e8f62fa011d3bbd8 +DIST pyside-setup-opensource-src-6.3.2.tar.xz 7853068 BLAKE2B 5b39e2f98bca0155d3f6617be206b759b628d0126fd30d76d67352c5c78a385938ce61a3c42b75343b9fde708e9f66617122c687ea9ecffca9cd0ab3af91a2ff SHA512 8d25d20b64ac7874e9b7866f101b6bfd7b6fe1fffa602fec6113e1fdaa11608f14a58c2ae1d87b45ee3eac6a07bd55e66dbbd222727cfe6860d8f444bc2b1ff0 +EBUILD pyside6-tools-6.3.2.ebuild 1361 BLAKE2B 7156cbfcde57a2bc0006097bc580b235952902e1dfde5c6cb1a150dd1372582e165c91a0f5c4ed189805c28771cce20b89b014963529c2dc6844cc00385d2a4a SHA512 76f49a8c9a2bb92a12123da40a1e0c87221838390996935b492985d58292e7da81d91b7bd5700d27c20c8b214218cf4ab8f6e109427d6f2441acc0aa5ee367a0 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41 diff --git a/dev-python/pyside6-tools/pyside6-tools-6.3.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.3.1.ebuild deleted file mode 100644 index 41ea6d4bbe2f..000000000000 --- a/dev-python/pyside6-tools/pyside6-tools-6.3.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{8..10} ) -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake python-r1 - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)" -HOMEPAGE="https://wiki.qt.io/PySide6" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/pyside-tools" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/pyside6-${PV}[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_prepare() { - cmake_src_prepare - - python_copy_sources -} - -src_configure() { - pyside-tools_configure() { - local mycmakeargs=( - # the tools conflict with tools from Qt - -DNO_QT_TOOLS=yes - ) - CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure - } - - python_foreach_impl pyside-tools_configure -} - -src_compile() { - pyside-tools_compile() { - CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile - } - - python_foreach_impl pyside-tools_compile -} - -src_install() { - pyside-tools_install() { - python_doexe "${BUILD_DIR}/"*.py - } - - python_foreach_impl pyside-tools_install - - einstalldocs -} diff --git a/dev-python/pyside6-tools/pyside6-tools-6.3.2.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.3.2.ebuild new file mode 100644 index 000000000000..f44ca2a5e3a7 --- /dev/null +++ b/dev-python/pyside6-tools/pyside6-tools-6.3.2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{8..11} ) +CMAKE_IN_SOURCE_BUILD=1 + +inherit cmake python-r1 + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)" +HOMEPAGE="https://wiki.qt.io/PySide6" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/pyside-tools" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-python/pyside6-${PV}[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_prepare() { + cmake_src_prepare + + python_copy_sources +} + +src_configure() { + pyside-tools_configure() { + local mycmakeargs=( + # the tools conflict with tools from Qt + -DNO_QT_TOOLS=yes + ) + CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure + } + + python_foreach_impl pyside-tools_configure +} + +src_compile() { + pyside-tools_compile() { + CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile + } + + python_foreach_impl pyside-tools_compile +} + +src_install() { + pyside-tools_install() { + python_doexe "${BUILD_DIR}/"*.py + } + + python_foreach_impl pyside-tools_install + + einstalldocs +} diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest index ec5d184e8404..027703580052 100644 --- a/dev-python/pyside6/Manifest +++ b/dev-python/pyside6/Manifest @@ -1,5 +1,5 @@ AUX pyside6-6.3.1-fix-designer-plugin-install-location.patch 685 BLAKE2B 2f3b3873f4f1f46b737ae85467798b25fd1634a15a391cd7fa04a1c391a56cd57a68ec4f98b51460cd805fc75cc0ee50b9addc4a757520429f6b7e66101ed609 SHA512 76ca097b42b47d3b290966fe805b1b4f58e04ab05d8e5420dfa1014e3399452a0326d964d2304068c78a6a82bcea2883d5c9e6a51b383a7f96a7520cfebdfcad AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a -DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321 -EBUILD pyside6-6.3.1-r1.ebuild 8721 BLAKE2B 3cec280d81552ef79cab4a9cf6db9ed3094e8fcb0124f176a442b376eca0c7472f840dbf8f8e69ae75bcd8f8875670316ece890326bb0adf381c7ffbb7009b18 SHA512 e687e65c52e73a3bbeca8a3377de45c949682f87f71023ec0e544bf2879804b4221b39a0743dc0edc63ea06960961743a628b49038ab49bd307ffc999daadad6 +DIST pyside-setup-opensource-src-6.3.2.tar.xz 7853068 BLAKE2B 5b39e2f98bca0155d3f6617be206b759b628d0126fd30d76d67352c5c78a385938ce61a3c42b75343b9fde708e9f66617122c687ea9ecffca9cd0ab3af91a2ff SHA512 8d25d20b64ac7874e9b7866f101b6bfd7b6fe1fffa602fec6113e1fdaa11608f14a58c2ae1d87b45ee3eac6a07bd55e66dbbd222727cfe6860d8f444bc2b1ff0 +EBUILD pyside6-6.3.2.ebuild 8735 BLAKE2B 202fa199e5a6e9090007340350e972216af19c660eb95f6fd92db66018a17d4c4927b504266b7d8beed97a3499c3424cee0f1c54ebe756532ed03577dad45449 SHA512 5731814b4146c6caea2fa7dc3470948fc42a4ba35bc2b38345b62dd1d430064e6052b7d9d69ee701cb29bcdd4c9a0f7dda90604cfbe1cebbffc94545aff6d6ad MISC metadata.xml 1717 BLAKE2B 9bacda544318b48fc7b97139e22f95c2b3f9a5bc29ad4660db9ead6a89859e16eebbcc2d54d5a2639f7a1d458fcf2b39ef9eb846589cffc1d111b256678e3777 SHA512 7b18d2124bd99d77715d1ce44d2a154799d5055fef4734b06e159d73b598ef8065c0f18076fe7ff4bc59f2b995ccd7eaa125aae1fa5fc726da79c7c3f3873c3c diff --git a/dev-python/pyside6/pyside6-6.3.1-r1.ebuild b/dev-python/pyside6/pyside6-6.3.1-r1.ebuild deleted file mode 100644 index a94b8db45b4b..000000000000 --- a/dev-python/pyside6/pyside6-6.3.1-r1.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake python-r1 virtualx - -# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" -# USE flag after an external "dev-qt/qtremoteobjects" package has been created. -# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. -# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once -# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. -# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note -# that the "PySide6/QtGui/CMakeLists.txt" and -# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by -# testing whether the "Qt5::Gui" list property defined by -# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation -# time contains the substring "opengles2". Since cmake does not permit -# properties to be overridden from the command line, these files must instead -# be conditionally patched to avoid these tests. An issue should be filed with -# upstream requesting a CLI-settable variable to control this. - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python bindings for the Qt framework" -HOMEPAGE="https://wiki.qt.io/PySide6" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/pyside6" - -# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details. -# Shall we allow essential modules to be disabled? They are: -# (core), gui, widgets, printsupport, sql, network, testlib, concurrent, -# x11extras (for X) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" -SLOT="0" -KEYWORDS="~amd64" -IUSE=" - dbus +concurrent designer gles2-only +gui help multimedia - +network opengl positioning printsupport qml quick quick3d - serialport +sql svg test +testlib webchannel webengine - websockets +widgets +xml -" - -# Manually reextract these requirements on version bumps by running the -# following one-liner from within "${S}": -# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt -# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - designer? ( widgets ) - gles2-only? ( gui ) - help? ( widgets ) - multimedia? ( gui network ) - opengl? ( gui ) - printsupport? ( widgets ) - qml? ( network ) - quick? ( gui network opengl qml ) - quick3d? ( gui network opengl qml quick ) - sql? ( widgets ) - svg? ( gui ) - testlib? ( widgets ) - webengine? ( network gui printsupport webchannel ) - websockets? ( network ) - widgets? ( gui ) -" - -# Tests fail pretty bad and I'm not fixing them right now -RESTRICT="test" - -# Minimal supported version of Qt. -QT_PV="$(ver_cut 1-2):6" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] - >=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?] - designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) - gui? ( >=dev-qt/qtbase-${QT_PV}[gui,jpeg] ) - help? ( >=dev-qt/qttools-${QT_PV}[assistant] ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] ) - positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml(+)?] ) - printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] ) - qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) - quick3d? ( >=dev-qt/qtquick3d-${QT_PV} ) - serialport? ( >=dev-qt/qtserialport-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] ) - webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml(+)?] ) - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) - websockets? ( >=dev-qt/qtwebsockets-${QT_PV} ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtbase-${QT_PV}[gui] ) -" -# testlib is toggled by the gui flag on qtbase - -PATCHES=( - "${FILESDIR}/${P}-no-strip.patch" - "${FILESDIR}/${P}-fix-designer-plugin-install-location.patch" -) - -src_configure() { - # See collect_module_if_found macros in PySideHelpers.cmake - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) - # try to avoid pre-stripping - -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes - -DQFP_NO_STRIP=yes - - ) - - pyside6_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" - -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" - ) - cmake_src_configure - } - python_foreach_impl pyside6_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE - python_foreach_impl virtx cmake_src_test -} - -src_install() { - pyside6_install() { - cmake_src_install - python_optimize - - # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig - # file for the current Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ - "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die - - # Uniquify the PySide6 pkgconfig file for the current Python target, - # preserving an unversioned "pyside6.pc" file arbitrarily associated - # with the last Python target. (See the previously linked issue.) - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl pyside6_install - - # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., pyside6-tools) to target one - # "libpyside6-*.so" library linked to one Python interpreter. See also: - # https://bugreports.qt.io/browse/PYSIDE-1053 - # https://github.com/leycec/raiagent/issues/74 - sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)/cmake/PySide6-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die -} diff --git a/dev-python/pyside6/pyside6-6.3.2.ebuild b/dev-python/pyside6/pyside6-6.3.2.ebuild new file mode 100644 index 000000000000..6f0f4f03a176 --- /dev/null +++ b/dev-python/pyside6/pyside6-6.3.2.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{8..11} ) + +inherit cmake python-r1 virtualx + +# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" +# USE flag after an external "dev-qt/qtremoteobjects" package has been created. +# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. +# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once +# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. +# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note +# that the "PySide6/QtGui/CMakeLists.txt" and +# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by +# testing whether the "Qt5::Gui" list property defined by +# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation +# time contains the substring "opengles2". Since cmake does not permit +# properties to be overridden from the command line, these files must instead +# be conditionally patched to avoid these tests. An issue should be filed with +# upstream requesting a CLI-settable variable to control this. + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="Python bindings for the Qt framework" +HOMEPAGE="https://wiki.qt.io/PySide6" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/pyside6" + +# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details. +# Shall we allow essential modules to be disabled? They are: +# (core), gui, widgets, printsupport, sql, network, testlib, concurrent, +# x11extras (for X) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64" +IUSE=" + dbus +concurrent designer gles2-only +gui help multimedia + +network opengl positioning printsupport qml quick quick3d + serialport +sql svg test +testlib webchannel webengine + websockets +widgets +xml +" + +# Manually reextract these requirements on version bumps by running the +# following one-liner from within "${S}": +# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt +# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + designer? ( widgets ) + gles2-only? ( gui ) + help? ( widgets ) + multimedia? ( gui network ) + opengl? ( gui ) + printsupport? ( widgets ) + qml? ( network ) + quick? ( gui network opengl qml ) + quick3d? ( gui network opengl qml quick ) + sql? ( widgets ) + svg? ( gui ) + testlib? ( widgets ) + webengine? ( network gui printsupport webchannel ) + websockets? ( network ) + widgets? ( gui ) +" + +# Tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2):6" + +RDEPEND="${PYTHON_DEPS} + >=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] + >=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?] + designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) + gui? ( >=dev-qt/qtbase-${QT_PV}[gui,jpeg] ) + help? ( >=dev-qt/qttools-${QT_PV}[assistant] ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] ) + positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml(+)?] ) + printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] ) + qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + quick3d? ( >=dev-qt/qtquick3d-${QT_PV} ) + serialport? ( >=dev-qt/qtserialport-${QT_PV} ) + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] ) + webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml(+)?] ) + webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) + websockets? ( >=dev-qt/qtwebsockets-${QT_PV} ) +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtbase-${QT_PV}[gui] ) +" +# testlib is toggled by the gui flag on qtbase + +PATCHES=( + "${FILESDIR}/${PN}-6.3.1-no-strip.patch" + "${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch" +) + +src_configure() { + # See collect_module_if_found macros in PySideHelpers.cmake + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) + # try to avoid pre-stripping + -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes + -DQFP_NO_STRIP=yes + + ) + + pyside6_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" + -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" + ) + cmake_src_configure + } + python_foreach_impl pyside6_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + local -x PYTHONDONTWRITEBYTECODE + python_foreach_impl virtx cmake_src_test +} + +src_install() { + pyside6_install() { + cmake_src_install + python_optimize + + # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig + # file for the current Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ + "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die + + # Uniquify the PySide6 pkgconfig file for the current Python target, + # preserving an unversioned "pyside6.pc" file arbitrarily associated + # with the last Python target. (See the previously linked issue.) + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl pyside6_install + + # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., pyside6-tools) to target one + # "libpyside6-*.so" library linked to one Python interpreter. See also: + # https://bugreports.qt.io/browse/PYSIDE-1053 + # https://github.com/leycec/raiagent/issues/74 + sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)/cmake/PySide6-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die +} diff --git a/dev-python/pytest-markdown/Manifest b/dev-python/pytest-markdown/Manifest index 18110cba4b7b..77e263c0252a 100644 --- a/dev-python/pytest-markdown/Manifest +++ b/dev-python/pytest-markdown/Manifest @@ -1,3 +1,3 @@ DIST pytest-markdown-1.0.2.tar.gz 2991 BLAKE2B 489bd1ccd6060b9588515772ff1f269dc57c328b3695405d0dd755340968899a2b912644e325ce5792528da90e5eac828314dbb9d1396eb34dffe0da04261848 SHA512 a2d5b38982f004a362ec2bda7aec45a6fb9e0b33dfd212647d8eab38fdadf6501b7fec8ad8838b286d81a156429aeb0ad3aa63361a580c2c7528fe19e474a7f6 -EBUILD pytest-markdown-1.0.2-r1.ebuild 593 BLAKE2B ec52d010b7e43cae77ac3544c12a2960efa02f58bf972a27f6c3f8a3c845686b3b3badc02af43756a8f69a3b7083d795f26579e2e74100fc31d6249da6f84bd0 SHA512 bf1a4dd0d1e7ffabebdedb732e58fa792dd9dc7edd0f3302344dd2097a8cdce45109670d7bb5086f6e6d181f169fd641ce31d6ff5f29d63de05a3cda377694ad +EBUILD pytest-markdown-1.0.2-r1.ebuild 592 BLAKE2B 5218e316820e72837c3757422b513d8f6ddc0a29c0e522922a26d4ed282b915ad837ded77ac6c3105bc058b0ed9d6270320e5798cb9e7d57a3b16c060dee7a6d SHA512 db170483252119762aad790a96728f26c9e6a75b66190206e34a7e169ea903201d4bae382e615eed7df5f197cdf6975773d8e01adffabef0c964d0684ad2b1c9 MISC metadata.xml 408 BLAKE2B 5bf707e04d11ff64f66112fb2a097ff7791ba883fd96492ccf59856d7840e2de34e6945f04943effa82b4f60b6b48c29b75de310c395da989bd82dbc7088154b SHA512 4c381e16ede235dff63ab6b5525900b66ad160c3e5fd3dfd013358c55266a799c2e10a310ca673ea4a931d671908f28e3e284a44b2fe3f9fbfaabb162ff39ea1 diff --git a/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild b/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild index 6fe08a1956af..29d207afe1c7 100644 --- a/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild +++ b/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" RDEPEND=">=dev-python/commonmark-0.9.1[${PYTHON_USEDEP}] >=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]" diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest index 37608626e313..757c625ce195 100644 --- a/dev-python/pytest-plus/Manifest +++ b/dev-python/pytest-plus/Manifest @@ -1,3 +1,3 @@ DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139 -EBUILD pytest-plus-0.2-r1.ebuild 660 BLAKE2B 5173858f8d85857d44519d05f56daa147456df76b540a831883111366a2c827445240453823529c4e7eaa6ca50d4206bd5857d2422413b257e1b7536f865f626 SHA512 b04dafe2c78aee3d91d051d24ee6a29debaed70b48b91247279e10a400c926112691b2abbe274f33a6b6d0a0dd9deae84a1b134e1ed330f154e7d317b1834102 +EBUILD pytest-plus-0.2-r1.ebuild 659 BLAKE2B 72dba59fa2acfe4ba2f9bd61f4b7a7831646caf5fd6762bf880e32c3ec5973b02df2b447a0075a3bef5488ea906cd1a4b69c5efee99da2b11106d628954f0ee0 SHA512 178cf869c7adaf5c55672298352bc67d73cf5b8a775a87d7b4235e5eacb8231df05f75920686cea155a2c49d48551010a129f9a814096657927df5fae02e46a4 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3 diff --git a/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild b/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild index a618aaa1583a..e668106bf343 100644 --- a/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild +++ b/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" RDEPEND=" dev-python/more-itertools[${PYTHON_USEDEP}] diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest index 51363269dad1..1d99a3724bc9 100644 --- a/dev-python/rpy/Manifest +++ b/dev-python/rpy/Manifest @@ -1,5 +1,3 @@ -DIST rpy2-3.4.5.tar.gz 194433 BLAKE2B 588c1c270d69b0214e77e586c4c66e78ae8912b6c10a2fe082be64dc75dff574fa0ab6d5bc500b8ff6a199de8540f508467bf0210f1c66b779857dee767262ab SHA512 296056e1c64a4555a1ccef74cfb580674034155a42b8e7c83feb8bb7d7a6d80b8e2f2966df53a6ed8612718ad169755a7994c5635dda1d1c8af1b549a5863935 DIST rpy2-3.5.4.tar.gz 208307 BLAKE2B bd302a65daf9f702f66cde63484552c8b01777baf1fd99f1631711806ea259df51d4beb7800b6fa9f9816637b1b6a0f75bb583e256c956142aaad5b677038fa2 SHA512 65a0a4516f362459667a678c3aeaaa05fa1df785ac4e203122e6268db1578af8d7344b905ef27528c20ebdf93bbbe5f1b6a5d8958d1f5dca2867d95f191afb5b -EBUILD rpy-3.4.5.ebuild 1013 BLAKE2B 6af707a0779984a9689f8021a2f2c3675a29196e9e7a2079af859a9f27af6a67e1ea787ebe3e5059aa61a985952f57b51cf4b073e2334733b8f8467805b07f50 SHA512 bf24aa767d77addfb079b8ff434f6689aeca2f2a13f213f83644c814cd7a350904c06a4316f31999c1493c72d4f865d8a4caf0b86058b15d3da00e5ffd2595ce -EBUILD rpy-3.5.4.ebuild 1015 BLAKE2B edf8c35be2b9ca0147410693c084c68065ca9ce51962614a7808ae36ea46d18f096116ab91b266227f8bfcde22534171d16286095d23c0e2af188ed09a43a58c SHA512 6ef86c3336bdf25448186c533c83830afcd15ec126b2b02c93cb57daf470b4ac496b6b9c178523ac23dc0b8d006260d9da9b1e106cff1f90c9013c4999b38b9f +EBUILD rpy-3.5.4.ebuild 1014 BLAKE2B cb94ad14f79016f8ab707d5e793548f6cc1bb3944c8d8f7afcad59854a71fd9d7c78cc57e763075ed53594eb2e7dc54f15d97f3be609b23ba91a60163fc1de48 SHA512 558ac7090589b8109c2b994644984cc4d450fc9bbfe93f06862ec950d904fd50db9f989cec96607754e01c2b6740a754952a6f5c3e63b4735761fce12995b7e1 MISC metadata.xml 594 BLAKE2B 30723d02d77794b1d8303e4063b3f14b0896de94ab2f7dff371353db67fe132e7fbbc914cad4157fba2764faefad6b15e8ece111023fd3935f04b926c4c7364f SHA512 ee3231beea6731daf7e14a20aee434c35eb3a2f9e9c4bc7a9047fd0a3de133fa0142ef758cb353abb769bb13280f5a57f50153fa20bb2ecf06e4570c65fca8d6 diff --git a/dev-python/rpy/rpy-3.4.5.ebuild b/dev-python/rpy/rpy-3.4.5.ebuild deleted file mode 100644 index 2becc8e720c6..000000000000 --- a/dev-python/rpy/rpy-3.4.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="sqlite" -inherit distutils-r1 virtualx - -MYSLOT=2 -MY_PN=${PN}${MYSLOT} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python interface to the R Programming Language" -HOMEPAGE="https://rpy.sourceforge.net/ - https://pypi.org/project/rpy2/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" - -# ggplot2 is a test dep but not in portage -RESTRICT="test" - -RDEPEND=" - >=dev-lang/R-3.2 - dev-python/cffi[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - >=dev-python/pandas-0.13.1[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/tzlocal[${PYTHON_USEDEP}]" -PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]" - -python_test() { - cd "${BUILD_DIR}"/lib || die - virtx "${EPYTHON}" -m 'rpy2.tests' -} diff --git a/dev-python/rpy/rpy-3.5.4.ebuild b/dev-python/rpy/rpy-3.5.4.ebuild index 646190af11ec..7fc4a253ebc8 100644 --- a/dev-python/rpy/rpy-3.5.4.ebuild +++ b/dev-python/rpy/rpy-3.5.4.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" SLOT="0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" # ggplot2 is a test dep but not in portage RESTRICT="test" diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest index a2d7e9c87df6..7778f9f9e03f 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -2,6 +2,9 @@ AUX shiboken2-5.15.5-add-numpy-1.23-compatibility.patch 1095 BLAKE2B 8266da9d94c AUX shiboken2-5.15.5-python311-1.patch 3124 BLAKE2B 97e51ae8cc6866da7ac9cced4f1988eeb00c8bbf1e033766b6f926ec16ad1dab171f15060ddaaf541f1eadfcc0fb9251df2ea613c3c16a51467d0870b378dda1 SHA512 8d11c6cc737ac99aa748e9e100a8b559aa315142f587d77f4ecae8f5ac74e65ddfb3348631203a781d445177d423f0a83307d8121b5d35ba6065e0cbb52673a8 AUX shiboken2-5.15.5-python311-2.patch 2056 BLAKE2B c93be29e31b0fa6ce28a29de0dc4dba9635e86ba0103d77334e324a0d26f4c81c9ee6583bef146eb908fe290426eb462dd0a0f68e917ca5f3c4505742d673a0f SHA512 df6f185546180b3d27d8ed1ec1ccf90cdf3813f8928894717ad02e97f0c404b8dc00aed330e8b51aa7e04d5b3e621a15981fc911b2371542f9266c147fdf3828 AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e235d0d976c3219f7ecf50f28938a7cce6952ec41795c2c86d0f71ccd94210661dc22a471adb2f879a133e11a3148923fd708 SHA512 540ff5afbfebcc00f20c43993f67458013f4655c06505fdf23bc26085bd2c621863dd9c28be1a20dca299113aee828974f853b145818fdb11d59fc12d0bb8c14 +AUX shiboken2-5.15.6-fix-pyside2-compile.patch 422 BLAKE2B bdb66c4ef26fccf4b9f4bc4586fb7ffdd8dfed80bf6315a70c86882f98250e42235ff27265b6c3a4e65e8dd7b233b61201a33808985ffb50e929bc8b5deb864f SHA512 4f608eb93fb72f81a9327699b14d4451261831f5079fac12aa88ce17ac30fc846bd9b461b8f6a4780727507b388f675a116f55ef1c240ced33d941315af4d21c DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3 +DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4 EBUILD shiboken2-5.15.5.ebuild 6563 BLAKE2B 455dc6f82e4269b6cf3f22574fe0a11c67caaa053ecff26b6b3ab2d1288f578fdca91e2d7ddedcdce0182bf3efd637f6514fb991fcd8b6abc4d40df76b5bba56 SHA512 850fdf59276270cb14fba754c9b405d1c4e2615970b9826ed4542822dc80e0a711efa8728f87dbfac5b3a3855a204be1af31c8ad0dce8083bc680cfb15e0f12e +EBUILD shiboken2-5.15.6.ebuild 6652 BLAKE2B e6011065b7572e1f3b3f6f18713e47b818582d067e99e61f1ad4ae3464e8810232bd863153e43243620fce57bb6682e4b07653f20d46615374fdd17089fcf65b SHA512 f6ab9a8ce273fb975c4f632abcdb581df02a4f20c2f0c3a1b607835c277aaab5a32ac6204f2938428687d19fd9491510f414026e6d8e2a8d7033ecdc0cd86ef4 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24 diff --git a/dev-python/shiboken2/files/shiboken2-5.15.6-fix-pyside2-compile.patch b/dev-python/shiboken2/files/shiboken2-5.15.6-fix-pyside2-compile.patch new file mode 100644 index 000000000000..1af6ad5aef7d --- /dev/null +++ b/dev-python/shiboken2/files/shiboken2-5.15.6-fix-pyside2-compile.patch @@ -0,0 +1,11 @@ +--- a/libshiboken/embed/signature_bootstrap.py 2022-09-08 23:54:19.419724864 +0200 ++++ b/libshiboken/embed/signature_bootstrap.py 2022-09-08 23:55:04.494277606 +0200 +@@ -211,7 +211,7 @@ + return self if self._mod2path.get(fullname) else None + + def load_module(self, fullname): +- import importlib ++ import importlib.machinery + import sys + + filename = self._mod2path.get(fullname) diff --git a/dev-python/shiboken2/shiboken2-5.15.6.ebuild b/dev-python/shiboken2/shiboken2-5.15.6.ebuild new file mode 100644 index 000000000000..d2d00d980756 --- /dev/null +++ b/dev-python/shiboken2/shiboken2-5.15.6.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Split the "/usr/bin/shiboken2" binding generator from the +# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former +# requires everything (including Clang) at runtime; the latter only requires +# Qt and Python at runtime. Note that "pip" separates these two as well. See: +# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding +# Once split, the PySide2 ebuild should be revised to require +# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime. +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{8..11} ) + +inherit cmake llvm python-r1 toolchain-funcs + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="Python binding generator for C++ libraries" +HOMEPAGE="https://wiki.qt.io/PySide2" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/shiboken2" + +# The "sources/shiboken2/libshiboken" directory is triple-licensed under the +# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 +# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be +# arbitrarily relicensed. (TODO) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+docstrings numpy test vulkan" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2):5" + +# Since Clang is required at both build- and runtime, BDEPEND is omitted here. +RDEPEND="${PYTHON_DEPS} + >=dev-qt/qtcore-${QT_PV} + sys-devel/clang:= + sys-devel/clang-runtime:= + docstrings? ( + >=dev-libs/libxml2-2.6.32 + >=dev-libs/libxslt-1.1.19 + >=dev-qt/qtxml-${QT_PV} + >=dev-qt/qtxmlpatterns-${QT_PV} + ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + vulkan? ( dev-util/vulkan-headers ) +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qttest-${QT_PV} ) +" + +DOCS=( AUTHORS ) + +PATCHES=( + "${FILESDIR}"/${PN}-5.15.5-python311-1.patch + "${FILESDIR}"/${PN}-5.15.5-python311-2.patch + "${FILESDIR}"/${PN}-5.15.5-python311-3.patch + "${FILESDIR}"/${PN}-5.15.6-fix-pyside2-compile.patch + "${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch +) + +# Ensure the path returned by get_llvm_prefix() contains clang as well. +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +src_prepare() { + # TODO: File upstream issue requesting a sane way to disable NumPy support. + if ! use numpy; then + sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ + libshiboken/CMakeLists.txt || die + fi + + # Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include" + # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". + if use vulkan; then + sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ + ApiExtractor/clangparser/compilersupport.cpp || die + fi + + # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" + # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the + # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is + # the largest version specifier that exists under the "/usr/lib/clang/" + # subdirectory. This assumption is false in edge cases, including when + # users downgrade from newer Clang versions but fail to remove those + # versions with "emerge --depclean". See also: + # https://github.com/leycec/raiagent/issues/85 + # + # Sadly, the clang-* family of functions exported by the "toolchain-funcs" + # eclass are defective, returning nonsensical placeholder strings if the + # end user has *NOT* explicitly configured their C++ compiler to be Clang. + # PySide2 does *NOT* care whether the end user has done so or not, as + # PySide2 unconditionally requires Clang in either case. See also: + # https://bugs.gentoo.org/619490 + sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ + ApiExtractor/clangparser/compilersupport.cpp || die + + cmake_src_prepare +} + +src_configure() { + # Minimal tests for now, 2 failing with the extended version + # FIXME Subscripted generics cannot be used with class and instance checks + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DDISABLE_DOCSTRINGS=$(usex !docstrings) + ) + + shiboken2_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_PYTHON_VERSION="${EPYTHON#python}" + ) + # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. + local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)" + cmake_src_configure + } + python_foreach_impl shiboken2_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + python_foreach_impl cmake_src_test +} + +src_install() { + shiboken2_install() { + cmake_src_install + python_optimize + + # Uniquify the "shiboken2" executable for the current Python target, + # preserving an unversioned "shiboken2" file arbitrarily associated + # with the last Python target. + cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die + + # Uniquify the Shiboken2 pkgconfig file for the current Python target, + # preserving an unversioned "shiboken2.pc" file arbitrarily associated + # with the last Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl shiboken2_install + + # CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so" + # library and one "shiboken2" executable linked to one Python interpreter. + # See also: + # https://bugreports.qt.io/browse/PYSIDE-1053 + # https://github.com/leycec/raiagent/issues/74 + sed -i \ + -e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ + -e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die + + # Remove the broken "shiboken_tool.py" script. By inspection, this script + # reduces to a noop. Moreover, this script raises the following exception: + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' + rm "${ED}"/usr/bin/shiboken_tool.py || die +} diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest index 435ade5ba907..ce0f7919c2d0 100644 --- a/dev-python/shiboken6/Manifest +++ b/dev-python/shiboken6/Manifest @@ -1,4 +1,4 @@ AUX shiboken6-6.3.1-no-strip.patch 1001 BLAKE2B c486f9423d4934c2305e8f3109f017dbebd568573469a2fced8da895fbc61ef07a80e0d1c846e7a57988801d6ec4be05b86b46a8039e6702d667129a899fc137 SHA512 1f3e5b082a978e3ab8d8f4d9a5a0a661b8c063e2ece0221440abe342fbd45d566a384d588dbf00a1e469687f82da3728cd53e35d02077ce6a748d3747de3cec2 -DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321 -EBUILD shiboken6-6.3.1.ebuild 6407 BLAKE2B a088e2bc4dffa5478a89825999794663b7f1de1340d83ac007aeab75fd6a9451e96193a2346fbeba0ed8772168d29a004ecd3fee47c304f89136cab90f5e4043 SHA512 eb42098d5eeb0759967736f83c850c54acda28fb760c2604986b2dc46fd48ae3ca33e0c4e1fd079310e00c77a47cbe80321454e90a7bb53a39550241449602c5 +DIST pyside-setup-opensource-src-6.3.2.tar.xz 7853068 BLAKE2B 5b39e2f98bca0155d3f6617be206b759b628d0126fd30d76d67352c5c78a385938ce61a3c42b75343b9fde708e9f66617122c687ea9ecffca9cd0ab3af91a2ff SHA512 8d25d20b64ac7874e9b7866f101b6bfd7b6fe1fffa602fec6113e1fdaa11608f14a58c2ae1d87b45ee3eac6a07bd55e66dbbd222727cfe6860d8f444bc2b1ff0 +EBUILD shiboken6-6.3.2.ebuild 6414 BLAKE2B 685a4cd09b8298cc43ddf579164da54304f326864e42245818bc35e1d18b44c090079d491a039bea0e4a93cfc823a253c0d7897d651fd818745c79cefdca3306 SHA512 08a7126f33a4abb677b53aa1c2e73d9c669a633c63d9ab4091be9d9383afae0f28bd2228e06321fd7a9a98a19440cf7b349acef58442ce2a0637462309da09ea MISC metadata.xml 730 BLAKE2B 33e7e589d02ec0517e134aa50407ecb97c6800be3ab7b69174d65776f62c1f25c2b2209d51299d9e0110b5f5e9322ee2c0b43dc89e6b12c40ea322ca9bc8eb3f SHA512 cc4ecdd9bc86ce59c2027c6f87307d32bd76d5d2cd8c07edb6c60cc5317ea52a96136c7597a179d75f1632db2999300d8b8f0567679ba3fc562804774fcdcc98 diff --git a/dev-python/shiboken6/shiboken6-6.3.1.ebuild b/dev-python/shiboken6/shiboken6-6.3.1.ebuild deleted file mode 100644 index b44de045d9ad..000000000000 --- a/dev-python/shiboken6/shiboken6-6.3.1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Split the "/usr/bin/shiboken6" binding generator from the -# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former -# requires everything (including Clang) at runtime; the latter only requires -# Qt and Python at runtime. Note that "pip" separates these two as well. See: -# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding -# Once split, the PySide6 ebuild should be revised to require -# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime. -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{8..11} ) - -inherit cmake llvm python-r1 toolchain-funcs - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python binding generator for C++ libraries" -HOMEPAGE="https://wiki.qt.io/PySide6" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/shiboken6" - -# The "sources/shiboken6/libshiboken" directory is triple-licensed under the -# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 -# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be -# arbitrarily relicensed. (TODO) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+docstrings numpy test vulkan" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Tests fail pretty bad and I'm not fixing them right now -RESTRICT="test" - -# Minimal supported version of Qt. -QT_PV="$(ver_cut 1-2):6" - -# Since Clang is required at both build- and runtime, BDEPEND is omitted here. -RDEPEND="${PYTHON_DEPS} - >=dev-qt/qtbase-${QT_PV} - sys-devel/clang:= - sys-devel/clang-runtime:= - docstrings? ( - >=dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtbase-${QT_PV}[gui] ) -" -# testlib is toggled by the gui flag on qtbase - -DOCS=( AUTHORS ) - -PATCHES=( - "${FILESDIR}/${P}-no-strip.patch" -) - -# Ensure the path returned by get_llvm_prefix() contains clang as well. -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - # TODO: File upstream issue requesting a sane way to disable NumPy support. - if ! use numpy; then - sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ - libshiboken/CMakeLists.txt || die - fi - - # Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include" - # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". - if use vulkan; then - sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ - ApiExtractor/clangparser/compilersupport.cpp || die - fi - - # Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" - # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the - # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is - # the largest version specifier that exists under the "/usr/lib/clang/" - # subdirectory. This assumption is false in edge cases, including when - # users downgrade from newer Clang versions but fail to remove those - # versions with "emerge --depclean". See also: - # https://github.com/leycec/raiagent/issues/85 - # - # Sadly, the clang-* family of functions exported by the "toolchain-funcs" - # eclass are defective, returning nonsensical placeholder strings if the - # end user has *NOT* explicitly configured their C++ compiler to be Clang. - # PySide6 does *NOT* care whether the end user has done so or not, as - # PySide6 unconditionally requires Clang in either case. See also: - # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - - cmake_src_prepare -} - -src_configure() { - # Minimal tests for now, 2 failing with the extended version - # FIXME Subscripted generics cannot be used with class and instance checks - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DDISABLE_DOCSTRINGS=$(usex !docstrings) - ) - - shiboken6_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_PYTHON_VERSION="${EPYTHON#python}" - ) - # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)" - cmake_src_configure - } - python_foreach_impl shiboken6_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - python_foreach_impl cmake_src_test -} - -src_install() { - shiboken6_install() { - cmake_src_install - python_optimize - - # Uniquify the "shiboken6" executable for the current Python target, - # preserving an unversioned "shiboken6" file arbitrarily associated - # with the last Python target. - cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die - - # Uniquify the Shiboken6 pkgconfig file for the current Python target, - # preserving an unversioned "shiboken6.pc" file arbitrarily associated - # with the last Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl shiboken6_install - - # CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so" - # library and one "shiboken6" executable linked to one Python interpreter. - # See also: - # https://bugreports.qt.io/browse/PYSIDE-1053 - # https://github.com/leycec/raiagent/issues/74 - sed -i \ - -e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ - -e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/Shiboken6-${PV}/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die - - # Remove the broken "shiboken_tool.py" script. By inspection, this script - # reduces to a noop. Moreover, this script raises the following exception: - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' - rm "${ED}"/usr/bin/shiboken_tool.py || die -} diff --git a/dev-python/shiboken6/shiboken6-6.3.2.ebuild b/dev-python/shiboken6/shiboken6-6.3.2.ebuild new file mode 100644 index 000000000000..9db9451fc19c --- /dev/null +++ b/dev-python/shiboken6/shiboken6-6.3.2.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Split the "/usr/bin/shiboken6" binding generator from the +# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former +# requires everything (including Clang) at runtime; the latter only requires +# Qt and Python at runtime. Note that "pip" separates these two as well. See: +# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding +# Once split, the PySide6 ebuild should be revised to require +# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime. +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{8..11} ) + +inherit cmake llvm python-r1 toolchain-funcs + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="Python binding generator for C++ libraries" +HOMEPAGE="https://wiki.qt.io/PySide6" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/shiboken6" + +# The "sources/shiboken6/libshiboken" directory is triple-licensed under the +# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 +# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be +# arbitrarily relicensed. (TODO) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+docstrings numpy test vulkan" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2):6" + +# Since Clang is required at both build- and runtime, BDEPEND is omitted here. +RDEPEND="${PYTHON_DEPS} + >=dev-qt/qtbase-${QT_PV} + sys-devel/clang:= + sys-devel/clang-runtime:= + docstrings? ( + >=dev-libs/libxml2-2.6.32 + >=dev-libs/libxslt-1.1.19 + ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + vulkan? ( dev-util/vulkan-headers ) +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtbase-${QT_PV}[gui] ) +" +# testlib is toggled by the gui flag on qtbase + +DOCS=( AUTHORS ) + +PATCHES=( + "${FILESDIR}/${PN}-6.3.1-no-strip.patch" +) + +# Ensure the path returned by get_llvm_prefix() contains clang as well. +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +src_prepare() { + # TODO: File upstream issue requesting a sane way to disable NumPy support. + if ! use numpy; then + sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ + libshiboken/CMakeLists.txt || die + fi + + # Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include" + # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". + if use vulkan; then + sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ + ApiExtractor/clangparser/compilersupport.cpp || die + fi + + # Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" + # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the + # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is + # the largest version specifier that exists under the "/usr/lib/clang/" + # subdirectory. This assumption is false in edge cases, including when + # users downgrade from newer Clang versions but fail to remove those + # versions with "emerge --depclean". See also: + # https://github.com/leycec/raiagent/issues/85 + # + # Sadly, the clang-* family of functions exported by the "toolchain-funcs" + # eclass are defective, returning nonsensical placeholder strings if the + # end user has *NOT* explicitly configured their C++ compiler to be Clang. + # PySide6 does *NOT* care whether the end user has done so or not, as + # PySide6 unconditionally requires Clang in either case. See also: + # https://bugs.gentoo.org/619490 + sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ + ApiExtractor/clangparser/compilersupport.cpp || die + + cmake_src_prepare +} + +src_configure() { + # Minimal tests for now, 2 failing with the extended version + # FIXME Subscripted generics cannot be used with class and instance checks + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DDISABLE_DOCSTRINGS=$(usex !docstrings) + ) + + shiboken6_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_PYTHON_VERSION="${EPYTHON#python}" + ) + # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. + local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)" + cmake_src_configure + } + python_foreach_impl shiboken6_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + python_foreach_impl cmake_src_test +} + +src_install() { + shiboken6_install() { + cmake_src_install + python_optimize + + # Uniquify the "shiboken6" executable for the current Python target, + # preserving an unversioned "shiboken6" file arbitrarily associated + # with the last Python target. + cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die + + # Uniquify the Shiboken6 pkgconfig file for the current Python target, + # preserving an unversioned "shiboken6.pc" file arbitrarily associated + # with the last Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl shiboken6_install + + # CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so" + # library and one "shiboken6" executable linked to one Python interpreter. + # See also: + # https://bugreports.qt.io/browse/PYSIDE-1053 + # https://github.com/leycec/raiagent/issues/74 + sed -i \ + -e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ + -e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)"/cmake/Shiboken6-${PV}/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die + + # Remove the broken "shiboken_tool.py" script. By inspection, this script + # reduces to a noop. Moreover, this script raises the following exception: + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' + rm "${ED}"/usr/bin/shiboken_tool.py || die +} diff --git a/dev-python/sphinx_ansible_theme/Manifest b/dev-python/sphinx_ansible_theme/Manifest index a0e14e228bce..bf1a250bc56f 100644 --- a/dev-python/sphinx_ansible_theme/Manifest +++ b/dev-python/sphinx_ansible_theme/Manifest @@ -1,3 +1,3 @@ DIST sphinx-ansible-theme-0.9.1.tar.gz 34505 BLAKE2B 533e665b30f5aa450e4a2240c55c4992340b9f6ee03d27758bf119dfe2eef987fbd4b98136349af376557d8e9a78e5391a648b9886136995d05410b0c26561f2 SHA512 f78602af8affe7be59988f466cf6a2aa67e174086f338cad855369a7bbee5a76d07bcffa8406dea5a819127b26d69e29b0d90dab38b82524b3e317f9082d0379 -EBUILD sphinx_ansible_theme-0.9.1.ebuild 780 BLAKE2B 0507e1b0a2166e4eded12ebbc8a022614ee44cff204632f414a178f8cf4da9795d673152256d19eb5e2f09359aa86fb86a2dd2499d9111d86c3ae4ca3a3d4588 SHA512 fbb6d09a9f737d083c4bbdc881eed15d4ecd5e3c548dd03beb1cb52f59b5188bf227e716eb78b76d421a8c813007d5ba867d7f2459e9ee4746b41e3c1fece2fb +EBUILD sphinx_ansible_theme-0.9.1.ebuild 779 BLAKE2B ea173434706ff3db9e905164e8321e2a87a2cde8e5256b341e3a31a6a5c29e1d313df93328a2c136d1598b52cb2e8e9caa19aac1274920756bd9efeadc1274ce SHA512 f8f7941c18280bba644c8efc401bdb319e9528ead6a9dbd66fbccda94ac74edd1aa04beafa26bea93b05e38ce7049a68ce9735a92ac42aa782cc2a06183efb91 MISC metadata.xml 532 BLAKE2B a684e40deb310344be8b988f801674872c61052843664b13ce22e08d0c38f629a32749fbc31661fe56c997e2d8ad84d0bc689cb671d047025b8ebade6ed9b8c5 SHA512 6562c3cedeae7bf0097119c2c13dd6c6fbb230c5be33927fa101b8daf4f759c8356d2c760cb7fbc880c2b385a60aa314857d656cf02250c62232cebaf1787a15 diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild index 60343704c810..2072312ac633 100644 --- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild +++ b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" RDEPEND=" dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest index ee5139317d3f..84501c7ed011 100644 --- a/dev-python/subprocess-tee/Manifest +++ b/dev-python/subprocess-tee/Manifest @@ -1,3 +1,3 @@ DIST subprocess-tee-0.3.5.tar.gz 16887 BLAKE2B 6eb25085eb2b2ee4557efd556d8035ab8f6b781b47783f24f227db04b3f82fffcfa29d69f0e3588c3fa6188446a3d96d4421e6b1ea5b3292f42635e19a404bab SHA512 47de075e7b6c75598dac0ad1899e1cce9dc1131b49c35ccade2b67c8d2a2d0248ce22a20c336519ff00bfd57269613bc663012e48cf0afa087c93ee74e18e4d4 -EBUILD subprocess-tee-0.3.5.ebuild 1177 BLAKE2B 60fe512f79efaeabb86de974f3f207a661d5d9ac0eb7a1f09fe1ac6af647eae9ae73b333ad29a456ed9b5386ff3cdfbeb602bacc76ca42f11e0db8012b55a1aa SHA512 fdfce1e7ea212e3dcc221766b7657360594ba72b024725e628747ba506a783f014a4c98ff37e38b535753ebd1700ecf1d65ebb82a790ff1ac3f4e7f27b91a822 +EBUILD subprocess-tee-0.3.5.ebuild 1176 BLAKE2B 7e724f5184690c88aac1794e920641f1bd459160804bff4e068ce5871eaaa1906242649dd0bf41fdf8e642e21981886eb7d569351e4f47b428f9da59db1a3440 SHA512 17d4b5b7d005639a153d815b6bb73c2699849ca4013c8cd15ee99dfa434d43f9ecb9582c5418816207b022dc0c85a3c3894f95c9a946a64f8efe5b67a4e438d1 MISC metadata.xml 733 BLAKE2B b18b79649744580db9298cb069dbf3b4c23d10983f012206199f6049752a5a232ed7068daad0716add206cfbf811d3c30e61c90d465e9f2a7f5c444f415d5dad SHA512 a3458edf61b355dc98f05602aa0a98c56d553567f85644ce5157f6a36f8947f8fb11971992305074c1d00a00e38481d4b34048ccf2312f51b477f33498cd792f diff --git a/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild index 3c4eaee3f160..44be8ed7fe5e 100644 --- a/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild +++ b/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" IUSE="test-full" REQUIRED_USE="test-full? ( test )" -- cgit v1.2.3