gentoo auto-resync : 06:03:2023 - 05:53:38

3 files changed, 126 insertions, 2 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 95e214d43c76..87fc23d00c8b 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.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8 SHA512 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
 DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07 SHA512 4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
 DIST meson-1.0.0.tar.gz 2099642 BLAKE2B 0be89aeaf103b19c21a6eaf9cba43608436986ba045198b9dbe73778e925b8340c92f24ec12f480a8527e9d10da422122f17ff4469bd1076c3e85903c0ed9610 SHA512 9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
+DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1 SHA512 3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
 EBUILD meson-0.63.3.ebuild 2978 BLAKE2B ebdf54198bd010928a402e68e427d1333b816bfd2a80862f94496a03f74c6030258d4295c563fac26496203f4f07d7fe747d28dfa841e7e21def6178bab85abc SHA512 728eee4770cd69040758ddf44bc6f06adcb31ef5155583d6c264e8aa21c3185f0c2c9870e8dae7fa384950f440f48db03e8e0e1367d2bdb391776340184621e7
 EBUILD meson-0.64.1.ebuild 3016 BLAKE2B 7e9a8e434623058032f5c9d2f9e0b7d3abad73acc5343f3b38270da333cab2fba8c99781fbe09a1e0875b0479b3d15c220c59d8bc2af290fb0c44e731aefa56c SHA512 6ff6d348c159a862c30b9e4c576ca11a9bc065a94323868fa69cbafc3c28ae64c30fdbd28e966950a8fd87c01be994364e47bfc8bd08f07bd71a92fe8495f79b
 EBUILD meson-1.0.0.ebuild 3016 BLAKE2B 7e9a8e434623058032f5c9d2f9e0b7d3abad73acc5343f3b38270da333cab2fba8c99781fbe09a1e0875b0479b3d15c220c59d8bc2af290fb0c44e731aefa56c SHA512 6ff6d348c159a862c30b9e4c576ca11a9bc065a94323868fa69cbafc3c28ae64c30fdbd28e966950a8fd87c01be994364e47bfc8bd08f07bd71a92fe8495f79b
-EBUILD meson-9999.ebuild 3024 BLAKE2B ec625a379d921d795834b542ea0b1fb6d80d9c2b959f62385a77e389b5e8615269ac58fa0b02e05056a41f17cf67e658123021a2791cd0487318b9530e9d2bbb SHA512 b7196b000747b08003a900ec8865e415f6567b870a3fed01d306f16b06e3376c8848333c5cda64f547076e908fb117b724cbeb40887731bbe2db7b64c5d9c0e8
+EBUILD meson-1.0.1.ebuild 2983 BLAKE2B 0ea5d22287834058c10d8fef252fbdebe93706dba037bb3c5dbc68d4efdf9a1a885bc66e2d8cbec03b5fef53ebff283bd435ad3e0918b3e4e2d47935e05c91c0 SHA512 fffcd619626a784cce14309d8a80f7f6542aea07ae7b9401a4383860501687d9b77d8313533caa175bed297bf61751114346cf6dd646fd9a851c45a5d919c600
+EBUILD meson-9999.ebuild 2983 BLAKE2B 0ea5d22287834058c10d8fef252fbdebe93706dba037bb3c5dbc68d4efdf9a1a885bc66e2d8cbec03b5fef53ebff283bd435ad3e0918b3e4e2d47935e05c91c0 SHA512 fffcd619626a784cce14309d8a80f7f6542aea07ae7b9401a4383860501687d9b77d8313533caa175bed297bf61751114346cf6dd646fd9a851c45a5d919c600
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-1.0.1.ebuild b/dev-util/meson/meson-1.0.1.ebuild
new file mode 100644
index 000000000000..97dcdaf7e9fa
--- /dev/null
+++ b/dev-util/meson/meson-1.0.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_{9..11} )
+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 ~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
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 8140364c2c1b..97dcdaf7e9fa 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -10,9 +10,10 @@ 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}
-	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"