gentoo resync : 05.02.2020

7 files changed, 27 insertions, 12 deletions

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 928ec4e19725..d9f68cd57013 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,4 +1,5 @@
 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
+AUX openjdk-11-make43.patch 595 BLAKE2B b33a6e4979b8a37451ca2bcf09dc11bdc180d480a43ab4b3aa1f649bf1b90395cdb089fbcbc586f8b72127c9df8999f75a118e19444f7ed8c95990f8b7ed5410 SHA512 b4ca872d9f304c6f794a326d9cce387e08352e47923fcae7a9a8328d095d24822bbf6e2811a19c5e5c83d1981687eb7da1b11c791710350f396af0493f140318
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
 DIST jdk-11.0.5+10.tar.bz2 90613232 BLAKE2B 0a3cba851ac967d84f97ae1e7972d3ab593dbc76fb20664c4e7950380ad91acee7e263a2989930b45346cd170da71c500db9d8a0a6ac88982d77607089b95513 SHA512 0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6
@@ -27,9 +28,9 @@ DIST openjdk-langtools-8.242.tar.bz2 2397745 BLAKE2B 94748fa5304217a6354b4de29e8
 DIST openjdk-nashorn-8.222_p10.tar.bz2 2859130 BLAKE2B d43b2e05dea1f97eff9e6d81ac0a6c8bfbe8cd444ff23df4b7d2fec29b678386893c169742a80fca6f0a785189796d2a6f29c10011a835cf5ac9e74001ae2b72 SHA512 453cefcd3f34cf6fca9bb14176145c9e4620e4188461b49049e5363cd62d87cc4f7703356369677dcd1e4862de0b5c16d1c505d66317944226a590af56026ac4
 DIST openjdk-nashorn-8.232_p09.tar.bz2 2858464 BLAKE2B a75eb94f81c4d94bb5df6a0799ce447a5a382753a95579ff0dc20e171233a84737067edd120412b14ffc93e82290998a2e8c4de6407888e7bae1f4d226034c38 SHA512 6e5d12b75735b1c51048b0e90e7d977766ae4711bccf139714e19f773e2cf6532d36492168ef6ccf797f86cb11b22b0bbfbb53d9399265a58b08ece702e96a3b
 DIST openjdk-nashorn-8.242.tar.bz2 2856246 BLAKE2B 87343677e79b13baa0181b988f248f1dc1ccd265117e407e5be8d848813322a0e7cc53f5ea50bd7796b06b9c0b07320ca1b0ad8623f690c5bda3a4519656b6d6 SHA512 3f5fb2917fc65c85f007aea7842d0f1fef6c20050ef66a593d7ae25ced38a9eb5f1a4bb3c3d6b9757832a7d450d1cde06f98e383523707d93046e34ee70814c6
