public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-01-14  3:18 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-01-14  3:18 UTC (permalink / raw
  To: gentoo-commits

commit:     7eca49abfbb82f783f10318780b53224d17968f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 03:17:44 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 03:17:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca49ab

dev-build/meson: Stabilize 1.3.0-r2 hppa, #921373

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.0-r2.ebuild b/dev-build/meson/meson-1.3.0-r2.ebuild
index c663b7fe3456..321c8279eb4d 100644
--- a/dev-build/meson/meson-1.3.0-r2.ebuild
+++ b/dev-build/meson/meson-1.3.0-r2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-14  0:27 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-14  0:27 UTC (permalink / raw
  To: gentoo-commits

commit:     56a5c9c531c45adfc1dfd0077832f55975bfc873
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 13 21:00:52 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 00:25:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a5c9c5

dev-build/meson: add 1.3.2

Drop patches which were backported to gentoo in 1.3.1-r1 and upstream in
1.3.2.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35310
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest           |   2 +
 dev-build/meson/meson-1.3.2.ebuild | 130 +++++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 67d0986b387c..38c3e6a66ee7 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -10,3 +10,5 @@ DIST meson-1.3.0.tar.gz 2222383 BLAKE2B cb9ac8e00fe924df67166938687584a9de35e784
 DIST meson-1.3.0.tar.gz.asc 833 BLAKE2B d83b819e75e732d694ac98412717af39a8115defc7371f1983e4619cf990b5cdfd7ab7c93911f2a8b6c7055c7252ebeba04d15f508f4278b506e326fa1801a25 SHA512 8c72bfe5f3bdec9c9f787dd5a7186599bb44079a89d0a87a535a6e890adb7718cbf570b2ac74583b72b92aa05160823a8571ca530384787c428e49d6fbe095ba
 DIST meson-1.3.1.tar.gz 2222386 BLAKE2B 64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a SHA512 6e694beb70329535faca9405358c04e2fd5a490b0c0d2678d5831b7de3477e0fcf4f6a242f1bc6218da04ac4f6e096ee53cdf273c6b6a38a35d370e8c16694ba
 DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c SHA512 0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873
+DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
+DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
new file mode 100644
index 000000000000..c41bb4b8cbf7
--- /dev/null
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+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 )
+	"
+	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
+
+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
+		app-alternatives/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+
+	# backport fix for hiding compiler warnings (such as Modern C) in vala and cython
+	"${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.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/_&/'
+	)
+
+	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() {
+	(
+		# 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
+}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-19  4:04 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-19  4:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0edd9f0effdff89999ff883d54aa3d64825c7452
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 03:59:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 04:04:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edd9f0e

dev-build/meson: Stabilize amd64, #924949

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
index 6a86fb79dedb..40bfea501720 100644
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-19  5:08 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-19  5:08 UTC (permalink / raw
  To: gentoo-commits

commit:     0d6fefc3137d750f1e3bfdc2bd37b54fa154b820
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 05:08:14 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 05:08:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6fefc3

dev-build/meson: Stabilize 1.3.1-r1 arm64, #924949

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
index 40bfea501720..f4fb7deab480 100644
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-19  5:08 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-19  5:08 UTC (permalink / raw
  To: gentoo-commits

commit:     5b8825cb41ecbc644809e1c7c860630ee625f0a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 05:08:15 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 05:08:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8825cb

dev-build/meson: Stabilize 1.3.1-r1 arm, #924949

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
index f4fb7deab480..51da3b4f85b6 100644
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-19  5:08 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-19  5:08 UTC (permalink / raw
  To: gentoo-commits

commit:     fe97b83c9bfe2a9d12af992ca57f2686434f72ed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 05:08:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 05:08:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe97b83c

dev-build/meson: Stabilize 1.3.1-r1 sparc, #924949

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
index 51da3b4f85b6..8ab3ef50008e 100644
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-19  5:08 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-19  5:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6954fd662e858edf71652688fed2d31db75ee8da
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 05:08:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 05:08:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6954fd66

dev-build/meson: Stabilize 1.3.1-r1 ppc64, #924949

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
index 110a47371889..ad75501a2cb4 100644
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-19  5:08 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-19  5:08 UTC (permalink / raw
  To: gentoo-commits

commit:     7f3cf4cc7080fc136526bf37dcf3e8c2b3368a6b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 05:08:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 05:08:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3cf4cc

dev-build/meson: Stabilize 1.3.1-r1 x86, #924949

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
index 8ab3ef50008e..110a47371889 100644
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-26 22:27 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-26 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     973aecd3315d2651f3977e13970ccdc155ae8304
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Feb 26 22:22:28 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 22:26:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973aecd3

dev-build/meson: add 1.4.0_rc1

Beginning the 1.4.0 testing cycle.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest               |   2 +
 dev-build/meson/meson-1.4.0_rc1.ebuild | 127 +++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 38c3e6a66ee7..2230338a92d4 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -12,3 +12,5 @@ DIST meson-1.3.1.tar.gz 2222386 BLAKE2B 64d53eddc8cb321a4e2dabaa4b7499798a7b6876
 DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c SHA512 0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873
 DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
+DIST meson-1.4.0rc1.tar.gz 2226075 BLAKE2B af810c785ff4a0c3eab91cf1a963a364c256aa72ba086b61821370ee37b8ca8133337993c5b28afdf990787074a486f34f00344419e4cd63c2784833d7fd7d7b SHA512 0c59531c6169d8d81b66781496cc5406ce3ba45069643c8b8e3fc13dc578bd16d42776e94373193fbe976caa53258da8fcc6a20cecb6d4db757c1fed5f1b970f
+DIST meson-1.4.0rc1.tar.gz.asc 833 BLAKE2B 7a98191f3493cc3b15b3aec793e4852692e101bb9cc8818c6815c566e39eb117a3e12d3b961cdbba22f271ddfe9eca23adfbf30bdef522997a35156e1d58bb39 SHA512 0c112cf7c67fa290f2bd0964ab1757fda03e0dac4bb3a52583c95b908522a9a3086fa6a6adfc9c2f875f92d8db54ab5ba1a1af9a6e457cc9be103d0f72c04320

diff --git a/dev-build/meson/meson-1.4.0_rc1.ebuild b/dev-build/meson/meson-1.4.0_rc1.ebuild
new file mode 100644
index 000000000000..aaa0403ac9dc
--- /dev/null
+++ b/dev-build/meson/meson-1.4.0_rc1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+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 )
+	"
+	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
+
+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
+		app-alternatives/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.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/_&/'
+	)
+
+	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() {
+	(
+		# 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
+}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-02-28 15:27 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-02-28 15:27 UTC (permalink / raw
  To: gentoo-commits

commit:     db898a86abcb87674b7f8b974f6e3f741bab3eeb
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Feb 28 05:09:51 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 15:26:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db898a86

dev-build/meson: drop old

In general, no one should ever be running an old patchlevel release for
a minor version that has received updates. This is the purpose of bugfix
releases.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest              |   4 --
 dev-build/meson/meson-1.2.1-r1.ebuild | 129 ---------------------------------
 dev-build/meson/meson-1.2.1-r2.ebuild | 130 ---------------------------------
 dev-build/meson/meson-1.2.2-r1.ebuild | 130 ---------------------------------
 dev-build/meson/meson-1.2.2.ebuild    | 129 ---------------------------------
 dev-build/meson/meson-1.3.0-r1.ebuild | 132 ----------------------------------
 6 files changed, 654 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 2230338a92d4..d6f7668c82a7 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -1,9 +1,5 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.1.1.tar.gz.asc 833 BLAKE2B 165f3a0e8093995e82efcdea78b8cf0d2479505aeec145cf0c4bf3448dd74f0b5d1631e574e7d945d5b5976e11c065043ab0a6efe5646484a5bcd6386050a073 SHA512 004ec7e530ad21b012e461c8d50322295e4ec96a1a3197dbcbeb24b8bd6465a34008541e6fc547e451a50dce53f7ce170ec1bfd8c465ded56a5924e880aa0539
-DIST meson-1.2.1.tar.gz 2182126 BLAKE2B b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58 SHA512 6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e
-DIST meson-1.2.1.tar.gz.asc 833 BLAKE2B e4c1ee16f65631815ce5c1be49df77b7eab91e9f256ffcbf3555d257cf468bbcca49ee79ce6ddb701f35b9be0ce6c315809094b87ccfeff8f4de2d1995dbf6ff SHA512 c41b4a6686016cddc407497b003590939760c4f19d1f4481c315024f76f1ecd055dd6f8c7ba3647549c7ff192ab10097b9d0ad64e449ab83f623ea62d0ae4703
-DIST meson-1.2.2.tar.gz 2190455 BLAKE2B b355c8e5ab7508fca51dbe5c95eea68f91b995a670ad20eb9b7e93d3c97ad5363afe3fbd39cd554d1a6953a07166851257d16706acc9db6d5265e6452e40a857 SHA512 8dde3235f31862953e2f4db2527e441dfa9413b5f7545c85949ebc0f3b58819307ca124bf04d481d6f1425d6a4c93051239a659554322af893c97b651379fa86
-DIST meson-1.2.2.tar.gz.asc 833 BLAKE2B 21c12a94ea5803b8a608d522988f9da63826bff9ce4a74c8c2cf9721d87504b930135532697e9a18710f732446dde2dc70f1c972f825542d043ae20bb76ed9f5 SHA512 9d4117a09f6852bcad7c91c0084bf6f37c05295b134d297a77b8ca5958edb93f030d05e216206c42cf2739e5a6ccdf680fb612056f3a21da9ec3ee80922236df
 DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8 SHA512 cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc
 DIST meson-1.2.3.tar.gz.asc 833 BLAKE2B 1416c49302aab80b5f647cc1d6cd18c36f6199e79c7d13ea284143b2423267b5823850218578626937c14589ebcdf19069b310394c63bc762ab8f59d7ebe3780 SHA512 852c031ecfe032cb48d284bb270597d114294b7d1be5dd0df6ec2f78a62e1a5ba82711bc14ae410e47ced54f99a639055a1628b0acf7aa07a3a80034fce5ebc9
 DIST meson-1.3.0.tar.gz 2222383 BLAKE2B cb9ac8e00fe924df67166938687584a9de35e784e1e52bff281649d787695d37e3044ea3d6d5869181fe1e9676b5136548293dbd5cdbd091a6de0c449b8932f5 SHA512 fbcbdd9551ad12b7be84411b96357e01c7c0c38a8e9933093d2e71ed7e12bd4278245798684d389c332eb75dd50c99310affc9acb01cf8bedd45265335083a32

diff --git a/dev-build/meson/meson-1.2.1-r1.ebuild b/dev-build/meson/meson-1.2.1-r1.ebuild
deleted file mode 100644
index 5443030fc815..000000000000
--- a/dev-build/meson/meson-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-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 )
-	"
-	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
-
-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
-		app-alternatives/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-path.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-build/meson/meson-1.2.1-r2.ebuild b/dev-build/meson/meson-1.2.1-r2.ebuild
deleted file mode 100644
index 8394dad75715..000000000000
--- a/dev-build/meson/meson-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-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 )
-	"
-	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
-
-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
-		app-alternatives/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-path.patch
-	"${FILESDIR}"/${P}-llvm-17.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-build/meson/meson-1.2.2-r1.ebuild b/dev-build/meson/meson-1.2.2-r1.ebuild
deleted file mode 100644
index f19775d1fd3d..000000000000
--- a/dev-build/meson/meson-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-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 )
-	"
-	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
-
-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
-		app-alternatives/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
-	"${FILESDIR}"/1.2.2
-)
-
-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-build/meson/meson-1.2.2.ebuild b/dev-build/meson/meson-1.2.2.ebuild
deleted file mode 100644
index 2562b7ab025f..000000000000
--- a/dev-build/meson/meson-1.2.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-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 )
-	"
-	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
-
-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
-		app-alternatives/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-python-path.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-build/meson/meson-1.3.0-r1.ebuild b/dev-build/meson/meson-1.3.0-r1.ebuild
deleted file mode 100644
index 63d6c0a17684..000000000000
--- a/dev-build/meson/meson-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-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 )
-	"
-	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
-
-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
-		app-alternatives/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
-
-	# backport fix for broken configure_file()
-	"${FILESDIR}"/0001-Only-convert-boolean-values-for-cmake-formats.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
-}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-02 18:07 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-03-02 18:07 UTC (permalink / raw
  To: gentoo-commits

commit:     13018a415f32f453072cf653fd017fa80bcb6bf0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 18:07:02 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 18:07:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13018a41

dev-build/meson: Stabilize 1.3.1-r1 ppc, #924949

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
index ad75501a2cb4..6bbfeaeaa0e0 100644
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-03 23:18 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-03 23:18 UTC (permalink / raw
  To: gentoo-commits

commit:     dec446a1d744af666866e1724e34640fd9410ed1
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Mar  3 22:49:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 23:18:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec446a1

dev-build/meson: add 1.4.0_rc2

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest                                           | 4 ++--
 dev-build/meson/{meson-1.4.0_rc1.ebuild => meson-1.4.0_rc2.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index d6f7668c82a7..518929cb4023 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -8,5 +8,5 @@ DIST meson-1.3.1.tar.gz 2222386 BLAKE2B 64d53eddc8cb321a4e2dabaa4b7499798a7b6876
 DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c SHA512 0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873
 DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
-DIST meson-1.4.0rc1.tar.gz 2226075 BLAKE2B af810c785ff4a0c3eab91cf1a963a364c256aa72ba086b61821370ee37b8ca8133337993c5b28afdf990787074a486f34f00344419e4cd63c2784833d7fd7d7b SHA512 0c59531c6169d8d81b66781496cc5406ce3ba45069643c8b8e3fc13dc578bd16d42776e94373193fbe976caa53258da8fcc6a20cecb6d4db757c1fed5f1b970f
-DIST meson-1.4.0rc1.tar.gz.asc 833 BLAKE2B 7a98191f3493cc3b15b3aec793e4852692e101bb9cc8818c6815c566e39eb117a3e12d3b961cdbba22f271ddfe9eca23adfbf30bdef522997a35156e1d58bb39 SHA512 0c112cf7c67fa290f2bd0964ab1757fda03e0dac4bb3a52583c95b908522a9a3086fa6a6adfc9c2f875f92d8db54ab5ba1a1af9a6e457cc9be103d0f72c04320
+DIST meson-1.4.0rc2.tar.gz 2227818 BLAKE2B 8b33fc50c726f8aa712aa8d23da712051d99b72f909e74baec54fef64e559a5562b75947987057e496e0d161ff9c2fa85140bf6fac70ecbc2375a09036e8422d SHA512 e070fa321824e2870371fc869157b469a1d37353706984e52d5f6dbe2730561ce6a0aefe15a697b2c2be4060fea29430a5f2460a4fa25736a8bd72f99bcc9b72
+DIST meson-1.4.0rc2.tar.gz.asc 833 BLAKE2B 9ce4649f7c4fff4d8c0f12bb5d309dc5662a133a14b9ceb01c511b6619a59314ff19aca8fab94cd904d5b33abecf3248b9f2c6a3efdbdf91de95aebba1f1ac50 SHA512 400e8e4b3f1910a06b94aa5b23919e9c049c4a91d6612b9792e8e0796f90d01644930f2cd44903c3d4a29bedf989b3aba4cb5c88c1507fafaa277ee0e4db0ba3

diff --git a/dev-build/meson/meson-1.4.0_rc1.ebuild b/dev-build/meson/meson-1.4.0_rc2.ebuild
similarity index 100%
rename from dev-build/meson/meson-1.4.0_rc1.ebuild
rename to dev-build/meson/meson-1.4.0_rc2.ebuild


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-03 23:18 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-03 23:18 UTC (permalink / raw
  To: gentoo-commits

commit:     7e548173a7b8ae7d75ad48f0ba6db52545fc91e8
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Mar  3 22:49:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 23:18:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e548173

dev-build/meson: add additional test quirks

A couple tests fail with LTO enabled in make.conf. This is because they
do things like try to link C <-> rust and cannot handle incompatible
bytecode formats.

It's really irrelevant to the tests, since these are end-to-end project
tests for a build system and there's no actual value in testing meson
w.r.t. -flto. Meson already has some tests covering meson's own support
of LTO, and that's all that really matters.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0_rc2.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0_rc2.ebuild b/dev-build/meson/meson-1.4.0_rc2.ebuild
index aaa0403ac9dc..f089b6a869b1 100644
--- a/dev-build/meson/meson-1.4.0_rc2.ebuild
+++ b/dev-build/meson/meson-1.4.0_rc2.ebuild
@@ -28,7 +28,7 @@ else
 	fi
 fi
 
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs
 
 DESCRIPTION="Open source build system"
 HOMEPAGE="https://mesonbuild.com/"
@@ -86,6 +86,11 @@ src_test() {
 
 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:"


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-14  6:40 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-14  6:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b36edfbfd7a99c96eb16799c8258704e380fc625
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 14 06:37:52 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 06:39:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b36edfbf

dev-build/meson: add 1.4.0

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest                                       | 4 ++--
 dev-build/meson/{meson-1.4.0_rc2.ebuild => meson-1.4.0.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 518929cb4023..9f68e5541aa6 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -8,5 +8,5 @@ DIST meson-1.3.1.tar.gz 2222386 BLAKE2B 64d53eddc8cb321a4e2dabaa4b7499798a7b6876
 DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c SHA512 0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873
 DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
-DIST meson-1.4.0rc2.tar.gz 2227818 BLAKE2B 8b33fc50c726f8aa712aa8d23da712051d99b72f909e74baec54fef64e559a5562b75947987057e496e0d161ff9c2fa85140bf6fac70ecbc2375a09036e8422d SHA512 e070fa321824e2870371fc869157b469a1d37353706984e52d5f6dbe2730561ce6a0aefe15a697b2c2be4060fea29430a5f2460a4fa25736a8bd72f99bcc9b72
-DIST meson-1.4.0rc2.tar.gz.asc 833 BLAKE2B 9ce4649f7c4fff4d8c0f12bb5d309dc5662a133a14b9ceb01c511b6619a59314ff19aca8fab94cd904d5b33abecf3248b9f2c6a3efdbdf91de95aebba1f1ac50 SHA512 400e8e4b3f1910a06b94aa5b23919e9c049c4a91d6612b9792e8e0796f90d01644930f2cd44903c3d4a29bedf989b3aba4cb5c88c1507fafaa277ee0e4db0ba3
+DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486 SHA512 2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd
+DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad

diff --git a/dev-build/meson/meson-1.4.0_rc2.ebuild b/dev-build/meson/meson-1.4.0.ebuild
similarity index 100%
rename from dev-build/meson/meson-1.4.0_rc2.ebuild
rename to dev-build/meson/meson-1.4.0.ebuild


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-19  3:42 Ionen Wolkens
  0 siblings, 0 replies; 76+ messages in thread
From: Ionen Wolkens @ 2024-03-19  3:42 UTC (permalink / raw
  To: gentoo-commits

commit:     8167b338a569f00847def24810cee63f40c115c9
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Mon Mar 18 15:48:29 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 03:42:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8167b338

dev-build/meson: Stabilize 1.3.1-r1 hppa, #924949

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-build/meson/meson-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
index 6bbfeaeaa0e0..8a1bba292f2a 100644
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-19  5:50 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-19  5:50 UTC (permalink / raw
  To: gentoo-commits

commit:     79b31dccce6f4644f158cfbe9c8694cca807426d
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 19 05:15:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 05:48:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b31dcc

dev-build/meson: install the meson-reference(3) manpage

It requires additional dependencies to build, but meson uploads the
built version as a release asset. It will need to be built in the live
ebuild but users of a live ebuild can bear the ignominious burden of one
small python package. :D

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest                           |  1 +
 .../{meson-9999.ebuild => meson-1.4.0-r1.ebuild}   | 54 ++++++++++++++++++++--
 dev-build/meson/meson-9999.ebuild                  | 54 ++++++++++++++++++++--
 3 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 9f68e5541aa6..c57d99aefd52 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -10,3 +10,4 @@ DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb5
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
 DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486 SHA512 2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd
 DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad
+DIST meson-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
similarity index 74%
copy from dev-build/meson/meson-9999.ebuild
copy to dev-build/meson/meson-1.4.0-r1.ebuild
index f089b6a869b1..ec92df368f4f 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -6,9 +6,17 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..12} 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 git-r3
+	inherit ninja-utils git-r3
+
+	BDEPEND="
+		${NINJA_DEPEND}
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	"
+
 else
 	inherit verify-sig
 
@@ -19,6 +27,7 @@ else
 	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
@@ -28,8 +37,6 @@ else
 	fi
 fi
 
-inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs
-
 DESCRIPTION="Open source build system"
 HOMEPAGE="https://mesonbuild.com/"
 
@@ -56,6 +63,16 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
 )
 
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		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
@@ -75,6 +92,31 @@ python_prepare_all() {
 	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
@@ -129,4 +171,10 @@ python_install_all() {
 	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-${PV}.3 meson-reference.3
+	fi
 }

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index f089b6a869b1..ec92df368f4f 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -6,9 +6,17 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..12} 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 git-r3
+	inherit ninja-utils git-r3
+
+	BDEPEND="
+		${NINJA_DEPEND}
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	"
+
 else
 	inherit verify-sig
 
@@ -19,6 +27,7 @@ else
 	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
@@ -28,8 +37,6 @@ else
 	fi
 fi
 
-inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs
-
 DESCRIPTION="Open source build system"
 HOMEPAGE="https://mesonbuild.com/"
 
@@ -56,6 +63,16 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
 )
 
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		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
@@ -75,6 +92,31 @@ python_prepare_all() {
 	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
@@ -129,4 +171,10 @@ python_install_all() {
 	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-${PV}.3 meson-reference.3
+	fi
 }


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-19  5:50 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-19  5:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f7eb1d145dafea17188ee0f0d735436a86123e3e
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 19 05:13:50 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 05:48:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7eb1d14

dev-build/meson: sync live

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-9999.ebuild | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index 4e7497b5c819..f089b6a869b1 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -28,7 +28,7 @@ else
 	fi
 fi
 
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs
 
 DESCRIPTION="Open source build system"
 HOMEPAGE="https://mesonbuild.com/"
@@ -52,6 +52,10 @@ RDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+)
+
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
@@ -61,12 +65,6 @@ python_prepare_all() {
 		# 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
@@ -88,6 +86,16 @@ src_test() {
 
 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
 
@@ -107,8 +115,7 @@ python_test() {
 		# 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
+		${EPYTHON} -u run_tests.py
 	) || die "Testing failed with ${EPYTHON}"
 }
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-19  5:50 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-19  5:50 UTC (permalink / raw
  To: gentoo-commits

commit:     e16bbc501be375593a0dadb347bd3de8d1f265ec
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 05:50:08 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 05:50:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e16bbc50

dev-build/meson: fix DoubleEmptyLine

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 1 -
 dev-build/meson/meson-9999.ebuild     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index ec92df368f4f..76daad8a812e 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -63,7 +63,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
 )
 
-
 src_unpack() {
 	if [[ ${PV} = *9999* ]]; then
 		git-r3_src_unpack

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index ec92df368f4f..76daad8a812e 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -63,7 +63,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
 )
 
-
 src_unpack() {
 	if [[ ${PV} = *9999* ]]; then
 		git-r3_src_unpack


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-19  6:09 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-19  6:09 UTC (permalink / raw
  To: gentoo-commits

commit:     e639e8fd292f6fedbeb2941cfa165106c3c7be28
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 19 06:03:52 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 06:05:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e639e8fd

dev-build/meson: add a blocker on versions of muon with the manpage

Oops.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 1 +
 dev-build/meson/meson-9999.ebuild     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index 76daad8a812e..26906b31fc92 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -56,6 +56,7 @@ DEPEND="
 	)
 "
 RDEPEND="
+	!<dev-build/muon-0.2.0-r2[man(-)]
 	virtual/pkgconfig
 "
 

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index 76daad8a812e..26906b31fc92 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -56,6 +56,7 @@ DEPEND="
 	)
 "
 RDEPEND="
+	!<dev-build/muon-0.2.0-r2[man(-)]
 	virtual/pkgconfig
 "
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-19  7:21 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-19  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     83874f9eccd994a001a33a6284a2750ec64b748e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 07:19:44 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 07:20:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83874f9e

dev-build/meson: fix USE=-verify-sig

Closes: https://bugs.gentoo.org/927277
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 dev-build/meson/meson-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index 26906b31fc92..027a1fc01853 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -69,7 +69,7 @@ src_unpack() {
 		git-r3_src_unpack
 	else
 		default
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+		use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
 	fi
 }
 

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index 26906b31fc92..027a1fc01853 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -69,7 +69,7 @@ src_unpack() {
 		git-r3_src_unpack
 	else
 		default
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+		use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-22  4:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-22  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     46b61c98fcaa654bd6947a32720f379dc7a8ecb7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 04:03:05 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 04:03:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b61c98

dev-build/meson: Stabilize 1.3.2 ppc, #927462

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index c41bb4b8cbf7..63c3c9318d88 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-22  4:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-22  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     6dbf69025197d1238e5ae06652b5fe38c3735e59
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 04:03:09 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 04:03:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dbf6902

dev-build/meson: Stabilize 1.3.2 arm64, #927462

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index 0130b31c17b6..211d718fe4bb 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-22  4:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-22  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     1e324cf1b719c3f1f8fbb4ea42a87075f961ad5f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 04:03:06 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 04:03:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e324cf1

dev-build/meson: Stabilize 1.3.2 ppc64, #927462

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index 63c3c9318d88..508b077187cc 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-22  4:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-22  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     8fe3e1b4a8717a393faedd796ac57cbe0a1ebb19
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 04:03:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 04:03:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe3e1b4

dev-build/meson: Stabilize 1.3.2 arm, #927462

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index 508b077187cc..0130b31c17b6 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-22  4:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-03-22  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     5286429effbff2238f9dce251b2b212c429f162d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 04:03:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 04:03:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5286429e

dev-build/meson: Stabilize 1.3.2 sparc, #927462

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index 211d718fe4bb..e2361226a1c8 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-22  6:14 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-03-22  6:14 UTC (permalink / raw
  To: gentoo-commits

commit:     51f042454cc8b26eb0ece359d2ab2f348fb7df54
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 06:14:11 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 06:14:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f04245

dev-build/meson: Stabilize 1.3.2 amd64, #927462

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index e99bffca521d..678bb44fc09d 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-03-22  6:14 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-03-22  6:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1f8f7fdd178028d3493c8f0fdf3917b6bc11da93
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 06:14:10 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 06:14:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8f7fdd

dev-build/meson: Stabilize 1.3.2 x86, #927462

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index e2361226a1c8..e99bffca521d 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-04-17  5:37 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-04-17  5:37 UTC (permalink / raw
  To: gentoo-commits

commit:     fef20340906d376b9648f2f865a4af27ffeebde0
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Apr 16 22:29:21 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 05:36:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef20340

dev-build/meson: Stabilize 1.3.2 hppa, #927462

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index 678bb44fc09d..9c8c4cef6bc3 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-01  6:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-01  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     141a694f0bebcbe3ec56632b443dcff18b6b02da
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 06:03:12 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  1 06:03:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141a694f

dev-build/meson: Stabilize 1.4.0-r1 x86, #930997

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index bec21e4a81d3..633eff79dfc6 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-01  6:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-01  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     24a88593d51a369c2865fc1af247c9a894aeefb0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 06:03:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  1 06:03:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a88593

dev-build/meson: Stabilize 1.4.0-r1 ppc, #930997

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index c73ce203e912..bec21e4a81d3 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-01  6:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-01  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     66e6767f63f547e162950cf75a69e0ecd42f24bd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 06:03:14 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  1 06:03:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e6767f

dev-build/meson: Stabilize 1.4.0-r1 arm, #930997

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index e7e4ea7aa21b..5761171de7d6 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-01  6:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-01  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     e1c3d2a5e193dcbb638773a980c32f6c7694349f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 06:03:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  1 06:03:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c3d2a5

dev-build/meson: Stabilize 1.4.0-r1 arm64, #930997

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index 633eff79dfc6..e7e4ea7aa21b 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-01  6:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-01  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     ad9cb8d5b2a56b42b29462649d57adc58c2213b3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 06:03:09 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  1 06:03:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad9cb8d5

dev-build/meson: Stabilize 1.4.0-r1 sparc, #930997

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index 027a1fc01853..c73ce203e912 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-01  6:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-01  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     519942a88b0f87d3c6ff6f6493b40d08936c407d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 06:03:15 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  1 06:03:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519942a8

dev-build/meson: Stabilize 1.4.0-r1 amd64, #930997

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index 5761171de7d6..a7e9c48e7ae9 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-01  6:03 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-01  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     14ffa788281853b68661d872e3507b48086ef608
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 06:03:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  1 06:03:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ffa788

dev-build/meson: Stabilize 1.4.0-r1 ppc64, #930997

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index a7e9c48e7ae9..c46e944a5d16 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-05 20:07 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-05-05 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e95f2c30ba6bd767c775397d3d6c47cbcb9de170
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 20:06:49 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun May  5 20:06:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95f2c30

dev-build/meson: Stabilize 1.4.0-r1 hppa, #930997

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index c46e944a5d16..d30bc90b1103 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-13 18:45 Michał Górny
  0 siblings, 0 replies; 76+ messages in thread
From: Michał Górny @ 2024-05-13 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     6c402b8999d80c1dce6bc075184545ca9e592cb9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 17:06:19 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 13 18:44:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c402b89

dev-build/meson: Enable py3.13

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 dev-build/meson/meson-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index d30bc90b1103..24f0d730f741 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index 027a1fc01853..b65657a09c33 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-13 19:41 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-13 19:41 UTC (permalink / raw
  To: gentoo-commits

commit:     5ea7d3029192357a89585cc8997f9f370a2ad090
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon May 13 18:49:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 13 19:40:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ea7d302

Revert "dev-build/meson: Enable py3.13"

This reverts commit 6c402b8999d80c1dce6bc075184545ca9e592cb9.

Meson doesn't pass tests upstream with py3.13, nor when overriding
RESTRICT=test and testing it on gentoo.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.0-r1.ebuild | 2 +-
 dev-build/meson/meson-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
index 24f0d730f741..d30bc90b1103 100644
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ b/dev-build/meson/meson-1.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index b65657a09c33..027a1fc01853 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-05-31 20:10 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-05-31 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     dfa1b608bf6d6566827b4c9ea60d9443cc482186
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu May 30 19:08:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 31 20:09:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfa1b608

dev-build/meson: add 1.4.1

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest           |   3 +
 dev-build/meson/meson-1.4.1.ebuild | 180 +++++++++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index c57d99aefd52..60c78060b987 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -10,4 +10,7 @@ DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb5
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
 DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486 SHA512 2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd
 DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad
+DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
+DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
 DIST meson-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768
+DIST meson-reference-1.4.1.3 339324 BLAKE2B a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488 SHA512 fc94aa95df3cd04af49ab2f27050c3ef206407a2ccb3b61d9c8660deba55eae3fb627d83713de62f3e1216a1a33a88e989bf5b557b7e17adbb73a57d5f2ad11a

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
new file mode 100644
index 000000000000..027a1fc01853
--- /dev/null
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} 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/_&/'
+	)
+
+	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
+}
+
+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-${PV}.3 meson-reference.3
+	fi
+}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  1:32 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  1:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ab7c96ea605a876344fbfabda71b59627f6b67da
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 01:18:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 01:31:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7c96ea

dev-build/meson: drop old

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest              |   4 -
 dev-build/meson/meson-1.3.0-r2.ebuild | 135 ---------------------------------
 dev-build/meson/meson-1.3.1-r1.ebuild | 136 ----------------------------------
 dev-build/meson/meson-1.4.0.ebuild    | 132 ---------------------------------
 4 files changed, 407 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index f1863f8dda4f..762d95058f6b 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -2,10 +2,6 @@ DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d976890
 DIST meson-1.1.1.tar.gz.asc 833 BLAKE2B 165f3a0e8093995e82efcdea78b8cf0d2479505aeec145cf0c4bf3448dd74f0b5d1631e574e7d945d5b5976e11c065043ab0a6efe5646484a5bcd6386050a073 SHA512 004ec7e530ad21b012e461c8d50322295e4ec96a1a3197dbcbeb24b8bd6465a34008541e6fc547e451a50dce53f7ce170ec1bfd8c465ded56a5924e880aa0539
 DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8 SHA512 cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc
 DIST meson-1.2.3.tar.gz.asc 833 BLAKE2B 1416c49302aab80b5f647cc1d6cd18c36f6199e79c7d13ea284143b2423267b5823850218578626937c14589ebcdf19069b310394c63bc762ab8f59d7ebe3780 SHA512 852c031ecfe032cb48d284bb270597d114294b7d1be5dd0df6ec2f78a62e1a5ba82711bc14ae410e47ced54f99a639055a1628b0acf7aa07a3a80034fce5ebc9
-DIST meson-1.3.0.tar.gz 2222383 BLAKE2B cb9ac8e00fe924df67166938687584a9de35e784e1e52bff281649d787695d37e3044ea3d6d5869181fe1e9676b5136548293dbd5cdbd091a6de0c449b8932f5 SHA512 fbcbdd9551ad12b7be84411b96357e01c7c0c38a8e9933093d2e71ed7e12bd4278245798684d389c332eb75dd50c99310affc9acb01cf8bedd45265335083a32
-DIST meson-1.3.0.tar.gz.asc 833 BLAKE2B d83b819e75e732d694ac98412717af39a8115defc7371f1983e4619cf990b5cdfd7ab7c93911f2a8b6c7055c7252ebeba04d15f508f4278b506e326fa1801a25 SHA512 8c72bfe5f3bdec9c9f787dd5a7186599bb44079a89d0a87a535a6e890adb7718cbf570b2ac74583b72b92aa05160823a8571ca530384787c428e49d6fbe095ba
-DIST meson-1.3.1.tar.gz 2222386 BLAKE2B 64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a SHA512 6e694beb70329535faca9405358c04e2fd5a490b0c0d2678d5831b7de3477e0fcf4f6a242f1bc6218da04ac4f6e096ee53cdf273c6b6a38a35d370e8c16694ba
-DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c SHA512 0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873
 DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
 DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486 SHA512 2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd

diff --git a/dev-build/meson/meson-1.3.0-r2.ebuild b/dev-build/meson/meson-1.3.0-r2.ebuild
deleted file mode 100644
index 321c8279eb4d..000000000000
--- a/dev-build/meson/meson-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-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 )
-	"
-	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
-
-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
-		app-alternatives/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
-
-	# backport fix for broken configure_file()
-	"${FILESDIR}"/0001-Only-convert-boolean-values-for-cmake-formats.patch
-
-	# backport fix for hiding compiler warnings (such as Modern C) in vala and cython
-	"${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.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-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild
deleted file mode 100644
index 8a1bba292f2a..000000000000
--- a/dev-build/meson/meson-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-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 )
-	"
-	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
-
-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
-		app-alternatives/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
-
-	# backport fix for hiding compiler warnings (such as Modern C) in vala and cython
-	"${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch
-
-	# backport revert for broken rpath changes: https://github.com/mesonbuild/meson/pull/12672
-	"${FILESDIR}"/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch
-
-	# backport macos Prefix fix: https://github.com/mesonbuild/meson/pull/12747
-	"${FILESDIR}"/meson-1.3.1-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/_&/'
-	)
-
-	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() {
-	(
-		# 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
-}

diff --git a/dev-build/meson/meson-1.4.0.ebuild b/dev-build/meson/meson-1.4.0.ebuild
deleted file mode 100644
index f089b6a869b1..000000000000
--- a/dev-build/meson/meson-1.4.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-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 )
-	"
-	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
-
-inherit bash-completion-r1 flag-o-matic 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
-		app-alternatives/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-python-path.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/_&/'
-	)
-
-	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() {
-	(
-		# 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
-}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  1:32 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  1:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f6bad1b3b58baf4bc1f73b515926b3e8306a2cfd
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 01:16:02 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 01:31:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6bad1b3

dev-build/meson: add 1.5.0_rc1

Includes py3.13 support.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/Manifest               |   3 +
 dev-build/meson/meson-1.5.0_rc1.ebuild | 180 +++++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 60c78060b987..f1863f8dda4f 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -12,5 +12,8 @@ DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610
 DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad
 DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
 DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
+DIST meson-1.5.0rc1.tar.gz 2253455 BLAKE2B 1e0d9e350532a75c8db8295dba4e12527eca9be21cf9dfd55f86fb4f063c618e93c5f579c23ddebf322a3c2e29fbad41ce9051565bd997c3b234d7eb6c3a0f60 SHA512 d19168bf32a1c758c63d08cf8eb0b8c3b63b22e8bdef1ccccf2b7d6970cc1a4ea9400b0ee593765ad579c8184cfa6b731138a040d2aad6ebe9943c8c7778da13
+DIST meson-1.5.0rc1.tar.gz.asc 833 BLAKE2B 256058d06f2e13eab8b2a82211d78f7fd2fc70ec65f7e97a1441311a6df5ca82a7950f06b4523af6494951a4a49bba5ed69c8cefc95b56fe7913e2c17a300b31 SHA512 260052a143ea050ada19673d622a459c36717d6bedf56c699c2afbf287ad78d01572c50d510d875537f4ad81442a5caed5639b9f5c25b015ca4041335f92b1d7
 DIST meson-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768
 DIST meson-reference-1.4.1.3 339324 BLAKE2B a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488 SHA512 fc94aa95df3cd04af49ab2f27050c3ef206407a2ccb3b61d9c8660deba55eae3fb627d83713de62f3e1216a1a33a88e989bf5b557b7e17adbb73a57d5f2ad11a
+DIST meson-reference-1.5.0rc1.3 341787 BLAKE2B aaa8b32db40cfcb91fab2a147e7d4ca77e934606f630eda3362adeaa2f25df25ee4393876a4c4e5a6320ec4c4c689dcb2f8d0560d74b694c61d9449da44fd508 SHA512 4cb6ca649f167b477fc26f45bde9eb3e7fe9b322efe55146578ddc42ad075737a3d15ca3d6724d2ffa52131d5f4bb3b480d02eda20a38bfffd326910de0d5f92

diff --git a/dev-build/meson/meson-1.5.0_rc1.ebuild b/dev-build/meson/meson-1.5.0_rc1.ebuild
new file mode 100644
index 000000000000..b65657a09c33
--- /dev/null
+++ b/dev-build/meson/meson-1.5.0_rc1.ebuild
@@ -0,0 +1,180 @@
+# 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/_&/'
+	)
+
+	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
+}
+
+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-${PV}.3 meson-reference.3
+	fi
+}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  1:32 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  1:32 UTC (permalink / raw
  To: gentoo-commits

commit:     5e8bdf124e507d3efaf5a9a59a10c6e16de116d2
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 01:12:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 01:31:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e8bdf12

dev-build/meson: enable py3.13 in live

A couple known problems are now resolved via:
https://github.com/mesonbuild/meson/pull/13205

And tests pass under 3.13.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index 027a1fc01853..b65657a09c33 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  3:11 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  3:11 UTC (permalink / raw
  To: gentoo-commits

commit:     a8828147bee8f1e891f399ebe1f108b91e392607
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 03:10:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 03:10:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8828147

dev-build/meson: Stabilize 1.4.1 amd64, #934824

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
index 027a1fc01853..7f9a27b97c06 100644
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  3:35 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6be0a23309d9dae207fd792c3e1e1dd9bdfc111f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 03:34:35 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 03:34:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be0a233

dev-build/meson: Stabilize 1.4.1 arm, #934824

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
index 2eb0dc9d0f08..7ea18ad78c15 100644
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  3:35 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     ef5ae2447381b74310014254c009ecfc655f8361
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 03:34:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 03:34:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5ae244

dev-build/meson: Stabilize 1.4.1 arm64, #934824

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
index 269c56bcf83e..c46e944a5d16 100644
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  3:35 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     a8190407be29c303b8078a29e0d1aec0a2627314
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 03:34:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 03:34:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8190407

dev-build/meson: Stabilize 1.4.1 ppc64, #934824

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
index 7ea18ad78c15..269c56bcf83e 100644
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  3:35 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     c437937de02cfa8f44c1e1f4840e000799204a60
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 03:34:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 03:34:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c437937d

dev-build/meson: Stabilize 1.4.1 ppc, #934824

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
index f41668614cc5..3c59e8444d3b 100644
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  3:35 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     c681fcb50f6745fa0a92eab8ab281d8f92077f7b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 03:34:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 03:34:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c681fcb5

dev-build/meson: Stabilize 1.4.1 x86, #934824

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
index 3c59e8444d3b..2eb0dc9d0f08 100644
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  3:35 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     24c48fcc4b597a5e982ac2cd26b636ee3193dd22
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 03:34:30 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 03:34:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c48fcc

dev-build/meson: Stabilize 1.4.1 sparc, #934824

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
index 7f9a27b97c06..f41668614cc5 100644
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ b/dev-build/meson/meson-1.4.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-06-25  4:48 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-06-25  4:48 UTC (permalink / raw
  To: gentoo-commits

commit:     adeacceebb6a1ac395c69be6d3b3eac55e0fc316
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 04:42:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 04:48:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adeaccee

dev-build/meson: actually commit the change to support release candidates

The manpage needs to be installed via the correct name as downloaded.
This was normally correct but for release candidates we need to map a
gentoo version to an upstream version. We did this at download time,
just not in src_install.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.5.0_rc1.ebuild | 2 +-
 dev-build/meson/meson-9999.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-build/meson/meson-1.5.0_rc1.ebuild b/dev-build/meson/meson-1.5.0_rc1.ebuild
index b65657a09c33..2a1d8a788dbb 100644
--- a/dev-build/meson/meson-1.5.0_rc1.ebuild
+++ b/dev-build/meson/meson-1.5.0_rc1.ebuild
@@ -175,6 +175,6 @@ python_install_all() {
 	if [[ ${PV} = *9999* ]]; then
 		DESTDIR="${ED}" eninja -C docs/builddir install
 	else
-		newman "${DISTDIR}"/meson-reference-${PV}.3 meson-reference.3
+		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 b65657a09c33..2a1d8a788dbb 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -175,6 +175,6 @@ python_install_all() {
 	if [[ ${PV} = *9999* ]]; then
 		DESTDIR="${ED}" eninja -C docs/builddir install
 	else
-		newman "${DISTDIR}"/meson-reference-${PV}.3 meson-reference.3
+		newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3
 	fi
 }


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-07-03 21:25 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-07-03 21:25 UTC (permalink / raw
  To: gentoo-commits

commit:     bd0905453fb376d7a1cf0a16f1410a1dbf52fce7
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 20:30:06 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 21:24:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd090545

dev-build/meson: add 1.5.0_rc2

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest                                           | 6 +++---
 dev-build/meson/{meson-1.5.0_rc1.ebuild => meson-1.5.0_rc2.ebuild} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 762d95058f6b..599e2396f14e 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -8,8 +8,8 @@ DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610
 DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad
 DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
 DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
-DIST meson-1.5.0rc1.tar.gz 2253455 BLAKE2B 1e0d9e350532a75c8db8295dba4e12527eca9be21cf9dfd55f86fb4f063c618e93c5f579c23ddebf322a3c2e29fbad41ce9051565bd997c3b234d7eb6c3a0f60 SHA512 d19168bf32a1c758c63d08cf8eb0b8c3b63b22e8bdef1ccccf2b7d6970cc1a4ea9400b0ee593765ad579c8184cfa6b731138a040d2aad6ebe9943c8c7778da13
-DIST meson-1.5.0rc1.tar.gz.asc 833 BLAKE2B 256058d06f2e13eab8b2a82211d78f7fd2fc70ec65f7e97a1441311a6df5ca82a7950f06b4523af6494951a4a49bba5ed69c8cefc95b56fe7913e2c17a300b31 SHA512 260052a143ea050ada19673d622a459c36717d6bedf56c699c2afbf287ad78d01572c50d510d875537f4ad81442a5caed5639b9f5c25b015ca4041335f92b1d7
+DIST meson-1.5.0rc2.tar.gz 2255834 BLAKE2B e3bd5cb22676b69576698faa955eaaa14af9b891efd6853180eb9824a9a75e102af1b1c7c3c9cfc27581605720536e569911697ea1248cb1328d72169f270fb1 SHA512 39a1aa84a9aa219358f34dcd485a3788731f3325a2cd6bbbbb19b6b24a33852fa68fff9d6a0ad3a18e3fbf58a880839a6f54cfa3e2bf779c1212cd36f3b45a79
+DIST meson-1.5.0rc2.tar.gz.asc 833 BLAKE2B 69a865a872a8e0dd47081be6a5456d475c13b636fb8699a83ca82b870f1917ca7608910236fe2d77b8e45838cf0a61466ee176408e89c87c6643f3881d49adcd SHA512 3101e759fc205d73434de71b56fb17ac3076691d6bdeb7f038b5d2983ed29680a54578fe8180d74809c4ec63c2e71dcff9d7d911c187c2fc7d7f7651972dce6e
 DIST meson-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768
 DIST meson-reference-1.4.1.3 339324 BLAKE2B a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488 SHA512 fc94aa95df3cd04af49ab2f27050c3ef206407a2ccb3b61d9c8660deba55eae3fb627d83713de62f3e1216a1a33a88e989bf5b557b7e17adbb73a57d5f2ad11a
-DIST meson-reference-1.5.0rc1.3 341787 BLAKE2B aaa8b32db40cfcb91fab2a147e7d4ca77e934606f630eda3362adeaa2f25df25ee4393876a4c4e5a6320ec4c4c689dcb2f8d0560d74b694c61d9449da44fd508 SHA512 4cb6ca649f167b477fc26f45bde9eb3e7fe9b322efe55146578ddc42ad075737a3d15ca3d6724d2ffa52131d5f4bb3b480d02eda20a38bfffd326910de0d5f92
+DIST meson-reference-1.5.0rc2.3 341787 BLAKE2B 70e07aa724d6e46a1679178c7e34b05ec0cf825d0f163981f70e25f8e914a5746156e2c2169d68f0ad482a813f77bc6a2343009f84f0aa4746c0f47e65ae6dfe SHA512 37ba1c1a6655cadcb155bc2b1ae46d850f46b49209ddcd319a190d3e1579dc2bfd92528e7ab737206f0b212fcb58355b9ba8de4c60ceae8f044712746b6db4f4

diff --git a/dev-build/meson/meson-1.5.0_rc1.ebuild b/dev-build/meson/meson-1.5.0_rc2.ebuild
similarity index 100%
rename from dev-build/meson/meson-1.5.0_rc1.ebuild
rename to dev-build/meson/meson-1.5.0_rc2.ebuild


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-07-08 19:25 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-07-08 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     38c87bff66c9d531f48d66512015b56642dde6ea
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  8 19:20:49 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Jul  8 19:24:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38c87bff

dev-build/meson: add 1.5.0_rc3

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest                                           | 6 +++---
 dev-build/meson/{meson-1.5.0_rc2.ebuild => meson-1.5.0_rc3.ebuild} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 599e2396f14e..61bc1fd13407 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -8,8 +8,8 @@ DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610
 DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad
 DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
 DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
-DIST meson-1.5.0rc2.tar.gz 2255834 BLAKE2B e3bd5cb22676b69576698faa955eaaa14af9b891efd6853180eb9824a9a75e102af1b1c7c3c9cfc27581605720536e569911697ea1248cb1328d72169f270fb1 SHA512 39a1aa84a9aa219358f34dcd485a3788731f3325a2cd6bbbbb19b6b24a33852fa68fff9d6a0ad3a18e3fbf58a880839a6f54cfa3e2bf779c1212cd36f3b45a79
-DIST meson-1.5.0rc2.tar.gz.asc 833 BLAKE2B 69a865a872a8e0dd47081be6a5456d475c13b636fb8699a83ca82b870f1917ca7608910236fe2d77b8e45838cf0a61466ee176408e89c87c6643f3881d49adcd SHA512 3101e759fc205d73434de71b56fb17ac3076691d6bdeb7f038b5d2983ed29680a54578fe8180d74809c4ec63c2e71dcff9d7d911c187c2fc7d7f7651972dce6e
+DIST meson-1.5.0rc3.tar.gz 2261804 BLAKE2B 19475e84099a2652dc94c08c69b1b889281eba554ca7d4bf089ff80d5b56f6199b4d0fc0dd37d42adcd6d77d087f655eab0be1b6a03566f74ad2a5e267f19185 SHA512 3941f62ce9c2cace78fb8daa85dba375eda16e3fbf1822a1af4e7c478b99c6c29d4135214a592d2d394a16261c8cd3198a8f1ed1102359dbbf78ff41c1f8e5a1
+DIST meson-1.5.0rc3.tar.gz.asc 833 BLAKE2B b05ad7927e6618afa6c41e0471d4b3118c4c91515272059d8a75e5770a19b7870147c44e1d68606ba3c98449f7c91929d351ba0c807943ab1410c65cf282fea4 SHA512 bb0c315ae5d59123fa06f530c779bc843c57f262867143d1f44feac6c8958f3638e59ee1900163d28a4adb95243445e5cc60d9efbdcfd55cefdec80d3774eca2
 DIST meson-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768
 DIST meson-reference-1.4.1.3 339324 BLAKE2B a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488 SHA512 fc94aa95df3cd04af49ab2f27050c3ef206407a2ccb3b61d9c8660deba55eae3fb627d83713de62f3e1216a1a33a88e989bf5b557b7e17adbb73a57d5f2ad11a
-DIST meson-reference-1.5.0rc2.3 341787 BLAKE2B 70e07aa724d6e46a1679178c7e34b05ec0cf825d0f163981f70e25f8e914a5746156e2c2169d68f0ad482a813f77bc6a2343009f84f0aa4746c0f47e65ae6dfe SHA512 37ba1c1a6655cadcb155bc2b1ae46d850f46b49209ddcd319a190d3e1579dc2bfd92528e7ab737206f0b212fcb58355b9ba8de4c60ceae8f044712746b6db4f4
+DIST meson-reference-1.5.0rc3.3 341114 BLAKE2B 7b6b5e672a4cdf42531d6b33abb0c41d1d8b13bbcb6740587f07a40a782c1bcf031c44894f9ece50e815599a3e6565a6272ea40cbcc5d7330009a9723b08bf60 SHA512 210d77bd45518dcdf5a36a2df4b69685dddcc72ba958326ba70c81ed5d7fef973297afc5f4ebf169c4a3db85a6ca6107d47c925ddf6a327a37f92182b498f294

diff --git a/dev-build/meson/meson-1.5.0_rc2.ebuild b/dev-build/meson/meson-1.5.0_rc3.ebuild
similarity index 100%
rename from dev-build/meson/meson-1.5.0_rc2.ebuild
rename to dev-build/meson/meson-1.5.0_rc3.ebuild


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-07-11  0:34 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-07-11  0:34 UTC (permalink / raw
  To: gentoo-commits

commit:     8e9526c3b7df7a50abba96abe64d1e0736be6d05
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 19:26:08 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 00:33:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9526c3

dev-build/meson: add 1.4.2

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest           |   3 +
 dev-build/meson/meson-1.4.2.ebuild | 184 +++++++++++++++++++++++++++++++++++++
 2 files changed, 187 insertions(+)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 61bc1fd13407..4bc00b45efa4 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -8,8 +8,11 @@ DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610
 DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad
 DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
 DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
+DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad56c363471b5be59521f08c0b70da5dc5b3f991e5c715d6b59f4752738515bd8dc2412a6dc5ca1fa42e7cd63b SHA512 4aed1a5f133de2c6839bab361a0e911dd5697f5dac2a8f100df69d43a8880a810dcfa1aa6402cdfb9c5e14fdceec76925f0496c301c31ba733a32618c403eaf0
+DIST meson-1.4.2.tar.gz.asc 833 BLAKE2B 64ce1fc0fecdd6aa76bb89d88ff7497548d82afc00805c083a0bca7ce4cee41dc50be50368e333649ae7e863c03ea780fe24a48c525281fbbcab679b540f4254 SHA512 51d3245f9443cb398e2e8f225f00a853848bde1bfba02bae6334d47115e36ad96c8ec03244f6169c89d73162b86a73158a7f8d08d5bd6b3d28e8369ce7b55093
 DIST meson-1.5.0rc3.tar.gz 2261804 BLAKE2B 19475e84099a2652dc94c08c69b1b889281eba554ca7d4bf089ff80d5b56f6199b4d0fc0dd37d42adcd6d77d087f655eab0be1b6a03566f74ad2a5e267f19185 SHA512 3941f62ce9c2cace78fb8daa85dba375eda16e3fbf1822a1af4e7c478b99c6c29d4135214a592d2d394a16261c8cd3198a8f1ed1102359dbbf78ff41c1f8e5a1
 DIST meson-1.5.0rc3.tar.gz.asc 833 BLAKE2B b05ad7927e6618afa6c41e0471d4b3118c4c91515272059d8a75e5770a19b7870147c44e1d68606ba3c98449f7c91929d351ba0c807943ab1410c65cf282fea4 SHA512 bb0c315ae5d59123fa06f530c779bc843c57f262867143d1f44feac6c8958f3638e59ee1900163d28a4adb95243445e5cc60d9efbdcfd55cefdec80d3774eca2
 DIST meson-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768
 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.0rc3.3 341114 BLAKE2B 7b6b5e672a4cdf42531d6b33abb0c41d1d8b13bbcb6740587f07a40a782c1bcf031c44894f9ece50e815599a3e6565a6272ea40cbcc5d7330009a9723b08bf60 SHA512 210d77bd45518dcdf5a36a2df4b69685dddcc72ba958326ba70c81ed5d7fef973297afc5f4ebf169c4a3db85a6ca6107d47c925ddf6a327a37f92182b498f294

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
new file mode 100644
index 000000000000..1d559a807e62
--- /dev/null
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} 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/_&/'
+	)
+
+	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
+
+	# The 1.4.2 tarball accidentally contains some untracked files from git master:
+	# - subprojects/bar-0.1/Cargo.toml
+	rm -r "test cases/rust/25 cargo lock/"
+
+	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-${PV}.3 meson-reference.3
+	fi
+}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-07-11  0:34 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-07-11  0:34 UTC (permalink / raw
  To: gentoo-commits

commit:     e8874b1971eeb1e8a404d6a9ee9890f0b1edf694
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 21:58:31 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 00:33:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8874b19

dev-build/meson: add 1.5.0

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest                                       | 6 +++---
 dev-build/meson/{meson-1.5.0_rc3.ebuild => meson-1.5.0.ebuild} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 4bc00b45efa4..bcaf26f70684 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -10,9 +10,9 @@ DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0
 DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
 DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad56c363471b5be59521f08c0b70da5dc5b3f991e5c715d6b59f4752738515bd8dc2412a6dc5ca1fa42e7cd63b SHA512 4aed1a5f133de2c6839bab361a0e911dd5697f5dac2a8f100df69d43a8880a810dcfa1aa6402cdfb9c5e14fdceec76925f0496c301c31ba733a32618c403eaf0
 DIST meson-1.4.2.tar.gz.asc 833 BLAKE2B 64ce1fc0fecdd6aa76bb89d88ff7497548d82afc00805c083a0bca7ce4cee41dc50be50368e333649ae7e863c03ea780fe24a48c525281fbbcab679b540f4254 SHA512 51d3245f9443cb398e2e8f225f00a853848bde1bfba02bae6334d47115e36ad96c8ec03244f6169c89d73162b86a73158a7f8d08d5bd6b3d28e8369ce7b55093
-DIST meson-1.5.0rc3.tar.gz 2261804 BLAKE2B 19475e84099a2652dc94c08c69b1b889281eba554ca7d4bf089ff80d5b56f6199b4d0fc0dd37d42adcd6d77d087f655eab0be1b6a03566f74ad2a5e267f19185 SHA512 3941f62ce9c2cace78fb8daa85dba375eda16e3fbf1822a1af4e7c478b99c6c29d4135214a592d2d394a16261c8cd3198a8f1ed1102359dbbf78ff41c1f8e5a1
-DIST meson-1.5.0rc3.tar.gz.asc 833 BLAKE2B b05ad7927e6618afa6c41e0471d4b3118c4c91515272059d8a75e5770a19b7870147c44e1d68606ba3c98449f7c91929d351ba0c807943ab1410c65cf282fea4 SHA512 bb0c315ae5d59123fa06f530c779bc843c57f262867143d1f44feac6c8958f3638e59ee1900163d28a4adb95243445e5cc60d9efbdcfd55cefdec80d3774eca2
+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-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768
 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.0rc3.3 341114 BLAKE2B 7b6b5e672a4cdf42531d6b33abb0c41d1d8b13bbcb6740587f07a40a782c1bcf031c44894f9ece50e815599a3e6565a6272ea40cbcc5d7330009a9723b08bf60 SHA512 210d77bd45518dcdf5a36a2df4b69685dddcc72ba958326ba70c81ed5d7fef973297afc5f4ebf169c4a3db85a6ca6107d47c925ddf6a327a37f92182b498f294
+DIST meson-reference-1.5.0.3 341110 BLAKE2B c81d1014f93ca3848e03e6a8948190a31e1823b04134ab6861db94d5b9517252bf66fcbbc987ba2051430c54282256d729d3575db83e1e8d09fa344c6ff06dbf SHA512 b45c7b40cbe1abf7416d50c1c7658726d4feda4a30627a6dc70c7b9aab61f72c9c7c1fa915e47f4b50e9d82987e4179db8ab3d5158ec5ef3d7856335b604f603

diff --git a/dev-build/meson/meson-1.5.0_rc3.ebuild b/dev-build/meson/meson-1.5.0.ebuild
similarity index 100%
rename from dev-build/meson/meson-1.5.0_rc3.ebuild
rename to dev-build/meson/meson-1.5.0.ebuild


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-07-11  3:15 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-07-11  3:15 UTC (permalink / raw
  To: gentoo-commits

commit:     75429502f814c34df6c05a7e0c538f35adf5cd59
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 03:14:30 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 03:14:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75429502

dev-build/meson: drop old

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest              |   3 -
 dev-build/meson/meson-1.4.0-r1.ebuild | 180 ----------------------------------
 2 files changed, 183 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index bcaf26f70684..24e33d0e26a3 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -4,15 +4,12 @@ DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa
 DIST meson-1.2.3.tar.gz.asc 833 BLAKE2B 1416c49302aab80b5f647cc1d6cd18c36f6199e79c7d13ea284143b2423267b5823850218578626937c14589ebcdf19069b310394c63bc762ab8f59d7ebe3780 SHA512 852c031ecfe032cb48d284bb270597d114294b7d1be5dd0df6ec2f78a62e1a5ba82711bc14ae410e47ced54f99a639055a1628b0acf7aa07a3a80034fce5ebc9
 DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
-DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486 SHA512 2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd
-DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad
 DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
 DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
 DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad56c363471b5be59521f08c0b70da5dc5b3f991e5c715d6b59f4752738515bd8dc2412a6dc5ca1fa42e7cd63b SHA512 4aed1a5f133de2c6839bab361a0e911dd5697f5dac2a8f100df69d43a8880a810dcfa1aa6402cdfb9c5e14fdceec76925f0496c301c31ba733a32618c403eaf0
 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-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768
 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

diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild
deleted file mode 100644
index d30bc90b1103..000000000000
--- a/dev-build/meson/meson-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} 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/_&/'
-	)
-
-	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
-}
-
-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-${PV}.3 meson-reference.3
-	fi
-}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-07-11 16:29 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-07-11 16:29 UTC (permalink / raw
  To: gentoo-commits

commit:     286a9a66fb3d1f9643f4751c8f65affa6fff7e89
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 04:16:06 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 16:28:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=286a9a66

dev-build/meson: skip another test that inexplicably fails

I do not know why clippy-driver fails to compile sanity.rs, but it does.
It works flawlessly outside of portage, and is tested like that in
upstream CI running on Gentoo. And tests pass on my machine, in a git
checkout of meson. But not when running the same thing in portage. Even
manually constructing a sanity.rs file in ${FILESDIR} and executing
`clippy-driver ...` in src_test fails, but the exact same command
run inside of `sudo -u portage bash` upon the same file, succeeds.

It's not the portage sandbox, but it is something about the portage
environment, and I have not been able to figure out what. And it's
making it impossible to run the testsuite.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 6 ++++++
 dev-build/meson/meson-1.5.0.ebuild | 6 ++++++
 dev-build/meson/meson-9999.ebuild  | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index 1d559a807e62..4b7ba1a3634a 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -82,6 +82,12 @@ 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

diff --git a/dev-build/meson/meson-1.5.0.ebuild b/dev-build/meson/meson-1.5.0.ebuild
index 2a1d8a788dbb..762876dc5e40 100644
--- a/dev-build/meson/meson-1.5.0.ebuild
+++ b/dev-build/meson/meson-1.5.0.ebuild
@@ -82,6 +82,12 @@ 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

diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index 2a1d8a788dbb..762876dc5e40 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -82,6 +82,12 @@ 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


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-07-29  1:19 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-07-29  1:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a1fd60e05bb9a6158dc4f664d4328d229b357915
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 00:36:04 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 01:19:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1fd60e0

dev-build/meson: add 1.5.1

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest           |   3 +
 dev-build/meson/meson-1.5.1.ebuild | 190 +++++++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 24e33d0e26a3..536d224b89be 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -10,6 +10,9 @@ 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

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


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-07-29  1:19 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-07-29  1:19 UTC (permalink / raw
  To: gentoo-commits

commit:     bf408fd63c6aa6e9afd0546c4abdfc0990d9e6a2
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 00:32:45 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 01:19:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf408fd6

dev-build/meson: disable CUDA tests

If CUDA is installed, we try to test it and everything fails. The issue
seems to be that CUDA simply cannot handle the use of LDFLAGS. It may be
possible for meson to mangle these for you, but it currently does not.
There's a tracking ticket for it.

It's preferable to test common functionality rather than work around
bugs. Just pretend CUDA doesn't exist as far as src_test is concerned.

Closes: https://bugs.gentoo.org/936757
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/meson-1.4.1.ebuild | 10 ++++++++++
 dev-build/meson/meson-1.4.2.ebuild |  4 ++++
 dev-build/meson/meson-1.5.0.ebuild |  4 ++++
 dev-build/meson/meson-9999.ebuild  |  4 ++++
 4 files changed, 22 insertions(+)

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


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-14 23:29 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-08-14 23:29 UTC (permalink / raw
  To: gentoo-commits

commit:     1ebb08853c313e5c0c21528d6a458b73b6e7d1f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 23:28:50 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 23:28:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebb0885

dev-build/meson: Stabilize 1.5.1 amd64, #937937

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index 9a7ebe5d40e4..8c9c3db01773 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-14 23:29 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-08-14 23:29 UTC (permalink / raw
  To: gentoo-commits

commit:     f8bdfef9517499aae5ad7e45767d31d23fb0c1bd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 23:28:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 23:28:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8bdfef9

dev-build/meson: Stabilize 1.5.1 x86, #937937

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index 9cddc1a7a32d..9a7ebe5d40e4 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-16  1:16 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-08-16  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f2bcabbcec03d24adf9bf7886a1573bdebddd9c4
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 01:14:02 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 01:14:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2bcabbc

dev-build/meson: drop old

We skipped stabilizing this one and started stabilizing the next
bugfix.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest           |   3 -
 dev-build/meson/meson-1.5.0.ebuild | 190 -------------------------------------
 2 files changed, 193 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 536d224b89be..6e0689e80bcc 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -8,11 +8,8 @@ DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0
 DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
 DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad56c363471b5be59521f08c0b70da5dc5b3f991e5c715d6b59f4752738515bd8dc2412a6dc5ca1fa42e7cd63b SHA512 4aed1a5f133de2c6839bab361a0e911dd5697f5dac2a8f100df69d43a8880a810dcfa1aa6402cdfb9c5e14fdceec76925f0496c301c31ba733a32618c403eaf0
 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

diff --git a/dev-build/meson/meson-1.5.0.ebuild b/dev-build/meson/meson-1.5.0.ebuild
deleted file mode 100644
index 9cddc1a7a32d..000000000000
--- a/dev-build/meson/meson-1.5.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-20 18:05 Sam James
  0 siblings, 0 replies; 76+ messages in thread
From: Sam James @ 2024-08-20 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     88f8ded1cbc7a9a98d459d11285b5629984aac89
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 18:04:40 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 18:04:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f8ded1

dev-build/meson: Stabilize 1.4.2 x86, #938244

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index c1202d979e1c..c37809e05762 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-20 22:22 Jakov Smolić
  0 siblings, 0 replies; 76+ messages in thread
From: Jakov Smolić @ 2024-08-20 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     0dcc4bfd4d24c8efe6a86e4f0e353288b0b1ec6d
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 22:22:03 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 22:22:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dcc4bfd

dev-build/meson: Stabilize 1.4.2 amd64, #938244

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index c37809e05762..30681ff29c9c 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  7:16 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     4dfcd96c22458fc90627804bf849cd484f3d8f77
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 07:15:53 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 07:15:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dfcd96c

dev-build/meson: Stabilize 1.4.2 arm, #938244

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index 30681ff29c9c..08c627b44c24 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  7:16 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     0f4bc39b4ccb1bfde3438ea1192551b13d5c8897
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 07:15:56 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 07:15:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4bc39b

dev-build/meson: Stabilize 1.4.2 arm64, #938244

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index 08c627b44c24..0dfccf696d0f 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  7:16 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     01f9324dd420dd934ca5b493cc8d14a4afb4102b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 07:15:59 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 07:15:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f9324d

dev-build/meson: Stabilize 1.4.2 ppc, #938244

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index 0dfccf696d0f..fb03fcabc7a7 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  7:16 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     a03de17f6a3ca12739c04a49efc5cfe842718ad4
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 07:16:02 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 07:16:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03de17f

dev-build/meson: Stabilize 1.4.2 ppc64, #938244

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index fb03fcabc7a7..9b2d1181c17c 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  9:39 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8f368a0bdc174a8d17e270acafd7d354a5ec7dbe
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 09:39:12 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 09:39:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f368a0b

dev-build/meson: Stabilize 1.4.2 sparc, #938244

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index 9b2d1181c17c..9789efe74960 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  9:40 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     7cb2d4cd1d66c72dd85b81cfe86ccaf2f4d1dab2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 09:40:10 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 09:40:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb2d4cd

dev-build/meson: Stabilize 1.5.1 arm, #937937

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index 8c9c3db01773..619cf82e95af 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  9:40 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     faf5954a09dc04778a1223b089ca94aa7ceae890
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 09:40:18 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 09:40:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf5954a

dev-build/meson: Stabilize 1.5.1 ppc64, #937937

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index 648e985655e5..1f355876b388 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  9:40 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     7f9f967d89f954344e4ad42f598fb9a3dfa3052b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 09:40:12 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 09:40:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9f967d

dev-build/meson: Stabilize 1.5.1 arm64, #937937

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index 619cf82e95af..eb8c6fe84f87 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  9:40 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b1fce003172dc05c84e2e64460179edbcc8dd1be
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 09:40:15 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 09:40:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fce003

dev-build/meson: Stabilize 1.5.1 ppc, #937937

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index eb8c6fe84f87..648e985655e5 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-21  9:40 Arthur Zamarin
  0 siblings, 0 replies; 76+ messages in thread
From: Arthur Zamarin @ 2024-08-21  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     ade4e93a3abdac1d219839ea2552ed70cda596ca
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 09:40:20 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 09:40:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade4e93a

dev-build/meson: Stabilize 1.5.1 sparc, #937937

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-build/meson/meson-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index 1f355876b388..f0a32e526747 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-29 14:28 Ionen Wolkens
  0 siblings, 0 replies; 76+ messages in thread
From: Ionen Wolkens @ 2024-08-29 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     0da3eb82c0eba77b8c49c986409dd57b0666c255
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu Aug 29 14:26:47 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 14:28:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da3eb82

dev-build/meson: Stabilize 1.5.1 hppa, #937937

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-build/meson/meson-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index f0a32e526747..432bf445fd27 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-29 14:28 Ionen Wolkens
  0 siblings, 0 replies; 76+ messages in thread
From: Ionen Wolkens @ 2024-08-29 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     615ac388405b7dd8ef2de29c45aa0dd9d4bc352a
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu Aug 29 05:27:07 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 14:28:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615ac388

dev-build/meson: Stabilize 1.4.2 hppa, #938244

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-build/meson/meson-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index 9789efe74960..cbfd9c783e84 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	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"
+		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
 


^ permalink raw reply related	[flat|nested] 76+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
@ 2024-08-29 14:32 Eli Schwartz
  0 siblings, 0 replies; 76+ messages in thread
From: Eli Schwartz @ 2024-08-29 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     fa207631169c8a7c62df8f4e9b8d523396c0b493
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 14:31:40 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 14:31:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa207631

dev-build/meson: drop old

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest           |   3 -
 dev-build/meson/meson-1.4.1.ebuild | 190 -------------------------------------
 2 files changed, 193 deletions(-)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 6e0689e80bcc..3b6ec88f671d 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -4,12 +4,9 @@ DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa
 DIST meson-1.2.3.tar.gz.asc 833 BLAKE2B 1416c49302aab80b5f647cc1d6cd18c36f6199e79c7d13ea284143b2423267b5823850218578626937c14589ebcdf19069b310394c63bc762ab8f59d7ebe3780 SHA512 852c031ecfe032cb48d284bb270597d114294b7d1be5dd0df6ec2f78a62e1a5ba82711bc14ae410e47ced54f99a639055a1628b0acf7aa07a3a80034fce5ebc9
 DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
-DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
-DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
 DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad56c363471b5be59521f08c0b70da5dc5b3f991e5c715d6b59f4752738515bd8dc2412a6dc5ca1fa42e7cd63b SHA512 4aed1a5f133de2c6839bab361a0e911dd5697f5dac2a8f100df69d43a8880a810dcfa1aa6402cdfb9c5e14fdceec76925f0496c301c31ba733a32618c403eaf0
 DIST meson-1.4.2.tar.gz.asc 833 BLAKE2B 64ce1fc0fecdd6aa76bb89d88ff7497548d82afc00805c083a0bca7ce4cee41dc50be50368e333649ae7e863c03ea780fe24a48c525281fbbcab679b540f4254 SHA512 51d3245f9443cb398e2e8f225f00a853848bde1bfba02bae6334d47115e36ad96c8ec03244f6169c89d73162b86a73158a7f8d08d5bd6b3d28e8369ce7b55093
 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.1.3 341110 BLAKE2B 5267c2eea1b1281f87e63eb08aa928257dd98088b4d5c27c2785d2d8066c2c28536f7f56bf804ffe37d2f51552c91f31ff7e2729f3b2485d594a9e44a0df9ab1 SHA512 2d36e87e9bc2de0b958f4b20544b0bd9f2b0ffb646768e68fefcd5dfb8f09c24db40f27208b5f2d1f6ba02e7465f68a538ea72be118670c76e0959e090a42cf3

diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
deleted file mode 100644
index db2001929162..000000000000
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} 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-${PV}.3 meson-reference.3
-	fi
-}


^ permalink raw reply related	[flat|nested] 76+ messages in thread

end of thread, other threads:[~2024-08-29 14:32 UTC | newest]

Thread overview: 76+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-19  5:08 [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29 14:32 Eli Schwartz
2024-08-29 14:28 Ionen Wolkens
2024-08-29 14:28 Ionen Wolkens
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:39 Arthur Zamarin
2024-08-21  7:16 Arthur Zamarin
2024-08-21  7:16 Arthur Zamarin
2024-08-21  7:16 Arthur Zamarin
2024-08-21  7:16 Arthur Zamarin
2024-08-20 22:22 Jakov Smolić
2024-08-20 18:05 Sam James
2024-08-16  1:16 Eli Schwartz
2024-08-14 23:29 Sam James
2024-08-14 23:29 Sam James
2024-07-29  1:19 Eli Schwartz
2024-07-29  1:19 Eli Schwartz
2024-07-11 16:29 Eli Schwartz
2024-07-11  3:15 Eli Schwartz
2024-07-11  0:34 Eli Schwartz
2024-07-11  0:34 Eli Schwartz
2024-07-08 19:25 Eli Schwartz
2024-07-03 21:25 Eli Schwartz
2024-06-25  4:48 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:11 Sam James
2024-06-25  1:32 Sam James
2024-06-25  1:32 Sam James
2024-06-25  1:32 Sam James
2024-05-31 20:10 Sam James
2024-05-13 19:41 Sam James
2024-05-13 18:45 Michał Górny
2024-05-05 20:07 Arthur Zamarin
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-04-17  5:37 Arthur Zamarin
2024-03-22  6:14 Arthur Zamarin
2024-03-22  6:14 Arthur Zamarin
2024-03-22  4:03 Sam James
2024-03-22  4:03 Sam James
2024-03-22  4:03 Sam James
2024-03-22  4:03 Sam James
2024-03-22  4:03 Sam James
2024-03-19  7:21 Sam James
2024-03-19  6:09 Sam James
2024-03-19  5:50 Sam James
2024-03-19  5:50 Sam James
2024-03-19  5:50 Sam James
2024-03-19  3:42 Ionen Wolkens
2024-03-14  6:40 Sam James
2024-03-03 23:18 Sam James
2024-03-03 23:18 Sam James
2024-03-02 18:07 Arthur Zamarin
2024-02-28 15:27 Sam James
2024-02-26 22:27 Sam James
2024-02-19  5:08 Sam James
2024-02-19  5:08 Sam James
2024-02-19  5:08 Sam James
2024-02-19  5:08 Sam James
2024-02-19  4:04 Sam James
2024-02-14  0:27 Sam James
2024-01-14  3:18 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox