gentoo resync : 16.09.2021

5 files changed, 132 insertions, 2 deletions

diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index d8f68208357b..c92bd3695180 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -1,3 +1,6 @@
+AUX autoconf-archive-2021.02.19-python310.patch 1344 BLAKE2B adf7282ce2f57c957d3542f4fb1af2cce0da4d93556249529d2bfe11e5f7c3f42e725770decf5dce37ee310710d954f43ca61fd6f7685c5a5d2362830520355b SHA512 5541fe628832b071bfba890530bc72f0b1747ec3cfc1e43a79b5a0f992c8c59609d836fd00eb8ee0daf0428c6d3f7b8894bddf2d9485625f683175e45d4f5640
+AUX autoconf-archive-2021.02.19-revert-ax_pthreads.patch 2642 BLAKE2B aef63e95d567e80e54f87b2476a70e8fb9df9fcdb6b1023c52df8a2fef0c2dbeda57488c3813ef1e22af2e4901251f102a76290d6d04e78766994d92cb3445b7 SHA512 1dea34945bed9c1c96970165ffad5f075f0bc85929b9f02c2bb254e35e2e3b9325bc7be8b1cb79b8f7bc6be5e1fffd33e504a82fc262a747dc458bad6bedb87d
 DIST autoconf-archive-2021.02.19.tar.xz 667304 BLAKE2B bc99cfd2b507a0c7fc37a001cc9e090fa037cc3626f5f5201c9a62ef06ee8ca4532ca8f21e1422f9dff9f67f64409ae560117c3161809f2d3bc3a39469910485 SHA512 a968c355c3cf66d74dc5b452141afbdf763e84a6c43b12c25da9a08482910d6d57ba3952aaf270d8cd5fd8b9d2dadf2d7d943ae2e1b067d68b71d2738d881aa0
+EBUILD autoconf-archive-2021.02.19-r1.ebuild 747 BLAKE2B 103c90fbea8f87de38b4e5b6352d59441afa45df17462c330b2a437601141deb169692bebeb7f2a50618bab4c6680539661feffc98ff37dc288f46bc0f058244 SHA512 b5f1fc22367fa604314b38bde132619e365b1685464da947ea8160d08fc15e925685eeedefb2503b27126ee8885d6960f43758dd559123015bc50504f50cb558
 EBUILD autoconf-archive-2021.02.19.ebuild 639 BLAKE2B 376bcd528e33c40d7494b374599bd21f19d05a5d37502ae89d566b8f94b77fb7d662dcafb239d5f8e2282ad75576f92bc1922ce14096204f52320fb738eedb78 SHA512 0fdb0a254884ad11950aa931798a8fc2da584d77fad51f9f6d87f7c4c8c60e8b23d10ab7c50ec3e70d3571e9f615db6d37258562493409a68ed7b8622effecf7
