gentoo resync : 12.05.2022

4 files changed, 57 insertions, 2 deletions

diff --git a/app-emulation/aranym/Manifest b/app-emulation/aranym/Manifest
index efa3cc98261f..c5c597a5a4bc 100644
--- a/app-emulation/aranym/Manifest
+++ b/app-emulation/aranym/Manifest
@@ -1,4 +1,6 @@
+AUX aranym-1.1.0-ar.patch 583 BLAKE2B 81d9bf1ba80e5811efafea16dc004df7de82ffbb95989313c829e489c414e18b910809728ebc5d44837189dbe5ee6bbef23027e4848aff21431b66f189f93b17 SHA512 40b7b263fc8a04991c34cd5613e7f9d6d56723cbf425a033503cbb5a50f12d8ffe01a98bd60b583a36239cd7a21be06d7bbe789ca0b1c81fd77778918831e28a
 AUX aranym-1.1.0-conditional-installs.patch 3396 BLAKE2B b1013bb4897e83c960e2870317f6c7e468edc0a5c96362d140d7ab9533a88bbe45339f6cba17b103d3cb9ac5ab1efb0ed3752d1975c2442921119242bd87a73d SHA512 88a7c63f8311b04402bbd0f5e7f6f5358d2aabb9024d8303f7f11234e48e09464c9dd56e09df1ffc6aa11ef908e8672ffa3f77a1cfb1e77668c1c7de835fca30
+AUX aranym-1.1.0-libcwrap.patch 830 BLAKE2B 6eed885e5f06d3e9405501ade35c52afe8e01ecebde21ca6a9a0020d4402e39a97939c0ed64cf96a47f95779885eb1132bda90d3ba325b1d6a1f36527df072f9 SHA512 7050d4e24457f5ee12adb1a9aaddb2f5cb16c06105a74f78d8eefbf431629a043acb53160be5e66cfd82b64e8324fdf3cd7f4374cf8a64a66aa669ff701c2019
 DIST aranym_1.1.0.orig.tar.gz 3785612 BLAKE2B 52b5fa34c78c67cb94cbe0d94795368cb7007f37571282d67387a0237500143f8078117132c9df392c5fd48b32cdb8c1cf727fe4d22a3d24eac0595215bddf4e SHA512 723b1a7c80532734e1dea288dbffd66746d9c7d1302ccb0259248a26aac5dedc7f66a134929de7064686af6c676d10918d90e2cf58cb010fd445979945177b51
-EBUILD aranym-1.1.0.ebuild 2423 BLAKE2B 965a397ab57ef29db4301166907dce74e59c6ecae81989bde5cdbf1756418bfd4ebba7d5aad58bc60867909a426e19dff8f8192dd90d49c30f563817b22add5e SHA512 0fd7a6c972bebf388bc84bfad8a1b0c0d2cb9520237ce7c9a336beca2fff5b005f1493c36cd98082e3ff1e76f2db4614f7c2d3edbc59b0abaf7efa2deb1c27d7
+EBUILD aranym-1.1.0.ebuild 2611 BLAKE2B ff065d7e9bf7010d94ab197ca3b9b06b9501979a9cfe97e282b3e9dc39b4a7bbd61f3dcf53ef21fd01a03faa1be44be7dc59b44c25c678068a2e2867c9295a5e SHA512 e8a1dbabc3b211778a1dc1a581a747f166ced7a7d75be50c13f7d3d62c5d194634f373c82053e4ac83cd5e299288d0e410789c3e6b3bb6ee466a13f619ca2710
 MISC metadata.xml 862 BLAKE2B 3661f056df9749365d616c3a8c0c99458c08347e199bef3c21c657fe634862fb43edb6966d4acc2eec7196e310087fcb26b64c3f4177d8dc9ef8d6d62166abcb SHA512 0c85331417427933b6ee396f623054fbe3dbf6e51e0621159a6a7524104985f73d97f87473a1fb5388032bca37351d27199558e6f0726c199d7568962cd4f8d8
diff --git a/app-emulation/aranym/aranym-1.1.0.ebuild b/app-emulation/aranym/aranym-1.1.0.ebuild
index fe2c0f728ab6..291f5a97220e 100644
--- a/app-emulation/aranym/aranym-1.1.0.ebuild
+++ b/app-emulation/aranym/aranym-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multibuild xdg
+inherit autotools multibuild toolchain-funcs xdg
 
 DESCRIPTION="Atari Running on Any Machine, VM running Atari ST/TT/Falcon OS and TOS/GEM apps"
 HOMEPAGE="https://aranym.github.io"
@@ -38,6 +38,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-conditional-installs.patch
+	"${FILESDIR}"/${PN}-1.1.0-libcwrap.patch
+	"${FILESDIR}"/${PN}-1.1.0-ar.patch
 )
 
 ECONF_SOURCE="${S}"
@@ -49,6 +51,9 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export_build_env
+	export CC_FOR_BUILD=$(tc-getBUILD_CC) CXX_FOR_BUILD=$(tc-getBUILD_CXX)
+
 	# standard must come last otherwise the aranym executable gets
 	# overwritten by the others.
 	MULTIBUILD_VARIANTS=(
diff --git a/app-emulation/aranym/files/aranym-1.1.0-ar.patch b/app-emulation/aranym/files/aranym-1.1.0-ar.patch
new file mode 100644
index 000000000000..55026a626334
--- /dev/null
+++ b/app-emulation/aranym/files/aranym-1.1.0-ar.patch
@@ -0,0 +1,24 @@
+From 9d8586fe8b0f210b2a2d3f5e6f710993015945aa Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 16 Apr 2022 21:51:04 +0100
+Subject: [PATCH] Respect the AR environment variable when building
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 14eedb5f..8d425dee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -371,6 +371,7 @@ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ AC_PROG_MKDIR_P
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_PATH_PROG(PERL, perl)
+ AC_CHECK_TOOLS(WINDRES, [windres], :)
+ PKG_PROG_PKG_CONFIG
+-- 
+2.34.1
+
diff --git a/app-emulation/aranym/files/aranym-1.1.0-libcwrap.patch b/app-emulation/aranym/files/aranym-1.1.0-libcwrap.patch
new file mode 100644
index 000000000000..39ef32c7cc41
--- /dev/null
+++ b/app-emulation/aranym/files/aranym-1.1.0-libcwrap.patch
@@ -0,0 +1,24 @@
+From baa00c51d3cd63602912ee1b252fa774a43b042f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 16 Apr 2022 10:41:44 +0100
+Subject: [PATCH] Use libcwrap.h specifically with glibc, not just Linux, to
+ fix musl
+
+---
+ src/include/linux/libcwrap.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/include/linux/libcwrap.h b/src/include/linux/libcwrap.h
+index f68bafb1..9c5c6b8e 100644
+--- a/src/include/linux/libcwrap.h
++++ b/src/include/linux/libcwrap.h
+@@ -1,5 +1,5 @@
+ /* glibc bindings for target ABI version glibc 2.11 */
+-#if defined(__linux__) && !defined (__LIBC_CUSTOM_BINDINGS_H__) && !defined(__ANDROID__)
++#if defined(__GLIBC__) && defined(__linux__) && !defined (__LIBC_CUSTOM_BINDINGS_H__) && !defined(__ANDROID__)
+ 
+ #if defined (__cplusplus)
+ extern "C" {
+-- 
+2.34.1
+