From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1704777-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 03E5315812D
for <garchives@archives.gentoo.org>; Wed, 01 Jan 2025 14:56:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4B69FE077D;
Wed, 01 Jan 2025 14:56:06 +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 2EEC9E077D
for <gentoo-commits@lists.gentoo.org>; Wed, 01 Jan 2025 14:56:06 +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 327AF335CAF
for <gentoo-commits@lists.gentoo.org>; Wed, 01 Jan 2025 14:56:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F75E1148
for <gentoo-commits@lists.gentoo.org>; Wed, 01 Jan 2025 14:56:03 +0000 (UTC)
From: "Ulrich Müller" <ulm@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, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1735743358.1adfa8063a9def832f8c27456f3ac50dc3be2cfc.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
X-VCS-Directories: sci-visualization/gnuplot/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 1adfa8063a9def832f8c27456f3ac50dc3be2cfc
X-VCS-Branch: master
Date: Wed, 01 Jan 2025 14:56:03 +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: 488811d1-81be-4180-9a20-9faa120a0661
X-Archives-Hash: 1312a6f82575c055f4123b9902886ad1
commit: 1adfa8063a9def832f8c27456f3ac50dc3be2cfc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 11:33:20 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=1adfa806
sci-visualization/gnuplot: Drop IUSE qt5 (leaves IUSE qt6)
Fix dependencies along the way:
- missing Qt6 BDEPEND
- excessive dev-qt/* slot ops (no sign of private header usage)
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
index 49f714f07c46..6dbe8779a478 100644
--- a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
@@ -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 )"
@@ -130,8 +123,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) \
@@ -145,11 +136,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