gentoo resync : 03.11.2021

4 files changed, 7 insertions, 119 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 482c620e7f5e..b39483ecc243 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,12 +1,10 @@
 AUX meson-mcompile-treat-load-average-as-a-float.patch 852 BLAKE2B 669dfe4e4cff53b8b3bba66f1098fcf06e4d2f387c83f007d4d92e4b1a7f46b9eeea3d4f2273ddd402e7131b84885f81be8f815be59d8e34539bb13f7ef87f8e SHA512 7d455b1a8d21730bfbeedb5be5ca70978a3ed2af3e7d55a7f0cbf5405b6f7935c7c1f3961dbc09e7e42b3bfc7f2752316458e8627d7846b230638d5b2d6450e7
 AUX meson-tests-rust-add-libm.patch 828 BLAKE2B 1d1165703aa3c82295a25860d85c6f3e468f21a11a90c6b8e92f4ddd6f91a5769bcf4f409bbe788da1a5bdf6daa4f02d7e30cb3322b08ae65be324c0c3bf34e6 SHA512 51d67c2c2d45ac1e1eb2b7b82f4a6283361afd7507ab722a22d6e45c2b9c2094bfcd97e5e67f3215da6239a1cfee68bd37441b7657b5618eabc758fffe5ea633
-DIST meson-0.58.2.tar.gz 1899464 BLAKE2B 48c4c0cec2cb1c55e51cd56e08461ad7d95211d83bb60085f32493cb8d53cfeb00234fa1ab62ba8fbf3baf726231c7e9b098a0630281fda63402a860337528e0 SHA512 31496da729ede0813d5b6cfcc891e8376108252ee8a8148d23e8a4c2a4109b9b0dbc7e9e59acd954fb7de38ceb35f05c3a916eb6d4e106656d9ea8e7536ac4b1
 DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
-DIST meson-0.59.2.tar.gz 1952115 BLAKE2B f3946976e793540c78c54de367c6576bb35c1217fdc45c1e6f62e12edb9f755d6bceb850fecd313ec71e49e59fc3ab856d68af8874333b787d302c4f41784543 SHA512 910e4a8c9828506b576dc8ae0b5765efec24f44a34a5694f782c8a533d75053b10b4167564c06456d05f7a32c5fd9bd657faa62329e1e4ed24bfc4c9ac1ef73e
-DIST meson-0.59.3.tar.gz 1953620 BLAKE2B 333ae9ac7925101b0371c9171d0e8368bbff1669a3c9709becb95e73e53042aa2e4223c3272d0b0a3f24b5b43035a58d73c72655a55e10314cc027ababd485cf SHA512 4ffca094474c09567a69f576b25588c38e18d3a96d0b1d592adb05493a5d6dcfcd1a6549a821862a5aabd3df34d81b3a90d01e012e62c7f46bd98152337c0ea6
-EBUILD meson-0.58.2-r1.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
+DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3
+DIST meson-0.60.0.tar.gz 1994364 BLAKE2B cb9641a8ea6cd2592e40f8a3d2046556977cb978a4296cbe0ba221a27fb52db676b9217767a7bda203eca8ed1d40fa4adb2599096005335d150ff45ab7cd7591 SHA512 05275f003445672c1613db6c4c62ab39bfedc64cf2261f91d361a2aa24116a08185874b2e5dfa7daeebd584313bd91f4e0856fe68b36d8709065f80529902dda
 EBUILD meson-0.59.1-r1.ebuild 2804 BLAKE2B 8ea60235201c73c667985ea4cb48d45ced5453e2da646352cb52368a6b28a4fba4d664c1405254205a1697dcf4e94885a1028c28faefa35f93ecb715197a3b32 SHA512 bdebf4f3646e6d32318647d9edf5a1845edcc0e23ce36fb2d498c3d53260d68a7b89050d8371153c8394da7d89ec5aec5d9aff8df878ce03311979f086b9d61d
-EBUILD meson-0.59.2.ebuild 2812 BLAKE2B 67d7f42cfadfc3152a4a1b2f95be694439b34040c20d56b1d533d30668ec58ffd89305438a38dcd0c1f3d1afe4ca817ee8eca5d05ec36cb88ebeafd1851412a0 SHA512 90f775a4130d9570e01d8db6e35f7ba94371062735837e18f77f9b2b3ccff7e35ed6fe4342d0b132a8b7b157562e39fb3da1ebe19d8037280582c55e31317662
-EBUILD meson-0.59.3.ebuild 2765 BLAKE2B bcedeae1c647c0c1b9616919db71562b2c3326ab3e94a3f3fde83d2525af2ec1623c726b841f7e72784e717fce408a450d8e69f53773aa05713c8b1306394b5c SHA512 1f3c9bff2134fa8d5a79b810ba37c9970021208cb616b46dbb227b34bbeadd2884f06d76ccb2fc89a38be4fc1fcde834fe1cb97ac0923a551e0c102faeefc674
+EBUILD meson-0.59.4.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
+EBUILD meson-0.60.0.ebuild 2689 BLAKE2B e29c9c15d646c24ab35b59d94a9a28d5e63c31934e5809b29ff2e2112a188e24226301c7cb1b972caeacde9e5891e0e45e4658359b8445454c8b1840a4a7b68c SHA512 0dfd427362a59bd7435fa6b5d9eb79c74cef0ed63035693fa52031a83e1475476726673e36e520e270cbbbe5a8c37a1b0f1eb11fa49ad3a22398fb254034624c
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.59.2.ebuild b/dev-util/meson/meson-0.59.2.ebuild
deleted file mode 100644
index 88452baa5bbb..000000000000
--- a/dev-util/meson/meson-0.59.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
-	"${FILESDIR}/meson-tests-rust-add-libm.patch"
-)
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# '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}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.58.2-r1.ebuild b/dev-util/meson/meson-0.59.4.ebuild
index 0b7b12ebfbb7..0b7b12ebfbb7 100644
--- a/dev-util/meson/meson-0.58.2-r1.ebuild
+++ b/dev-util/meson/meson-0.59.4.ebuild
diff --git a/dev-util/meson/meson-0.59.3.ebuild b/dev-util/meson/meson-0.60.0.ebuild
index 5d637ceeeddc..55ddaad08258 100644
--- a/dev-util/meson/meson-0.59.3.ebuild
+++ b/dev-util/meson/meson-0.60.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 if [[ ${PV} = *9999* ]]; then
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	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
@@ -33,10 +33,6 @@ DEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
-)
-
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
@@ -87,7 +83,7 @@ python_test() {
 		# 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
+		# autodetection. 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)