From c9515336084e543b4661feb7d0e0568da7a79991 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 14 Jun 2024 10:11:19 +0100
Subject: 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 <sam@gentoo.org>
---
 dev-lang/lazarus/lazarus-3.0-r1.ebuild | 114 --------------------------------
 dev-lang/lazarus/lazarus-3.0-r2.ebuild | 117 +++++++++++++++++++++++++++++++++
 dev-lang/lazarus/lazarus-3.4-r1.ebuild | 117 +++++++++++++++++++++++++++++++++
 dev-lang/lazarus/lazarus-3.4.ebuild    | 114 --------------------------------
 4 files changed, 234 insertions(+), 228 deletions(-)
 delete mode 100644 dev-lang/lazarus/lazarus-3.0-r1.ebuild
 create mode 100644 dev-lang/lazarus/lazarus-3.0-r2.ebuild
 create mode 100644 dev-lang/lazarus/lazarus-3.4-r1.ebuild
 delete mode 100644 dev-lang/lazarus/lazarus-3.4.ebuild

(limited to 'dev-lang')

diff --git a/dev-lang/lazarus/lazarus-3.0-r1.ebuild b/dev-lang/lazarus/lazarus-3.0-r1.ebuild
deleted file mode 100644
index cd47f1f30556..000000000000
--- a/dev-lang/lazarus/lazarus-3.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-# See https://wiki.freepascal.org/Lazarus_3.0_fixes_branch for notes and
-# changes in FPCVER. It *does* change between minor versions of lazarus.
-FPCVER="3.2.2"
-
-DESCRIPTION="feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://downloads.sourceforge.net/lazarus/${P}-0.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0-makefile.patch.xz"
-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 )"
-
-# Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it.
-QA_FLAGS_IGNORED="
-/usr/share/lazarus/startlazarus \
-/usr/share/lazarus/lazarus \
-/usr/share/lazarus/tools/lazres \
-/usr/share/lazarus/tools/lrstolfm \
-/usr/share/lazarus/tools/updatepofiles \
-/usr/share/lazarus/tools/svn2revisioninc \
-/usr/share/lazarus/lazbuild \
-/usr/share/lazarus/components/chmhelp/lhelp/lhelp"
-
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-DEPEND="
-	>=dev-lang/fpc-${FPCVER}[source]
-	>=sys-devel/binutils-2.19.1-r1:=
-	gui? (
-		gtk2? ( x11-libs/gtk+:2 )
-		gtk? ( x11-libs/gtk+:3 )
-		qt6? ( dev-libs/libqt6pas:0/3.0 )
-	)
-"
-BDEPEND="net-misc/rsync"
-RDEPEND="${DEPEND}"
-
-RESTRICT="strip" #269221
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-3.0-makefile.patch
-)
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-}
-
-src_compile() {
-	# bug #732758
-	if ( use gui ) ; then
-		if ( use gtk2 ) ; then
-			export LCL_PLATFORM=gtk2
-		elif ( use gtk ) ; then
-			export LCL_PLATFORM=gtk3
-		else
-			export LCL_PLATFORM=qt6
-		fi
-	else
-		export LCL_PLATFORM=nogui
-	fi
-	if ( use gui ) ; then
-		emake all $(usex extras "bigide lhelp" "") -j1 || die "make failed!"
-	else
-		emake lazbuild -j1 || die "make failed!"
-	fi
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED}"/usr/share \
-		|| die "Unable to copy files!"
-
-	if ( use gui ) ; then
-		dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-		dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	fi
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use extras && dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	use gui && make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
-}
diff --git a/dev-lang/lazarus/lazarus-3.0-r2.ebuild b/dev-lang/lazarus/lazarus-3.0-r2.ebuild
new file mode 100644
index 000000000000..464571a70783
--- /dev/null
+++ b/dev-lang/lazarus/lazarus-3.0-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+# See https://wiki.freepascal.org/Lazarus_3.0_fixes_branch for notes and
+# changes in FPCVER. It *does* change between minor versions of lazarus.
+FPCVER="3.2.2"
+
+DESCRIPTION="feature rich visual programming environment emulating Delphi"
+HOMEPAGE="https://www.lazarus-ide.org/"
+SRC_URI="https://downloads.sourceforge.net/lazarus/${P}-0.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0-makefile.patch.xz"
+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 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="
+/usr/share/lazarus/startlazarus \
+/usr/share/lazarus/lazarus \
+/usr/share/lazarus/tools/lazres \
+/usr/share/lazarus/tools/lrstolfm \
+/usr/share/lazarus/tools/updatepofiles \
+/usr/share/lazarus/tools/svn2revisioninc \
+/usr/share/lazarus/lazbuild \
+/usr/share/lazarus/components/chmhelp/lhelp/lhelp"
+
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+DEPEND="
+	>=dev-lang/fpc-${FPCVER}[source]
+	>=sys-devel/binutils-2.19.1-r1:=
+	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 )
+	)
+"
+BDEPEND="net-misc/rsync"
+RDEPEND="${DEPEND}"
+
+RESTRICT="strip" #269221
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-3.0-makefile.patch
+)
+
+src_prepare() {
+	default
+	# Use default configuration (minus stripping) unless specifically requested otherwise
+	if ! test ${PPC_CONFIG_PATH+set} ; then
+		local FPCVER=$(fpc -iV)
+		export PPC_CONFIG_PATH="${WORKDIR}"
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+	fi
+}
+
+src_compile() {
+	# bug #732758
+	if ( use gui ) ; then
+		if ( use gtk2 ) ; then
+			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
+	else
+		export LCL_PLATFORM=nogui
+	fi
+	if ( use gui ) ; then
+		emake all $(usex extras "bigide lhelp" "") -j1 || die "make failed!"
+	else
+		emake lazbuild -j1 || die "make failed!"
+	fi
+}
+
+src_install() {
+	diropts -m0755
+	dodir /usr/share
+	# Using rsync to avoid unnecessary copies and cleaning...
+	# Note: *.o and *.ppu are needed
+	rsync -a \
+		--exclude="CVS"     --exclude=".cvsignore" \
+		--exclude="*.ppw"   --exclude="*.ppl" \
+		--exclude="*.ow"    --exclude="*.a"\
+		--exclude="*.rst"   --exclude=".#*" \
+		--exclude="*.~*"    --exclude="*.bak" \
+		--exclude="*.orig"  --exclude="*.rej" \
+		--exclude=".xvpics" --exclude="*.compiled" \
+		--exclude="killme*" --exclude=".gdb_hist*" \
+		--exclude="debian"  --exclude="COPYING*" \
+		--exclude="*.app" \
+		"${S}" "${ED}"/usr/share \
+		|| die "Unable to copy files!"
+
+	if ( use gui ) ; then
+		dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
+		dosym ../share/lazarus/startlazarus /usr/bin/lazarus
+	fi
+	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
+	use extras && dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
+	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
+
+	use gui && make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
+}
diff --git a/dev-lang/lazarus/lazarus-3.4-r1.ebuild b/dev-lang/lazarus/lazarus-3.4-r1.ebuild
new file mode 100644
index 000000000000..464571a70783
--- /dev/null
+++ b/dev-lang/lazarus/lazarus-3.4-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+# See https://wiki.freepascal.org/Lazarus_3.0_fixes_branch for notes and
+# changes in FPCVER. It *does* change between minor versions of lazarus.
+FPCVER="3.2.2"
+
+DESCRIPTION="feature rich visual programming environment emulating Delphi"
+HOMEPAGE="https://www.lazarus-ide.org/"
+SRC_URI="https://downloads.sourceforge.net/lazarus/${P}-0.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0-makefile.patch.xz"
+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 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="
+/usr/share/lazarus/startlazarus \
+/usr/share/lazarus/lazarus \
+/usr/share/lazarus/tools/lazres \
+/usr/share/lazarus/tools/lrstolfm \
+/usr/share/lazarus/tools/updatepofiles \
+/usr/share/lazarus/tools/svn2revisioninc \
+/usr/share/lazarus/lazbuild \
+/usr/share/lazarus/components/chmhelp/lhelp/lhelp"
+
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+DEPEND="
+	>=dev-lang/fpc-${FPCVER}[source]
+	>=sys-devel/binutils-2.19.1-r1:=
+	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 )
+	)
+"
+BDEPEND="net-misc/rsync"
+RDEPEND="${DEPEND}"
+
+RESTRICT="strip" #269221
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-3.0-makefile.patch
+)
+
+src_prepare() {
+	default
+	# Use default configuration (minus stripping) unless specifically requested otherwise
+	if ! test ${PPC_CONFIG_PATH+set} ; then
+		local FPCVER=$(fpc -iV)
+		export PPC_CONFIG_PATH="${WORKDIR}"
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+	fi
+}
+
+src_compile() {
+	# bug #732758
+	if ( use gui ) ; then
+		if ( use gtk2 ) ; then
+			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
+	else
+		export LCL_PLATFORM=nogui
+	fi
+	if ( use gui ) ; then
+		emake all $(usex extras "bigide lhelp" "") -j1 || die "make failed!"
+	else
+		emake lazbuild -j1 || die "make failed!"
+	fi
+}
+
+src_install() {
+	diropts -m0755
+	dodir /usr/share
+	# Using rsync to avoid unnecessary copies and cleaning...
+	# Note: *.o and *.ppu are needed
+	rsync -a \
+		--exclude="CVS"     --exclude=".cvsignore" \
+		--exclude="*.ppw"   --exclude="*.ppl" \
+		--exclude="*.ow"    --exclude="*.a"\
+		--exclude="*.rst"   --exclude=".#*" \
+		--exclude="*.~*"    --exclude="*.bak" \
+		--exclude="*.orig"  --exclude="*.rej" \
+		--exclude=".xvpics" --exclude="*.compiled" \
+		--exclude="killme*" --exclude=".gdb_hist*" \
+		--exclude="debian"  --exclude="COPYING*" \
+		--exclude="*.app" \
+		"${S}" "${ED}"/usr/share \
+		|| die "Unable to copy files!"
+
+	if ( use gui ) ; then
+		dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
+		dosym ../share/lazarus/startlazarus /usr/bin/lazarus
+	fi
+	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
+	use extras && dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
+	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
+
+	use gui && make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
+}
diff --git a/dev-lang/lazarus/lazarus-3.4.ebuild b/dev-lang/lazarus/lazarus-3.4.ebuild
deleted file mode 100644
index cd47f1f30556..000000000000
--- a/dev-lang/lazarus/lazarus-3.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-# See https://wiki.freepascal.org/Lazarus_3.0_fixes_branch for notes and
-# changes in FPCVER. It *does* change between minor versions of lazarus.
-FPCVER="3.2.2"
-
-DESCRIPTION="feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://downloads.sourceforge.net/lazarus/${P}-0.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0-makefile.patch.xz"
-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 )"
-
-# Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it.
-QA_FLAGS_IGNORED="
-/usr/share/lazarus/startlazarus \
-/usr/share/lazarus/lazarus \
-/usr/share/lazarus/tools/lazres \
-/usr/share/lazarus/tools/lrstolfm \
-/usr/share/lazarus/tools/updatepofiles \
-/usr/share/lazarus/tools/svn2revisioninc \
-/usr/share/lazarus/lazbuild \
-/usr/share/lazarus/components/chmhelp/lhelp/lhelp"
-
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-DEPEND="
-	>=dev-lang/fpc-${FPCVER}[source]
-	>=sys-devel/binutils-2.19.1-r1:=
-	gui? (
-		gtk2? ( x11-libs/gtk+:2 )
-		gtk? ( x11-libs/gtk+:3 )
-		qt6? ( dev-libs/libqt6pas:0/3.0 )
-	)
-"
-BDEPEND="net-misc/rsync"
-RDEPEND="${DEPEND}"
-
-RESTRICT="strip" #269221
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-3.0-makefile.patch
-)
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-}
-
-src_compile() {
-	# bug #732758
-	if ( use gui ) ; then
-		if ( use gtk2 ) ; then
-			export LCL_PLATFORM=gtk2
-		elif ( use gtk ) ; then
-			export LCL_PLATFORM=gtk3
-		else
-			export LCL_PLATFORM=qt6
-		fi
-	else
-		export LCL_PLATFORM=nogui
-	fi
-	if ( use gui ) ; then
-		emake all $(usex extras "bigide lhelp" "") -j1 || die "make failed!"
-	else
-		emake lazbuild -j1 || die "make failed!"
-	fi
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED}"/usr/share \
-		|| die "Unable to copy files!"
-
-	if ( use gui ) ; then
-		dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-		dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	fi
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use extras && dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	use gui && make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
-}
-- 
cgit v1.2.3-65-gdbad