From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA5E5158089 for ; Wed, 18 Oct 2023 11:36:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68B742BC060; Wed, 18 Oct 2023 11:36:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43D072BC061 for ; Wed, 18 Oct 2023 11:36:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39C48335D1C for ; Wed, 18 Oct 2023 11:36:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77306128A for ; Wed, 18 Oct 2023 11:36:35 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1697628960.cc7656c67a41eed9c22a01ed6f1df55b20346d7c.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyside2/metadata.xml dev-python/pyside2/pyside2-5.15.10-r2.ebuild dev-python/pyside2/pyside2-5.15.10-r3.ebuild dev-python/pyside2/pyside2-5.15.11-r1.ebuild dev-python/pyside2/pyside2-5.15.11.ebuild X-VCS-Directories: dev-python/pyside2/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: cc7656c67a41eed9c22a01ed6f1df55b20346d7c X-VCS-Branch: master Date: Wed, 18 Oct 2023 11:36:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2a9d383c-655c-4e9f-8607-f19862ac298b X-Archives-Hash: 147aad6be55176f575956ecc16d67445 commit: cc7656c67a41eed9c22a01ed6f1df55b20346d7c Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Oct 18 10:15:28 2023 +0000 Commit: Andrew Ammerlaan gentoo 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 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 @@ Build QtPrintSupport module Build QtQml module Build QtQuick and QtQuickWidgets modules - Build QtScript module - Build QtScriptTools module Build QtScxml module Build QtSensors module Build QtTextToSpeech module 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)