gentoo auto-resync : 07:08:2024 - 12:37:20

6 files changed, 220 insertions, 4 deletions

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 2805a7ba877a..86adef7005ef 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -13,14 +13,18 @@ DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad
 DIST meson-1.4.2.tar.gz.asc 833 BLAKE2B 64ce1fc0fecdd6aa76bb89d88ff7497548d82afc00805c083a0bca7ce4cee41dc50be50368e333649ae7e863c03ea780fe24a48c525281fbbcab679b540f4254 SHA512 51d3245f9443cb398e2e8f225f00a853848bde1bfba02bae6334d47115e36ad96c8ec03244f6169c89d73162b86a73158a7f8d08d5bd6b3d28e8369ce7b55093
 DIST meson-1.5.0.tar.gz 2257170 BLAKE2B 5103622831a3581b428f9cdd96950b8544ddfdcbd384ec2ccd344d6b9ffb2cdd7da069963d57b09a22f26938f6a3b34823abe678fb50a0fe8d79c8abc7899605 SHA512 f0a25cf134949739c698eddaea602bf7852866b3fee3d2c11c1e6b6e48c944cf92abc3d171a2e42e21077edc01f1e7079d451f5624e2b6131382e114e814db3e
 DIST meson-1.5.0.tar.gz.asc 833 BLAKE2B 43c1e0f197520d3151ea4a41e3723666034fbfba0d794a18783ed765e5844776337f8119aed5897f5320922ac8978992f3900756300b54970bf1066f6fcde629 SHA512 35537ebc8c430eb3c011ff75529442e0ab364aa4fbec8176c340b5f466cd7f2217ab7ed6a03c7bdb577b86bb3472faa054e5ce0472edbb690fe76f39845c2dd6
+DIST meson-1.5.1.tar.gz 2257106 BLAKE2B 3368b209444d0873217bafee2339b395dca9fa43df68adce19029a41ad5c0eca59426ef681d174ef8b6b89d4a6c5b4f189c1ae219deed78334028d44bdb23a95 SHA512 3239d6f3d64dcedddd456dc451278a37aa6c4460708b0efdff1b04b6e8844c20f5f882060de311c59a678bebd51ee09e1906c9384d4b0c85b28015fd1713ab0a
+DIST meson-1.5.1.tar.gz.asc 833 BLAKE2B c099720b102b8fff581f2043000454f5cb3593352a8b69c681cda73dae7172fb7d892dc0500e29fffe4ba7828cdcba418acea230563dc26a7a89139ab526b231 SHA512 f8210dd309a104b4169bc2eae9ff370f3ced6fe2c5dfc8f3477c9fbbed983dd6636ea05822d9345d7570e88bfe7789c6cc075e5a91d578a8376666d16ad550a3
 DIST meson-reference-1.4.1.3 339324 BLAKE2B a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488 SHA512 fc94aa95df3cd04af49ab2f27050c3ef206407a2ccb3b61d9c8660deba55eae3fb627d83713de62f3e1216a1a33a88e989bf5b557b7e17adbb73a57d5f2ad11a
 DIST meson-reference-1.4.2.3 339324 BLAKE2B 1a4fbd8c27a8cfba773777eabd2ebaa0f76ec0c61dcfe1c7b4483737b348ff9528d68f26e68d7d40b2e1875611eed5b9a31c1cf55fed8eabb42fc1e31d9ef14b SHA512 8b8ec43e812599203ec44c08805eb6818485805c45b9c69802261eaa35efc97846a96f6472c6b1ef5f6c703e7153fd957df7b805f173ca3400a2030dfbe002ca
 DIST meson-reference-1.5.0.3 341110 BLAKE2B c81d1014f93ca3848e03e6a8948190a31e1823b04134ab6861db94d5b9517252bf66fcbbc987ba2051430c54282256d729d3575db83e1e8d09fa344c6ff06dbf SHA512 b45c7b40cbe1abf7416d50c1c7658726d4feda4a30627a6dc70c7b9aab61f72c9c7c1fa915e47f4b50e9d82987e4179db8ab3d5158ec5ef3d7856335b604f603
