gentoo resync : 24.02.2018

4 files changed, 35 insertions, 29 deletions

diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 5fad2e9ecf50..4e6fb049fb3e 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,15 +1,15 @@
-AUX make-3.82-darwin-library_search-dylib.patch 439 BLAKE2B a1588c20c4e7236a7bf07876de44cc29ac9a7eaee377fee02dfcaade966874480af418fad168cc7e148448e6b11900e55fb34da3fed4057931ea6b7df25604b6 SHA512 aaabf2e7faaa6f116c0124d30e8bc5c049fa471defc39c454e03e3f484265f30fc0388ea13154559925935d803315b5594780b41bbf1d1f7d1599a60f85cd8ac
+AUX make-3.82-darwin-library_search-dylib.patch 386 BLAKE2B 4341e38aa89d08442dde331a7640b95771fb2cad824a32642c8b6bfbcffe609ae1af189d3e49c2eb529cfcbe10e137b9dc34cee3d7aecc8995c9a4459817bc8a SHA512 abd63b6a6d0b3bf77c5f26f0f711d148dd47964564d17562d9714272ff37700afffad50d77d5921c47b1f3eb705112b854ad15933740751071d2579123f9f259
 AUX make-4.0-char-cast.patch 1399 BLAKE2B c4923356f8b6807008dff15612d1c10ac729399f348bf45f9a276a79b8f9dabdc1d107b8c814bd85cbb5e542eab5995edfd590ecf1655cff49e83dffda5a76e8 SHA512 7d1490094b01362bba40cb0d2088d2ee79b9bd6756e4ea51920675ca305acfc653cdf92df5735e4e40360ece6c9de6dafcdd542df6b9821de8b1345b8ad2fb1b
 AUX make-4.1-fix_null_returns_from_ttyname.patch 1888 BLAKE2B 2aee82af5c6d2f8b5fb1d45be2708b6c0f5632236a0be948f16e1e59bd6619145913d4920c8428907479ae29fbc105663f9bbcbd3951ba60b8cead5793b34f65 SHA512 47eb22909be25618fbc120fe5b844207989135101ada960c69557f898b2345c52a25fc329945324cd968f19fc3835330d939cf4ec2faf5ccf5c54e20dc02a1da
 AUX make-4.2-default-cxx.patch 269 BLAKE2B 6bbadfe43e3494c7dbd423edc5caf1eba1b6c3bb8f3b2f04368ccbe5c03f248a2692ba1b2299b966bd630c94e2b66674c079eaafa9b3b3c54bd163e75ac53f9f SHA512 b9c6254c8111111d9986de617023fad1673a8992d5a8b2e1e5ce32a92f5e4d064e1a9677b44f1d647a54ddd1c62782eccfd2d71ddc8d41baee141f65bdc894fe
 AUX make-4.2.1-glob-internals.patch 1752 BLAKE2B 97616f18dcc30dbda296942d7dfa5b1a70c65e6d0c24314c5ae6b30102b81ff5ca0114f9c2a2fa777173204bf5bb0ea9b793317d2d7f7d44ae734e9174c6f361 SHA512 79b5454fa2f1e976611ecf5de99e764d4c9a85917d3d97ce424cd56b0954430f3e31fd2254a30320469f0b30c464734e3633b89d8374b3e4b8d182a342325ab1
-AUX make-4.2.1-glob-v2.patch 845 BLAKE2B 8d5caeece460588fb22cee971e0e3257115fd5ce5b1dfc1b487f9d33fee8545b10bb69e6b2c34cbe54f416819ead8c45db67197332d0e82c1664722b87caa384 SHA512 0a52b1b204e26b397c1d90e27a3b79ea23847d2bdf83a25f620af96f20f81061301414e489422ca5bb313110c33bd142191672f6b188e9276b76f0ce6f0fd8bb
+AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4
 AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360087da4c212da19a4cda622c5bbc1c00782802589aee3142a62c3b8a2df18cfa8bc98c523e2eb65aaa29398a6d SHA512 3817f6efed5fbcd2bb9d1747bea4af5a197ef4aa552ab79accee5139d25241956eca669edd19eff32df2a51fee666b6bc398fb6277b1f92f6175eca2d2228d6e
 DIST make-4.0.tar.bz2 1341927 BLAKE2B 84cef70a3611da0172610f083ba18f87317c6bf89a71e53ebd7ed6881a6bc1c81897167cdd9dc09ba4754479b6337c746eb2716b2925aeae7d6488a3c1a81771 SHA512 82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376
 DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
 EBUILD make-4.0-r1.ebuild 1284 BLAKE2B 124d6a7ba1e715ce7f584991c209b53e803fcdb2e9b423481a0e46f8e868a48a19db282554d21a7a75603a72865d25986f746647ceadfe2b833bf4f0b8875598 SHA512 5c2d8ff215eca2f4179c05646a3d5bb67d2aee689e0dae23b964feacada4c166096af46ebaf5b1af20f4cf74c4b3f5275df4a1d7571643079a09de407b64a38f
 EBUILD make-4.1-r1.ebuild 1294 BLAKE2B 79312e1a1af06a8a44aa014226e5c1dbdb16ffdeeb65053181552257f62231f0f5b0e88287a97c4c6eb721d76e02f4a07ea5f7523329ee5497f3f180034e9de5 SHA512 87afba6be03d935e44f94547d12f1bc265774481a065834694b42f083675fb7b01ad00233321c096e1e93e23436cdacb20933b164687b4713d821daecaaff0d1
