gentoo resync : 03.11.2021

3 files changed, 126 insertions, 17 deletions

diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index be8d57dd3f7c..87037612800e 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -2,9 +2,11 @@ AUX xar-1.6.1-ext2.patch 693 BLAKE2B c73338104f93aef90474f1d3489cb8655be2c8c19a9
 AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047257755dd0fab0e1459f7cfff79f7eaa16668a67e99f52d56dc1637dba7ea29991bd29c4bf11f0ef4727768 SHA512 01de32828d30d9d99f338bb34747a5f978982dbcc2aefac9c5718b5283185fa5857cdd031c799e57607da5bff7dc3190bb4a93c737f2520c1034e959ee819377
 AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2b63bf1f4d7b841a7ffc78712f307ddb2f8c78ecd573e5e7b3169d70ccae209acca9513d8446b2f785af368b6955 SHA512 2fb90f5f6e412ed31b8cf9aa23aa9b844baf683d357e647d33c2c6318656dd6e6f3027a1715ed916815e3fd75d51d2f178845c2c6b247797d37cc4f539116f85
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
+AUX xar-1.8.0.0.452-linux.patch 2612 BLAKE2B 6503ff16de09dadb75ab3e06a7909729f590e31dca2e2aa831f404cee8961f21d9d1d2194c42fd831201ddb8a3054703b409f980b333baf879abd2ec1c14db09 SHA512 db7bb0c8b3c9bc2481b85e3cba5308216d370ce692746c1d9e5430c08481710c061eb4dc25625612c414087d1e9e18f0628bd5ffe272d16f561e8506376322a4
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
+DIST xar-452.tar.gz 220690 BLAKE2B 9728c73734a4bcb31e6e72d3d1a6735d5c78e384e15415641c4f40068f2da9498e9808cc36df6eaf7d3addf8be6d9eb90bdfa2900321e4dbe482156075bcdcd7 SHA512 d6ae9e5687020d20ec12579178f84c852fd485c52cff0ad23b7b31d2eabbde8c7fc85ab33e82eb81a5ddb59df4c26b756894be85061195cd191ab32be1f56b10
 EBUILD xar-1.8-r2.ebuild 1415 BLAKE2B f55f09ee399e2f99aad1a0b3f488edea094085132dcf6498370ae366ec62effaa079d90806dfd77a72f1452f4380ce4a0762ed5bb3c9442119dca8fae5294f60 SHA512 5a7198d75841f02f8da6ecf53b861511afdfb586b092c55867e7f5969db66121076d9968322d4e3a2c3e3dc3ccbc6e02ceed1ab8246b34bffe027d5cbf20006e
-EBUILD xar-1.8-r3.ebuild 1964 BLAKE2B 753173b5aee76ec4348b1ef2a263800c0145dbc6c7ecee05f8d0654e79396fed6debf19960412d527456e5d71dd84495ffd672a375eb39cc07314c217f9efbe3 SHA512 294295ed07c38ec2f248192875d72fd2bfd8ad3ece0045c7930bd8dde61547017b08287695a7ae212dcc3a3d638603df2baa46d8bb8d42fdf293cbb116e9762f
 EBUILD xar-1.8-r4.ebuild 2419 BLAKE2B 79f316c9983b4d02e7c344f3604e3c9d74b26179482998e1fd9e9ca797aa90d50a5a7791ff0075d163260a99565ba61e3eb11b33ef6ebd6ca3e5afb8bf724abc SHA512 d3849273275eba79b7888f7774853f96b53bac5291cafe1617f714ed29b0fd0ae78d8333ecefa10fa0d4de796f0280b55eb1f8fb526556e7b08f7bebbad9583f
+EBUILD xar-1.8.0.0.452.ebuild 2583 BLAKE2B c3f7136cffff772d5d4405b8a7f8606d13498f4a06f34ad6a39b81e163a138cf663768280928a555a32b0fb880ed141c29cfb3d4bc12961cf883addaecf37460 SHA512 667cb5b095802ae52fac391d97d32903f30612b9ea5a788668fb53f9992ecc5b8d658aa7d8f10e33a978bd6a319de1787a70147130ea88e77d9e02bef2121878
 MISC metadata.xml 896 BLAKE2B 6276428173e9e59e3bd792a6df84b865eb695bf2591a8586b9903d1eb275af3a10d2295c9e37f452e911aa771f30a902c7b1361c83a1c5280f442a6652437c59 SHA512 7088753baae558cf466eb6a3af584d406ea09c5065f235d1e44d891731055fb88acd8957e764554b41d86d8fbf7cea21deaacdd2b38d9f8b05744202252ec271
