gentoo auto-resync : 23:11:2022 - 07:07:57

9 files changed, 130 insertions, 8 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ff5dbeb4402d..df406ab467c9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/b2/Manifest b/dev-util/b2/Manifest
index e88d42c4a243..9b1857bea1ae 100644
--- a/dev-util/b2/Manifest
+++ b/dev-util/b2/Manifest
@@ -6,5 +6,5 @@ AUX b2-4.9.2-odr.patch 1109 BLAKE2B 0bf70f2b2237369acd5089d1d1c6e1362f1d3528b036
 AUX b2-4.9.2-respect-user-flags.patch 461 BLAKE2B e5a9e0293afb7bde189c03677189ef11e0c1c07b8e02d598dc7e4d02f9fe1bf7079e94adb4150cd551ce0bf39b8c5710cb2f6b4bc685588900c4644127836fb2 SHA512 54af91eecd42cc8e5a079e29f1f3d9a8ebc8a6587254038167f531ddb217108d49161689bd45e1ed7e92eb7cfed53addeee2971e16e41d02fe3904b071bd96b9
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST b2-4.9.2.tar.gz 975882 BLAKE2B 83c2ef85c9f1ae20922541ca8c344316f1660ee069426e3a9907c0a19e1c94db470c67d0c29a1f31788eddb86ab414ab06b9713f8ea53d974d1d8f0ca29f4aa5 SHA512 eab180770608b863dcf6a5fbc626e1733cf4353cf62f4189bd28258a03591fdb7853f5dddb4d3dad60f1bb06db5415025b792a30c2c65f7b1278f61e33f903e3
-EBUILD b2-4.9.2.ebuild 1847 BLAKE2B edba3eab058fbd9101c291728e7c2bbeef60075b1107c3eefe90b721fa5ebf2fbd82f43d104f0c2728c19babb74bed478effcea9ef40f903dc475019246e99a1 SHA512 353d8085b0ded6fe8d6e0963b07e053f26dd55d56d541427b2f24491d254be9910d7e8cc00b0dad6366853d0e89fda9b9348857b21fb667889d4fa913e87e9b2
+EBUILD b2-4.9.2.ebuild 1846 BLAKE2B d60cd6c8037c346709f13c0804ddc33db09b03b40a3b9c392de69b371d2c75e649ed7e91468245d4eb7b0faecb075ccf86216f837b420e116f99df8763087231 SHA512 cfc88a7d0d623e0c990f2f0d3abf56ee5ea0932929576691213f2e0cda7dce82687c120b51154d06a474451c6837569bd62320329417ade3ec20be099c2a3777
 MISC metadata.xml 320 BLAKE2B e32bcf6d7bfe5e8a0f36d34022d49ef8baf1d4c0324fa7e7b25e1fa41ac81c21e010a8e49d456b7ce6027c51af57b6b07f3bdc8b7e05daa18b288c63a58a171e SHA512 767da992cd650d91b393848e73d6f0626febcb02eba350a16d390e8416a2832c49b1ca2608be98a9f4abd9ae2078a7f1a543a387be139e5533f90d82171796bf
diff --git a/dev-util/b2/b2-4.9.2.ebuild b/dev-util/b2/b2-4.9.2.ebuild
index b6a24414c5cd..3adfbfd96356 100644
--- a/dev-util/b2/b2-4.9.2.ebuild
+++ b/dev-util/b2/b2-4.9.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~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 ~loong ~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"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 20172626db46..dfa0c004f09a 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -5,6 +5,6 @@ DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36
 DIST glslang-1.3.231.tar.gz 3657070 BLAKE2B 3a33854d165e966f339027f73d0f05bf4a2df5998f379529413209eaca2b3e95939ead4bb606e7f65effb7a32e81ce40f4bd7af94b2e6fbad1ed8d809f6a1f19 SHA512 2235c476b03bcb93ac9d0d8a88fdf980f6435086d7ce13a1d9c8ff223880d788a49f35e7392f1b5af9174da7b501a171b80ce4e89bc0c6d609d2b737da982e56
 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B a207750c9898380d2ca4b7b3769828d3a7e7950666282cc54a7e02f0e1b1dd0ba1834b08ca081e152cdcfe55dcf5ab165c3ad743539253e69988008e717be603 SHA512 a51a0c70ef135db12b71c6b42663f5528127602adf1327411fb81a10159461314472814e8aab044c48ff7dbb2c3e8ee9fa2e76c9eeb74725a9ed33ecdfd70f0e
 EBUILD glslang-1.3.224-r1.ebuild 874 BLAKE2B adb8e53b4667fc094fed4f3568bb82a338906bc6056c2975fa04ce3346c43c79a4140c052efdd286b37eb6f6350b0b70fcbc343fc5e35592ee36d3e7f0f531c2 SHA512 9ace062e32cd94a8691afe87c4d838c639b1227fa8cd7bca53ab9999cd031a5734ad620dbcfa54a34ff741efc91968f62f4099474e45aba76e261a2b5bfe8e74
