gentoo resync : 30.05.2020

4 files changed, 56 insertions, 14 deletions

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index d35676d71fc2..e23805b44f0b 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,6 +1,6 @@
-AUX openjdk-11-make43.patch 595 BLAKE2B b33a6e4979b8a37451ca2bcf09dc11bdc180d480a43ab4b3aa1f649bf1b90395cdb089fbcbc586f8b72127c9df8999f75a118e19444f7ed8c95990f8b7ed5410 SHA512 b4ca872d9f304c6f794a326d9cce387e08352e47923fcae7a9a8328d095d24822bbf6e2811a19c5e5c83d1981687eb7da1b11c791710350f396af0493f140318
 AUX openjdk-11.0.7_p10-sigsegv.patch 2639 BLAKE2B 70750a312fbacabc7e7131d135347864fc1807f397278e614427d1ef7c401c8020aa762bfea996307f24137fab09b44c6d2478e8e4bd548401bc9856a2e74859 SHA512 94babc6fd566f366ad3531b18512c06b6d79003d3692490158f9c2a3f9ed83dfe2ffd472999a3a4f00044ce1c4fa0c950bfb147ede7b9edce758c013820835bc
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
+AUX openjdk-8-detect-gcc10.patch 2463 BLAKE2B c7c8f62dfc78894c9808fae2a517b2b45008054bf5a6349b9745da3f30db799280a6751dc532a17e1f0341dcc96fa8512d56bef4d087a54a77920ff1f5d7abac SHA512 660d8e2564cefa24b58923ef21b4691650efeeb555bdc6103995a5c634c7175de3ab019ddb3eb8661d3e4b9de6f6fac1b1d1c8a3fef7ef29a4c86a76c7fdb821
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
 DIST openjdk-11.0.7_p10.tar.bz2 91317054 BLAKE2B 113f6d0b1ea97aa6c3a619a3f4183b72f5e0448422d17b6ffc4d778ce50eee68e4495d610845d1f3aace2e5660703dad96583203c6d12b5528e0f33f78df7cec SHA512 c6776bd05e2cbb42134ccf5cd522e4b73d1662e3cf136a8718c5d302b9c44e76b74a554b81aa14c5deda20bee76abc80a144f5c2e1941b70c9503579c325aa12
 DIST openjdk-8.252_p09.tar.bz2 454656 BLAKE2B 7132af72a09da9ded1759ccf92da6237a24e3fd15209b8d5aecb7011b890cd3484b4724f6b6a144e4bc5cb41931076985f75a9089c178938be62ac1a1d2a7f07 SHA512 0f03f1549dea1577cb01895d4e34721d16443977c5e7b3f0744af9cf2c0b09e60cb6d91b35a5e474c593d518d5610fb4c14fc4b9a907a7e13bb2351cea51bd06
@@ -12,5 +12,5 @@ DIST openjdk-jdk-8.252_p09.tar.bz2 47507382 BLAKE2B 4638256df52aa48a1ccace15fe65
 DIST openjdk-langtools-8.252_p09.tar.bz2 2399354 BLAKE2B aa3f0cb647986490612b9574fb0c78955f5ffb8969dbd06dfae5406436d6fecdbbb09896bdb0acc18d56f51bcd4ad1eadb19cc544185762ad623a47fde2e4a85 SHA512 d84ff97294ac612cd4e49deb2d7470026a564208c0e1fa23d5692db45efaaf564483966921ce642506a97aa90a2a8593617f944ebc6d18c9db5a808fd3946864
 DIST openjdk-nashorn-8.252_p09.tar.bz2 2852104 BLAKE2B 570fbe605ed27c4b3a5db5f6e9dbb4269ad2c895654a989d366a4a6f238ea06fec398140563ca2700303856dfa795ae40dbf9485dd9e9a46ef438f5418fd8b8b SHA512 996e7068d8c6f8ca192e6037eaf7f98ff94188c02670caadf1042e4e0909a3d51835a8cd2250d1f0a8bbdedb107f3713b614466ba4d2915b955e19fdcc2cbb91
 EBUILD openjdk-11.0.7_p10.ebuild 7832 BLAKE2B 6dd4fe2d18646f941320729eb2e013e4607b838f86a5d944e238064ad69e7b5417e7c523baeb3d786d20b76d93ab6c42f129f55aba29d0121cd866bf79369b15 SHA512 1e64f61d8623de658e52c861ba2c663155cb4f8ad6c1f8505ed7b3820f16db533f4ffa5f0d2124ca9d2c1c60e458aaad9ea7234843667f177e0f69fd9563a61f
