From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
Date: Sat, 23 Nov 2024 19:40:47 +0000 (UTC) [thread overview]
Message-ID: <1732390736.18a0ba99fa5b74fbd5ebc10fa7e301acfa684cfd.asturm@gentoo> (raw)
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
next reply other threads:[~2024-11-23 19:40 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-23 19:40 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-10 16:43 [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/ Nowa Ammerlaan
2024-12-20 16:09 Nowa Ammerlaan
2024-12-01 16:15 Sam James
2024-12-01 16:04 Sam James
2024-11-27 23:26 Sam James
2024-11-25 15:32 Andreas Sturmlechner
2024-11-25 15:32 Andreas Sturmlechner
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-24 20:25 Sam James
2024-11-22 18:39 Joonas Niilola
2024-11-20 10:31 Nowa Ammerlaan
2024-10-11 9:36 Andrew Ammerlaan
2024-09-30 13:37 Andrew Ammerlaan
2024-09-23 9:01 Andrew Ammerlaan
2024-09-15 15:42 Andrew Ammerlaan
2024-09-14 19:59 Alexey Shvetsov
2024-04-15 9:42 Andrew Ammerlaan
2024-04-15 8:38 Joonas Niilola
2024-03-27 2:57 Sam James
2024-03-24 13:54 Andrew Ammerlaan
2024-03-23 11:21 Andrew Ammerlaan
2024-03-09 10:17 Andrew Ammerlaan
2024-03-09 7:23 Andrew Ammerlaan
2024-01-05 13:12 Andrew Ammerlaan
2024-01-05 10:23 Andrew Ammerlaan
2023-11-25 9:11 Miroslav Šulc
2023-11-20 19:43 Andrew Ammerlaan
2023-05-08 8:19 Joonas Niilola
2023-05-08 8:19 Joonas Niilola
2023-05-07 8:44 Joonas Niilola
2023-02-23 17:30 Miroslav Šulc
2023-02-23 11:25 Andrew Ammerlaan
2023-02-21 6:18 Joonas Niilola
2023-01-09 19:23 Joonas Niilola
2022-11-27 13:23 Piotr Karbowski
2022-11-22 15:03 Joonas Niilola
2022-09-28 9:55 Joonas Niilola
2022-09-02 16:50 Joonas Niilola
2022-08-31 4:57 Joonas Niilola
2022-07-29 3:16 Sam James
2022-07-09 12:26 Matthew Smith
2022-05-19 12:12 Joonas Niilola
2022-04-18 11:35 Joonas Niilola
2022-04-14 8:54 Joonas Niilola
2022-04-06 17:30 Piotr Karbowski
2022-04-02 12:58 Andreas Sturmlechner
2022-02-03 15:52 John Helmert III
2022-01-28 8:24 Sam James
2022-01-10 1:04 Sam James
2022-01-10 1:04 Sam James
2021-12-04 21:52 Sam James
2021-12-04 21:52 Sam James
2021-11-30 12:50 Joonas Niilola
2021-11-30 12:50 Joonas Niilola
2021-11-02 10:04 Sam James
2021-11-02 10:04 Sam James
2021-07-10 9:17 Ionen Wolkens
2021-06-21 22:26 Sam James
2021-06-21 22:26 Sam James
2021-06-21 22:26 Sam James
2021-06-18 19:18 David Seifert
2021-06-16 14:02 Sam James
2021-06-15 14:42 Sam James
2021-06-05 14:14 Andrew Ammerlaan
2021-06-05 11:56 Andrew Ammerlaan
2021-06-03 19:15 Sam James
2021-05-31 19:26 Alexey Shvetsov
2021-05-31 19:26 Alexey Shvetsov
2021-05-24 12:30 Andrew Ammerlaan
2021-05-06 21:45 Sam James
2021-05-06 21:45 Sam James
2021-03-16 17:12 Michał Górny
2021-03-14 11:41 Joonas Niilola
2021-02-15 9:04 Joonas Niilola
2018-05-11 19:36 Andreas Sturmlechner
2018-03-13 9:33 Andreas Sturmlechner
2018-03-13 9:33 Andreas Sturmlechner
2018-03-13 9:33 Andreas Sturmlechner
2018-03-13 9:33 Andreas Sturmlechner
2018-03-02 22:08 Andreas Sturmlechner
2018-03-02 22:08 Andreas Sturmlechner
2018-03-02 22:08 Andreas Sturmlechner
2018-03-02 22:08 Andreas Sturmlechner
2018-01-05 0:35 Andreas Sturmlechner
2017-12-29 19:06 Miroslav Šulc
2017-12-29 19:06 Miroslav Šulc
2017-11-06 1:58 Andreas Sturmlechner
2017-11-06 1:58 Andreas Sturmlechner
2017-11-06 1:58 Andreas Sturmlechner
2017-11-06 1:58 Andreas Sturmlechner
2017-07-26 17:08 Alexey Shvetsov
2017-07-26 17:08 Alexey Shvetsov
2017-07-26 17:08 Alexey Shvetsov
2017-04-30 19:46 Davide Pesavento
2017-04-13 19:33 Patrice Clement
2017-01-20 14:21 David Seifert
2017-01-18 21:19 David Seifert
2017-01-18 21:19 David Seifert
2016-02-20 12:45 Michael Weber
2015-09-18 15:26 Michael Weber
2015-08-11 9:32 Michael Weber
2015-08-11 9:18 Michael Weber
2015-08-11 9:08 Michael Weber
2015-08-11 9:08 Michael Weber
2015-08-11 6:18 Michael Weber
2015-08-09 14:03 Michael Weber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1732390736.18a0ba99fa5b74fbd5ebc10fa7e301acfa684cfd.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox