gentoo resync : 12.05.2022

2 files changed, 28 insertions, 12 deletions

diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 9a2d1e0a2b86..ab2fa4b2d785 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
 EBUILD cdrtools-3.02_alpha09-r3.ebuild 8176 BLAKE2B 47e5d32a77a929a0982e8823b72f424a88668e3e42bde40bf0a633e587fdaf27ed1a9573d9029f6f46cf0928813e498f070d2338258edcdd97e71bd01ee35932 SHA512 6a53a2eb61a2c6d370eb701a7007f6d5f411a5f22bd0de72d7a9d639111857f24f822eb4ce94115e012ce6db4dc26ecaf74802114aebdf752c6931f39c0ad567
-EBUILD cdrtools-3.02_alpha09-r4.ebuild 8621 BLAKE2B 3c852c9912b64d1f018024f9d19d425dd3b79f8626e4bbc9d3cdfd20e9eee8c4f15c534fbb5c29b68848612a86f1db00a26f45a5133a0a7fe2bfa2a1fa9ad415 SHA512 cacff66bf2cab9f922308e07b62745db8af3c8725f2393a34eb62df106b61d3321a38989681359889f8782b29301d7a21f136bc1a09bc6af1a72d919d9569983
+EBUILD cdrtools-3.02_alpha09-r4.ebuild 9006 BLAKE2B c185543b1b29af2555cebf3d97f821fac8db389b422d82b85d6d8f273abe4e47d0f2696d524842ba3fb73baf8dad3fc88c288725259bd2183392887f635ec647 SHA512 4e2aa1ccc621172333301bb8e05bbfe136557c574312aa745862eec8b1969e85ed51ecf49417772acb2bb8df2cb11fc7653d63f54f6f5c41fc2c5ad45abba503
 EBUILD cdrtools-3.02_alpha09.ebuild 7881 BLAKE2B 3ca107b16e92797b85e0fd09a5e205db41d73977220998d7b0baef7d29120bb0cbbeb788c739f98d9e3b8f4bdcda5f6b2a5a57b2cf55562edc2d82136a6d8aef SHA512 0835b77c2af21e5cff24ab0da2d089273b2984eca57087e3e0e92f0cc01325718d7b583f87179d8dba9bb3ad2d46f95752afce55b5d51bc678cc0a3c33bb3c67
 MISC metadata.xml 445 BLAKE2B 43f12bca87633d1b039beed2fb401b652eafb937afc8a27d9d84885d306636bc29978beb17426dc782cb7c2e7ba9333b9346b6455fa72db2b778800f39995476 SHA512 c552eae00d8560d482fcb02799f064f5481e67ec12107760c841620db2d3023826377e186f5dc1b3555eea9b40964b4c7020b1deb82574ff1ff3ad7fd957bde9
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
index d57c022de7c1..0bd54271fe20 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
@@ -44,6 +44,19 @@ cdrtools_os() {
 	echo "${os}"
 }
 
+symlink_build_rules() {
+	local cputype="$1"
+	pushd "${S}"/RULES > /dev/null || die
+	ln -sf i586-linux-cc.rul       "${cputype}"-linux-cc.rul      || die
+	ln -sf i586-linux-clang.rul    "${cputype}"-linux-clang.rul   || die
+	ln -sf i586-linux-clang32.rul  "${cputype}"-linux-clang32.rul || die
+	ln -sf i586-linux-clang64.rul  "${cputype}"-linux-clang64.rul || die
+	ln -sf i586-linux-gcc.rul      "${cputype}"-linux-gcc.rul     || die
+	ln -sf i586-linux-gcc32.rul    "${cputype}"-linux-gcc32.rul   || die
+	ln -sf i586-linux-gcc64.rul    "${cputype}"-linux-gcc64.rul   || die
+	popd > /dev/null || die
+}
+
 src_prepare() {
 	default
 
@@ -71,6 +84,11 @@ src_prepare() {
 		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
 		|| die "sed rules"
 
+	# Don't quote $(MAKE)
+	sed -i -e 's|"$(MAKE)"|$(MAKE)|' \
+		$(find ./RULES -type f -exec grep -l '"$(MAKE)"' '{}' '+') \
+		|| die "sed RULES/"
+
 	# Enable verbose build.
 	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
 		RULES/*.rul RULES/rules.prg RULES/rules.inc \
@@ -80,9 +98,6 @@ src_prepare() {
 	cd "${S}"/RULES || die
 	local tcCC="$(tc-getCC)"
 	local tcCXX="$(tc-getCXX)"
-	# fix RISC-V build err, bug 811375
-	ln -s i586-linux-cc.rul riscv-linux-cc.rul || die
-	ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die
 
 	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
 		rules1.top || die "sed rules1.top"
@@ -95,13 +110,14 @@ src_prepare() {
 		rules.cnf || die "sed rules.cnf"
 
 	# Add support for arm64
-	ln -sf i586-linux-cc.rul       aarch64_be-linux-cc.rul
-	ln -sf i586-linux-clang.rul    aarch64_be-linux-clang.rul
-	ln -sf i586-linux-clang32.rul  aarch64_be-linux-clang32.rul
-	ln -sf i586-linux-clang64.rul  aarch64_be-linux-clang64.rul
-	ln -sf i586-linux-gcc.rul      aarch64_be-linux-gcc.rul
-	ln -sf i586-linux-gcc32.rul    aarch64_be-linux-gcc32.rul
-	ln -sf i586-linux-gcc64.rul    aarch64_be-linux-gcc64.rul
+	symlink_build_rules aarch64_be
+
+	# fix RISC-V build err, bug 811375
+	symlink_build_rules riscv
+	symlink_build_rules riscv64
+
+	# Add support for loong
+	symlink_build_rules loongarch64
 
 	# Schily make setup.
 	cd "${S}"/DEFAULTS || die