[gentoo-commits] repo/gentoo:master commit in: dev-lang/lazarus/

["Amy Liffey" <amynka@gentoo.org>]

commit:     dc4ae6502bc01de42621d6744ebca15b882de5fd
Author:     Michael Corvinus <voron1 <AT> gmail <DOT> com>
AuthorDate: Sat Dec 24 21:31:42 2022 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 09:40:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4ae650

dev-lang/lazarus: fix calling `gcc` directly

The build system does things like GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
Replace with ${CC}.

Add QA_FLAGS_IGNORED and QA_PRESTRIPPED as FPC doesn't care about CFLAGS and does its own stripping.

Closes: https://bugs.gentoo.org/818154
Closes: https://bugs.gentoo.org/737060

Signed-off-by: Michael Corvinus <voron1 <AT> gmail.com>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 dev-lang/lazarus/Manifest                           |  1 +
 ...lazarus-2.2.4.ebuild => lazarus-2.2.4-r1.ebuild} | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 472e3d95c033..6814ab378a15 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,3 +1,4 @@
 DIST lazarus-2.0.12.tar.gz 69560778 BLAKE2B ff6c9414483b0d50dbbb30c8fbf626c81d9c71ef0329aa1d58b37aa4288a500e1ab55d06bad27f637e3f09b9d062af1896720b9cb7367b092fc872cf613f8a3d SHA512 dfd22b2b96fca9d0f672f03b9120c4294a7e640737a09b26c274d304025c61566a8504a5484638c108e42a322b21992229451d95e38d7e491a1c2f07a663483e
 DIST lazarus-2.2.0-0.tar.gz 76777421 BLAKE2B 29a7ed3285e3fbb6f72fe932d72d71edfd6903a8a5eb24f9534a12a4d1ccf5e40c61ce3cc1cbd8eef6dd7700f6e29fb640e35510b23a1ca1b02f7df0a4a738cc SHA512 4ebd8b4b7c6dfea491a30b1253e604646109d208c237e59be2fd9f6be3fb1e29443dd4e482076d77100678d0e4085b998398fca0532aa6122b59db7157af0ce4
 DIST lazarus-2.2.4-0.tar.gz 77272959 BLAKE2B 2d7b2872a7399eb1a3a7d9fb20fed209900603ae433db75ac2c4244edf5e5981314ed3d8e39143ff30764e7ccbf1286edace9c38505df1cd28b44250bdd07224 SHA512 1a2fbc8451f1954df1d0071c586662ebc3cd0e9a7db5d910e0af86a3095252a5796d4c7abcf3861ad723af26974ac416c5bf919cd77ad5f406295ad7cdf47eb1
+DIST lazarus-2.2.4-makefile.patch.bz2 3650 BLAKE2B 4a86e0dee7759183e3311cfa9f250995dbf2bb39d1de4c0fbc0191767b5f16029285ab92c76466d261708a88ed600929e777798560161e9942a64e44f956ff89 SHA512 560ffd3d43b75a804dfdb756323cecc7f2039215ab176ca0149cfee11dfe31d7943ad4aa212e9194c2bd2acbd0835e635501ef157888daf3715be7f760b3d51b

diff --git a/dev-lang/lazarus/lazarus-2.2.4.ebuild b/dev-lang/lazarus/lazarus-2.2.4-r1.ebuild
similarity index 78%
rename from dev-lang/lazarus/lazarus-2.2.4.ebuild
rename to dev-lang/lazarus/lazarus-2.2.4-r1.ebuild
index 2f36b89e352c..422a6d9f2bd0 100644
--- a/dev-lang/lazarus/lazarus-2.2.4.ebuild
+++ b/dev-lang/lazarus/lazarus-2.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ FPCVER="3.2.2"
 
 DESCRIPTION="feature rich visual programming environment emulating Delphi"
 HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="mirror://sourceforge/lazarus/${P}-0.tar.gz"
+SRC_URI="mirror://sourceforge/lazarus/${P}-0.tar.gz https://dev.gentoo.org/~amynka/snap/lazarus-2.2.4-makefile.patch.bz2"
 
 LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
 SLOT="0/2.2" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
@@ -19,6 +19,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gtk2 +gui extras"
 REQUIRED_USE="gtk2? ( gui ) 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:=
@@ -33,7 +46,9 @@ RESTRICT="strip" #269221
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
+PATCHES=(
+	"${WORKDIR}/${P}"-makefile.patch
+	"${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
 
 src_prepare() {
 	default