-EBUILD openjdk-8.252_p09.ebuild 6045 BLAKE2B 2309b78f625316abc2e38864c03033b344df753b5865806fe336b203a4f56e998a5c74e1716e4ac4b55e971e2eadabd407991cfeeacb50432cd6a29fbf83bd23 SHA512 f510d8af93e004e607ceaa294e5bd333bbde83c46e934ceccff98e683c8c8c82326f647d834d82df4141068a480b6423031fa9d451d0d0556aff0c0f5f45bc0f
+EBUILD openjdk-8.252_p09.ebuild 6128 BLAKE2B bf07a7e457673ce56ab493cf36701357c0301ef0053488cce5f4f70730f9c19bbe6a793e74ada978c67fb9583b68364903a5b6aa8b3ebb61572a20e372e9460c SHA512 92aaa45aba9d64b5fac22a0d27f59ef249a9e98f043daf4f171396866d3816e6a39811f14663c6d92c24dc80e4633a3f9edc3386fd7d72eae3e24ab4b8766528
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/files/openjdk-11-make43.patch b/dev-java/openjdk/files/openjdk-11-make43.patch
deleted file mode 100644
index 9466e2be56fb..000000000000
--- a/dev-java/openjdk/files/openjdk-11-make43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
-index 170c3ed..b3b49f1 100644
---- a/make/common/MakeBase.gmk
-+++ b/make/common/MakeBase.gmk
-@@ -974,6 +974,7 @@ DependOnVariableFileName = \
- # Param 2 - (optional) name of file to store value in
- DependOnVariableHelper = \
-     $(strip \
-+        $(eval $(call DependOnVariableFileName, $1, $2):$(NEWLINE)	true) \
-         $(eval -include $(call DependOnVariableFileName, $1, $2)) \
-         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
-           $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
diff --git a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
new file mode 100644
index 000000000000..b47e012d4a39
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
@@ -0,0 +1,49 @@
+From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 23 May 2020 20:48:10 -0700
+Subject: [PATCH] backport gcc10 fix
+
+https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0
+---
+ common/autoconf/generated-configure.sh | 4 ++--
+ common/autoconf/toolchain.m4           | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
+index 5e71c50..90c017d 100644
+--- a/common/autoconf/generated-configure.sh
++++ b/common/autoconf/generated-configure.sh
+@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
+     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
+         $SED -e 's/ *Copyright .*//'`
+     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
+-        $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
++        $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
+   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
+     # clang --version output typically looks like
+     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
+@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
+     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
+         $SED -e 's/ *Copyright .*//'`
+     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
+-        $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
++        $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
+   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
+     # clang --version output typically looks like
+     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
+diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
+index e3a82c8..c0a4af5 100644
+--- a/common/autoconf/toolchain.m4
++++ b/common/autoconf/toolchain.m4
+@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
+     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
+         $SED -e 's/ *Copyright .*//'`
+     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
+-        $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'`
++        $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'`
+   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
+     # clang --version output typically looks like
+     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
+-- 
+2.26.2
+
diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild
index 1b3576eacaf4..45c3e3cc90ca 100644
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild
@@ -80,6 +80,11 @@ PDEPEND="
 
 S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
+# bug 721970, JDK-8244760
+PATCHES=(
+	"${FILESDIR}/openjdk-8-detect-gcc10.patch"
+)
+
 # The space required to build varies wildly depending on USE flags,
 # ranging from 2GB to 16GB. This function is certainly not exact but
 # should be close enough to be useful.