gentoo resync : 04.01.2022

4 files changed, 15 insertions, 24 deletions

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 236c5868e4ee..45fa0c601496 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -9,7 +9,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r6.ebuild 4694 BLAKE2B 5d610abd43fd9abc57921c740bf2612f42d735028e4e6d0ce0ef8f1ef38ab63f9ac0315729d8bb647c803c5e24b385173337e10bdef8b3a5ad7985c5d310f097 SHA512 f0d3c7daa05315e19928379236197d57d9b5822227978cd71fa7463801b12c6a7909ca98f65fdfb8daa798651da90fc36f357f0b430f414b78d4230573b6fd07
-EBUILD apr-1.6.5-r3.ebuild 4640 BLAKE2B 72a747721652745cabeb33f66bc83b5af841587a4856e23ea616fa1a281400edb07319b6025756230e32801bd889d3857085abcff7c1451d5526dc0f38030016 SHA512 915917d0010e6c98786c919b82c5332e9553de92ad61f35a1e2638da042021826fdcddbd03c7eee098cd369f8d107ca65704975638acd6d2ef21f9437341f1cc
-EBUILD apr-1.7.0-r3.ebuild 4610 BLAKE2B abb9ba6f854f8603e943e34a562cd608e681195188b51ae0ca5a6d114982cd20be6bf6ac0ba7aedc6b2bd45613cb24cbff26bd3c82e0651e834c026dabcde52a SHA512 f32fb0bc97bd46e5f2bca7e28587e1cc529761e86744629ffdfee8e29a198bcec3c95dfd38cae0745979a346cbf34c05de8e592db99c2033d9f71c8042367a2c
+EBUILD apr-1.6.3-r7.ebuild 4588 BLAKE2B 142e2a5f12b048898ecaaaf1dd49db3fc68e771f3b34efd04f4b60bb2a54f99c7fb2b6625ce6c2d2bcc5428e2a614eace274ce141496d0a1ee4cf7163b6dd6ae SHA512 9e45f291e168356a9c9f02a714e2ae3c98318d4eea91b0bbf9ec2eea7c81cfa235fad4e21a1ad0603f636e68c77cc10a9ad4e3c09c8ee9153030a587fd5a2a12
+EBUILD apr-1.6.5-r4.ebuild 4534 BLAKE2B 0a20eb3bdeb8b01e642ed75e7c3390f866cb38fe8dc264bd3aa32fca93ad72ed1e4aa1e006625bbc9e251caf2fdfb5e8b7df655f3c6e6336aacd8896f614c7fd SHA512 21b961189842eed4739c024977334b3b061e125d5b7bed61e7dd1ad7ce4c8a2e8026a4962203d9018a7af6f17ddc25660c9b7765aa0a8e12504eb2219eaade59
+EBUILD apr-1.7.0-r4.ebuild 4504 BLAKE2B 73996f7ae0de78624bcf8a648cc96a4f6a65f3b6171743cfae6e5f86f45d549d2d39fc921ee344b4f032e7cf6a3c4b1aaad823bf8af0fbbc9c98dd90b80003c0 SHA512 13f8d3b67db2eea7013d6009fc05d754b8bfef3306883501dfa2b65deca468704f4b49db20e6e938ac7d28caef0763cb593cf1962102e6d56828a8ed2e3b409f
 MISC metadata.xml 434 BLAKE2B b757acb73195bacb3e89e6fefcadd77beb184ecaf6f15471842c5715a2ec15e10157e8916a25580884a570a274047b3e9868ba65393cebbf47c397e6d6474b4a SHA512 d27ba45c40ced6bf6a60bcb74a8ad474ff9048430d9cb8d08573c0f2e1958eda333edfdbf90ecf00f4c33b50502872645457fd11d8f1cb1c5f90f745e08341ca
diff --git a/dev-libs/apr/apr-1.6.3-r6.ebuild b/dev-libs/apr/apr-1.6.3-r7.ebuild
index 828c9a2b2e72..ab54bd385307 100644
--- a/dev-libs/apr/apr-1.6.3-r6.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,12 +12,11 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
@@ -55,8 +54,6 @@ src_configure() {
 		--with-installbuilddir=/usr/share/${PN}/build
 	)
 
-	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
 	if use older-kernels-compatibility; then
 		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
 		export apr_cv_accept4="no"
@@ -112,7 +109,7 @@ src_configure() {
 			;;
 		esac
 	else
-		if use ppc || use sparc; then
+		if use ppc || use sparc || use mips; then
 			# Avoid libapr containing undefined references (underlinked)
 			# undefined reference to `__sync_val_compare_and_swap_8'
 			# (May be possible to fix via libatomic linkage in future?)
diff --git a/dev-libs/apr/apr-1.6.5-r3.ebuild b/dev-libs/apr/apr-1.6.5-r4.ebuild
index 725836e73499..47fc612f3ec9 100644
--- a/dev-libs/apr/apr-1.6.5-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,12 +12,11 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
@@ -54,8 +53,6 @@ src_configure() {
 		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
 	)
 
-	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
 	if use older-kernels-compatibility; then
 		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
 		export apr_cv_accept4="no"
@@ -111,7 +108,7 @@ src_configure() {
 			;;
 		esac
 	else
-		if use ppc || use sparc; then
+		if use ppc || use sparc || use mips; then
 			# Avoid libapr containing undefined references (underlinked)
 			# undefined reference to `__sync_val_compare_and_swap_8'
 			# (May be possible to fix via libatomic linkage in future?)
diff --git a/dev-libs/apr/apr-1.7.0-r3.ebuild b/dev-libs/apr/apr-1.7.0-r4.ebuild
index 70e3bd4db4b1..deb46f4b9f16 100644
--- a/dev-libs/apr/apr-1.7.0-r3.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,12 +12,11 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
@@ -55,8 +54,6 @@ src_configure() {
 		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
 	)
 
-	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
 	if use older-kernels-compatibility; then
 		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
 		export apr_cv_accept4="no"
@@ -112,7 +109,7 @@ src_configure() {
 			;;
 		esac
 	else
-		if use ppc || use sparc; then
+		if use ppc || use sparc || use mips; then
 			# Avoid libapr containing undefined references (underlinked)
 			# undefined reference to `__sync_val_compare_and_swap_8'
 			# (May be possible to fix via libatomic linkage in future?)