gentoo resync : 28.04.2021

3 files changed, 2 insertions, 114 deletions

diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 39007f54874e..c42bfd540262 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,6 +1,5 @@
-AUX m4-1.4.17-posix_spawn.patch 3302 BLAKE2B fe00346f2f180fe70ef867376d9a3f0da632d83aeee21aa524642ec061e6c1e37538c37d266a32aea63c6a8f776ee3bc85fd82f447704c1e73965132f528030a SHA512 82f6f1960a290265f1a7a3c868a780fa0816194c26ed5fc8337e35983021798c55db7c75fccf979a7dcc73253d1864cbf2de89a906fc6bf8458a524e2c4604c8
 AUX m4-1.4.18-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f40dd037e28b5fe833d3ddf87fe853ee8885e34c5720b7b00f08242131df9996d36f4a954571ed21d067ca0dfeae69961e09 SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf
 AUX m4-1.4.18-glibc228.patch 13863 BLAKE2B f8b54c3b7feae5d458ba893e08313f5e9772e66be03a5db2fe3929e671002cc3c80cf8cc6ca0a68b792f729404dc27c95cf436663026b50682f47c306721b581 SHA512 c81df4510b01044578e11c7bd1046ec297ab195f6e5c7d7eaad7aae31862326d12cf00a9f36218f93db88e36f88ec73be8e320214b999330da3dc5bba9a3be46
 DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
-EBUILD m4-1.4.18-r2.ebuild 1331 BLAKE2B c7270e1440c2f54182075d137199be699898a764dec39f95dd180500408ca8072ae0ae16ea48a39ed876ffbb1ffdc3041eff3ec2f9571b52b65c140db187518b SHA512 b6956a89a8672055f1ba3889461b02b223e79dcbe170d393964220b1c91b9f60877c600b35baba49fd1e6ad6b6ced9e2b986cfdd087127d89d194ba3e706f176
+EBUILD m4-1.4.18-r2.ebuild 1332 BLAKE2B e436ea04a282b05aa213f92822f619520c280910a676aa3bffdc313e1c3c8bd648f6aa71e326bd50876714dbe51ab088961277f213d45972355906987c681666 SHA512 6ae904bce3461eba20d7c42e49f83b0a6ec6f0f48f32ceae61dc9dd590299158f332298becdf5391aa4dcf7f74db8eda37a053cae584c9fb00a2d901e5d31a7f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch b/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch
deleted file mode 100644
index 5954cc35d548..000000000000
--- a/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-This fixes the search for posix_spawn() to use AC_SEARCH_LIBS which
-is needed for uClibc which puts the function in librt [1].  The fix
-is in gnulib commit d6eab2e [2], but we can't just apply that patch
-and autoreconf because that means we must depend on autotools.eclass
-and this leads to a circular dependency.  So we have to patch
-configure directlly.
-
-[1] https://bugs.gentoo.org/show_bug.cgi?id=580688
-[2] http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d6eab2e70fc5ccc82a73e5c988b76a229e4cd3d5
-[3] https://bugs.gentoo.org/show_bug.cgi?id=581086
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur m4-1.4.17.orig/configure m4-1.4.17/configure
---- m4-1.4.17.orig/configure	2013-09-22 06:38:28.000000000 +0000
-+++ m4-1.4.17/configure	2016-04-25 22:27:12.774118561 +0000
-@@ -808,6 +808,7 @@
- GNULIB_SIGNAL_H_SIGPIPE
- GNULIB_RAISE
- GNULIB_PTHREAD_SIGMASK
-+LIB_POSIX_SPAWN
- REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
- REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
- REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-@@ -3590,7 +3591,6 @@
- as_fn_append ac_func_list " mkstemp"
- as_fn_append ac_func_list " nl_langinfo"
- as_fn_append ac_func_list " pipe2"
--as_fn_append ac_func_list " posix_spawn"
- gl_printf_safe=yes
- as_fn_append ac_func_list " isblank"
- as_fn_append ac_func_list " iswctype"
-@@ -15877,8 +15881,78 @@
- 
- 
- 
-+  LIB_POSIX_SPAWN=
-+
-+  gl_saved_libs=$LIBS
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing posix_spawn" >&5
-+$as_echo_n "checking for library containing posix_spawn... " >&6; }
-+if ${ac_cv_search_posix_spawn+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char posix_spawn ();
-+int
-+main ()
-+{
-+return posix_spawn ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' rt; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_posix_spawn=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if ${ac_cv_search_posix_spawn+:} false; then :
-+  break
-+fi
-+done
-+if ${ac_cv_search_posix_spawn+:} false; then :
-+
-+else
-+  ac_cv_search_posix_spawn=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5
-+$as_echo "$ac_cv_search_posix_spawn" >&6; }
-+ac_res=$ac_cv_search_posix_spawn
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  test "$ac_cv_search_posix_spawn" = "none required" ||
-+                    LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn
-+fi
-+
-+    for ac_func in posix_spawn
-+do :
-+  ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
-+if test "x$ac_cv_func_posix_spawn" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_POSIX_SPAWN 1
-+_ACEOF
- 
-+fi
-+done
- 
-+  LIBS=$gl_saved_libs
- 
-   if test $ac_cv_func_posix_spawn != yes; then
-     HAVE_POSIX_SPAWN=0
diff --git a/sys-devel/m4/m4-1.4.18-r2.ebuild b/sys-devel/m4/m4-1.4.18-r2.ebuild
index e8f9585638d5..6350bc24bdca 100644
--- a/sys-devel/m4/m4-1.4.18-r2.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r2.ebuild
@@ -9,7 +9,7 @@ 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"
+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"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us