-MISC metadata.xml 281 BLAKE2B 2aae5ea5778d806017d2b9a5ec265d4f50db5cab57712dc18e1441cd7a1a91d595d478926fc465437e1e729ef541d8fbcc8a9a9c09765270f093d4e16ac0072c SHA512 e9c907d7513327937e8a9f400bd097524d23001932d4416f533d43a94b07ba4eaf3f95d28df4193a2a7c8c1a8ce7b512c66a86386cc1bb82325b6bfeea9bc65e
+MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild
new file mode 100644
index 000000000000..d9ba9d3bedf3
--- /dev/null
+++ b/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="GNU Autoconf Macro Archive"
+HOMEPAGE="https://www.gnu.org/software/autoconf-archive/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# File collisions. #540246
+RDEPEND="!=gnome-base/gnome-common-3.14.0-r0
+	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2021.02.19-python310.patch
+	"${FILESDIR}"/${PN}-2021.02.19-revert-ax_pthreads.patch
+)
diff --git a/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch
new file mode 100644
index 000000000000..d76605eb5c1d
--- /dev/null
+++ b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch
@@ -0,0 +1,36 @@
+Ensure configure tests don't fail with Python 3.10, 3.11.
+
+https://github.com/autoconf-archive/autoconf-archive/pull/235
+
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Thu, 5 Aug 2021 11:12:47 -0400
+Subject: [PATCH 1/2] AX_PYTHON_DEVEL: fix for Python 3.10+
+
+--- a/m4/ax_python_devel.m4
++++ b/m4/ax_python_devel.m4
+@@ -208,7 +208,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[[:3]])"`
++					print ("%d.%d" % sys.version_info[[:2]])"`
+ 			fi
+ 		fi
+ 
+
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Thu, 5 Aug 2021 11:27:24 -0400
+Subject: [PATCH 2/2] AX_PYTHON: Add 3.10 and 3.11
+
+--- a/m4/ax_python.m4
++++ b/m4/ax_python.m4
+@@ -55,7 +55,7 @@
+ AC_DEFUN([AX_PYTHON],
+ [AC_MSG_CHECKING(for python build information)
+ AC_MSG_RESULT([])
+-for python in python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
++for python in python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+ AC_CHECK_PROGS(PYTHON_BIN, [$python])
+ ax_python_bin=$PYTHON_BIN
+ if test x$ax_python_bin != x; then
+
diff --git a/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch
new file mode 100644
index 000000000000..3800fd292a6d
--- /dev/null
+++ b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch
@@ -0,0 +1,70 @@
+This is an upstream revert which hasn't yet landed in a release.
+
+https://github.com/autoconf-archive/autoconf-archive/commit/59008cc7f85e1982eb298e1c424c2e6ad5942c4a
+https://github.com/autoconf-archive/autoconf-archive/pull/233
+https://github.com/autoconf-archive/autoconf-archive/commit/2567e0ce0f3a11b535c6b527386197fb49ff172b
+
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 12 Jun 2021 22:29:03 +0200
+Subject: [PATCH] Revert "AX_PTHREAD: target > host"
+
+This reverts commit 2567e0ce0f3a11b535c6b527386197fb49ff172b.
+
+* `AC_CANONICAL_HOST` is the system on which the actual binary will run,
+  `AC_CANONICAL_TARGET` is the system for which code is generated. The
+  Autoconf manual even mentions that
+
+    --target=target-type
+      the type of system for which any compiler tools in the package produce code (**rarely needed**).
+--- a/m4/ax_pthread.m4
++++ b/m4/ax_pthread.m4
+@@ -87,11 +87,11 @@
+ #   modified version of the Autoconf Macro, you may extend this special
+ #   exception to the GPL to apply to your modified version as well.
+ 
+-#serial 30
++#serial 31
+ 
+ AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+ AC_DEFUN([AX_PTHREAD], [
+-AC_REQUIRE([AC_CANONICAL_TARGET])
++AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_PROG_SED])
+ AC_LANG_PUSH([C])
+@@ -158,7 +158,7 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
+ # --thread-safe: KAI C++
+ # pthread-config: use pthread-config program (for GNU Pth library)
+ 
+-case $target_os in
++case $host_os in
+ 
+         freebsd*)
+ 
+@@ -248,7 +248,7 @@ AS_IF([test "x$ax_pthread_clang" = "xyes"],
+ # definitions is, on some systems, a strong hint that pthreads support is
+ # correctly enabled
+ 
+-case $target_os in
++case $host_os in
+         darwin* | hpux* | linux* | osf* | solaris*)
+         ax_pthread_check_macro="_REENTRANT"
+         ;;
+@@ -450,7 +450,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
+         AC_CACHE_CHECK([whether more special flags are required for pthreads],
+             [ax_cv_PTHREAD_SPECIAL_FLAGS],
+             [ax_cv_PTHREAD_SPECIAL_FLAGS=no
+-             case $target_os in
++             case $host_os in
+              solaris*)
+              ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+              ;;
+@@ -480,7 +480,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
+ 
+         # More AIX lossage: compile with *_r variant
+         if test "x$GCC" != "xyes"; then
+-            case $target_os in
++            case $host_os in
+                 aix*)
+                 AS_CASE(["x/$CC"],
+                     [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
diff --git a/sys-devel/autoconf-archive/metadata.xml b/sys-devel/autoconf-archive/metadata.xml
index e70c63a3ec25..de9d78424186 100644
--- a/sys-devel/autoconf-archive/metadata.xml
+++ b/sys-devel/autoconf-archive/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>