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 A8CD115817D for ; Sun, 16 Jun 2024 18:30:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA97EE2AB9; Sun, 16 Jun 2024 18:30:56 +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 8C3DAE2AB9 for ; Sun, 16 Jun 2024 18:30:56 +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 6D19F33C1EB for ; Sun, 16 Jun 2024 18:30:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9D8F1D24 for ; Sun, 16 Jun 2024 18:30:53 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1718562645.9b76d2a9f91c19fd0f6cb8547ed1c3ccc4b3ce72.chiitoo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/qterminal/qterminal-2.0.0-r1.ebuild x11-terms/qterminal/qterminal-9999.ebuild X-VCS-Directories: x11-terms/qterminal/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 9b76d2a9f91c19fd0f6cb8547ed1c3ccc4b3ce72 X-VCS-Branch: master Date: Sun, 16 Jun 2024 18:30:53 +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: ed19d9cd-b2d5-4119-974a-095a05714d08 X-Archives-Hash: 429cd8e218a3663fea18227b762ff0ef commit: 9b76d2a9f91c19fd0f6cb8547ed1c3ccc4b3ce72 Author: Jimi Huotari gentoo org> AuthorDate: Sun Jun 16 18:22:25 2024 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Sun Jun 16 18:30:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b76d2a9 x11-terms/qterminal: add dev-qt/qtbase[X] dependency Reportedly fails to build without this. Also sync 9999 with ::qt. Signed-off-by: Jimi Huotari gentoo.org> .../{qterminal-9999.ebuild => qterminal-2.0.0-r1.ebuild} | 15 +++++---------- x11-terms/qterminal/qterminal-9999.ebuild | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-2.0.0-r1.ebuild similarity index 67% copy from x11-terms/qterminal/qterminal-9999.ebuild copy to x11-terms/qterminal/qterminal-2.0.0-r1.ebuild index 7e969e772422..14dfb83303be 100644 --- a/x11-terms/qterminal/qterminal-9999.ebuild +++ b/x11-terms/qterminal/qterminal-2.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,12 +8,12 @@ inherit cmake xdg-utils DESCRIPTION="Qt-based multitab terminal emulator" HOMEPAGE="https://lxqt-project.org/" -if [[ ${PV} = *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-2 GPL-2+" @@ -21,16 +21,11 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -BDEPEND=">=dev-util/lxqt-build-tools-0.13.0" +BDEPEND=">=dev-util/lxqt-build-tools-2.0.0" DEPEND=" - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdbus-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - >=dev-qt/qtx11extras-5.15:5 + >=dev-qt/qtbase-6.6:6[dbus,gui,widgets,X] x11-libs/libX11 ~x11-libs/qtermwidget-${PV}:= - test? ( dev-qt/qttest:5 ) " RDEPEND="${DEPEND}" diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild index 7e969e772422..14dfb83303be 100644 --- a/x11-terms/qterminal/qterminal-9999.ebuild +++ b/x11-terms/qterminal/qterminal-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,12 +8,12 @@ inherit cmake xdg-utils DESCRIPTION="Qt-based multitab terminal emulator" HOMEPAGE="https://lxqt-project.org/" -if [[ ${PV} = *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-2 GPL-2+" @@ -21,16 +21,11 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -BDEPEND=">=dev-util/lxqt-build-tools-0.13.0" +BDEPEND=">=dev-util/lxqt-build-tools-2.0.0" DEPEND=" - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdbus-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - >=dev-qt/qtx11extras-5.15:5 + >=dev-qt/qtbase-6.6:6[dbus,gui,widgets,X] x11-libs/libX11 ~x11-libs/qtermwidget-${PV}:= - test? ( dev-qt/qttest:5 ) " RDEPEND="${DEPEND}"