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

3 files changed, 124 insertions, 2 deletions

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
+}