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 521BA1581D3 for ; Mon, 27 May 2024 22:18:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F086E2A13; Mon, 27 May 2024 22:18:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 06E43E2A13 for ; Mon, 27 May 2024 22:18:29 +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 F3EC933BEF5 for ; Mon, 27 May 2024 22:18:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DD4B1161 for ; Mon, 27 May 2024 22:18:26 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1716848257.c2cbd1a4fdadea80643ef6a2bcc841caf0d4b5d0.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/ X-VCS-Repository: proj/qt X-VCS-Files: x11-misc/sddm/sddm-9999.ebuild X-VCS-Directories: x11-misc/sddm/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c2cbd1a4fdadea80643ef6a2bcc841caf0d4b5d0 X-VCS-Branch: master Date: Mon, 27 May 2024 22:18:26 +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: e0abc8f3-5b1d-4b31-ab21-481f4be68f54 X-Archives-Hash: 6c1aca1737c71d9aab923a968339d5f8 commit: c2cbd1a4fdadea80643ef6a2bcc841caf0d4b5d0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 27 22:17:37 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 27 22:17:37 2024 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c2cbd1a4 x11-misc/sddm: Drop IUSE qt5, build only Qt6-based version Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/sddm/sddm-9999.ebuild | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index 001fca99..e5d80033 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -9,10 +9,10 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" else SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64" fi -QTMIN=6.6.2 +QTMIN=6.7.1 inherit cmake linux-info pam systemd tmpfiles DESCRIPTION="Simple Desktop Display Manager" @@ -21,7 +21,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz" LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" SLOT="0" -IUSE="+elogind +qt5 systemd test +X" +IUSE="+elogind systemd test +X" REQUIRED_USE="^^ ( elogind systemd )" RESTRICT="!test? ( test )" @@ -29,29 +29,17 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" acct-group/sddm acct-user/sddm + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network] + >=dev-qt/qtdeclarative-${QTMIN}:6 sys-libs/pam x11-libs/libXau x11-libs/libxcb:= elogind? ( sys-auth/elogind[pam] ) - qt5? ( - >=dev-qt/qtcore-5.15.12:5 - >=dev-qt/qtdbus-5.15.12:5 - >=dev-qt/qtdeclarative-5.15.12:5 - >=dev-qt/qtgui-5.15.12:5 - >=dev-qt/qtnetwork-5.15.12:5 - ) - !qt5? ( - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network] - >=dev-qt/qtdeclarative-${QTMIN}:6 - ) systemd? ( sys-apps/systemd:=[pam] ) !systemd? ( sys-power/upower ) " DEPEND="${COMMON_DEPEND} - test? ( - qt5? ( >=dev-qt/qttest-5.15.12:5 ) - !qt5? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] ) - ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] ) " RDEPEND="${COMMON_DEPEND} X? ( x11-base/xorg-server ) @@ -60,8 +48,7 @@ RDEPEND="${COMMON_DEPEND} BDEPEND=" dev-python/docutils >=dev-build/cmake-3.25.0 - qt5? ( >=dev-qt/linguist-tools-5.15.12:5 ) - !qt5? ( >=dev-qt/qttools-${QTMIN}[linguist] ) + >=dev-qt/qttools-${QTMIN}[linguist] kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig " @@ -107,7 +94,7 @@ EOF src_configure() { local mycmakeargs=( -DBUILD_MAN_PAGES=ON - -DBUILD_WITH_QT6=$(usex !qt5) + -DBUILD_WITH_QT6=ON -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" -DRUNTIME_DIR=/run/sddm -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"