commit: cc7656c67a41eed9c22a01ed6f1df55b20346d7c Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Wed Oct 18 10:15:28 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Wed Oct 18 11:36:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7656c6
dev-python/pyside2: drop USE=script,scripttools Closes: https://bugs.gentoo.org/915781 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> dev-python/pyside2/metadata.xml | 2 -- .../{pyside2-5.15.10-r2.ebuild => pyside2-5.15.10-r3.ebuild} | 8 +++----- .../pyside2/{pyside2-5.15.11.ebuild => pyside2-5.15.11-r1.ebuild} | 8 +++----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dev-python/pyside2/metadata.xml b/dev-python/pyside2/metadata.xml index 445cc3a97502..174852886176 100644 --- a/dev-python/pyside2/metadata.xml +++ b/dev-python/pyside2/metadata.xml @@ -25,8 +25,6 @@ <flag name="printsupport">Build QtPrintSupport module</flag> <flag name="qml">Build QtQml module</flag> <flag name="quick">Build QtQuick and QtQuickWidgets modules</flag> - <flag name="script">Build QtScript module</flag> - <flag name="scripttools">Build QtScriptTools module</flag> <flag name="scxml">Build QtScxml module</flag> <flag name="sensors">Build QtSensors module</flag> <flag name="speech">Build QtTextToSpeech module</flag> diff --git a/dev-python/pyside2/pyside2-5.15.10-r2.ebuild b/dev-python/pyside2/pyside2-5.15.10-r3.ebuild similarity index 96% rename from dev-python/pyside2/pyside2-5.15.10-r2.ebuild rename to dev-python/pyside2/pyside2-5.15.10-r3.ebuild index 42f95d047316..fa43d3ed66e7 100644 --- a/dev-python/pyside2/pyside2-5.15.10-r2.ebuild +++ b/dev-python/pyside2/pyside2-5.15.10-r3.ebuild @@ -40,7 +40,7 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ~riscv x86" IUSE=" 3d charts +concurrent datavis designer gles2-only +gui help location - multimedia +network positioning +printsupport qml quick script scripttools + multimedia +network positioning +printsupport qml quick scxml sensors speech +sql svg test +testlib webchannel webengine websockets +widgets +x11extras xml xmlpatterns " @@ -62,7 +62,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} printsupport? ( gui widgets ) qml? ( gui network ) quick? ( gui network qml widgets network ) - scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) @@ -105,7 +104,6 @@ RDEPEND="${PYTHON_DEPS} =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} ) @@ -160,8 +158,8 @@ src_configure() { -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_Qt5Script=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=yes -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors) -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech) diff --git a/dev-python/pyside2/pyside2-5.15.11.ebuild b/dev-python/pyside2/pyside2-5.15.11-r1.ebuild similarity index 96% rename from dev-python/pyside2/pyside2-5.15.11.ebuild rename to dev-python/pyside2/pyside2-5.15.11-r1.ebuild index 014d3d91e865..2248e4af791e 100644 --- a/dev-python/pyside2/pyside2-5.15.11.ebuild +++ b/dev-python/pyside2/pyside2-5.15.11-r1.ebuild @@ -40,7 +40,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" IUSE=" 3d charts +concurrent datavis designer gles2-only +gui help location - multimedia +network positioning +printsupport qml quick script scripttools + multimedia +network positioning +printsupport qml quick scxml sensors speech +sql svg test +testlib webchannel webengine websockets +widgets +x11extras xml xmlpatterns " @@ -62,7 +62,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} printsupport? ( gui widgets ) qml? ( gui network ) quick? ( gui network qml widgets network ) - scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) @@ -105,7 +104,6 @@ RDEPEND="${PYTHON_DEPS} =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} ) @@ -154,8 +152,8 @@ src_configure() { -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_Qt5Script=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=yes -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors) -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech)
