gentoo resync : 03.03.2021

2 files changed, 2 insertions, 32 deletions

diff --git a/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch b/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch
deleted file mode 100644
index affd94daefe7..000000000000
--- a/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/make.c
-+++ b/make.c
-@@ -139,6 +139,8 @@
- static int MakeBuildChild(void *, void *);
- static int MakeBuildParent(void *, void *);
- 
-+FILE *debug_file;
-+
- MAKE_ATTR_DEAD static void
- make_abort(GNode *gn, int line)
- {
---- a/make.h
-+++ b/make.h
-@@ -464,7 +464,7 @@
-  *	There is one bit per module.  It is up to the module what debug
-  *	information to print.
-  */
--FILE *debug_file;		/* Output written here - default stdout */
-+extern FILE *debug_file;		/* Output written here - default stdout */
- extern int debug;
- #define	DEBUG_ARCH	0x00001
- #define	DEBUG_COND	0x00002
diff --git a/sys-devel/bmake/files/bmake-20210110-tests.patch b/sys-devel/bmake/files/bmake-20210206-tests.patch
index 1557ef85bef9..49e5f258e91a 100644
--- a/sys-devel/bmake/files/bmake-20210110-tests.patch
+++ b/sys-devel/bmake/files/bmake-20210206-tests.patch
@@ -1,6 +1,6 @@
 --- a/unit-tests/Makefile
 +++ b/unit-tests/Makefile
-@@ -188,7 +188,6 @@ TESTS+=		dotwait
+@@ -191,7 +191,6 @@ TESTS+=		dotwait
  TESTS+=		envfirst
  TESTS+=		error
  TESTS+=		# escape	# broken by reverting POSIX changes
@@ -8,7 +8,7 @@
  TESTS+=		export-all
  TESTS+=		export-env
  TESTS+=		export-variants
-@@ -285,7 +284,6 @@ TESTS+=		sh-leading-plus
+@@ -290,7 +289,6 @@ TESTS+=		sh-leading-plus
  TESTS+=		sh-meta-chars
  TESTS+=		sh-multi-line
  TESTS+=		sh-single-line
@@ -16,11 +16,3 @@
  TESTS+=		shell-custom
  .if exists(/bin/ksh)
  TESTS+=		shell-ksh
-@@ -321,7 +319,6 @@ TESTS+=		var-op-append
- TESTS+=		var-op-assign
- TESTS+=		var-op-default
- TESTS+=		var-op-expand
--TESTS+=		var-op-shell
- TESTS+=		var-op-sunsh
- TESTS+=		var-recursive
- TESTS+=		varcmd