-EBUILD glslang-1.3.231-r2.ebuild 989 BLAKE2B 2a7d40dcdadda55a64d790a06d95d0c50e620f5fe4c878e574a2ea4b95da80ffc390c6065eb19fc549bdf63099d3e888cd5d1fd07cedc9938aafeaf54e2df58a SHA512 89ce8596884892819a2a67ed756f13c318f742341da516732873541727342e21522a7e7ab69672c2e38a5a30c3ac5a135655ff190d1bc226c66b5546f7da44bb
-EBUILD glslang-9999.ebuild 998 BLAKE2B 7cc197649dac28cf919f270a8e2e8b83524b2bbb764c860189c38715676f0bc9ce654525564eeaa952c8d1883da297f0ccdeeadd5be683778547265fff30ae7c SHA512 95cc22718d367b74f155b7bd8ff712cf9ead07ce2b1c3f2a6e4e7543998f0458cd614993dc47497379b11e4bd3ecbd1d34e6dada701b7c46f704bf8bc9852890
+EBUILD glslang-1.3.231-r2.ebuild 969 BLAKE2B 6f11eb37e246b2ed1c1fe0887907131b715faa57081b824a2e91642d23bafdcf9cf55fce8cf09d1dbb8426c0263314cb034a6738b8a05b04dba4478b9a9955b0 SHA512 d9c97a111902298a6cadfb01c5fd9e77f8afe0b3bfaba773644f6836a60a408ffa22d8707247d0fd9cb3450ec08c5d957390945fb9a8ee752482b984e5ce7bb9
+EBUILD glslang-9999.ebuild 978 BLAKE2B 35807072685f3364ccb38b47af47cf8f6ed3c918b246312877a22659b20af6cb8d3f6a0dc7a404a1fdc0d55c4d516804621cd6b543f1efac28bc8908a3c559a8 SHA512 069143c55a6c62101a4efe4f220e219e4970592663be8c5fcc89fed2c80ae5ff5393a2ee363d74af747b92e2b5aaaecdb15955ef5f821da5ec128cee7899c225
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.231-r2.ebuild b/dev-util/glslang/glslang-1.3.231-r2.ebuild
index 1e271526d5c3..519eb9fd2b13 100644
--- a/dev-util/glslang/glslang-1.3.231-r2.ebuild
+++ b/dev-util/glslang/glslang-1.3.231-r2.ebuild
@@ -31,7 +31,7 @@ RESTRICT="test"
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=1
+		-DENABLE_PCH=OFF
 	)
 	cmake_src_configure
 }
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 7f472c0f455f..c7d6b2354929 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -31,7 +31,7 @@ RESTRICT="test"
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=1
+		-DENABLE_PCH=OFF
 	)
 	cmake_src_configure
 }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index e269429589fd..6896afda5550 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,8 +2,10 @@ AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d
 DIST meson-0.63.2.tar.gz 2063397 BLAKE2B 765ef8994168bb149cce4dbbbdab4a5531b1c1119db5dace1a66c2728241830c7de075d586187d3f987fcc99e4181176a5910da56552ba735dda110a641d2541 SHA512 770d8d82502c5cd419123e09f6a445d2cbaea4463c5fa79f1497c868bf5defc5e5779a6e550ef5fcf75d57322d2b25b61574f4df0cbf001c4325c6abdbbc30b4
 DIST meson-0.63.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8 SHA512 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
 DIST meson-0.64.0.tar.gz 2090162 BLAKE2B 85fe35cba3b2b966a8ba818b305e6e75437af4315f8ce9b6bdc26324dc4a51e5ef3cbb16e23552db1d6191b8d08b1086640eb87e03a1dcfee794de492a0fa237 SHA512 0656515e983d98350081dc7cd726bff4a83ed1e24d414c022ea804317f2ff86052b53bbbc36e00847541f2cbe19ebe4c87bb35a174bf6321864363512a4cf6b0
+DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07 SHA512 4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
 EBUILD meson-0.63.2-r1.ebuild 2978 BLAKE2B 7e3c27064fc4bbf116a7fc5efaf9d56bf942567b0c674c70c832826a557edd458a29ce0dbb445ab5b4e04cad03236798ebc499aab4c5edcefd7049d84f1e862e SHA512 176d0bd3a9f7b4aab8614ee10f5b7b18c5d8889c7a07dd7f49b283b01e72ae7c878108de8e135bcdd60d5563a51d6c62c44093f6eb115676087c9fd073ed762c
-EBUILD meson-0.63.3.ebuild 2986 BLAKE2B f508b97b7aff346569dfa2466c06c2907fc10edfccba98b40e254a5bf78af9143056862d1a6ba1c5141fa767d93ae4cf9641a613af218815cfb8b55ff49cc6ae SHA512 bbd988ab9f8abed83a68bd0723f3ef5ebb148c7f23b71cf444428eec6416c0cfda329e671c702ba1b3daed928d3cbd3e2908230b38ea17da6af8ee0abf9e7c54
+EBUILD meson-0.63.3.ebuild 2978 BLAKE2B 7e3c27064fc4bbf116a7fc5efaf9d56bf942567b0c674c70c832826a557edd458a29ce0dbb445ab5b4e04cad03236798ebc499aab4c5edcefd7049d84f1e862e SHA512 176d0bd3a9f7b4aab8614ee10f5b7b18c5d8889c7a07dd7f49b283b01e72ae7c878108de8e135bcdd60d5563a51d6c62c44093f6eb115676087c9fd073ed762c
 EBUILD meson-0.64.0.ebuild 3024 BLAKE2B d1364c97302f4507adc94fa970cd9083b4833787433a789296596b372198f6c0a22063ca0e8c3eb9d9c3e0076c43b0884c6f7355090549aeb9c4d48308aaf4a0 SHA512 456477d6bcd781841a935163c64e15cd62a227fea9ac84f5257df607371ee4c09013b3d5927ea15e9c0986dd9cfc24106c300299f5ba4b86706c4b71288c3cc9
+EBUILD meson-0.64.1.ebuild 3024 BLAKE2B d1364c97302f4507adc94fa970cd9083b4833787433a789296596b372198f6c0a22063ca0e8c3eb9d9c3e0076c43b0884c6f7355090549aeb9c4d48308aaf4a0 SHA512 456477d6bcd781841a935163c64e15cd62a227fea9ac84f5257df607371ee4c09013b3d5927ea15e9c0986dd9cfc24106c300299f5ba4b86706c4b71288c3cc9
 EBUILD meson-9999.ebuild 3024 BLAKE2B d1364c97302f4507adc94fa970cd9083b4833787433a789296596b372198f6c0a22063ca0e8c3eb9d9c3e0076c43b0884c6f7355090549aeb9c4d48308aaf4a0 SHA512 456477d6bcd781841a935163c64e15cd62a227fea9ac84f5257df607371ee4c09013b3d5927ea15e9c0986dd9cfc24106c300299f5ba4b86706c4b71288c3cc9
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-0.63.3.ebuild b/dev-util/meson/meson-0.63.3.ebuild
index 1fbfb537b873..8c8f381c9545 100644
--- a/dev-util/meson/meson-0.63.3.ebuild
+++ b/dev-util/meson/meson-0.63.3.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P=${P/_/}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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 bash-completion-r1 distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.64.1.ebuild b/dev-util/meson/meson-0.64.1.ebuild
new file mode 100644
index 000000000000..7eaa764dfcab
--- /dev/null
+++ b/dev-util/meson/meson-0.64.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+fi
+
+inherit bash-completion-r1 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
+	)
+"
+RDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.63-xtools-support.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[@]}" 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
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# 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
+		# 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)
+
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 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
+
+	dobashcomp data/shell-completions/bash/meson
+}