diff --git a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
new file mode 100644
index 000000000000..a9e9575c400e
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
@@ -0,0 +1,95 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,7 +183,7 @@
+ 
+ AC_TRY_COMPILE([#include <sys/types.h> 
+ #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
+-AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
++AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
+ AC_CHECK_FUNCS(lgetxattr)
+ AC_CHECK_FUNCS(lsetxattr)
+ AC_CHECK_FUNCS(getxattr)
+@@ -199,7 +199,22 @@
+ 
+ AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[#include <sys/types.h>
+ #include <sys/param.h>
+-#include <sys/mount.h>])
++#include <sys/mount.h>
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
++AC_CHECK_MEMBERS([struct statfs.f_iosize],,,[#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/mount.h>
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
++AC_CHECK_MEMBERS([struct statfs.f_bsize],,,[#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/mount.h>
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
+ AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,,[#include <sys/statvfs.h>])
+ AC_CHECK_MEMBERS([struct stat.st_flags])
+ 
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -40,6 +40,9 @@
+ #include <sys/types.h>
+ #include <sys/mount.h>
+ #include <sys/param.h>
++#ifdef HAVE_SYS_VFS_H
++# include <sys/vfs.h>
++#endif
+ #include <arpa/inet.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -467,6 +467,14 @@
+ 	return tmp;
+ }
+ 
++#ifndef HAVE_STRUCT_STATFS_F_IOSIZE
++# ifdef HAVE_STRUCT_STATFS_F_BSIZE
++#  define f_iosize f_bsize
++# else
++#  error need a field to get optimal transfer block size
++# endif
++#endif
++
+ size_t xar_optimal_io_size_at_path(const char *path)
+ {
+ 	// Start at 1MiB
+@@ -491,6 +491,7 @@
+ 			fs_iosize = optimal_rsize;
+ 		}
+ 		
++#ifdef MNT_LOCAL
+ 		// If we're a remote filesystem, never let us go below the optimal size above of 1MiB
+ 		// NFS is horrible and lies that the optimal size is 512 bytes.
+ 		// Whereas SMB in my testing returns 7MiBs (far more practicle)
+@@ -503,6 +504,7 @@
+ 			}
+ 		}
+ 		else
++#endif
+ 		{
+ 			optimal_rsize = fs_iosize;
+ 		}
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -1,4 +1,5 @@
+ #undef HAVE_SYS_STATFS_H
++#undef HAVE_SYS_VFS_H
+ #undef HAVE_SYS_XATTR_H
+ #undef HAVE_SYS_EXTATTR_H
+ #undef HAVE_SYS_PARAM_H
+@@ -15,6 +15,8 @@
+ #undef HAVE_STRUCT_STAT_ST_FLAGS
+ #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME
+ #undef HAVE_STRUCT_STATFS_F_FSTYPENAME
++#undef HAVE_STRUCT_STATFS_F_IOSIZE
++#undef HAVE_STRUCT_STATFS_F_BSIZE
+ #undef HAVE_SYS_ACL_H
+ #undef HAVE_LIBUTIL_H
+ #undef HAVE_LIBPTHREAD
diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8.0.0.452.ebuild
index c7375f6ef613..4324f627e65a 100644
--- a/app-arch/xar/xar-1.8-r3.ebuild
+++ b/app-arch/xar/xar-1.8.0.0.452.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit flag-o-matic toolchain-funcs multilib-minimal multilib
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal multilib
 
-APPLE_PV=417.1
+APPLE_PV=$(ver_cut 5)  # 452: macOS 11.0.1 and up
 DESCRIPTION="An easily extensible archive format"
 HOMEPAGE="https://opensource.apple.com/source/xar/"
 SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
@@ -12,27 +12,24 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="kernel_Darwin"
 
-RDEPEND="
-	!kernel_Darwin? (
-		!kernel_SunOS? ( virtual/acl )
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
+DEPEND="
+	elibc_musl? ( sys-libs/fts-standalone )
+	kernel_linux? ( virtual/acl )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	app-arch/bzip2[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
 	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
 	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
 	"${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+	"${FILESDIR}"/${PN}-1.8.0.0.452-linux.patch
 )
 
 S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
@@ -53,13 +50,28 @@ src_prepare() {
 	# ebuild env, causing the install phase to re-compile xar.o and link
 	# the executable
 	echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die
+
+	# drop Darwin specific reliance on CommonCrypto Framework, for it
+	# depends on what version of Darwin we're on, and it is much simpler
+	# to just use openessl instead, which we maintain and control
+	cd "${S}" || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' \
+		include/archive.h \
+		lib/hash.c \
+		|| die
+
+	# fix branding somewhat
+	sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die
+
+	eautoreconf
 }
 
 multilib_src_configure() {
-	use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl)
+	append-libs $($(tc-getPKG_CONFIG) --libs openssl)
+	use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone)
+	append-cflags -Wno-unused-result  # allow to see real problems
 	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static
+	econf --disable-static
 	# botched check, fix it up
 	if use kernel_SunOS ; then
 		sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die