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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CFDAA15817D for ; Fri, 14 Jun 2024 09:33:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EC27E2B0F; Fri, 14 Jun 2024 09:33:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 02666E2B0F for ; Fri, 14 Jun 2024 09:33:51 +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 F090D33BEB9 for ; Fri, 14 Jun 2024 09:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C8921CE6 for ; Fri, 14 Jun 2024 09:33:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1718357558.c9515336084e543b4661feb7d0e0568da7a79991.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/lazarus/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/lazarus/lazarus-3.0-r1.ebuild dev-lang/lazarus/lazarus-3.0-r2.ebuild dev-lang/lazarus/lazarus-3.4-r1.ebuild dev-lang/lazarus/lazarus-3.4.ebuild X-VCS-Directories: dev-lang/lazarus/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c9515336084e543b4661feb7d0e0568da7a79991 X-VCS-Branch: master Date: Fri, 14 Jun 2024 09:33:49 +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: 71e87855-96cb-48f3-a169-1aeb500d01e1 X-Archives-Hash: 5ca706907b2d6ae76c5885f000517b8d commit: c9515336084e543b4661feb7d0e0568da7a79991 Author: Sam James gentoo org> AuthorDate: Fri Jun 14 09:11:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 14 09:32:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9515336 dev-lang/lazarus: put back REQUIRED_USE The change itself is right conceptually (see the USE=gui policy in QA guide), but Lazarus continues to be a mess and I've spent too much time on it for now. The right fix is to drop REQUIRED_USE (as we did) but also make *DEPEND reflect that. But given I don't really want to think about Lazarus again, I'm not going to do that right now. Its actual maintainer can do that. Bug: https://bugs.gentoo.org/934158 Closes: https://bugs.gentoo.org/934235 Signed-off-by: Sam James gentoo.org> dev-lang/lazarus/{lazarus-3.0-r1.ebuild => lazarus-3.0-r2.ebuild} | 7 +++++-- dev-lang/lazarus/{lazarus-3.4.ebuild => lazarus-3.4-r1.ebuild} | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dev-lang/lazarus/lazarus-3.0-r1.ebuild b/dev-lang/lazarus/lazarus-3.0-r2.ebuild similarity index 94% rename from dev-lang/lazarus/lazarus-3.0-r1.ebuild rename to dev-lang/lazarus/lazarus-3.0-r2.ebuild index cd47f1f30556..464571a70783 100644 --- a/dev-lang/lazarus/lazarus-3.0-r1.ebuild +++ b/dev-lang/lazarus/lazarus-3.0-r2.ebuild @@ -18,8 +18,8 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2 LGPL-2.1-with-linking-exception" SLOT="0/3.0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND. KEYWORDS="~amd64 ~x86" -IUSE="+gui gtk2 gtk qt6 extras" -REQUIRED_USE="extras? ( gui )" +IUSE="+gui gtk2 gtk qt5 qt6 extras" +REQUIRED_USE="gui? ( ^^ ( gtk2 gtk qt5 qt6 ) ) extras? ( gui )" # Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it. QA_FLAGS_IGNORED=" @@ -40,6 +40,7 @@ DEPEND=" gui? ( gtk2? ( x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:3 ) + qt5? ( dev-libs/libqt5pas:0/3.0 ) qt6? ( dev-libs/libqt6pas:0/3.0 ) ) " @@ -70,6 +71,8 @@ src_compile() { export LCL_PLATFORM=gtk2 elif ( use gtk ) ; then export LCL_PLATFORM=gtk3 + elif ( use qt5 ) ; then + export LCL_PLATFORM=qt5 else export LCL_PLATFORM=qt6 fi diff --git a/dev-lang/lazarus/lazarus-3.4.ebuild b/dev-lang/lazarus/lazarus-3.4-r1.ebuild similarity index 94% rename from dev-lang/lazarus/lazarus-3.4.ebuild rename to dev-lang/lazarus/lazarus-3.4-r1.ebuild index cd47f1f30556..464571a70783 100644 --- a/dev-lang/lazarus/lazarus-3.4.ebuild +++ b/dev-lang/lazarus/lazarus-3.4-r1.ebuild @@ -18,8 +18,8 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2 LGPL-2.1-with-linking-exception" SLOT="0/3.0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND. KEYWORDS="~amd64 ~x86" -IUSE="+gui gtk2 gtk qt6 extras" -REQUIRED_USE="extras? ( gui )" +IUSE="+gui gtk2 gtk qt5 qt6 extras" +REQUIRED_USE="gui? ( ^^ ( gtk2 gtk qt5 qt6 ) ) extras? ( gui )" # Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it. QA_FLAGS_IGNORED=" @@ -40,6 +40,7 @@ DEPEND=" gui? ( gtk2? ( x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:3 ) + qt5? ( dev-libs/libqt5pas:0/3.0 ) qt6? ( dev-libs/libqt6pas:0/3.0 ) ) " @@ -70,6 +71,8 @@ src_compile() { export LCL_PLATFORM=gtk2 elif ( use gtk ) ; then export LCL_PLATFORM=gtk3 + elif ( use qt5 ) ; then + export LCL_PLATFORM=qt5 else export LCL_PLATFORM=qt6 fi