gentoo resync : 15.06.2021

4 files changed, 21 insertions, 10 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ef2d7bfeaed4..277f9e0ffb16 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
-DIST meson-0.56.2.tar.gz 1794847 BLAKE2B 350427e2ff4b4fe688220ca6279ff3361e1b2c7c573e1e0185ea9014fda73bc68929256073fe05855e3403638257e26477868d0a5683a5b91f6a74ee55a01f0e SHA512 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
 DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
-EBUILD meson-0.56.2.ebuild 2338 BLAKE2B b50d254d2b52de7478c1480bfca34e9eed952e02df08e57964035a035e33c6dda033d8b50bad9301e79e537ef6a3f1ad7f666083c7e46b8584b7711227938c6d SHA512 d5abc3288b6d4261d3dffa318448d7e61e35781124ddff30527781863cd0b84f5944bf13fb0361af6c690ad627cdc5ec55f35ab50ba58c1699ac4e67add71f5c
-EBUILD meson-0.57.2.ebuild 2338 BLAKE2B b50d254d2b52de7478c1480bfca34e9eed952e02df08e57964035a035e33c6dda033d8b50bad9301e79e537ef6a3f1ad7f666083c7e46b8584b7711227938c6d SHA512 d5abc3288b6d4261d3dffa318448d7e61e35781124ddff30527781863cd0b84f5944bf13fb0361af6c690ad627cdc5ec55f35ab50ba58c1699ac4e67add71f5c
-EBUILD meson-9999.ebuild 2346 BLAKE2B 759d97034364081f55be457b9e8a31a51e30a87de26f9e7bd86dd3bc8ec8b0e99a0c6bd7f306c404b716e8b968debaf8a79c83c511832c06001e4f8a5ee0fd26 SHA512 b27c8176ddac2ab83b684190cef83d28cdd32ea7bf3fe4591a42d568766b1badc4cd7e046e8e80283d47f98f46216c53e5914dedad6e343a4f414fcbbd4a8dee
+DIST meson-0.58.1.tar.gz 1896205 BLAKE2B d42e04b262c6715ba2776f64d2e616016381303b07e609c804becf72db2ebd8ef08030c969f43813b2072552cb76974b2ed84f2da6d6c809ad612169d580395c SHA512 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453
+EBUILD meson-0.57.2.ebuild 2303 BLAKE2B f05ddd144872cd4a01891b089af2adec6e53bd6bf69707557dba5f7770385062d0111b0706e328aa5b21fb2acde9efb136221fbd651828ec16e902f5b7c878d1 SHA512 5bfdeeb4ed0542917ae6bc1780e06ff7733c1e03b9c1fb8816d6ffa26fc18b843008a3a32aa5ca1e596d219a0a7fdcf2984e9fabeb34f7ea793798239ab46653
+EBUILD meson-0.58.1.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
+EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.57.2.ebuild b/dev-util/meson/meson-0.57.2.ebuild
index 20afc602e2bf..718d9c7fe89c 100644
--- a/dev-util/meson/meson-0.57.2.ebuild
+++ b/dev-util/meson/meson-0.57.2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
diff --git a/dev-util/meson/meson-0.56.2.ebuild b/dev-util/meson/meson-0.58.1.ebuild
index 20afc602e2bf..e2a175666ca3 100644
--- a/dev-util/meson/meson-0.56.2.ebuild
+++ b/dev-util/meson/meson-0.58.1.ebuild
@@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	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"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -81,6 +80,13 @@ python_test() {
 		# 'test cases/unit/73 summary' expects 80 columns
 		export COLUMNS=80
 
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
 		${EPYTHON} -u run_tests.py
 	) || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index cb12aed28c93..e2a175666ca3 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
@@ -81,6 +80,13 @@ python_test() {
 		# 'test cases/unit/73 summary' expects 80 columns
 		export COLUMNS=80
 
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
 		${EPYTHON} -u run_tests.py
 	) || die "Testing failed with ${EPYTHON}"
 }