From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 3 Jul 2021 22:39:47 +0100
Subject: gentoo resync : 03.07.2021

---
 dev-lang/fpc/Manifest         |  2 +-
 dev-lang/fpc/fpc-3.2.2.ebuild | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'dev-lang/fpc')

diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest
index 097aae9b7664..4891a95f5042 100644
--- a/dev-lang/fpc/Manifest
+++ b/dev-lang/fpc/Manifest
@@ -9,5 +9,5 @@ DIST fpc-3.2.2.x86_64-linux.tar 86978560 BLAKE2B 29cac8c0da4ba65cee6a0e0cd3c1112
 DIST fpcbuild-3.0.4.tar.gz 68908523 BLAKE2B b5c3936cf0b803aa2cc71f9c25ded470f207c540a1691cf3c2a9876c9e4eefd5c04f45b9f1f3ca17917b14ba4a90e0f16cc890b27024ff225d9d6bb25649862b SHA512 eedfeb4d25b3f4cb30ae9c8f30e0fec2405ef806fa565933cef7904d512f781730e3f023aea2f908c21250e3ced4f74fa780abad77b560728a88cedf591505b6
 DIST fpcbuild-3.2.2.tar.gz 84195619 BLAKE2B 88848308c93f949b59197649cc344498082b6520e43eb1d4413bf68eb251fcab75c863794a188a2298d9e8aba47346253a596ac630b30049ac8bd6f6934aa5a2 SHA512 75889bb54adc70a6e2cbd291476b9b12d61c8f943a05b7d16d2024de3215c935465ff43b1400c412e128e260c7f49a9c66e35c21f86cb866e671b5b60a282d82
 EBUILD fpc-3.0.4.ebuild 4459 BLAKE2B 4e02e29ec7411fd966bd7048ad236d9910a7a137ef3b252673ca3d823780b628832bc926c9462eb88711c3c3a3a919b1fb2b399b01d5d00d6a6f1291e98a859e SHA512 b353563e68ebf3524938f1d9cf4f710067443177051d89de73f97aad729a282134859c5811129c88d7a7e516d4a6169c11c691d3300901a0fc5d8cee387b5a88
-EBUILD fpc-3.2.2.ebuild 4267 BLAKE2B e9eebbd06ebf95dfebe34e524ded59838745831bbd8cd85a2914d29341313daa8816ad9aca515c66bedd0a8eee8ee0181d655e3eba4494792ee5c93511527c69 SHA512 044c91d78d07b452cbfb2209026a3af8e5e111de8023f5eb20d0c293b9ea91d68f13e6306dc54fdc853f7f7068c46cbd199cefff226a64bb96251b3835196713
+EBUILD fpc-3.2.2.ebuild 4474 BLAKE2B c702320c30aaefd48468e8e847f08219ed1f953b7895c261e5244bb823c6a78c1a76e1e4a1b3189e58d679d03252eac6c6e5a54079c361a67a79f298a43599da SHA512 b664a8957034f192802339187cae161fe594742d8123833fe48f2f0ecb238abce7cd82ca3284ae1b17816c43a803ce21b2dbb03f6b0e94c039d187606a27a127
 MISC metadata.xml 385 BLAKE2B 0e0d050ec7539e841469fd1b2dd9b834e274c5acf63c6f5b38923271cac205d8680229e08dbcb931ed0b136f45800843ee21df6c7b670346b81ea988f1ba11b4 SHA512 1d1ec643e71bbaf3f38dd0f817aeba74f8871071a429b203b3b3397b114ef09e89cb5f166a08e7027e834f4f2ef6ad26049063a2d633ecbd65754945d0be1c46
diff --git a/dev-lang/fpc/fpc-3.2.2.ebuild b/dev-lang/fpc/fpc-3.2.2.ebuild
index 843ec9edcd9a..dc0615246046 100644
--- a/dev-lang/fpc/fpc-3.2.2.ebuild
+++ b/dev-lang/fpc/fpc-3.2.2.ebuild
@@ -26,6 +26,17 @@ QA_FLAGS_IGNORED="
 	usr/bin/.*
 	usr/lib.*/.*"
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 475210
+		if $(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "fpc has several issues with the gold linker and does not easily"
+			eerror "permit selection. Please do not use USE=default-gold on binutils."
+			die "GNU gold detected from $(tc-getLD)"
+		fi
+	fi
+}
+
 src_unpack() {
 	case ${ARCH} in
 		amd64)
@@ -49,10 +60,7 @@ src_unpack() {
 src_prepare() {
 	default
 
-	local f
-	while IFS="" read -d $'\0' -r f ; do
-		sed -i -e 's/ -Xs / /' "${f}" || die
-	done < <(find "${WORKDIR}" -name Makefile -type f -print0)
+	find "${WORKDIR}" -name Makefile -exec sed -i 's/ -Xs / /' {} + || die
 
 	# let the pkg manager compress man files
 	sed -i '/find man.* gzip /d' "${WORKDIR}"/fpcbuild-${PV}/install/man/Makefile || die
@@ -61,10 +69,6 @@ src_prepare() {
 	hprefixify "${WORKDIR}"/fpcbuild-${PV}/fpcsrc/compiler/options.pas
 }
 
-src_configure() {
-	tc-ld-disable-gold # bug 475210
-}
-
 set_pp() {
 	case ${ARCH} in
 		amd64)
-- 
cgit v1.2.3