From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1693379-garchives=archives.gentoo.org@lists.gentoo.org>
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 (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8F60A1581EC
for <garchives@archives.gentoo.org>; Sat, 23 Nov 2024 19:40:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6ECF4E086A;
Sat, 23 Nov 2024 19:40:50 +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 501ABE0869
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2024 19:40:50 +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 3DB9E342F9E
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2024 19:40:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 56BDD16E0
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2024 19:40:47 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1732390736.18a0ba99fa5b74fbd5ebc10fa7e301acfa684cfd.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/freecad/freecad-1.0.0.ebuild
X-VCS-Directories: media-gfx/freecad/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 18a0ba99fa5b74fbd5ebc10fa7e301acfa684cfd
X-VCS-Branch: master
Date: Sat, 23 Nov 2024 19:40:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fd62a3ee-151a-4519-a7d2-0a77955b5e57
X-Archives-Hash: 58e61261a11ba2407f1f21b239322ac5
commit: 18a0ba99fa5b74fbd5ebc10fa7e301acfa684cfd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 18:38:31 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 19:38:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a0ba99
media-gfx/freecad: IUSE qt6 -> qt5 and invert logic
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/freecad/freecad-1.0.0.ebuild | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/media-gfx/freecad/freecad-1.0.0.ebuild b/media-gfx/freecad/freecad-1.0.0.ebuild
index 510af30c761d..0807027c8d44 100644
--- a/media-gfx/freecad/freecad-1.0.0.ebuild
+++ b/media-gfx/freecad/freecad-1.0.0.ebuild
@@ -26,7 +26,7 @@ fi
# examples are licensed CC-BY-SA (without note of specific version)
LICENSE="LGPL-2 CC-BY-SA-4.0"
SLOT="0"
-IUSE="debug designer +gui +qt6 test"
+IUSE="debug designer +gui qt5 test"
FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
@@ -53,14 +53,14 @@ RDEPEND="
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
dev-ruby/asciidoctor
- !qt6? (
+ qt5? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtnetwork:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
)
- qt6? (
+ !qt5? (
dev-qt/qtbase:6[concurrent,network,xml]
)
media-libs/freetype
@@ -76,14 +76,14 @@ RDEPEND="
net-misc/curl
)
fem? (
- !qt6? ( sci-libs/vtk:=[qt5,rendering] )
- qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+ qt5? ( sci-libs/vtk:=[qt5,rendering] )
+ !qt5? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
)
gui? (
>=media-libs/coin-4.0.0
virtual/glu
virtual/opengl
- !qt6? (
+ qt5? (
dev-qt/designer:5
dev-qt/qtgui:5
dev-qt/qtopengl:5
@@ -99,7 +99,7 @@ RDEPEND="
dev-python/shiboken2:=[${PYTHON_USEDEP}]
' python3_{10..11} )
)
- qt6? (
+ !qt5? (
designer? ( dev-qt/qttools:6[designer] )
dev-qt/qt5compat:6
dev-qt/qttools:6[widgets]
@@ -118,8 +118,8 @@ RDEPEND="
openscad? ( media-gfx/openscad )
pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
smesh? (
- !qt6? ( sci-libs/vtk:=[qt5] )
- qt6? ( sci-libs/vtk:=[-qt5,qt6] )
+ qt5? ( sci-libs/vtk:=[qt5] )
+ !qt5? ( sci-libs/vtk:=[-qt5,qt6] )
)
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
@@ -133,7 +133,7 @@ DEPEND="${RDEPEND}
dev-cpp/ms-gsl
test? (
$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- !qt6? ( dev-qt/qttest:5 )
+ qt5? ( dev-qt/qttest:5 )
)
"
BDEPEND="
@@ -141,7 +141,7 @@ BDEPEND="
dev-lang/swig
test? (
$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- !qt6? ( dev-qt/qttest:5 )
+ qt5? ( dev-qt/qttest:5 )
dev-cpp/gtest
)
"
@@ -164,7 +164,7 @@ REQUIRED_USE="
designer? ( gui )
inspection? ( points )
path? ( robot )
- python_single_target_python3_12? ( gui? ( qt6 ) )
+ python_single_target_python3_12? ( gui? ( !qt5 ) )
"
# There is no py3.12 support planned for pyside2
@@ -285,7 +285,7 @@ src_configure() {
)
fi
- if use qt6; then
+ if ! use qt5; then
mycmakeargs+=(
-DFREECAD_QT_MAJOR_VERSION=6
-DFREECAD_QT_VERSION=6