-EBUILD make-4.2.1-r1.ebuild 1474 BLAKE2B f36146c30046ecbc878b2d245c02252e28b8b73bde5a88e52e8659f7ebec40761a6f24c0b3c5ae8539f953881aa04461535cb9314a04b72ef80cc78fcfe4363b SHA512 91cfeba3d078190d0fa63fe47e54e7775deed15044a378ea700d1271d68cb2a726118efc970966f0677b2a6b3ff7ec8531438915b2862d61d9ad51e26e53766e
+EBUILD make-4.2.1-r2.ebuild 1634 BLAKE2B f8a2a88bd7fb97e3f8723ea977d1b56e4a1030a91fd13f819eb9d2027efe1bee13d6722f2d48b30f6eaddc3d6b2b8d31dda076e95db1330ab30d554d206ee0b7 SHA512 ad948abed2465ee7ab3597a57d5ea1d301249d8dd85be4dda3959885f482df80a0346cb9bd3edc0ccea2cb504b638d4d5ebedff82917d6785dedaef45cd56562
 EBUILD make-4.2.1.ebuild 1333 BLAKE2B 5c9786bcb8119c2e2f98ff07607686ab16638e663c21374504be9687d85752dc58654fcc0aa6e2ff4c9eea25be066fc5409017923e82517d3df32eb32e950568 SHA512 d89725d226ac924816623c6a7237cacd0001c22540c8788808ea59473d526ce8d1bd4d573751569fe605f7c46145d5d7e2a647e86dae6276077fa3aeff915402
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
index de7e4f615212..d2f60ec91cc0 100644
--- a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
+++ b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
@@ -1,8 +1,8 @@
 Fixed default libpatttern on Darwin, imported from prefix overlay.
 Got merged upstream:
 https://savannah.gnu.org/bugs/?37197
---- default.c.orig	2009-05-02 12:25:24 +0200
-+++ default.c	2009-05-02 12:25:58 +0200
+--- a/default.c
++++ b/default.c
 @@ -509,7 +509,11 @@
  #ifdef __MSDOS__
      ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
diff --git a/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch
index a9aeb787cd72..e55a7790a3f6 100644
--- a/sys-devel/make/files/make-4.2.1-glob-v2.patch
+++ b/sys-devel/make/files/make-4.2.1-glob-v2.patch
@@ -1,17 +1,22 @@
-From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001
-From: Paul Smith <psmith@gnu.org>
-Date: Sun, 19 Nov 2017 15:09:16 -0500
-Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2
+http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
 
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8c72568..4710832 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
+--- make-4.2.1/configure	2016-06-11 01:03:21.000000000 +0200
++++ make-4.2.1/configure	2016-06-11 01:03:21.000000000 +0200
+@@ -11481,10 +11481,9 @@
+ #include <glob.h>
+ #include <fnmatch.h>
+ 
+-#define GLOB_INTERFACE_VERSION 1
+ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+ # include <gnu-versions.h>
+-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+    gnu glob
+ # endif
+ #endif
+--- make-4.2.1/configure.ac	2016-06-06 14:27:31.000000000 +0200
++++ make-4.2.1/configure.ac	2016-06-06 14:27:31.000000000 +0200
+@@ -399,10 +399,9 @@
  #include <glob.h>
  #include <fnmatch.h>
  
@@ -23,6 +28,3 @@ index 8c72568..4710832 100644
     gnu glob
  # endif
  #endif],
--- 
-2.16.1
-
diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r2.ebuild
index d0f079cef26d..c52a434b513b 100644
--- a/sys-devel/make/make-4.2.1-r1.ebuild
+++ b/sys-devel/make/make-4.2.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit flag-o-matic eutils
+inherit flag-o-matic
 
 DESCRIPTION="Standard tool to compile source trees"
 HOMEPAGE="https://www.gnu.org/software/make/make.html"
@@ -25,20 +25,24 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
 	"${FILESDIR}"/${PN}-4.2.1-perl526.patch
 	"${FILESDIR}"/${PN}-4.2.1-glob-internals.patch
-	"${FILESDIR}"/${PN}-4.2.1-glob-v2.patch
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
+	default
+	# This patch requires special handling as it modifies configure.ac
+	# which in turn triggers maintainer-mode when being applied the
+	# usual way.
+	eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch
 }
 
 src_configure() {
 	use static && append-ldflags -static
-	econf \
-		--program-prefix=g \
-		$(use_with guile) \
+	local myeconfargs=(
+		--program-prefix=g
+		$(use_with guile)
 		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {