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

9 files changed, 131 insertions, 26 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e060bedf8f94..59077f9b3d11 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 8e0782e77863..f53bfc4937d4 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -2,5 +2,4 @@ AUX gperf-3.1-clang-16-wregister.patch 766 BLAKE2B 52117a973bf01ed6c8c43d383f128
 AUX gperf-3.1-strncmp-decl-mismatch.patch 819 BLAKE2B 627af81f91b5fdfd1bd3978adeed9a0d00a5d6b3f8aae54fe0ce21cfaf9384734a61a5986723f72f4c55efdccbed90ec651008d6df651a10322c04b4099431bf SHA512 167823f5908951c79e9ec5b77106a1acbc011bc34636a845d50f55689cf9a7a1f4652a628dc786a29d1dd764e94d1055e32eea1f8c3852d9622e14816969c7f4
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
 EBUILD gperf-3.1-r1.ebuild 636 BLAKE2B 873b3cb31b1dc7978c5f4f59ed7dfef34b868b00d7658fb47f4ecc51ef555d778f7ccd79439b881e32887940e33d4ec1bc2c3a325a7d9fc72084eef3831022f6 SHA512 a453676a64f4b6840f65bd4efb2a5edd6319a37278a94fb53eb5138960124848983da316c3ca83515d024c79f8c9996879b98bebea2806929090f8a026b2e074
-EBUILD gperf-3.1.ebuild 530 BLAKE2B fac61e8b019594ffd141a2dc30e0a75e34dae1f7972614b1bacd63a3257d620aadcea3d87131d01275ac7e5193082c07324a750caba925b42a2733306f3a4582 SHA512 07cc9e0cf5e6f79c6400b039d0f16354b848d8e578fbf2668b2bcea6121e9a2580bc0d0e581eec76d87ba001f5fd56341cf469b90422825986adc30a203d8ec0
 MISC metadata.xml 340 BLAKE2B 50b364949bb779503aa29072024bb8d13a2195fc05911da90071b08742d63cc6bfcad152fdbd149c90eede93fb01165c95b46359a9b20bb3d32a87a1f19d4333 SHA512 19b11707d3d714c5ee69a1f17eac7cff18ccca9fefccc2d1d68305b3c86f4992db90529365340cb7f6ee07bfc01f3b690360d07f858da916c1136853172155d6
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
deleted file mode 100644
index 64710ec693b0..000000000000
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A perfect hash function generator"
-HOMEPAGE="https://www.gnu.org/software/gperf/"
-SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-src_prepare() {
-	sed -i \
-		-e "/^CPPFLAGS /s:=:+=:" \
-		*/Makefile.in || die #444078
-
-	default
-}
diff --git a/dev-util/mage/Manifest b/dev-util/mage/Manifest
index fc4e25a9ce7d..2e3a2a3327c6 100644
--- a/dev-util/mage/Manifest
+++ b/dev-util/mage/Manifest
@@ -2,4 +2,4 @@ DIST mage-1.11.0.tar.gz 8795144 BLAKE2B 20e0934cc8a4cdf91586d4883c69e2040a6b67e4
 DIST mage-1.13.0.tar.gz 8802625 BLAKE2B eb31c6f69b3e4cefc5816489c4c641740b924fd9dfdb91bf7fb7af6e6e119c09097b5fd6bef4e7194f5eee37945e194c5ddbda939295f4b433605bac4708a268 SHA512 a393a0192ecaf8664f9dd35acfd994993ab1c028a08fb8c925fc569ce58dc9d58baeef4760b012563e3f3a6957c77d548bb33a6b577d12af2e030e2465e6d24b
 EBUILD mage-1.11.0.ebuild 443 BLAKE2B d910d404ecc79a8973b5fc1ab873e317508f0d5f97000126f2af349fadbf422f08fe393ea8428a6c84c235a437027c37e253e8d905bfdedb5183fcd71b31ef86 SHA512 e1e69b3f109fc7f5d8f5231fbbb11238acbbfd2af174e1f04d67cd120e625e922106dce0dc75f02d0ecb3bc89f68aff1183ead24465a602bd0545ad91e721b80
 EBUILD mage-1.13.0.ebuild 443 BLAKE2B 86fe6ed7b72fbe096914c786c4f5cc08dbe8e1f06ea966d59812bd8deed68d5c48be03d2df8df82bc30828b79a24dd566b0faf29e0f72df981cea34a1d695986 SHA512 c3fb0caefc913eb26657ebe57fb1e19a04a5741494c7f8ca81e8e106be405df28033e10f65fae318e097883ba2b560c6317f024564ab2f47fe1e644463031f94
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 327 BLAKE2B 98fa81cecfb7b6f1d1702f3394c66d977e84dcc7a8c288a824af42d4d7b72043f4181c8e92636c9b43c51db554dc7261345a532443a8a5cbca4cecfe6af5d023 SHA512 6b2a8cfc8391b13e02d51fc879ce515a8790ec9af5714d286d17202ea20d5a736d18fe095dde857bfd45d03472522f31586621c360646772f84d05136aaf4834
diff --git a/dev-util/mage/metadata.xml b/dev-util/mage/metadata.xml
index db463f3eeb66..2470b06def1e 100644
--- a/dev-util/mage/metadata.xml
+++ b/dev-util/mage/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">magefile/mage</remote-id>
+	</upstream>
 </pkgmetadata>
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