+DIST meson-reference-1.5.1.3 341110 BLAKE2B 5267c2eea1b1281f87e63eb08aa928257dd98088b4d5c27c2785d2d8066c2c28536f7f56bf804ffe37d2f51552c91f31ff7e2729f3b2485d594a9e44a0df9ab1 SHA512 2d36e87e9bc2de0b958f4b20544b0bd9f2b0ffb646768e68fefcd5dfb8f09c24db40f27208b5f2d1f6ba02e7465f68a538ea72be118670c76e0959e090a42cf3
 EBUILD meson-1.1.1.ebuild 3287 BLAKE2B d449d5e7511b47baf4d26aae0359183d4ef9ea21bf163d5af5fbe6cc78c44bd9788d5c807486f106be3a8abfb07cc1d34782616cffed333e94dd4225f6650056 SHA512 9fca53429ebd722f91084a4796bc1c466216b2021cb6b88e76cdaa559fefa17651d76e744e32c3126b2bad5b4ca36f5b17d402cec57a764340406610e7c97dae
 EBUILD meson-1.2.3.ebuild 3285 BLAKE2B f937d7add71afbfb05e1ce2f7a07c9077a76b8018d6cc3e7e5ebc029419aa45e57cb98f0b05e7236500bfdcee35a35ddbedad9c3c00133817c4b0867cea71730 SHA512 e8415edf199ad281e253331e72e7ed4e2398c658d006b54a7a89b24b9e2ce3950fb6d750c8a6b728849e973af7e576e9d95b7510d3aa27a320fc38614ec439bc
 EBUILD meson-1.3.2.ebuild 3417 BLAKE2B 167f9f98a9cdde3e2629144c25e8a1fea8ad2446618879968cbf9d8544f8bd2c1c1ff9c9741d3c526204a36f5e62b63004a0644a20624ab1fb0258edbf01454e SHA512 a123f1501259fec57b2b0e286d34db993eb52d4d13c8fcbc2d9ad7824f47517b7d6d255c952a985f9830a17a7e04a2da95e0bd9e779b9ff065adc044d5efd90e
-EBUILD meson-1.4.1.ebuild 4587 BLAKE2B 22fdaf1715940df969cba34097ee765430d859b8024173ad04e58ea16dda3dd0549146e024a64b0ad0f2da325695bba81485b404e354d7d11baf5136317936be SHA512 2405c329971cd7b00fa46a4c9aa37b6e6438d4123d662635fd2cad940bbcdc45e48a36e30305f10d4291a2fbe6c26a64751635bd049622e093c527b5502f4b46
-EBUILD meson-1.4.2.ebuild 4931 BLAKE2B e774eab8d0b3a7d6f34bd070107e03dcc4afd67298ca093bfacd4e89c4b49a5f7f5398fe09595e6637f199bf62332635e21afa1a05c2f40a7deb8521f7598929 SHA512 7dc3f4a8204f82b52f47ff9fc1751e378b0126f286ea539e5ed9d3ef6715c25cd80292d9248a54402173dbdf5cff6553343ab75fc39ee804e4b9607915bc7c47
-EBUILD meson-1.5.0.ebuild 4776 BLAKE2B 020b7addb911b70691a3106986db1a538d3d0dd5dcab2cc0e9d5abd43b6676349c15d076cec9adc39480e5f691bb64fb36b3627723ae76f75be912ff0782e4d4 SHA512 a705974d63ef7bb650f26deafd54cdd41f1e6a024fe69a706617d4db41f1924aef9e5a8865aaa20a8b75c5d754c98b5134d624e470bace1d3ac385671b2422e0
-EBUILD meson-9999.ebuild 4776 BLAKE2B 020b7addb911b70691a3106986db1a538d3d0dd5dcab2cc0e9d5abd43b6676349c15d076cec9adc39480e5f691bb64fb36b3627723ae76f75be912ff0782e4d4 SHA512 a705974d63ef7bb650f26deafd54cdd41f1e6a024fe69a706617d4db41f1924aef9e5a8865aaa20a8b75c5d754c98b5134d624e470bace1d3ac385671b2422e0
+EBUILD meson-1.4.1.ebuild 4927 BLAKE2B fe6c5c98c98ef42cb226638ee24bdc5c0de5070c263407ccc59ef31166c96fda42b64e45701081dbfdf769ab86a31fb6085d40b8326ebf1fa6024b350d6a5054 SHA512 ddf3e4aa09c7134b0daf49e2a466cd627845bd1e9a34b3740bf790392314350d38b543cdfc976917096f5b4426448f44f4c7c33afa09738629d7d61701ddfac1
+EBUILD meson-1.4.2.ebuild 5093 BLAKE2B 80d123be2feab1115772ac641e07ceee3f29bc53279d2bbc025c2d889701b4b06beef42f2ba12ddc2be2c218e8aa3f5c908eee39f8934ad116b9859b73e6efab SHA512 9e67af567b4eb09ff074d96e9280e095360a037ed7247f6d1338623cac1ce93194f032369f7e8030b2dc845ebd115eb8dea4eb700c1458b38dbf4792eedf959e
+EBUILD meson-1.5.0.ebuild 4938 BLAKE2B db4f9bf32eaa6dd7a60fa9eb3845ef58dfa2e842099a3b1148fa51dfe68fe26a8ae175b11227c24e4154e6e3780a1968ccee9d8e82808d105d08b4ec22c3642f SHA512 4d882f8f01c395546a09d5ec0e006cd87385574ae5427c59fe629ff070b85262a114c481caf03dd6dc988bd58acab72f84707203790db50ed0a758d26f27b2d3
+EBUILD meson-1.5.1.ebuild 4938 BLAKE2B db4f9bf32eaa6dd7a60fa9eb3845ef58dfa2e842099a3b1148fa51dfe68fe26a8ae175b11227c24e4154e6e3780a1968ccee9d8e82808d105d08b4ec22c3642f SHA512 4d882f8f01c395546a09d5ec0e006cd87385574ae5427c59fe629ff070b85262a114c481caf03dd6dc988bd58acab72f84707203790db50ed0a758d26f27b2d3
+EBUILD meson-9999.ebuild 4938 BLAKE2B db4f9bf32eaa6dd7a60fa9eb3845ef58dfa2e842099a3b1148fa51dfe68fe26a8ae175b11227c24e4154e6e3780a1968ccee9d8e82808d105d08b4ec22c3642f SHA512 4d882f8f01c395546a09d5ec0e006cd87385574ae5427c59fe629ff070b85262a114c481caf03dd6dc988bd58acab72f84707203790db50ed0a758d26f27b2d3
 MISC metadata.xml 457 BLAKE2B 65bcd07bc76772c13ef3f5cf602206330c3b7456180d140b82ee1ad759762a9d0066b4c60001862ce8e2f99150bea411eb804e5df65ef3f7824dc790626319f3 SHA512 aacb863efe3f8548eb8e97a4be3c013ad8d351c0a6173f6204ac4df46054bddf934bdd6ea5673fbf4671b7aa83405847626393ac012c0db3bbc062c234eec1f3
diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
index d30bc90b1103..db2001929162 100644
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -82,12 +82,22 @@ python_prepare_all() {
 		# ASAN is unsupported on some targets
 		# https://bugs.gentoo.org/692822
 		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# clippy-driver fails, but only when run via portage.
+		#
+		#   error[E0463]: can't find crate for `std`
+		#   error: requires `sized` lang_item
+		-e 's/test_rust_clippy/_&/'
 	)
 
 	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
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index 4b7ba1a3634a..c1202d979e1c 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -94,6 +94,10 @@ python_prepare_all() {
 
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
 
 	# The 1.4.2 tarball accidentally contains some untracked files from git master:
 	# - subprojects/bar-0.1/Cargo.toml
diff --git a/dev-build/meson/meson-1.5.0.ebuild b/dev-build/meson/meson-1.5.0.ebuild
index 762876dc5e40..9cddc1a7a32d 100644
--- a/dev-build/meson/meson-1.5.0.ebuild
+++ b/dev-build/meson/meson-1.5.0.ebuild
@@ -94,6 +94,10 @@ python_prepare_all() {
 
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
new file mode 100644
index 000000000000..9cddc1a7a32d
--- /dev/null
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit ninja-utils git-r3
+
+	BDEPEND="
+		${NINJA_DEPEND}
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	"
+
+else
+	inherit verify-sig
+
+	MY_PV=${PV/_/}
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+		verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc )
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3
+	"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
+	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
+
+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
+		app-alternatives/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	!<dev-build/muon-0.2.0-r2[man(-)]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+}
+
+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/_&/'
+
+		# clippy-driver fails, but only when run via portage.
+		#
+		#   error[E0463]: can't find crate for `std`
+		#   error: requires `sized` lang_item
+		-e 's/test_rust_clippy/_&/'
+	)
+
+	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
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_check_deps() {
+	if [[ ${PV} = *9999* ]]; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+python_configure_all() {
+	if [[ ${PV} = *9999* ]]; then
+		# We use the unsafe_yaml loader because strictyaml is not packaged. In
+		# theory they produce the same results, but pyyaml is faster and
+		# without safety checks.
+		edo ./meson.py setup \
+			--prefix "${EPREFIX}/usr" \
+			-Dhtml=false \
+			-Dunsafe_yaml=true \
+			docs/ docs/builddir
+	fi
+}
+
+python_compile_all() {
+	if [[ ${PV} = *9999* ]]; then
+		eninja -C docs/builddir
+	fi
+}
+
+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() {
+	(
+		# meson has its own tests for LTO support. We don't need to verify that
+		# all tests work when they happen to use it. And in particular, this
+		# breaks rust.
+		filter-lto
+
+		# remove unwanted python_wrapper_setup contents
+		# We actually do want to non-error if python2 is installed and tested.
+		remove="${T}/${EPYTHON}/bin:"
+		PATH=${PATH/${remove}/}
+
+		# 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)
+
+		${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
+
+	dobashcomp data/shell-completions/bash/meson
+
+	if [[ ${PV} = *9999* ]]; then
+		DESTDIR="${ED}" eninja -C docs/builddir install
+	else
+		newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3
+	fi
+}
diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index 762876dc5e40..9cddc1a7a32d 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -94,6 +94,10 @@ python_prepare_all() {
 
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
 
 	distutils-r1_python_prepare_all
 }