gentoo auto-resync : 31:05:2023 - 09:23:01

4 files changed, 127 insertions, 4 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 2a72947eca7c..8a3565a47e5e 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,7 +1,9 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1 SHA512 3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
 DIST meson-1.1.0.tar.gz 2124254 BLAKE2B 149dedc0e49b72682fa053f27f9a6c2543362539861b4b79ce65ecf4d913e221ac2d63f3b9aa350bd7622851c73be418b804ae1131dd27607eb01218e0204a5e SHA512 b8968becd1de25d8e92ecbe4c3b50694269a463430b41fcf5206f35ac952507b01f316721fb36f8c7940437e35c3588f6a4504f5b8256fa47fd9b0ceb588ae39
+DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 EBUILD meson-1.0.1.ebuild 2931 BLAKE2B 72ff67d3f73a3ab92f6d56332b1cf9aca0ddf156727d3ea740e0cc2437b862ff99effbdf25c4ccf7202d9a69f4c14d08562067f2941fc8c51ac40226ce6a6579 SHA512 6f8a0d390025f34e51ffaadf910d837dd8623bba5afb5f7bba87614a6b9cd9e2b3fb257b906612ac756f5b9bbc340e034def398f7ff62ea90f47cd07351d0062
-EBUILD meson-1.1.0.ebuild 2939 BLAKE2B c43eb0db7a36a252899ab4fa1e0b2e50e0f1ab5cd49906538826cb3df23e5ea92efa58287a5ca5d5fe653869623e829626c67046cae4b3b4172fdb7bde54b686 SHA512 674aa902d1ce093c5e8055528d6f176e8a81aa0eb5db986a4483af154b99a06adf34c034e0dfcfb091f8c0a09a95cad0f34321ca7b2fa0f2573a56e859031f5e
-EBUILD meson-9999.ebuild 2939 BLAKE2B c43eb0db7a36a252899ab4fa1e0b2e50e0f1ab5cd49906538826cb3df23e5ea92efa58287a5ca5d5fe653869623e829626c67046cae4b3b4172fdb7bde54b686 SHA512 674aa902d1ce093c5e8055528d6f176e8a81aa0eb5db986a4483af154b99a06adf34c034e0dfcfb091f8c0a09a95cad0f34321ca7b2fa0f2573a56e859031f5e
+EBUILD meson-1.1.0.ebuild 2940 BLAKE2B 2561a89d308e94b6815a2099b3aed020df40080c1f1ab21fe8de0a3eed439417b72512056a180087d8e3624d9d1769e9031bc08f18a7bbbc732fd85e4a6403fc SHA512 215fbf63eb8a8a1566f68aa993f5ca4075e5305f27d69a6147f29af8a49fa975516d2e63287a402f4d2fba06e357d65d449de70c479ef75aa4147ef7557a539d
+EBUILD meson-1.1.1.ebuild 2940 BLAKE2B 2561a89d308e94b6815a2099b3aed020df40080c1f1ab21fe8de0a3eed439417b72512056a180087d8e3624d9d1769e9031bc08f18a7bbbc732fd85e4a6403fc SHA512 215fbf63eb8a8a1566f68aa993f5ca4075e5305f27d69a6147f29af8a49fa975516d2e63287a402f4d2fba06e357d65d449de70c479ef75aa4147ef7557a539d
+EBUILD meson-9999.ebuild 2940 BLAKE2B 2561a89d308e94b6815a2099b3aed020df40080c1f1ab21fe8de0a3eed439417b72512056a180087d8e3624d9d1769e9031bc08f18a7bbbc732fd85e4a6403fc SHA512 215fbf63eb8a8a1566f68aa993f5ca4075e5305f27d69a6147f29af8a49fa975516d2e63287a402f4d2fba06e357d65d449de70c479ef75aa4147ef7557a539d
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-1.1.0.ebuild b/dev-util/meson/meson-1.1.0.ebuild
index 1cedf7d75ccb..c9781cdd78c0 100644
--- a/dev-util/meson/meson-1.1.0.ebuild
+++ b/dev-util/meson/meson-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = *9999* ]]; then
diff --git a/dev-util/meson/meson-1.1.1.ebuild b/dev-util/meson/meson-1.1.1.ebuild
new file mode 100644
index 000000000000..c9781cdd78c0
--- /dev/null
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	inherit pypi
+
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 1cedf7d75ccb..c9781cdd78c0 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = *9999* ]]; then