commit: c29d1b26724237fd08739862a1dd3a4b3f3389bb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 14:53:05 2025 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 14:55:58 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c29d1b26
sci-visualization/gnuplot: Drop qt5 flag also from non-live ebuilds
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sci-visualization/gnuplot/gnuplot-5.4.10.ebuild | 16 ++++------------
sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild | 23 +++++++----------------
2 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild
b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild
index 7d12858f2eb6..b130a44172d5 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="gnuplot"
SLOT="0"
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5
readline regis wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua
readline regis wxwidgets X"
REQUIRED_USE="
doc? ( gd )
lua? ( ${LUA_REQUIRED_USE} )"
@@ -45,13 +45,6 @@ RDEPEND="
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
lua? ( ${LUA_DEPS} )
- qt5? (
- dev-qt/qtcore:5=
- dev-qt/qtgui:5=
- dev-qt/qtnetwork:5=
- dev-qt/qtprintsupport:5=
- dev-qt/qtsvg:5=
- dev-qt/qtwidgets:5= )
readline? ( sys-libs/readline:0= )
libcerf? ( sci-libs/libcerf )
wxwidgets? (
@@ -73,8 +66,7 @@ BDEPEND="
dev-texlive/texlive-latexextra
dev-texlive/texlive-langgreek
dev-texlive/texlive-mathscience
- app-text/ghostscript-gpl )
- qt5? ( dev-qt/linguist-tools:5 )"
+ app-text/ghostscript-gpl )"
IDEPEND="latex? ( virtual/latex-base )"
@@ -137,8 +129,8 @@ src_configure() {
$(use_with lua) \
$(use_with regis) \
$(use_with X x) \
+ --without-qt \
--enable-stats \
- $(use_with qt5 qt qt5) \
$(use_enable wxwidgets) \
DIST_CONTACT="https://bugs.gentoo.org/"; \
EMACS=no
diff --git a/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild
b/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild
index 90984d5202f6..85bfbaf518ef 100644
--- a/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="gnuplot"
SLOT="0"
-IUSE="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua
metafont metapost qt5 qt6 readline regis tgif wxwidgets X"
+IUSE="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua
metafont metapost qt6 readline regis tgif wxwidgets X"
REQUIRED_USE="
doc? ( gd )
@@ -46,17 +46,10 @@ RDEPEND="
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
lua? ( ${LUA_DEPS} )
- qt5? ( !qt6? (
- dev-qt/qtcore:5=
- dev-qt/qtgui:5=
- dev-qt/qtnetwork:5=
- dev-qt/qtprintsupport:5=
- dev-qt/qtsvg:5=
- dev-qt/qtwidgets:5= ) )
qt6? (
- dev-qt/qtbase:6=[gui,network,widgets]
- dev-qt/qtsvg:6=
- dev-qt/qt5compat:6= )
+ dev-qt/qt5compat:6
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtsvg:6 )
readline? ( sys-libs/readline:0= )
libcerf? ( sci-libs/libcerf )
wxwidgets? (
@@ -79,7 +72,7 @@ BDEPEND="
dev-texlive/texlive-langgreek
dev-texlive/texlive-mathscience
app-text/ghostscript-gpl )
- qt5? ( !qt6? ( dev-qt/linguist-tools:5 ) )"
+ qt6? ( dev-qt/qttools:6[linguist] )"
IDEPEND="latex? ( virtual/latex-base )"
@@ -132,8 +125,6 @@ src_configure() {
tc-export_build_env BUILD_CC
export CC_FOR_BUILD=${BUILD_CC}
- use qt5 && use qt6 && ewarn "USE flag \"qt6\" overrides \"qt5\""
-
econf \
--with-texdir="${TEXMF}/tex/latex/${PN}" \
--with-readline=$(usex readline gnu builtin) \
@@ -147,11 +138,11 @@ src_configure() {
$(use_with lua) \
$(use_with metafont) \
$(use_with metapost) \
+ $(use_with qt6 qt qt6) \
$(use_with regis) \
$(use_with tgif) \
$(use_with X x) \
--enable-stats \
- $(usev qt6 --with-qt=qt6 || use_with qt5 qt qt5) \
$(use_enable wxwidgets) \
DIST_CONTACT="https://bugs.gentoo.org/"; \
EMACS=no