-EBUILD openjdk-11.0.5_p10.ebuild 7521 BLAKE2B de076a9b7ccb2eb1e179e871d276504e2e22286e9132bf85dc8242016ddde90c2f4b6f0946e370e22b43846d1dce587b38f591d3c20dc703f4b263c14a982288 SHA512 eafa0f8562ca4aef4209499e6e4ce1e40a11317fc16b1a8cee294f42ef7d3aefcd4d496bf5854f1cad3ab8b4bbb8d21c901265ee70df09f627ffb4b88a9ecc62
-EBUILD openjdk-11.0.6.ebuild 7539 BLAKE2B 386888c85dac344cb07c894e7fc4436f2ea9408480eec628151e5bb2f5e1a555072f19fc64b639e6e91ab7ede6b7b2b78c5f97a6af8893edb191f075250211f3 SHA512 0969dc29ef201638ec529aa5d88da3e8e6e4a3615ccca2d6db313bfcd3e61debc55c5be166fcec1e239a4557af45d7a195d5428768cbe90ad12be716fbad2146
-EBUILD openjdk-8.222_p10.ebuild 6820 BLAKE2B aeef0d831bbc35a4fea1a3fbc68be8af17eedefb5f3132fc96c7f7e062b5e3eaad30f3c8a56aa3f72ce1ea768211118c6964f4980c4d7d2936d9c521c100229c SHA512 66f73bd50b960c2ccb6956fc4af216689afaf2bb70df0dc58ec1751fb4831df3c705800bc15816630386f91840eefb74338d2efa163755381487bbbb889eb7d2
-EBUILD openjdk-8.232_p09.ebuild 6816 BLAKE2B 0e260daaee8fae0ecc2987928d47d8239e0b16e8a2673bb67d6c3c3f2dd6d59407c58f431cad35d8234631a927d9c990679f0891493e54d08cfd829eeaa65607 SHA512 81bdbaa7469dc4b805abfb30e1a5ba4dab8b4ee039da06ccaef0b9b0a77ffa18544da7e9f1f8c9e370eed51e2a8ecfdd6372c1abfd5d67b8c1624e3529903ded
-EBUILD openjdk-8.242.ebuild 5790 BLAKE2B f1056bc5f24dc464e5a16e82e0f8a86fe13c5763fbd84264d5b4f3babd06229acc94b7575168495090dfdcb23a35e25df4634d69188fa24e611b413004c273df SHA512 dce306230e2460c40b0a33a58454947000c16ff65aa6e714a6f71ac3221b242ee553a41becbf3280ac458e53d938d66e9e41565f47950b8d5489192579f19c14
+EBUILD openjdk-11.0.5_p10.ebuild 7519 BLAKE2B 2e440bf6e85776df16f688365de8c9b5dbfed915cbea4b61b23e6f3823f13eef085a815972ec03eedb3ba5fa6bce7c86cf3cfefd73968c3869b9051015e14826 SHA512 85c53548989faabd60e748f4a42d0ee67f8b7b84cbd2806837c7a9b76a416809982d96dc85e4122e05edc4b258b7ed11fabcccf2056b2ea6ff26eb8ecce33d4e
+EBUILD openjdk-11.0.6.ebuild 7588 BLAKE2B 014021561468c01cd5bda8de4c45a4c03cd5bdd4b7bc731c44854b04e21e1992e941c10caf1889f515d10d963f93cf7dc1f29cd40237860dbc5944590fdc9548 SHA512 85226a6167005b6fa30f4fba8a792dff1242f3638f8117c6fb7a6105c5c9426aff2b7a638c1e0e1f6ac660384948bb2d7e31977b083e63c53309aca96d5fdb42
+EBUILD openjdk-8.222_p10.ebuild 6825 BLAKE2B ca12311854dd4891f8fb346df2b28df53f08e164e7aeb5c8e633009f16da962121b98f2758b9f5b735a1246d70648046fbe8eca40017cd05b42cc6f3c3c457f5 SHA512 856d7003325ba7647927f582d9c0d00977d2ac0c8233f729190e124ec3100c730c5cd99f1c7f65396efac8fc42377ac377e90801eb02138d865dbfd917241a72
+EBUILD openjdk-8.232_p09.ebuild 6821 BLAKE2B 36586bd65dae04e88d95276fa42449a577cb081e57709e42a1b36015f528978114825e1d1e4124df3f5df7e5a3f3ff0c7257ddfa0277085c19cf074943cfbce9 SHA512 1445e303d7573ea259adbba8e51dbe1e51668435638eec5bd2c941df415c56e286e5f4bbee5dfb8270fb2d2895089f0afcf75a6b06d64b94f10c8a0151266730
+EBUILD openjdk-8.242.ebuild 5795 BLAKE2B 7d4ac1f80227d866225bf45a3ebb293ffed1985ab945022692d83353db097da7fa4d2aee2409fcb4700d619c2855da33613b0e72cc12ae4bcad06ad95ad8220a SHA512 a54a68330b8c9b67c496d1c0e22c00f483ce9f3c22e51d4b9fefb3c4c85eb7c7c0d8259d32a399a892db4dd24a440466c14a70c0d92a545144e145fa40d8fa94
 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
new file mode 100644
index 000000000000..9466e2be56fb
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-11-make43.patch
@@ -0,0 +1,12 @@
+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/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
index 8be378782e3e..e6429b524269 100644
--- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
@@ -233,7 +233,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
@@ -248,7 +248,7 @@ src_install() {
 	if use doc ; then
 		docinto html
 		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild
index dc940a8919c6..f98807e652b0 100644
--- a/dev-java/openjdk/openjdk-11.0.6.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.6.ebuild
@@ -73,6 +73,8 @@ PDEPEND="
 
 REQUIRED_USE="javafx? ( alsa !headless-awt )"
 
+PATCHES=( "${FILESDIR}/openjdk-11-make43.patch" )
+
 S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
 # The space required to build varies wildly depending on USE flags,
@@ -233,7 +235,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
@@ -248,7 +250,7 @@ src_install() {
 	if use doc ; then
 		docinto html
 		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
index 7f674fb94cc4..1374a9be223f 100644
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild
@@ -226,7 +226,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
 
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-8.232_p09.ebuild b/dev-java/openjdk/openjdk-8.232_p09.ebuild
index 4fa1e0c103a0..b3cd4c5a8eac 100644
--- a/dev-java/openjdk/openjdk-8.232_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.232_p09.ebuild
@@ -226,7 +226,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
 
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild
index 803f0b77b68d..b1a5c2322839 100644
--- a/dev-java/openjdk/openjdk-8.242.ebuild
+++ b/dev-java/openjdk/openjdk-8.242.ebuild
@@ -200,7 +200,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
 
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"