subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-util\/meson\/"

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson-format-array/files/, profiles/updates/, ...

2024-01-13 Thread Michał Górny

commit: db90c393875ad4f98de526b1e124fa7dd7dac04f
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 13 18:03:46 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 13 20:11:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db90c393

Move {dev-util → dev-build}/meson-format-array

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

 .../gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild| 4 ++--
 .../gallium-nine-standalone/gallium-nine-standalone-.ebuild   | 4 ++--
 {dev-util => dev-build}/meson-format-array/files/meson-format-array   | 0
 .../meson-format-array/meson-format-array-0.ebuild| 2 +-
 {dev-util => dev-build}/meson-format-array/metadata.xml   | 0
 eclass/meson.eclass   | 2 +-
 profiles/updates/1Q-2024  | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
index 3da718cb8610..c66c70b8f145 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
 "
 
 BDEPEND="
-   dev-util/meson-format-array
+   dev-build/meson-format-array
virtual/pkgconfig
 "
 

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
index 3da718cb8610..c66c70b8f145 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
 "
 
 BDEPEND="
-   dev-util/meson-format-array
+   dev-build/meson-format-array
virtual/pkgconfig
 "
 

diff --git a/dev-util/meson-format-array/files/meson-format-array 
b/dev-build/meson-format-array/files/meson-format-array
similarity index 100%
rename from dev-util/meson-format-array/files/meson-format-array
rename to dev-build/meson-format-array/files/meson-format-array

diff --git a/dev-util/meson-format-array/meson-format-array-0.ebuild 
b/dev-build/meson-format-array/meson-format-array-0.ebuild
similarity index 94%
rename from dev-util/meson-format-array/meson-format-array-0.ebuild
rename to dev-build/meson-format-array/meson-format-array-0.ebuild
index 1800171ff92f..e9b3d6f92bc7 100644
--- a/dev-util/meson-format-array/meson-format-array-0.ebuild
+++ b/dev-build/meson-format-array/meson-format-array-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/dev-util/meson-format-array/metadata.xml 
b/dev-build/meson-format-array/metadata.xml
similarity index 100%
rename from dev-util/meson-format-array/metadata.xml
rename to dev-build/meson-format-array/metadata.xml

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 12e9dd4bd9a6..19b83a880a37 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -45,7 +45,7 @@ inherit multiprocessing ninja-utils python-utils-r1 
toolchain-funcs
 
 BDEPEND=">=dev-util/meson-1.2.1
${NINJA_DEPEND}
-   dev-util/meson-format-array
+   dev-build/meson-format-array
 "
 
 # @ECLASS_VARIABLE: BUILD_DIR

diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index f13c0df06bf2..a4a782a4949c 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -17,3 +17,4 @@ move sys-devel/bmake dev-build/bmake
 move sys-devel/pmake dev-build/pmake
 move sys-devel/remake dev-build/remake
 move dev-util/valgrind dev-debug/valgrind
+move dev-util/meson-format-array dev-build/meson-format-array

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/

2024-01-13 Thread Fabian Groffen

commit: b7035fb0da8ffcf1577b68d43f49511adee8237d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jan 13 16:23:49 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jan 13 16:24:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7035fb0

dev-util/meson-1.3.1: fix for Darwin with native linker again

Signed-off-by: Fabian Groffen  gentoo.org>

 .../meson/files/meson-1.3.1-xtools-support.patch   | 26 ++
 dev-util/meson/meson-1.3.1.ebuild  |  1 +
 2 files changed, 27 insertions(+)

diff --git a/dev-util/meson/files/meson-1.3.1-xtools-support.patch 
b/dev-util/meson/files/meson-1.3.1-xtools-support.patch
new file mode 100644
index ..6e9e670ba8da
--- /dev/null
+++ b/dev-util/meson/files/meson-1.3.1-xtools-support.patch
@@ -0,0 +1,26 @@
+linkers_detect: detect xtools (Apple ld64 derivative)
+
+xtools is in use on x86_64 and ppc based darwin Prefix installs.  Pick
+it up as a valid linker.
+
+Meson is the only thing known at this point to try and figure out what
+linker is in use exactly, so instead of changing the linker (xtools),
+just teach Meson about xtools.
+
+Author: Fabian Groffen 
+Bug: https://bugs.gentoo.org/868516
+
+--- a/mesonbuild/linkers/detect.py
 b/mesonbuild/linkers/detect.py
+@@ -185,6 +185,11 @@
+ v = search_version(o)
+ 
+ linker = linkers.LLVMDynamicLinker(compiler, for_machine, 
comp_class.LINKER_PREFIX, override, version=v)
++# detect xtools first, bug #868516
++elif 'xtools-' in o.split('\n')[0]:
++xtools = o.split(' ')[0]
++v = xtools.split('-')[1]
++linker = AppleDynamicLinker(compiler, for_machine, 
comp_class.LINKER_PREFIX, override, version=v)
+ # First might be apple clang, second is for real gcc, the third is icc.
+ # Note that "ld: unknown option: " sometimes instead is "ld: unknown 
options:".
+ elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e 
or 'ld: unknown option' in e:

diff --git a/dev-util/meson/meson-1.3.1.ebuild 
b/dev-util/meson/meson-1.3.1.ebuild
index 2498ea56a83a..0f026f75c31e 100644
--- a/dev-util/meson/meson-1.3.1.ebuild
+++ b/dev-util/meson/meson-1.3.1.ebuild
@@ -54,6 +54,7 @@ RDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+   "${FILESDIR}"/${PN}-1.3.1-xtools-support.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2024-01-05 Thread Arthur Zamarin

commit: bec1ab7e9f1b20cc7b1796db114fc12768b0d341
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 18:15:31 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 18:15:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec1ab7e

dev-util/meson: Stabilize 1.3.0-r2 ppc, #921373

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild 
b/dev-util/meson/meson-1.3.0-r2.ebuild
index 7ba217e693ce..c866e99a75e1 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2024-01-05 Thread Sam James

commit: 7b2f96997881271a80c82247e1e6de540bb1372a
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 08:12:42 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 08:12:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2f9699

dev-util/meson: Stabilize 1.3.0-r2 x86, #921373

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild 
b/dev-util/meson/meson-1.3.0-r2.ebuild
index 731af5e71112..7ba217e693ce 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2024-01-04 Thread Sam James

commit: 401ac6f0bf86727826682778d339dca1bee68a86
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 07:32:42 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 07:32:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=401ac6f0

dev-util/meson: Stabilize 1.3.0-r2 sparc, #921373

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild 
b/dev-util/meson/meson-1.3.0-r2.ebuild
index 50d49b761d92..5a3bb41d4077 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2024-01-04 Thread Sam James

commit: d483b6cfb1e61cebfd8c7679c71b86dde3ce88ab
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 07:32:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 07:32:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d483b6cf

dev-util/meson: Stabilize 1.3.0-r2 arm64, #921373

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild 
b/dev-util/meson/meson-1.3.0-r2.ebuild
index b769a241e93f..731af5e71112 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2024-01-04 Thread Sam James

commit: 8acdfc65c092a6f2a113d0bc603dac8699ec99e3
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 07:32:41 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 07:32:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8acdfc65

dev-util/meson: Stabilize 1.3.0-r2 amd64, #921373

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild 
b/dev-util/meson/meson-1.3.0-r2.ebuild
index 134a1abfe44a..50d49b761d92 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2024-01-04 Thread Sam James

commit: 0f3da06f6032432691bb4213fe3a4cc5933ca022
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 07:32:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 07:32:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3da06f

dev-util/meson: Stabilize 1.3.0-r2 ppc64, #921373

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/meson-1.3.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild 
b/dev-util/meson/meson-1.3.0-r2.ebuild
index af208ef34bdc..134a1abfe44a 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/meson/meson-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2024-01-04 Thread Sam James

commit: 2e43a93e0eb7197f382484829566b3b380f6bfe1
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 07:32:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 07:32:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e43a93e

dev-util/meson: Stabilize 1.3.0-r2 arm, #921373

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild 
b/dev-util/meson/meson-1.3.0-r2.ebuild
index 5a3bb41d4077..b769a241e93f 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-12-27 Thread Sam James

commit: 7085ccd609ce8b488a8af6297911216776be464c
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Dec 27 06:16:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 13:31:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7085ccd6

dev-util/meson: solve the python2 test breakage correctly this time

The problem is that python-utils-r1 adds some wrappers around all the
python impls. I am not sure what these wrappers do (we don't even use
the python3 one, since the PEP517 installed copy of meson comes before
that in PATH, and overrides it) but it also poisons the `python2`
command with a script that says it is unsupported.

Well, no kidding it's unsupported to invoke building and installing a
python3.11 wheel using a `python2` command. However, we are not actually
trying to do this. So we should not feel constrained by this, either.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/meson-1.3.1.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-util/meson/meson-1.3.1.ebuild 
b/dev-util/meson/meson-1.3.1.ebuild
index 3e41566b7b9c..4abc34926a12 100644
--- a/dev-util/meson/meson-1.3.1.ebuild
+++ b/dev-util/meson/meson-1.3.1.ebuild
@@ -74,9 +74,6 @@ python_prepare_all() {
 
# 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
@@ -98,6 +95,11 @@ src_test() {
 
 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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-12-27 Thread Sam James

commit: 84f86f16e6a7026c5e55c9dc395015488d17a3db
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Dec 27 06:12:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 13:31:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f86f16

dev-util/meson: drop no longer needed test workaround

Running python3 directly instead of EPYTHON was introduced in commit
2338a84f3c87c8c94b8b615279ef3efb011ca61c.

I cannot reproduce this test failure anymore. I think this was probably
fixed when I tweaked the tests way back when:
https://github.com/mesonbuild/meson/commit/908a78dbc249b8f9db5d5404ccd08809ea1964ef

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/meson-1.3.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-util/meson/meson-1.3.1.ebuild 
b/dev-util/meson/meson-1.3.1.ebuild
index 03ce81fbfb01..3e41566b7b9c 100644
--- a/dev-util/meson/meson-1.3.1.ebuild
+++ b/dev-util/meson/meson-1.3.1.ebuild
@@ -117,8 +117,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}"
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/

2023-12-27 Thread Sam James

commit: d5b75d996d0dae84bdca47d4fff6dad756a1fe80
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Dec 27 06:10:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 13:31:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b75d99

dev-util/meson: add 1.3.1

Drop a backported patch, and add a new backport instead. Progress!

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest|   2 +
 ...vert-clike-Deduplicate-rpath-linker-flags.patch |  55 +
 dev-util/meson/meson-1.3.1.ebuild  | 135 +
 3 files changed, 192 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 56b3c11d6c2d..67d0986b387c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -8,3 +8,5 @@ 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.0.tar.gz 383 BLAKE2B 
cb9ac8e00fe924df67166938687584a9de35e784e1e52bff281649d787695d37e3044ea3d6d5869181fe1e9676b5136548293dbd5cdbd091a6de0c449b8932f5
 SHA512 
fbcbdd9551ad12b7be84411b96357e01c7c0c38a8e9933093d2e71ed7e12bd4278245798684d389c332eb75dd50c99310affc9acb01cf8bedd45265335083a32
 DIST meson-1.3.0.tar.gz.asc 833 BLAKE2B 
d83b819e75e732d694ac98412717af39a8115defc7371f1983e4619cf990b5cdfd7ab7c93911f2a8b6c7055c7252ebeba04d15f508f4278b506e326fa1801a25
 SHA512 
8c72bfe5f3bdec9c9f787dd5a7186599bb44079a89d0a87a535a6e890adb7718cbf570b2ac74583b72b92aa05160823a8571ca530384787c428e49d6fbe095ba
+DIST meson-1.3.1.tar.gz 386 BLAKE2B 
64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a
 SHA512 
6e694beb70329535faca9405358c04e2fd5a490b0c0d2678d5831b7de3477e0fcf4f6a242f1bc6218da04ac4f6e096ee53cdf273c6b6a38a35d370e8c16694ba
+DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 
1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c
 SHA512 
0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873

diff --git 
a/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch 
b/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch
new file mode 100644
index ..3d40616fec1f
--- /dev/null
+++ 
b/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch
@@ -0,0 +1,55 @@
+From 2fbc7b5ce3aced483b196dd10ca9eee1713b7494 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Tue, 26 Dec 2023 15:06:12 -0500
+Subject: [PATCH] Revert "clike: Deduplicate rpath linker flags"
+
+This reverts commit 53ea59ad8455277797117d225f326851fe7d369c.
+
+This breaks at least:
+- frameworks/17 mpi
+- frameworks/30 scalapack
+
+The problem is that openmpi's pkg-config emitted link arguments
+includes:
+
+```
+-Wl,-rpath -Wl,/path/to/libdir
+```
+
+The deduplication logic in meson doesn't contain sufficient information
+to tell when the compiler is passing an argument that requires values,
+and definitely cannot tell when that argument is split across argv. But
+for arguments that *can* do this, it is not possible to deduplicate a
+single argument as standalone, because it is not standalone.
+
+The argument for deduplicating rpath here was that if you have multiple
+dependencies that all add the same rpath, the Apple ld64 emits a
+non-fatal warning "duplicate -rpath ignored". Since this is non-fatal,
+it's not a major issue. A major issue is when builds fatally error out
+with:
+
+```
+FAILED: scalapack_c
+cc  -o scalapack_c scalapack_c.p/main.c.o -Wl,--as-needed -Wl,--no-undefined 
-Wl,--start-group /usr/lib64/libscalapack.so /usr/lib64/liblapack.so 
/usr/lib64/libblas.so -Wl,-rpath -Wl,/usr/lib64 -Wl,/usr/lib64 
-Wl,--enable-new-dtags /usr/lib64/libmpi.so -Wl,--end-group
+/usr/libexec/gcc/x86_64-pc-linux-gnu/ld: error: /usr/lib64: read: Is a 
directory
+```
+---
+ mesonbuild/compilers/mixins/clike.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/compilers/mixins/clike.py 
b/mesonbuild/compilers/mixins/clike.py
+index b3fc96cec..76c8e0413 100644
+--- a/mesonbuild/compilers/mixins/clike.py
 b/mesonbuild/compilers/mixins/clike.py
+@@ -54,7 +54,7 @@ class CLikeCompilerArgs(arglist.CompilerArgs):
+ 
+ # NOTE: not thorough. A list of potential corner cases can be found in
+ # 
https://github.com/mesonbuild/meson/pull/4593#pullrequestreview-182016038
+-dedup1_prefixes = ('-l', '-Wl,-l', '-Wl,--export-dynamic', '-Wl,-rpath')
++dedup1_prefixes = ('-l', '-W

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-12-27 Thread Sam James

commit: b71a2848f9b83ab69c7da6ed82f3549debdb2d64
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Dec 27 06:27:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 13:31:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71a2848

dev-util/meson: remove outdated deselect of test relying on gcc[objc]

Workaround added in commit c8e5844221a71d1faddee13f2f7921010f786346.

This was upstream https://github.com/mesonbuild/meson/issues/7203 and
was solved as part of https://github.com/mesonbuild/meson/pull/7982.

Signed-off-by: Eli Schwartz  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34495
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/meson-1.3.1.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-util/meson/meson-1.3.1.ebuild 
b/dev-util/meson/meson-1.3.1.ebuild
index 4abc34926a12..0ae70d840991 100644
--- a/dev-util/meson/meson-1.3.1.ebuild
+++ b/dev-util/meson/meson-1.3.1.ebuild
@@ -71,9 +71,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/_&/'
)
 
sed -i "${disable_unittests[@]}" unittests/*.py || die

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/

2023-12-05 Thread Sam James

commit: 92d6b34449e631c904cc0c30c7d99853647c3ea2
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Dec  6 04:40:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  6 05:41:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d6b344

dev-util/meson: backport patch to stop hiding vala compiler warnings

This is especially bad because it makes these packages disappear
entirely from QA checks for, say, Modern C. Although it's only a matter
of adding more warnings, and doesn't really affect the resulting
packages, we need this live in order to do proper QA.

Bug: https://bugs.gentoo.org/870412
Signed-off-by: Eli Schwartz  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34141
Signed-off-by: Sam James  gentoo.org>

 ...nd-don-t-hide-all-compiler-warnings-for-t.patch | 250 +
 dev-util/meson/meson-1.3.0-r2.ebuild   | 135 +++
 2 files changed, 385 insertions(+)

diff --git 
a/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch
 
b/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch
new file mode 100644
index ..652ffd25228b
--- /dev/null
+++ 
b/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch
@@ -0,0 +1,250 @@
+From 5f659af870011e74299d1455a65c2cd5f5ace51f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Tue, 5 Dec 2023 14:26:54 -0500
+Subject: [PATCH] ninja backend: don't hide all compiler warnings for
+ transpiled languages
+
+This was originally added for vala only, with the rationale that vala
+generates bad code that has warnings. Unfortunately, the rationale was
+fatally flawed. The compiler warns about a number of things, which the
+user can control depending on their code (or their code generator's
+code), but some of those things are absolutely critical to warn about.
+
+In particular, GCC 14 and clang 17 are updating their defaults to warn
+-- and error by default for -- invalid C code that breaks the standard,
+but has been silently accepted for over 20 years "because lots of people
+do it". The code in question is UB, and compilers will generate faulty
+machine code that behaves erroneously and probably has a mass of CVEs
+waiting to happen.
+
+Compiler warnings are NOT safe to just... universally turn off. Compiler
+warnings could be either:
+
+- coding style lints
+
+- threatening statements that the code is factually and behaviorally wrong
+
+There is no magic bullet to ignore the former while respecting the
+latter. And the very last thing we should ever do is pass `-w`, since
+that causes ALL warnings to be disabled, even the manually added
+`-Werror=XXX`.
+
+If vala generated code creates warnings, then the vala compiler can
+decrease the log level by generating better code, or by adding warning
+suppression pragmas for *specific* issues, such as unused functions.
+---
+ mesonbuild/backend/backends.py| 13 ++-
+ mesonbuild/backend/ninjabackend.py| 19 --
+ .../failing build/1 vala c werror/meson.build | 10 -
+ .../failing build/1 vala c werror/prog.vala   |  7 
+ .../1 vala c werror/unused-var.c  |  8 
+ test cases/vala/5 target glib/meson.build |  4 --
+ unittests/linuxliketests.py   | 37 ---
+ 7 files changed, 11 insertions(+), 87 deletions(-)
+ delete mode 100644 test cases/failing build/1 vala c werror/meson.build
+ delete mode 100644 test cases/failing build/1 vala c werror/prog.vala
+ delete mode 100644 test cases/failing build/1 vala c werror/unused-var.c
+
+diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
+index 2c24e4c31..639e07b2a 100644
+--- a/mesonbuild/backend/backends.py
 b/mesonbuild/backend/backends.py
+@@ -986,7 +986,7 @@ class Backend:
+ return compiler.get_no_stdinc_args()
+ return []
+ 
+-def generate_basic_compiler_args(self, target: build.BuildTarget, 
compiler: 'Compiler', no_warn_args: bool = False) -> 'CompilerArgs':
++def generate_basic_compiler_args(self, target: build.BuildTarget, 
compiler: 'Compiler') -> 'CompilerArgs':
+ # Create an empty commands list, and start adding arguments from
+ # various sources in the order in which they must override each other
+ # starting from hard-coded defaults followed by build options and so 
on.
+@@ -999,17 +999,12 @@ class Backend:
+ commands += self.get_no_stdlib_args(target, compiler)
+ # Add things like /NOLOGO or -pipe; usually can't be overridden
+ commands += compiler.get_always_args()
+-# Only add warning-flags by default if the buildtype enables it, and 
if
+-# we weren't explicitly asked to not emit warnings (for Vala, f.ex)
+-if no_warn_args:
+-commands += compiler.get_no_warn_args()
+-else:
+-# warning_level is a string, but mypy can't determine th

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/

2023-12-02 Thread Sam James

commit: 2556ee17fb54aea6c0b6d766f239db009f7b57fc
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Dec  3 00:53:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 01:05:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2556ee17

dev-util/meson: backport fix for broken configure_file output

This broke portage itself.

Bug: https://github.com/mesonbuild/meson/pull/12532
Bug: https://bugs.gentoo.org/919072
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 ...-convert-boolean-values-for-cmake-formats.patch | 31 ++
 .../{meson-1.3.0.ebuild => meson-1.3.0-r1.ebuild}  |  3 +++
 2 files changed, 34 insertions(+)

diff --git 
a/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch 
b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch
new file mode 100644
index ..394b1bbb7c1b
--- /dev/null
+++ 
b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch
@@ -0,0 +1,31 @@
+From 9016e6958bb83feb9a724f20d8badb116bf7c5f2 Mon Sep 17 00:00:00 2001
+From: Jan200101 
+Date: Tue, 21 Nov 2023 08:42:56 +0100
+Subject: [PATCH] Only convert boolean values for cmake formats
+
+This caused a regression with mesondefine where
+  `conf_data.set("FOO", true)`
+turned into
+  `#define FOO 1`
+instead of
+  `#define FOO`
+---
+ mesonbuild/utils/universal.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py
+index 26194628c..93e64c0a2 100644
+--- a/mesonbuild/utils/universal.py
 b/mesonbuild/utils/universal.py
+@@ -1210,7 +1210,7 @@ def do_replacement(regex: T.Pattern[str], line: str,
+ var, _ = confdata.get(varname)
+ if isinstance(var, str):
+ var_str = var
+-elif isinstance(var, bool):
++elif variable_format.startswith("cmake") and isinstance(var, 
bool):
+ var_str = str(int(var))
+ elif isinstance(var, int):
+ var_str = str(var)
+-- 
+2.41.0
+

diff --git a/dev-util/meson/meson-1.3.0.ebuild 
b/dev-util/meson/meson-1.3.0-r1.ebuild
similarity index 96%
rename from dev-util/meson/meson-1.3.0.ebuild
rename to dev-util/meson/meson-1.3.0-r1.ebuild
index 429bfd5ba7d3..1621828da199 100644
--- a/dev-util/meson/meson-1.3.0.ebuild
+++ b/dev-util/meson/meson-1.3.0-r1.ebuild
@@ -54,6 +54,9 @@ RDEPEND="
 
 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() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-22 Thread Arthur Zamarin

commit: 9bd69d76b8f565601440b2ef6853004158e0db92
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 22 11:15:25 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 22 11:15:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd69d76

dev-util/meson: Stabilize 1.2.3 ppc, #917600

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index 38e7037ec6fa..71e1bdb7dc07 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-19 Thread Sam James

commit: 6475fd300200303c580b43d60ac46fea1f9f0f75
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Nov 19 22:56:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 07:36:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6475fd30

dev-util/meson: add 1.3.0

Bump from the release candidate to the final release.

Closes: https://bugs.gentoo.org/916576
Signed-off-by: Eli Schwartz  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33912
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   | 4 ++--
 dev-util/meson/{meson-1.3.0_rc3.ebuild => meson-1.3.0.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 868038779563..56b3c11d6c2d 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -6,5 +6,5 @@ DIST meson-1.2.2.tar.gz 2190455 BLAKE2B 
b355c8e5ab7508fca51dbe5c95eea68f91b995a6
 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.0rc3.tar.gz 2218690 BLAKE2B 
2bd5564b766240a849620a26a7fd9c47ff1973a3636c95b9f52634ff980b04b203e62aa790eed3d5ae027e992435be945d18ddea2d85b9da3f437a38d6c7556b
 SHA512 
66a82381490c0e55031b55165ccbeeaeb4e47b9e578eb6731f4deec3965ca2671679fcaf3070900733077b71ff442197ba6530b5720e86c95bb4d56abdad59d2
-DIST meson-1.3.0rc3.tar.gz.asc 833 BLAKE2B 
06c65e567067c2b3576fd2c3764feaed1e8a84ef11ad5901e6ad41441f1b3f148d19d2fcb2a642c991894c9428debb9f5c6cf3148e06916386fbbc192fb264db
 SHA512 
6002fa01d8647f8f7ce13a287c7abf6c6619c116927b7f0671824563244bdd3f7a3f9dfae9c8e12ed22a682c2d44d9a34269fd6216c2eb15c2944e83bdc87b44
+DIST meson-1.3.0.tar.gz 383 BLAKE2B 
cb9ac8e00fe924df67166938687584a9de35e784e1e52bff281649d787695d37e3044ea3d6d5869181fe1e9676b5136548293dbd5cdbd091a6de0c449b8932f5
 SHA512 
fbcbdd9551ad12b7be84411b96357e01c7c0c38a8e9933093d2e71ed7e12bd4278245798684d389c332eb75dd50c99310affc9acb01cf8bedd45265335083a32
+DIST meson-1.3.0.tar.gz.asc 833 BLAKE2B 
d83b819e75e732d694ac98412717af39a8115defc7371f1983e4619cf990b5cdfd7ab7c93911f2a8b6c7055c7252ebeba04d15f508f4278b506e326fa1801a25
 SHA512 
8c72bfe5f3bdec9c9f787dd5a7186599bb44079a89d0a87a535a6e890adb7718cbf570b2ac74583b72b92aa05160823a8571ca530384787c428e49d6fbe095ba

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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-19 Thread Sam James

commit: 66446eacb2324875eb79f0f990e508259f9e70f4
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 20 07:35:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 07:35:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66446eac

dev-util/meson: Stabilize 1.2.3 sparc, #917600

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index ca8d5b916da1..38e7037ec6fa 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-19 Thread Sam James

commit: 1724d052da9222c631b410746e4ebe07812f4693
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 20 07:03:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 07:03:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1724d052

dev-util/meson: Stabilize 1.2.3 amd64, #917600

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index 7ea1872668da..d14d5a3fcb60 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-19 Thread Sam James

commit: a1f55df483a4a5f7010ce45c4b377cac7fdd9c30
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 20 07:03:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 07:03:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f55df4

dev-util/meson: Stabilize 1.2.3 ppc64, #917600

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index d8285dc3fbaf..abcf6ebac4ae 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-19 Thread Sam James

commit: c80f8cc0551d230f6f8059c52625ec1e45437f8b
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 20 07:03:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 07:03:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80f8cc0

dev-util/meson: Stabilize 1.2.3 x86, #917600

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index abcf6ebac4ae..7ea1872668da 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-19 Thread Sam James

commit: 6cc48c0b87856a075047d65ea1fdf964356d5e52
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 20 07:03:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 07:03:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc48c0b

dev-util/meson: Stabilize 1.2.3 arm64, #917600

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index d14d5a3fcb60..ca8d5b916da1 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-19 Thread Sam James

commit: d5c11e49bc7576577a52ed4c92c89758dbc75a91
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 20 07:03:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 07:03:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c11e49

dev-util/meson: Stabilize 1.2.3 arm, #917600

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index 18334a4bed3b..d8285dc3fbaf 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-19 Thread Sam James

commit: 1b0a7276df661678b50f85ba4f34133ec469d259
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 20 07:03:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 07:03:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0a7276

dev-util/meson: Stabilize 1.2.3 hppa, #917600

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index 429bfd5ba7d3..18334a4bed3b 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-16 Thread Sam James

commit: ed229a76ce9dbab8d9e46e102708fef9fecf468d
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 16 16:21:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 16 16:21:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed229a76

dev-util/meson: Stabilize 1.2.2-r1 hppa, #917236

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index 407f2f84951c..191b8ea6ead8 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-13 Thread Sam James

commit: af1968b782ca70427d4ef73ac0ad69eae685ea4d
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Nov 14 01:24:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 14 01:42:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1968b7

dev-util/meson: bump release candidate to 1.3.0_rc3

Closes: https://bugs.gentoo.org/917118
Closes: https://bugs.gentoo.org/917292
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 4e88e85f7d89..9f847f40181c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -8,5 +8,5 @@ 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.0rc1.tar.gz 2139141 BLAKE2B 
b45bb81e630a8d25421c266953116837580aad0c2d577e575922aef1f2611f3f6b78e5ab346846991251f2409683f74b07f369f49608bf4f12a043cf0c3d0f81
 SHA512 
196b2e37124328f74bde7aae9d41774bb0b036a8be6f7fee5496eebc83a278222d0ad17efab8baaae421aeeaadda89efeff29e55e88aa4448d3690fc938ab8d8
 DIST meson-1.3.0rc1.tar.gz.asc 833 BLAKE2B 
08409567887443e841b7fddbac18d62c31e9d97bc9c380d2b2579de5a52c313fae955e9c9e3d1f27086103017608a5bcbffaef5f672eb4c97bc80f760dad520b
 SHA512 
5d5d44e6ed10f564b7e5452fb665121c9793d8ae044073b0315db8beba7b00540ebf1d25f20d3d94e17d5e9964bf9d618026d5b3abe6fc31ef8c434bcc275e42
-DIST meson-1.3.0rc2.tar.gz 2141090 BLAKE2B 
240c5f8744f31952744f920213e54cdd67c33b9d39ea7e039eff76a6950e9917294d893cee0dbcc9162c9286936dd6877f546beb067b297ccc765a98d32ab4c2
 SHA512 
54120d869b3d3827e51c569c295faafcd4ef3f7ece86a3f4785b7554fb11bc93c9cb7c2585d7a01463b0045d39c980b6691ed303b00749277c337985243c6135
-DIST meson-1.3.0rc2.tar.gz.asc 833 BLAKE2B 
9bdf9f0e2d2b377f6c42cb0e9047abfd9c17b27aa83dc0234c74052acb1cc095935d1271b50d3d6ad5c0015f28221fd8c0ad0cf3a37c2a9a1029c3f243e0010f
 SHA512 
31297ed93b6a6513b61ae9d403bf2c5bfbae75de4d173caa3c218bec28d7e859d180e1c4ccb84d33889561903689eba78c272b1582295a01c08976164d9fdecd
+DIST meson-1.3.0rc3.tar.gz 2218690 BLAKE2B 
2bd5564b766240a849620a26a7fd9c47ff1973a3636c95b9f52634ff980b04b203e62aa790eed3d5ae027e992435be945d18ddea2d85b9da3f437a38d6c7556b
 SHA512 
66a82381490c0e55031b55165ccbeeaeb4e47b9e578eb6731f4deec3965ca2671679fcaf3070900733077b71ff442197ba6530b5720e86c95bb4d56abdad59d2
+DIST meson-1.3.0rc3.tar.gz.asc 833 BLAKE2B 
06c65e567067c2b3576fd2c3764feaed1e8a84ef11ad5901e6ad41441f1b3f148d19d2fcb2a642c991894c9428debb9f5c6cf3148e06916386fbbc192fb264db
 SHA512 
6002fa01d8647f8f7ce13a287c7abf6c6619c116927b7f0671824563244bdd3f7a3f9dfae9c8e12ed22a682c2d44d9a34269fd6216c2eb15c2944e83bdc87b44

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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-13 Thread Sam James

commit: 7e09941b86cab01593d6c6fd68b1f8b01fe2a896
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Nov 14 01:26:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 14 01:42:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e09941b

dev-util/meson: drop 1.3.0_rc1

Signed-off-by: Eli Schwartz  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33813
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   2 -
 dev-util/meson/meson-1.3.0_rc1.ebuild | 129 --
 2 files changed, 131 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 9f847f40181c..868038779563 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -6,7 +6,5 @@ DIST meson-1.2.2.tar.gz 2190455 BLAKE2B 
b355c8e5ab7508fca51dbe5c95eea68f91b995a6
 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.0rc1.tar.gz 2139141 BLAKE2B 
b45bb81e630a8d25421c266953116837580aad0c2d577e575922aef1f2611f3f6b78e5ab346846991251f2409683f74b07f369f49608bf4f12a043cf0c3d0f81
 SHA512 
196b2e37124328f74bde7aae9d41774bb0b036a8be6f7fee5496eebc83a278222d0ad17efab8baaae421aeeaadda89efeff29e55e88aa4448d3690fc938ab8d8
-DIST meson-1.3.0rc1.tar.gz.asc 833 BLAKE2B 
08409567887443e841b7fddbac18d62c31e9d97bc9c380d2b2579de5a52c313fae955e9c9e3d1f27086103017608a5bcbffaef5f672eb4c97bc80f760dad520b
 SHA512 
5d5d44e6ed10f564b7e5452fb665121c9793d8ae044073b0315db8beba7b00540ebf1d25f20d3d94e17d5e9964bf9d618026d5b3abe6fc31ef8c434bcc275e42
 DIST meson-1.3.0rc3.tar.gz 2218690 BLAKE2B 
2bd5564b766240a849620a26a7fd9c47ff1973a3636c95b9f52634ff980b04b203e62aa790eed3d5ae027e992435be945d18ddea2d85b9da3f437a38d6c7556b
 SHA512 
66a82381490c0e55031b55165ccbeeaeb4e47b9e578eb6731f4deec3965ca2671679fcaf3070900733077b71ff442197ba6530b5720e86c95bb4d56abdad59d2
 DIST meson-1.3.0rc3.tar.gz.asc 833 BLAKE2B 
06c65e567067c2b3576fd2c3764feaed1e8a84ef11ad5901e6ad41441f1b3f148d19d2fcb2a642c991894c9428debb9f5c6cf3148e06916386fbbc192fb264db
 SHA512 
6002fa01d8647f8f7ce13a287c7abf6c6619c116927b7f0671824563244bdd3f7a3f9dfae9c8e12ed22a682c2d44d9a34269fd6216c2eb15c2944e83bdc87b44

diff --git a/dev-util/meson/meson-1.3.0_rc1.ebuild 
b/dev-util/meson/meson-1.3.0_rc1.ebuild
deleted file mode 100644
index 429bfd5ba7d3..
--- a/dev-util/meson/meson-1.3.0_rc1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2016-2023 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} = ** ]]; 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
-   dev-util/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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-12 Thread Arthur Zamarin

commit: 2c79a2c4f7679cbb91e661eeb511c25fbd0eee3e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 16:49:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 16:49:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c79a2c4

dev-util/meson: Stabilize 1.2.2-r1 ppc, #917236

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index e236c74316a8..407f2f84951c 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-12 Thread Arthur Zamarin

commit: b12e9d987965960d348f255bd24c176c9cd89c9e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:32:12 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:32:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12e9d98

dev-util/meson: Stabilize 1.2.2-r1 amd64, #917236

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index 0a9229dd58ae..e236c74316a8 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-12 Thread Arthur Zamarin

commit: a3f0512c213cea05da052b969827a9a5910bded9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:20:38 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:20:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f0512c

dev-util/meson: Stabilize 1.2.2-r1 sparc, #917236

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index 88ab66dfb9ed..b7746353339e 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-12 Thread Arthur Zamarin

commit: 914651d8e4e21993b8cc45bfe425d7756f5bc52f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:20:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:20:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914651d8

dev-util/meson: Stabilize 1.2.2-r1 ppc64, #917236

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index 8a8299941051..3c66d0b2bc79 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-12 Thread Arthur Zamarin

commit: a515c2c74c15fae4d9e664fab21676b6ddabf4ae
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:20:39 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:20:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a515c2c7

dev-util/meson: Stabilize 1.2.2-r1 x86, #917236

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index b7746353339e..63bb41e6cf9d 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-12 Thread Arthur Zamarin

commit: 06042c9759f79fb8df512e9c2017f564e5445762
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:20:39 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:20:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06042c97

dev-util/meson: Stabilize 1.2.2-r1 arm, #917236

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index 63bb41e6cf9d..0a9229dd58ae 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-12 Thread Arthur Zamarin

commit: fccd3f3fcb96ad7b0fcf64959f76ad6a942acac5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:20:37 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:20:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fccd3f3f

dev-util/meson: Stabilize 1.2.2-r1 arm64, #917236

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index 3c66d0b2bc79..88ab66dfb9ed 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-06 Thread Mike Gilbert

commit: 51a569068ae0610f1699c416258f6c4cb20af81a
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Nov  6 01:46:17 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Nov  6 15:53:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a56906

dev-util/meson: update SRC_URI; add verify-sig support

The canonical download location for meson is, and has always, been
github releases. PyPI is provided for convenience of `pip install`
users, but it is not a very good hosting site. In particular, it does
not support PGP signatures anymore (and campaigned to hide them from
user awareness for quite some time beforehand, which lack of awareness
was then used as grounds for "nobody uses them, let's remove the hidden
support").

The tarball remains the same either way. No revbump needed.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/meson/Manifest   |  5 +
 dev-util/meson/meson-1.1.1.ebuild | 10 +-
 dev-util/meson/meson-1.2.1-r1.ebuild  | 10 +-
 dev-util/meson/meson-1.2.1-r2.ebuild  | 10 +-
 dev-util/meson/meson-1.2.2-r1.ebuild  | 10 +-
 dev-util/meson/meson-1.2.2.ebuild | 10 +-
 dev-util/meson/meson-1.2.3.ebuild | 10 +-
 dev-util/meson/meson-1.3.0_rc1.ebuild | 10 +-
 dev-util/meson/meson-.ebuild  | 10 +-
 9 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 42c59d0a9505..92d79a427290 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,5 +1,10 @@
 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.0rc1.tar.gz 2139141 BLAKE2B 
b45bb81e630a8d25421c266953116837580aad0c2d577e575922aef1f2611f3f6b78e5ab346846991251f2409683f74b07f369f49608bf4f12a043cf0c3d0f81
 SHA512 
196b2e37124328f74bde7aae9d41774bb0b036a8be6f7fee5496eebc83a278222d0ad17efab8baaae421aeeaadda89efeff29e55e88aa4448d3690fc938ab8d8
+DIST meson-1.3.0rc1.tar.gz.asc 833 BLAKE2B 
08409567887443e841b7fddbac18d62c31e9d97bc9c380d2b2579de5a52c313fae955e9c9e3d1f27086103017608a5bcbffaef5f672eb4c97bc80f760dad520b
 SHA512 
5d5d44e6ed10f564b7e5452fb665121c9793d8ae044073b0315db8beba7b00540ebf1d25f20d3d94e17d5e9964bf9d618026d5b3abe6fc31ef8c434bcc275e42

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index af3261000a64..affad54f237d 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = ** ]]; then

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-06 Thread Mike Gilbert

commit: eaa8fbaea5e92370a63a54c9b329469b8d2fd90c
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Nov  6 02:21:45 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Nov  6 15:53:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa8fbae

dev-util/meson: add myself as a maintainer

I am upstream for this, might as well be downstream too. :)

Signed-off-by: Eli Schwartz  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33685
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/meson/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-util/meson/metadata.xml b/dev-util/meson/metadata.xml
index fcee1391ddd4..f4b485f0bec2 100644
--- a/dev-util/meson/metadata.xml
+++ b/dev-util/meson/metadata.xml
@@ -4,6 +4,10 @@

base-sys...@gentoo.org

+   
+   eschwart...@gmail.com
+   Eli Schwartz
+   

mesonbuild/meson
meson

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-11-06 Thread Mike Gilbert

commit: 0ebdd4080b851a57543b71e27b343948484aee1a
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Nov  6 02:20:37 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Nov  6 15:53:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebdd408

dev-util/meson: add 1.3.0_rc2

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/meson/Manifest   |   2 +
 dev-util/meson/meson-1.3.0_rc2.ebuild | 129 ++
 2 files changed, 131 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 92d79a427290..4e88e85f7d89 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -8,3 +8,5 @@ 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.0rc1.tar.gz 2139141 BLAKE2B 
b45bb81e630a8d25421c266953116837580aad0c2d577e575922aef1f2611f3f6b78e5ab346846991251f2409683f74b07f369f49608bf4f12a043cf0c3d0f81
 SHA512 
196b2e37124328f74bde7aae9d41774bb0b036a8be6f7fee5496eebc83a278222d0ad17efab8baaae421aeeaadda89efeff29e55e88aa4448d3690fc938ab8d8
 DIST meson-1.3.0rc1.tar.gz.asc 833 BLAKE2B 
08409567887443e841b7fddbac18d62c31e9d97bc9c380d2b2579de5a52c313fae955e9c9e3d1f27086103017608a5bcbffaef5f672eb4c97bc80f760dad520b
 SHA512 
5d5d44e6ed10f564b7e5452fb665121c9793d8ae044073b0315db8beba7b00540ebf1d25f20d3d94e17d5e9964bf9d618026d5b3abe6fc31ef8c434bcc275e42
+DIST meson-1.3.0rc2.tar.gz 2141090 BLAKE2B 
240c5f8744f31952744f920213e54cdd67c33b9d39ea7e039eff76a6950e9917294d893cee0dbcc9162c9286936dd6877f546beb067b297ccc765a98d32ab4c2
 SHA512 
54120d869b3d3827e51c569c295faafcd4ef3f7ece86a3f4785b7554fb11bc93c9cb7c2585d7a01463b0045d39c980b6691ed303b00749277c337985243c6135
+DIST meson-1.3.0rc2.tar.gz.asc 833 BLAKE2B 
9bdf9f0e2d2b377f6c42cb0e9047abfd9c17b27aa83dc0234c74052acb1cc095935d1271b50d3d6ad5c0015f28221fd8c0ad0cf3a37c2a9a1029c3f243e0010f
 SHA512 
31297ed93b6a6513b61ae9d403bf2c5bfbae75de4d173caa3c218bec28d7e859d180e1c4ccb84d33889561903689eba78c272b1582295a01c08976164d9fdecd

diff --git a/dev-util/meson/meson-1.3.0_rc2.ebuild 
b/dev-util/meson/meson-1.3.0_rc2.ebuild
new file mode 100644
index ..429bfd5ba7d3
--- /dev/null
+++ b/dev-util/meson/meson-1.3.0_rc2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2016-2023 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} = ** ]]; 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
+   dev-util/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_setu

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-10-27 Thread Sam James

commit: 1351e18a74e86cfb1f2019973ad8993fc96f9c33
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 27 21:28:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 27 21:28:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1351e18a

dev-util/meson: add 1.3.0_rc1

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.3.0_rc1.ebuild | 121 ++
 2 files changed, 122 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 146c6ab2fd0a..42c59d0a9505 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,3 +2,4 @@ DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d976890
 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B 
b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58
 SHA512 
6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e
 DIST meson-1.2.2.tar.gz 2190455 BLAKE2B 
b355c8e5ab7508fca51dbe5c95eea68f91b995a670ad20eb9b7e93d3c97ad5363afe3fbd39cd554d1a6953a07166851257d16706acc9db6d5265e6452e40a857
 SHA512 
8dde3235f31862953e2f4db2527e441dfa9413b5f7545c85949ebc0f3b58819307ca124bf04d481d6f1425d6a4c93051239a659554322af893c97b651379fa86
 DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 
7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8
 SHA512 
cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc
+DIST meson-1.3.0rc1.tar.gz 2139141 BLAKE2B 
b45bb81e630a8d25421c266953116837580aad0c2d577e575922aef1f2611f3f6b78e5ab346846991251f2409683f74b07f369f49608bf4f12a043cf0c3d0f81
 SHA512 
196b2e37124328f74bde7aae9d41774bb0b036a8be6f7fee5496eebc83a278222d0ad17efab8baaae421aeeaadda89efeff29e55e88aa4448d3690fc938ab8d8

diff --git a/dev-util/meson/meson-1.3.0_rc1.ebuild 
b/dev-util/meson/meson-1.3.0_rc1.ebuild
new file mode 100644
index ..b2dcaf1c2b6b
--- /dev/null
+++ b/dev-util/meson/meson-1.3.0_rc1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-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 JAV

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-10-20 Thread Sam James

commit: c9fe13a8985c66bf44a1f0a8d46bab20995a1a51
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 20 19:01:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 20 19:10:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fe13a8

dev-util/meson: add 1.2.3

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.2.3.ebuild | 121 ++
 2 files changed, 122 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 936553f74d22..146c6ab2fd0a 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,4 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B 
b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58
 SHA512 
6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e
 DIST meson-1.2.2.tar.gz 2190455 BLAKE2B 
b355c8e5ab7508fca51dbe5c95eea68f91b995a670ad20eb9b7e93d3c97ad5363afe3fbd39cd554d1a6953a07166851257d16706acc9db6d5265e6452e40a857
 SHA512 
8dde3235f31862953e2f4db2527e441dfa9413b5f7545c85949ebc0f3b58819307ca124bf04d481d6f1425d6a4c93051239a659554322af893c97b651379fa86
+DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 
7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8
 SHA512 
cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
new file mode 100644
index ..b2dcaf1c2b6b
--- /dev/null
+++ b/dev-util/meson/meson-1.2.3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-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 assume

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/1.2.2/

2023-10-03 Thread Sam James

commit: c0ad7b00c772c71a74ec42be0bf594ee9198b71c
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  3 16:13:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  3 16:13:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ad7b00

dev-util/meson: backport PEP632 py3.12 fixes, revert bindgen breakage

* Backport PEP632 fixes for Python 3.12
* Revert bindgen patch on 1.2.x branch which broke Mesa

Closes: https://bugs.gentoo.org/914989
Closes: https://bugs.gentoo.org/915014
Closes: https://bugs.gentoo.org/911418
Closes: https://bugs.gentoo.org/911990
Closes: https://bugs.gentoo.org/912397
Closes: https://bugs.gentoo.org/912437
Closes: https://bugs.gentoo.org/912452
Closes: https://bugs.gentoo.org/912282
Signed-off-by: Sam James  gentoo.org>

 ...ndency-ensure-that-setuptools-doesn-t-inj.patch |  39 ++
 ...le-stop-using-distutils-schemes-on-suffic.patch |  72 +++
 ...le-refactor-pypy-detection-into-a-consist.patch |  36 ++
 ...le-stop-using-distutils-link-to-libpython.patch |  72 +++
 ...est-case-to-not-import-distutils-on-pytho.patch |  31 +
 ...e-PyPI-metadata-as-supporting-python-3.12.patch |  25 
 ...-apply-global-project-and-environment-C-a.patch | 141 +
 dev-util/meson/meson-1.2.2-r1.ebuild   | 122 ++
 8 files changed, 538 insertions(+)

diff --git 
a/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch
 
b/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch
new file mode 100644
index ..c552831cfd6b
--- /dev/null
+++ 
b/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch
@@ -0,0 +1,39 @@
+From 5f96e35b873d6230970fd63ba2e706bbd3f4e26f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Fri, 8 Sep 2023 16:54:48 -0400
+Subject: [PATCH 1/7] python dependency: ensure that setuptools doesn't inject
+ itself into distutils
+
+We do not use setuptools for anything, and only lightly use distutils.
+Unpredictable issues can occur due to setuptools monkey-patching, which
+interferes with our intended use. Tell setuptools to simply never get
+involved.
+
+Note: while it's otherwise possible to check if the probe is run using
+sys.executable and avoid forking, setuptools unconditionally injects
+itself at startup in a way that requires subprocess isolation to
+disable.
+
+(cherry picked from commit 9f610ad5b72ea91de2d7aeb6f3266d0a7477062e)
+---
+ mesonbuild/dependencies/python.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/mesonbuild/dependencies/python.py 
b/mesonbuild/dependencies/python.py
+index 160772888..f04494674 100644
+--- a/mesonbuild/dependencies/python.py
 b/mesonbuild/dependencies/python.py
+@@ -113,7 +113,9 @@ class BasicPythonExternalProgram(ExternalProgram):
+ 
+ with importlib.resources.path('mesonbuild.scripts', 'python_info.py') 
as f:
+ cmd = self.get_command() + [str(f)]
+-p, stdout, stderr = mesonlib.Popen_safe(cmd)
++env = os.environ.copy()
++env['SETUPTOOLS_USE_DISTUTILS'] = 'stdlib'
++p, stdout, stderr = mesonlib.Popen_safe(cmd, env=env)
+ 
+ try:
+ info = json.loads(stdout)
+-- 
+2.42.0
+

diff --git 
a/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch
 
b/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch
new file mode 100644
index ..51c13d6926ff
--- /dev/null
+++ 
b/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch
@@ -0,0 +1,72 @@
+From cb4e62a8c55118988babac8b8254e0af1dc9698b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Mon, 21 Nov 2022 20:47:14 -0500
+Subject: [PATCH 2/7] python module: stop using distutils schemes on
+ sufficiently new Debian
+
+Since 3.10.3, Debian finally started patching sysconfig with custom
+paths, instead of just distutils. This means we can now go use that
+instead. It reduces our reliance on the deprecated distutils module.
+
+Partial fix for #7702
+
+(cherry picked from commit 40f897fa92f7d3cc43788d3000733310ce77cf0c)
+---
+ mesonbuild/scripts/python_info.py | 32 +++
+ 1 file changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/mesonbuild/scripts/python_info.py 
b/mesonbuild/scripts/python_info.py
+index 9c3a0791a..65597b121 100755
+--- a/mesonbuild/scripts/python_info.py
 b/mesonbuild/scripts/python_info.py
+@@ -13,7 +13,6 @@ if sys.path[0].endswith('scripts'):
+ del sys.path[0]
+ 
+ import json, os, sysconfig
+-import distutils.command.install
+ 
+ def get_distutils_paths(scheme=None, prefix=None):
+ import distutils.dist
+@@ -37,15 +36,32 @@ def get_distutils_paths(scheme=None, prefix=None):
+ # default scheme to a custom one pointing to /usr/local and replacing
+ # site-packages with dist-pack

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-29 Thread Sam James

commit: fc58cc26412728410c59a8fe1aeb3d24cc13fa76
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 30 00:40:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 30 00:40:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc58cc26

dev-util/meson: drop 1.2.0

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 -
 dev-util/meson/meson-1.2.0.ebuild | 117 --
 2 files changed, 118 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 3be872e1302a..78d78ae2fb86 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,2 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
-DIST meson-1.2.0.tar.gz 2182568 BLAKE2B 
a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936431d96571ff83e96b7648a80a16cfd8eb581ff29b2ca88615657d5ca3
 SHA512 
8b5768cf0dab5f88d2f3e3962305910e707ff810cbd21b5997aab0bb6abe1c4d5dbd24ec59ab4072f1faa9b81daa8be993d56679445afa93700676f52e314d23
 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B 
b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58
 SHA512 
6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e

diff --git a/dev-util/meson/meson-1.2.0.ebuild 
b/dev-util/meson/meson-1.2.0.ebuild
deleted file mode 100644
index fefd68d177e5..
--- a/dev-util/meson/meson-1.2.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2016-2023 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} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
-   inherit git-r3
-else
-   inherit pypi
-
-   MY_P=${P/_/}
-   S=${WORKDIR}/${MY_P}
-
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-   fi
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   test? (
-   dev-libs/glib:2
-   dev-libs/gobject-introspection
-   dev-util/ninja
-   dev-vcs/git
-   sys-libs/zlib[static-libs(+)]
-   virtual/pkgconfig
-   )
-"
-RDEPEND="
-   virtual/pkgconfig
-"
-
-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-29 Thread Sam James

commit: 11bfd9c310c0878f76c246f008436750d459
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 30 00:43:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 30 00:43:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bfd9c3

dev-util/meson: add 1.2.2

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.2.2.ebuild | 121 ++
 2 files changed, 122 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 78d78ae2fb86..936553f74d22 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,3 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B 
b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58
 SHA512 
6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e
+DIST meson-1.2.2.tar.gz 2190455 BLAKE2B 
b355c8e5ab7508fca51dbe5c95eea68f91b995a670ad20eb9b7e93d3c97ad5363afe3fbd39cd554d1a6953a07166851257d16706acc9db6d5265e6452e40a857
 SHA512 
8dde3235f31862953e2f4db2527e441dfa9413b5f7545c85949ebc0f3b58819307ca124bf04d481d6f1425d6a4c93051239a659554322af893c97b651379fa86

diff --git a/dev-util/meson/meson-1.2.2.ebuild 
b/dev-util/meson/meson-1.2.2.ebuild
new file mode 100644
index ..b2dcaf1c2b6b
--- /dev/null
+++ b/dev-util/meson/meson-1.2.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-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-con

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/

2023-09-23 Thread Sam James

commit: 41f439c2e9964de598ac976e41dc68924b338bc5
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 04:12:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 04:13:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f439c2

dev-util/meson: backport LLVM 17 fixes

1.2.2 is hopefully coming Real Soon Now but Eli already pointed out precisely
which PR it is and meson "rebuilds" are extremely cheap so there's no real
reason to not throw it in now.

Closes: https://bugs.gentoo.org/914576
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/files/meson-1.2.1-llvm-17.patch |  41 +
 dev-util/meson/meson-1.2.1-r2.ebuild   | 122 +
 2 files changed, 163 insertions(+)

diff --git a/dev-util/meson/files/meson-1.2.1-llvm-17.patch 
b/dev-util/meson/files/meson-1.2.1-llvm-17.patch
new file mode 100644
index ..ceee1dcd292b
--- /dev/null
+++ b/dev-util/meson/files/meson-1.2.1-llvm-17.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/914576
+https://github.com/mesonbuild/meson/commit/d0b09898c703f6c10ec5a6b2aeace0df2e3570aa
+https://github.com/mesonbuild/meson/commit/9c74c73bc7107c794e7f9896cc4220e50ad32bba
+
+From d0b09898c703f6c10ec5a6b2aeace0df2e3570aa Mon Sep 17 00:00:00 2001
+From: Christoph Reiter 
+Date: Sat, 23 Sep 2023 17:21:43 +0200
+Subject: [PATCH] get_llvm_tool_names: add llvm 17
+
+this fixes the "frameworks: 15 llvm" tests with llvm 17
+--- a/mesonbuild/environment.py
 b/mesonbuild/environment.py
+@@ -157,6 +157,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]:
+ # unless it becomes a stable release.
+ suffixes = [
+ '', # base (no suffix)
++'-17',  '17',
+ '-16',  '16',
+ '-15',  '15',
+ '-14',  '14',
+
+From 9c74c73bc7107c794e7f9896cc4220e50ad32bba Mon Sep 17 00:00:00 2001
+From: Christoph Reiter 
+Date: Sat, 23 Sep 2023 14:10:29 +0200
+Subject: [PATCH] openmp: add 5.1/5.2, fixes openmp with llvm v17
+
+llvm v17 defaults to 5.1 and without this meson fails to find
+openmp: 'ERROR: Dependency "openmp" not found, tried system'
+
+Add 5.2 as well while at it.
+--- a/mesonbuild/dependencies/misc.py
 b/mesonbuild/dependencies/misc.py
+@@ -85,6 +85,8 @@ def __init__(self, name: str, env: 'Environment', kwargs: 
T.Dict[str, T.Any]):
+ class OpenMPDependency(SystemDependency):
+ # Map date of specification release (which is the macro value) to a 
version.
+ VERSIONS = {
++'202111': '5.2',
++'202011': '5.1',
+ '201811': '5.0',
+ '201611': '5.0-revision1',  # This is supported by ICC 19.x
+ '201511': '4.5',

diff --git a/dev-util/meson/meson-1.2.1-r2.ebuild 
b/dev-util/meson/meson-1.2.1-r2.ebuild
new file mode 100644
index ..48e351394586
--- /dev/null
+++ b/dev-util/meson/meson-1.2.1-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2016-2023 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} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-22 Thread Arthur Zamarin

commit: e7bc21b1a560fe3be237d931a74a7e26a5ef45e4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 17:34:12 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 17:34:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7bc21b1

dev-util/meson: Stabilize 1.2.1-r1 hppa, #914538

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index 5865ea9dc637..bf7bd1160440 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-22 Thread Arthur Zamarin

commit: d523fec81eb5cc3b3fce643ca8dbb8d6a7d61ce6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 17:28:16 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 17:28:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d523fec8

dev-util/meson: Stabilize 1.2.1-r1 arm64, #914538

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index 9f96e77c60ab..5865ea9dc637 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-22 Thread Arthur Zamarin

commit: f5d81d21606769712be7e9583566f1fcb49a1b54
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 17:25:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 17:25:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d81d21

dev-util/meson: Stabilize 1.2.1-r1 ppc, #914538

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index 15445eb21adb..9f96e77c60ab 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-22 Thread Arthur Zamarin

commit: a30394364e2438a58d084605bba6485cc5d03510
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 17:23:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 17:23:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3039436

dev-util/meson: Stabilize 1.2.1-r1 sparc, #914538

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index bafab696a31e..15445eb21adb 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-22 Thread Arthur Zamarin

commit: a111b3918cb68753a438a03bedcf4335c9b5a411
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 17:23:02 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 17:23:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a111b391

dev-util/meson: Stabilize 1.2.1-r1 ppc64, #914538

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index a09372a78dff..bafab696a31e 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-22 Thread Arthur Zamarin

commit: e22765b2736e72681392cc88233ed37b8d63d302
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 17:22:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 17:22:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22765b2

dev-util/meson: Stabilize 1.2.1-r1 arm, #914538

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index 2f54a0120763..ad377af17931 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-22 Thread Arthur Zamarin

commit: 4b5f73faea42a21df7f0c9b8b3f3bd036849c2ea
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 17:22:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 17:22:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5f73fa

dev-util/meson: Stabilize 1.2.1-r1 amd64, #914538

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index ee18c8da7873..a09372a78dff 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-09-22 Thread Arthur Zamarin

commit: 791bc35e1fbcaa761eaac148151a4cf73f7471aa
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 17:22:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 17:22:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=791bc35e

dev-util/meson: Stabilize 1.2.1-r1 x86, #914538

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index ad377af17931..ee18c8da7873 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/

2023-08-17 Thread James Le Cuirot

commit: 0686381dfc3d39c0f844d25aeb8471b9a5de657e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Aug 16 21:34:25 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Aug 17 07:41:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0686381d

dev-util/meson: Backport fix to respect PATH when finding Python

Closes: https://bugs.gentoo.org/912051
Signed-off-by: James Le Cuirot  gentoo.org>

 dev-util/meson/files/meson-1.2.1-python-path.patch | 26 ++
 .../{meson-1.2.1.ebuild => meson-1.2.1-r1.ebuild}  |  4 
 2 files changed, 30 insertions(+)

diff --git a/dev-util/meson/files/meson-1.2.1-python-path.patch 
b/dev-util/meson/files/meson-1.2.1-python-path.patch
new file mode 100644
index ..d6151881f83f
--- /dev/null
+++ b/dev-util/meson/files/meson-1.2.1-python-path.patch
@@ -0,0 +1,26 @@
+From 2b33c94e6315e9a397dd48a58a5becb0df3b8aba Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Sat, 12 Aug 2023 09:56:44 +0100
+Subject: [PATCH 2/2] python module: Respect PATH when python is not given in
+ machine file
+
+We should only fall back to the Python interpreter running Meson itself
+if `python3` is not found in the PATH.
+
+https://github.com/mesonbuild/meson/pull/12116
+
+diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
+index 5654e4231..2b2395a9b 100644
+--- a/mesonbuild/modules/python.py
 b/mesonbuild/modules/python.py
+@@ -381,7 +381,9 @@ class PythonModule(ExtensionModule):
+ 
+ def _find_installation_impl(self, state: 'ModuleState', display_name: 
str, name_or_path: str, required: bool) -> MaybePythonProg:
+ if not name_or_path:
+-python = PythonExternalProgram('python3', mesonlib.python_command)
++python = PythonExternalProgram('python3')
++if not python.found():
++python = PythonExternalProgram('python3', 
mesonlib.python_command)
+ else:
+ tmp_python = ExternalProgram.from_entry(display_name, 
name_or_path)
+ python = PythonExternalProgram(display_name, ext_prog=tmp_python)

diff --git a/dev-util/meson/meson-1.2.1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
similarity index 98%
rename from dev-util/meson/meson-1.2.1.ebuild
rename to dev-util/meson/meson-1.2.1-r1.ebuild
index fefd68d177e5..2f54a0120763 100644
--- a/dev-util/meson/meson-1.2.1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}"/${P}-python-path.patch
+)
+
 python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-08-08 Thread Sam James

commit: ccb73e488a49e635fccb08d8e629e22982dfb8f5
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  9 04:55:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  9 04:56:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb73e48

dev-util/meson: add 1.2.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.2.1.ebuild | 117 ++
 2 files changed, 118 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index c7c5bbaa344b..3be872e1302a 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,3 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.2.0.tar.gz 2182568 BLAKE2B 
a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936431d96571ff83e96b7648a80a16cfd8eb581ff29b2ca88615657d5ca3
 SHA512 
8b5768cf0dab5f88d2f3e3962305910e707ff810cbd21b5997aab0bb6abe1c4d5dbd24ec59ab4072f1faa9b81daa8be993d56679445afa93700676f52e314d23
+DIST meson-1.2.1.tar.gz 2182126 BLAKE2B 
b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58
 SHA512 
6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e

diff --git a/dev-util/meson/meson-1.2.1.ebuild 
b/dev-util/meson/meson-1.2.1.ebuild
new file mode 100644
index ..fefd68d177e5
--- /dev/null
+++ b/dev-util/meson/meson-1.2.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2016-2023 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} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+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 EPYT

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-07-25 Thread Sam James

commit: 6de41399009a7bb79c126acb14de135f24a5986b
Author: Nataliiaaa <33694493+LaNataliaaa  users  noreply  
github  com>
AuthorDate: Mon Jul 17 19:11:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 26 02:47:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de41399

dev-util/meson: Drop obsolete live ebuild patches

Not needed as of now, plus breaks compilation.

[sam: We changed the identification of ld64.]

Signed-off-by: Nataliiaaa <33694493+LaNataliaaa  users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/31934
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/meson-.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-util/meson/meson-.ebuild b/dev-util/meson/meson-.ebuild
index 86cedf266f21..fefd68d177e5 100644
--- a/dev-util/meson/meson-.ebuild
+++ b/dev-util/meson/meson-.ebuild
@@ -44,10 +44,6 @@ RDEPEND="
virtual/pkgconfig
 "
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.63-xtools-support.patch
-)
-
 python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-07-16 Thread Sam James

commit: 65c6c820c1077fea91874f17b6a07ded90454a66
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 16 22:56:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 16 22:56:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c6c820

dev-util/meson: add 1.2.0, drop 1.2.0_rc3

Fixed upstream, or near enough fixed, in 
https://github.com/mesonbuild/meson/commit/9cc67b7fd185f92fb6c21ea7ecdb3d798ef3c2ae.

(Still unclear why, when searching for libcxx first, it "succeeds" though, but
whatever.)

Closes: https://bugs.gentoo.org/910231
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   | 2 +-
 dev-util/meson/{meson-1.2.0_rc3.ebuild => meson-1.2.0.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b8fa06613693..c7c5bbaa344b 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,2 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
-DIST meson-1.2.0rc3.tar.gz 2179074 BLAKE2B 
a195ccbc2fdf601ec7a0bbc4d858f04b37a843be4705e58f40274ada82615b63fd02f0e681138595d122bce76e274d69c6937247a578ae6bd76d71329693aa9d
 SHA512 
af2659d88d8b8db46c4b96a6c6b2da0ee71899600f8c6a65d1086503d3ee003b28f2ab37782bf678a7f90d6be5f2de10f7032e002008b57136b8f905b90dd5dc
+DIST meson-1.2.0.tar.gz 2182568 BLAKE2B 
a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936431d96571ff83e96b7648a80a16cfd8eb581ff29b2ca88615657d5ca3
 SHA512 
8b5768cf0dab5f88d2f3e3962305910e707ff810cbd21b5997aab0bb6abe1c4d5dbd24ec59ab4072f1faa9b81daa8be993d56679445afa93700676f52e314d23

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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-07-11 Thread Mike Gilbert

commit: 392ba20c7d894d2d8147e9e0fc7902b4748b2b15
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jul 12 01:10:00 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jul 12 01:10:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=392ba20c

dev-util/meson: switch maintainer to base-system

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/meson/metadata.xml | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dev-util/meson/metadata.xml b/dev-util/meson/metadata.xml
index b3ededb7ea8c..fcee1391ddd4 100644
--- a/dev-util/meson/metadata.xml
+++ b/dev-util/meson/metadata.xml
@@ -1,13 +1,8 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   flop...@gentoo.org
-   Mike Gilbert
-   
-   
-   willi...@gentoo.org
-   William Hubbs
+   
+   base-sys...@gentoo.org


mesonbuild/meson

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-07-11 Thread Sam James

commit: 62889088610bcc9df25bd1529ce6a3f19b6392a3
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 11 20:13:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 11 20:13:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62889088

dev-util/meson: drop 1.2.0_rc1, 1.2.0_rc2

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   2 -
 dev-util/meson/meson-1.2.0_rc1.ebuild | 117 --
 dev-util/meson/meson-1.2.0_rc2.ebuild | 117 --
 3 files changed, 236 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 3f74f61f04f1..b8fa06613693 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,4 +1,2 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
-DIST meson-1.2.0rc1.tar.gz 2176016 BLAKE2B 
c7c19b5fe8e25964dbdacaf7b2aa8e348e81e387f79b9576c6d8541064cd499008d70b527299eb02280828b7c1f91b194f2c6d2e54f702295b52b5d7a24c5d3f
 SHA512 
2511b40a8cc55093758599e3e51926a5ccac16c92a5bd33239c743fa6926af9ba0f7508dd2f04adbb2c4599ebad5d34f1a2e112d7ac10dd211e9511522d23962
-DIST meson-1.2.0rc2.tar.gz 2173996 BLAKE2B 
99707e8d57a95ed9ee381f05e5c22a5f73433a472c5dcad25999af8cb4c7a52d4604eee260e22a84cc2fff402fed0a57d0263f7e43e4986482c49b73f06920e0
 SHA512 
3090d33e0b4b695f407ebc196ad5508c1f617cdb04d97f265e7e13d12baa568273b04c4c0dbd8cb9a6a19fe1fec2047698bd3a4ea62929637887d835edcc6eac
 DIST meson-1.2.0rc3.tar.gz 2179074 BLAKE2B 
a195ccbc2fdf601ec7a0bbc4d858f04b37a843be4705e58f40274ada82615b63fd02f0e681138595d122bce76e274d69c6937247a578ae6bd76d71329693aa9d
 SHA512 
af2659d88d8b8db46c4b96a6c6b2da0ee71899600f8c6a65d1086503d3ee003b28f2ab37782bf678a7f90d6be5f2de10f7032e002008b57136b8f905b90dd5dc

diff --git a/dev-util/meson/meson-1.2.0_rc1.ebuild 
b/dev-util/meson/meson-1.2.0_rc1.ebuild
deleted file mode 100644
index fefd68d177e5..
--- a/dev-util/meson/meson-1.2.0_rc1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2016-2023 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} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
-   inherit git-r3
-else
-   inherit pypi
-
-   MY_P=${P/_/}
-   S=${WORKDIR}/${MY_P}
-
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-   fi
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   test? (
-   dev-libs/glib:2
-   dev-libs/gobject-introspection
-   dev-util/ninja
-   dev-vcs/git
-   sys-libs/zlib[static-libs(+)]
-   virtual/pkgconfig
-   )
-"
-RDEPEND="
-   virtual/pkgconfig
-"
-
-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.

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-07-11 Thread Sam James

commit: cb3ebe329e64fceb3635a5288a778786b82f42ba
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 11 20:13:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 11 20:13:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb3ebe32

dev-util/meson: add 1.2.0_rc3

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.2.0_rc3.ebuild | 117 ++
 2 files changed, 118 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 948a51d2de7c..3f74f61f04f1 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,4 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.2.0rc1.tar.gz 2176016 BLAKE2B 
c7c19b5fe8e25964dbdacaf7b2aa8e348e81e387f79b9576c6d8541064cd499008d70b527299eb02280828b7c1f91b194f2c6d2e54f702295b52b5d7a24c5d3f
 SHA512 
2511b40a8cc55093758599e3e51926a5ccac16c92a5bd33239c743fa6926af9ba0f7508dd2f04adbb2c4599ebad5d34f1a2e112d7ac10dd211e9511522d23962
 DIST meson-1.2.0rc2.tar.gz 2173996 BLAKE2B 
99707e8d57a95ed9ee381f05e5c22a5f73433a472c5dcad25999af8cb4c7a52d4604eee260e22a84cc2fff402fed0a57d0263f7e43e4986482c49b73f06920e0
 SHA512 
3090d33e0b4b695f407ebc196ad5508c1f617cdb04d97f265e7e13d12baa568273b04c4c0dbd8cb9a6a19fe1fec2047698bd3a4ea62929637887d835edcc6eac
+DIST meson-1.2.0rc3.tar.gz 2179074 BLAKE2B 
a195ccbc2fdf601ec7a0bbc4d858f04b37a843be4705e58f40274ada82615b63fd02f0e681138595d122bce76e274d69c6937247a578ae6bd76d71329693aa9d
 SHA512 
af2659d88d8b8db46c4b96a6c6b2da0ee71899600f8c6a65d1086503d3ee003b28f2ab37782bf678a7f90d6be5f2de10f7032e002008b57136b8f905b90dd5dc

diff --git a/dev-util/meson/meson-1.2.0_rc3.ebuild 
b/dev-util/meson/meson-1.2.0_rc3.ebuild
new file mode 100644
index ..fefd68d177e5
--- /dev/null
+++ b/dev-util/meson/meson-1.2.0_rc3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2016-2023 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} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+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
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-07-06 Thread Sam James

commit: d8dc1caf7341423e083da0e2215eb9ceb1a537ce
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul  6 08:28:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul  6 08:28:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8dc1caf

dev-util/meson: add 1.2.0_rc2

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.2.0_rc2.ebuild | 117 ++
 2 files changed, 118 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index a1da6fb4767f..948a51d2de7c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,3 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.2.0rc1.tar.gz 2176016 BLAKE2B 
c7c19b5fe8e25964dbdacaf7b2aa8e348e81e387f79b9576c6d8541064cd499008d70b527299eb02280828b7c1f91b194f2c6d2e54f702295b52b5d7a24c5d3f
 SHA512 
2511b40a8cc55093758599e3e51926a5ccac16c92a5bd33239c743fa6926af9ba0f7508dd2f04adbb2c4599ebad5d34f1a2e112d7ac10dd211e9511522d23962
+DIST meson-1.2.0rc2.tar.gz 2173996 BLAKE2B 
99707e8d57a95ed9ee381f05e5c22a5f73433a472c5dcad25999af8cb4c7a52d4604eee260e22a84cc2fff402fed0a57d0263f7e43e4986482c49b73f06920e0
 SHA512 
3090d33e0b4b695f407ebc196ad5508c1f617cdb04d97f265e7e13d12baa568273b04c4c0dbd8cb9a6a19fe1fec2047698bd3a4ea62929637887d835edcc6eac

diff --git a/dev-util/meson/meson-1.2.0_rc2.ebuild 
b/dev-util/meson/meson-1.2.0_rc2.ebuild
new file mode 100644
index ..fefd68d177e5
--- /dev/null
+++ b/dev-util/meson/meson-1.2.0_rc2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2016-2023 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} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+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)
+
+   # Ca

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-28 Thread Sam James

commit: 012b2e1da7a4e777ca3c8ea407dcaf5cd745b199
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 21:51:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 21:51:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012b2e1d

dev-util/meson: sync live

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-.ebuild b/dev-util/meson/meson-.ebuild
index c9781cdd78c0..86cedf266f21 100644
--- a/dev-util/meson/meson-.ebuild
+++ b/dev-util/meson/meson-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = ** ]]; then

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-28 Thread Sam James

commit: 5b243649038f6eaa4c3ccd881981f8969674b8af
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 22:09:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 22:09:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b243649

dev-util/meson: add 1.2.0_rc1

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.2.0_rc1.ebuild | 117 ++
 2 files changed, 118 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index aee94636f8bc..a1da6fb4767f 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1 +1,2 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
+DIST meson-1.2.0rc1.tar.gz 2176016 BLAKE2B 
c7c19b5fe8e25964dbdacaf7b2aa8e348e81e387f79b9576c6d8541064cd499008d70b527299eb02280828b7c1f91b194f2c6d2e54f702295b52b5d7a24c5d3f
 SHA512 
2511b40a8cc55093758599e3e51926a5ccac16c92a5bd33239c743fa6926af9ba0f7508dd2f04adbb2c4599ebad5d34f1a2e112d7ac10dd211e9511522d23962

diff --git a/dev-util/meson/meson-1.2.0_rc1.ebuild 
b/dev-util/meson/meson-1.2.0_rc1.ebuild
new file mode 100644
index ..fefd68d177e5
--- /dev/null
+++ b/dev-util/meson/meson-1.2.0_rc1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2016-2023 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} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+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/{ftd

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-28 Thread Michał Górny

commit: 06443b046d40779db891d3a2e3c4228d48cf96e3
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jun 28 06:24:02 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun 28 07:21:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06443b04

dev-util/meson: Enable pypy3

Enable pypy3 -- the test failures look roughly the same as with CPython.

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

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index e9da33425eb5..af3261000a64 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = ** ]]; then

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-21 Thread Sam James

commit: 6b8bbb9f465e3932e32aa9424599e4eb2b7540cc
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 22 05:19:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 22 05:19:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8bbb9f

dev-util/meson: drop 1.0.1, 1.1.0

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   2 -
 dev-util/meson/meson-1.0.1.ebuild | 121 --
 dev-util/meson/meson-1.1.0.ebuild | 121 --
 3 files changed, 244 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 8cdf77e14032..aee94636f8bc 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1 @@
-DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 
23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1
 SHA512 
3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
-DIST meson-1.1.0.tar.gz 2124254 BLAKE2B 
149dedc0e49b72682fa053f27f9a6c2543362539861b4b79ce65ecf4d913e221ac2d63f3b9aa350bd7622851c73be418b804ae1131dd27607eb01218e0204a5e
 SHA512 
b8968becd1de25d8e92ecbe4c3b50694269a463430b41fcf5206f35ac952507b01f316721fb36f8c7940437e35c3588f6a4504f5b8256fa47fd9b0ceb588ae39
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
deleted file mode 100644
index 0a5fa1cdd6f1..
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2016-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
-   inherit git-r3
-else
-   inherit pypi
-
-   MY_P=${P/_/}
-   S=${WORKDIR}/${MY_P}
-
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-   fi
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   test? (
-   dev-libs/glib:2
-   dev-libs/gobject-introspection
-   dev-util/ninja
-   dev-vcs/git
-   sys-libs/zlib[static-libs(+)]
-   virtual/pkgconfig
-   )
-"
-RDEPEND="
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.63-xtools-support.patch
-)
-
-python_prepare_all() {
-   local disable_unittests=(
-   # ASAN and sandbox both want control over LD_PRELOAD
-   # https://bugs.gentoo.org/673016
-   -e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-   # ASAN is unsupported on some targets
-   # https://bugs.gentoo.org/692822
-   -e 's/test_pch_with_address_sanitizer/_&/'
-
-   # https://github.com/mesonbuild/meson/issues/7203
-   -e 's/test_templates/_&/'
-
-   # Broken due to python2 wrapper
-   -e 's/test_python_module/_&/'
-   )
-
-   sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-   # Broken due to python2 script created by python_wrapper_setup
-   rm -r "test cases/frameworks/1 boost" || die
-
-   distutils-r1_python_prepare_all
-}
-
-src_test() {
-   tc-export PKG_CONFIG
-   if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; 
then
-   ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-   else
-   distutils-r1_src_test
-   fi
-}
-
-python_test() {
-   (
-   # test_meson_installed
-   unset PYTHONDONTWRITEBYTECODE
-
-   # https://bugs.gentoo.org/687792
-   unset PKG_CONFIG
-
-   # test_cross_file_system_paths
-   unset XDG_DATA_HOME
-
-   # 'test cases/unit/73 summary' expects 80 columns
-   export COLUMNS=80
-
-   # If JAVA_HOME is not set, meson looks for javac in PATH.
-   # If javac is in /usr/bin, meson assumes /usr/include is a valid
-   # JDK include path. Setting JAVA_HOME works around this broken
-   # autodetection. If no JDK is installed, we should end up with 
an empty
-   # value in JAVA_HOME, a

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-03 Thread Arthur Zamarin

commit: 1292056c79ced3da796f6363bb3f61f8a5e6fe80
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  3 19:42:45 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  3 19:42:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1292056c

dev-util/meson: Stabilize 1.1.1 sparc, #907664

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index 07f3d7cf96be..e9da33425eb5 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-01 Thread Sam James

commit: b85a8cc459ad49de741d6cdba973bee0907a7c05
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 22:19:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 22:19:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85a8cc4

dev-util/meson: Stabilize 1.1.1 hppa, #907664

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index eb645a3e4cb8..07f3d7cf96be 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-01 Thread Sam James

commit: af9054453ffa901d5e2cacd4b2271c5783e17d14
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 20:16:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 20:16:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af905445

dev-util/meson: Stabilize 1.1.1 arm64, #907664

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index c60c9c51a140..eb645a3e4cb8 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-01 Thread Sam James

commit: 5b54747f9e2cfb5e411c3b1671ed0fd46fd3
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 20:11:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 20:11:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b54747f

dev-util/meson: Stabilize 1.1.1 arm, #907664

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index 32d2991131d7..c60c9c51a140 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-01 Thread Sam James

commit: 328dc6ccab29b0bbaa186110c55b6a0aa8285161
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 20:11:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 20:11:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328dc6cc

dev-util/meson: Stabilize 1.1.1 ppc, #907664

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index 9340da5ae1c1..32d2991131d7 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-01 Thread Sam James

commit: b42388d8846156080c9956993f1959514c97e57e
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 20:04:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 20:04:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42388d8

dev-util/meson: Stabilize 1.1.1 ppc64, #907664

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index 7580383a9c86..9340da5ae1c1 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-01 Thread Sam James

commit: 77fb5b0ef3c394e016709ce40465663473fe441a
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 20:03:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 20:03:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fb5b0e

dev-util/meson: Stabilize 1.1.1 x86, #907664

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index 890f59400c8b..7580383a9c86 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-06-01 Thread Sam James

commit: db286685335411f7f91e88ec7a1859b5e2ae98c6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 20:03:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 20:03:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db286685

dev-util/meson: Stabilize 1.1.1 amd64, #907664

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index c9781cdd78c0..890f59400c8b 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-05-30 Thread Sam James

commit: 9f34ba39b0f79a13b27086b8b45e1bed81d929fd
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 05:59:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 05:59:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f34ba39

dev-util/meson: add 1.1.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.1.1.ebuild | 121 ++
 2 files changed, 122 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ea84ae7a348f..8cdf77e14032 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,3 @@
 DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 
23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1
 SHA512 
3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
 DIST meson-1.1.0.tar.gz 2124254 BLAKE2B 
149dedc0e49b72682fa053f27f9a6c2543362539861b4b79ce65ecf4d913e221ac2d63f3b9aa350bd7622851c73be418b804ae1131dd27607eb01218e0204a5e
 SHA512 
b8968becd1de25d8e92ecbe4c3b50694269a463430b41fcf5206f35ac952507b01f316721fb36f8c7940437e35c3588f6a4504f5b8256fa47fd9b0ceb588ae39
+DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
new file mode 100644
index ..c9781cdd78c0
--- /dev/null
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
+
+python_prepare_all() {
+   local disable_unittests=(
+   # ASAN and sandbox both want control over LD_PRELOAD
+   # https://bugs.gentoo.org/673016
+   -e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+   # ASAN is unsupported on some targets
+   # https://bugs.gentoo.org/692822
+   -e 's/test_pch_with_address_sanitizer/_&/'
+
+   # https://github.com/mesonbuild/meson/issues/7203
+   -e 's/test_templates/_&/'
+
+   # Broken due to python2 wrapper
+   -e 's/test_python_module/_&/'
+   )
+
+   sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+   # Broken due to python2 script created by python_wrapper_setup
+   rm -r "test cases/frameworks/1 boost" || die
+
+   distutils-r1_python_prepare_all
+}
+
+src_test() {
+   tc-export PKG_CONFIG
+   if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; 
then
+   ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+   else
+   distutils-r1_src_test
+   fi
+}
+
+python_test() {
+   (
+   # test_meson_installed
+   unset PYTHONDONTWRITEBYTECODE
+
+   # https://bugs.gentoo.org/687792
+   unset PKG_CONFIG
+
+   # test_cross_file_system_paths
+   unset XDG_DATA_HOME
+
+   # 'test cases/unit/73 summary' expects 80 columns
+   export COLUMNS=80
+
+   # If JAVA_HOME is not set, meson looks for javac in PATH.
+   # If javac is in /usr/bin, meson assumes /usr/include is a valid
+   # JDK include path. Setting JAVA_HOME works around this broken
+   # autodetection. If no JDK is installed, we should end up with 
an empty
+   # value in JAVA_HOME, and the tests should get skipped.
+   export JAVA_HOME=$(java-config

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-05-30 Thread Sam James

commit: 65bac15314f7db5d52f6b15f0f4dffdfe8d2f63e
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 05:35:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 05:35:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65bac153

dev-util/meson: enable py3.12

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/meson-1.1.0.ebuild | 2 +-
 dev-util/meson/meson-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/meson/meson-1.1.0.ebuild 
b/dev-util/meson/meson-1.1.0.ebuild
index 1cedf7d75ccb..c9781cdd78c0 100644
--- a/dev-util/meson/meson-1.1.0.ebuild
+++ b/dev-util/meson/meson-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = ** ]]; then

diff --git a/dev-util/meson/meson-.ebuild b/dev-util/meson/meson-.ebuild
index 1cedf7d75ccb..c9781cdd78c0 100644
--- a/dev-util/meson/meson-.ebuild
+++ b/dev-util/meson/meson-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = ** ]]; then

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson-format-array/

2023-05-27 Thread Arthur Zamarin

commit: 1a0ada1cae7ee649a0ef6cc34d332da83d81b40d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 27 07:39:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 27 07:40:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ada1c

dev-util/meson-format-array: EAPI=8, enable py3.12

I've tested the contents of the package, and there is no regression
with contents of the EAPI bump, so it is safe to do without revbump.

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/meson-format-array/meson-format-array-0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/meson-format-array/meson-format-array-0.ebuild 
b/dev-util/meson-format-array/meson-format-array-0.ebuild
index 2428eb34780c..1800171ff92f 100644
--- a/dev-util/meson-format-array/meson-format-array-0.ebuild
+++ b/dev-util/meson-format-array/meson-format-array-0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-r1

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-04-15 Thread Sam James

commit: e18e8e12b190354917e8e1b8effee638e8fbd7f7
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 16 05:59:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 16 05:59:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18e8e12

dev-util/meson: keyword 1.1.0

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.1.0.ebuild 
b/dev-util/meson/meson-1.1.0.ebuild
index d8c4a3c533d4..97dcdaf7e9fa 100644
--- a/dev-util/meson/meson-1.1.0.ebuild
+++ b/dev-util/meson/meson-1.1.0.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   : KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-04-12 Thread Sam James

commit: e10906f31ce35250f6c78cad6fa6c158ffc181b7
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 12 09:41:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 12 09:41:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10906f3

dev-util/meson: add 1.1.0, drop 1.1.0_rc2

Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest   | 2 +-
 dev-util/meson/{meson-1.1.0_rc2.ebuild => meson-1.1.0.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 7ff713e8e0ca..ea84ae7a348f 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,2 @@
 DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 
23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1
 SHA512 
3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
-DIST meson-1.1.0rc2.tar.gz 2121953 BLAKE2B 
a76dd31b65e833315d2be484a041ccdf799f959b78e8b937601cd15c6c2f823789c97c066f4d57f20aa091c03a87639591725f6bbf6dd411b101d990818df5bd
 SHA512 
fde87b2eb2cd3910fe577931919e7e16bac9f2945f20c56f63d2297068f5aca47d750f32ccbf9c30cc993bfc44984d33e35e1a99734051bec7dce86050a7e248
+DIST meson-1.1.0.tar.gz 2124254 BLAKE2B 
149dedc0e49b72682fa053f27f9a6c2543362539861b4b79ce65ecf4d913e221ac2d63f3b9aa350bd7622851c73be418b804ae1131dd27607eb01218e0204a5e
 SHA512 
b8968becd1de25d8e92ecbe4c3b50694269a463430b41fcf5206f35ac952507b01f316721fb36f8c7940437e35c3588f6a4504f5b8256fa47fd9b0ceb588ae39

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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-04-03 Thread Mike Gilbert

commit: aa84b3d87d46bc0aa6c35ac52bcfa49f8cc31687
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr  3 14:22:19 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr  3 14:47:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa84b3d8

dev-util/meson: add 1.1.0_rc2, drop 1.1.0_rc1

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/meson/Manifest   | 2 +-
 dev-util/meson/{meson-1.1.0_rc1.ebuild => meson-1.1.0_rc2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 705873be38cd..7ff713e8e0ca 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,2 @@
 DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 
23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1
 SHA512 
3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
-DIST meson-1.1.0rc1.tar.gz 2123774 BLAKE2B 
83ba979a5e3ca82f3bdfff3d317482a8d08fb6c6a13122cb135666fba7349eda23122799c45b05a6033a7d6a19156fd231af960ae061d4fa1495caec5a8e7b5f
 SHA512 
651c2976a5a63e93cf7f444ed889cf8a26551627694f013f2b803a3ce68f2733a36445f192e2684459d5124013870e4fd07eeaabbfecd1acdfc4ec6be0364dd2
+DIST meson-1.1.0rc2.tar.gz 2121953 BLAKE2B 
a76dd31b65e833315d2be484a041ccdf799f959b78e8b937601cd15c6c2f823789c97c066f4d57f20aa091c03a87639591725f6bbf6dd411b101d990818df5bd
 SHA512 
fde87b2eb2cd3910fe577931919e7e16bac9f2945f20c56f63d2297068f5aca47d750f32ccbf9c30cc993bfc44984d33e35e1a99734051bec7dce86050a7e248

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

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-30 Thread Mike Gilbert

commit: ff854f93304f672723ba8ccc1f02b19cb4c7a491
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Mar 30 15:45:15 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Mar 30 15:45:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff854f93

dev-util/meson: drop 0.63.3, 0.64.1, 1.0.0

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/meson/Manifest|   3 -
 dev-util/meson/meson-0.63.3.ebuild | 117 
 dev-util/meson/meson-0.64.1.ebuild | 120 -
 dev-util/meson/meson-1.0.0.ebuild  | 120 -
 4 files changed, 360 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b499b2447a50..705873be38cd 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,5 +1,2 @@
-DIST meson-0.63.3.tar.gz 2067612 BLAKE2B 
aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8
 SHA512 
6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
-DIST meson-0.64.1.tar.gz 2089752 BLAKE2B 
e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07
 SHA512 
4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
-DIST meson-1.0.0.tar.gz 2099642 BLAKE2B 
0be89aeaf103b19c21a6eaf9cba43608436986ba045198b9dbe73778e925b8340c92f24ec12f480a8527e9d10da422122f17ff4469bd1076c3e85903c0ed9610
 SHA512 
9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
 DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 
23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1
 SHA512 
3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
 DIST meson-1.1.0rc1.tar.gz 2123774 BLAKE2B 
83ba979a5e3ca82f3bdfff3d317482a8d08fb6c6a13122cb135666fba7349eda23122799c45b05a6033a7d6a19156fd231af960ae061d4fa1495caec5a8e7b5f
 SHA512 
651c2976a5a63e93cf7f444ed889cf8a26551627694f013f2b803a3ce68f2733a36445f192e2684459d5124013870e4fd07eeaabbfecd1acdfc4ec6be0364dd2

diff --git a/dev-util/meson/meson-0.63.3.ebuild 
b/dev-util/meson/meson-0.63.3.ebuild
deleted file mode 100644
index 2be01c9f3784..
--- a/dev-util/meson/meson-0.63.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2016-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
-   inherit git-r3
-else
-   MY_P=${P/_/}
-   S=${WORKDIR}/${MY_P}
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   test? (
-   dev-libs/glib:2
-   dev-libs/gobject-introspection
-   dev-util/ninja
-   dev-vcs/git
-   sys-libs/zlib[static-libs(+)]
-   virtual/pkgconfig
-   )
-"
-RDEPEND="
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.63-xtools-support.patch
-)
-
-python_prepare_all() {
-   local disable_unittests=(
-   # ASAN and sandbox both want control over LD_PRELOAD
-   # https://bugs.gentoo.org/673016
-   -e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-   # ASAN is unsupported on some targets
-   # https://bugs.gentoo.org/692822
-   -e 's/test_pch_with_address_sanitizer/_&/'
-
-   # https://github.com/mesonbuild/meson/issues/7203
-   -e 's/test_templates/_&/'
-
-   # Broken due to python2 wrapper
-   -e 's/test_python_module/_&/'
-   )
-
-   sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-   # Broken due to python2 script created by python_wrapper_setup
-   rm -r "test cases/frameworks/1 boost" || die
-
-   distutils-r1_python_prepare_all
-}
-
-src_test() {
-   tc-export PKG_CONFIG
-   if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; 
then
-   ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-   else
-   distutils-r1_src_test
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-30 Thread Mike Gilbert

commit: 37794c8b9ea827ee90db68de6810093037846675
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Mar 30 15:41:03 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Mar 30 15:45:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37794c8b

dev-util/meson: add 1.1.0_rc1

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/meson/Manifest   |   1 +
 dev-util/meson/meson-1.1.0_rc1.ebuild | 121 ++
 2 files changed, 122 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index a3d0627d347f..b499b2447a50 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,3 +2,4 @@ DIST meson-0.63.3.tar.gz 2067612 BLAKE2B 
aa6052330f15aa6b1f64598a60075ea3b245ba4
 DIST meson-0.64.1.tar.gz 2089752 BLAKE2B 
e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07
 SHA512 
4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
 DIST meson-1.0.0.tar.gz 2099642 BLAKE2B 
0be89aeaf103b19c21a6eaf9cba43608436986ba045198b9dbe73778e925b8340c92f24ec12f480a8527e9d10da422122f17ff4469bd1076c3e85903c0ed9610
 SHA512 
9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
 DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 
23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1
 SHA512 
3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
+DIST meson-1.1.0rc1.tar.gz 2123774 BLAKE2B 
83ba979a5e3ca82f3bdfff3d317482a8d08fb6c6a13122cb135666fba7349eda23122799c45b05a6033a7d6a19156fd231af960ae061d4fa1495caec5a8e7b5f
 SHA512 
651c2976a5a63e93cf7f444ed889cf8a26551627694f013f2b803a3ce68f2733a36445f192e2684459d5124013870e4fd07eeaabbfecd1acdfc4ec6be0364dd2

diff --git a/dev-util/meson/meson-1.1.0_rc1.ebuild 
b/dev-util/meson/meson-1.1.0_rc1.ebuild
new file mode 100644
index ..d8c4a3c533d4
--- /dev/null
+++ b/dev-util/meson/meson-1.1.0_rc1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+   inherit git-r3
+else
+   inherit pypi
+
+   MY_P=${P/_/}
+   S=${WORKDIR}/${MY_P}
+
+   if [[ ${PV} != *_rc* ]] ; then
+   : KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-libs/glib:2
+   dev-libs/gobject-introspection
+   dev-util/ninja
+   dev-vcs/git
+   sys-libs/zlib[static-libs(+)]
+   virtual/pkgconfig
+   )
+"
+RDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
+
+python_prepare_all() {
+   local disable_unittests=(
+   # ASAN and sandbox both want control over LD_PRELOAD
+   # https://bugs.gentoo.org/673016
+   -e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+   # ASAN is unsupported on some targets
+   # https://bugs.gentoo.org/692822
+   -e 's/test_pch_with_address_sanitizer/_&/'
+
+   # https://github.com/mesonbuild/meson/issues/7203
+   -e 's/test_templates/_&/'
+
+   # Broken due to python2 wrapper
+   -e 's/test_python_module/_&/'
+   )
+
+   sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+   # Broken due to python2 script created by python_wrapper_setup
+   rm -r "test cases/frameworks/1 boost" || die
+
+   distutils-r1_python_prepare_all
+}
+
+src_test() {
+   tc-export PKG_CONFIG
+   if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; 
then
+   ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+   else
+   distutils-r1_src_test
+   fi
+}
+
+python_test() {
+   (
+   # test_meson_installed
+   unset PYTHONDONTWRITEBYTECODE
+
+   # https://bugs.gentoo.org/687792
+   unset PKG_CONFIG
+
+   # test_cross_file_system_paths
+   unset XDG_DATA_HOME
+
+   # 'test cases/unit/73 summary' expects 80 columns
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-11 Thread Sam James

commit: c8f3cb3b350b7694919fd0adb2fa817f2822d08d
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 11 22:56:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 22:56:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f3cb3b

dev-util/meson: Stabilize 1.0.1 hppa, #900877

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
index fdf9462634f9..b71e586cc1d4 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-11 Thread Sam James

commit: cf6a0709c57c660a333b7609c7b3d999da8f6345
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 11 17:16:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:16:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6a0709

dev-util/meson: Stabilize 1.0.1 ppc, #900877

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
index 0279fd784793..fdf9462634f9 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-11 Thread Sam James

commit: ee0455e5c0de9df5f701b98f4ed6830676c59e5a
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 11 17:08:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:08:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0455e5

dev-util/meson: Stabilize 1.0.1 arm, #900877

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
index 1b3d65268051..5e35b700ec00 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-11 Thread Sam James

commit: 38f66e5cbfd6189c7a141632a852d28f325470d4
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 11 17:08:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:08:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f66e5c

dev-util/meson: Stabilize 1.0.1 sparc, #900877

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
index 5e35b700ec00..e49fb0aeea7c 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-11 Thread Sam James

commit: b660c01d5d94e0b92feaab9536138d1c1dd805c0
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 11 17:08:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:08:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b660c01d

dev-util/meson: Stabilize 1.0.1 ppc64, #900877

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
index e49fb0aeea7c..0279fd784793 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-11 Thread Sam James

commit: bd50dcb447b32b0b1ecb6fd128dc74a484447334
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 11 17:06:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:06:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd50dcb4

dev-util/meson: Stabilize 1.0.1 x86, #900877

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
index 599fde2234f0..1b3d65268051 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-11 Thread Sam James

commit: 1e34db2d3a05d5863532257a23127635c9f785ed
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 11 17:06:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:06:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e34db2d

dev-util/meson: Stabilize 1.0.1 amd64, #900877

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
index 3635a1f38814..599fde2234f0 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-11 Thread Sam James

commit: a3e11158a651f850226ab1a5700c30dd53625aeb
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 11 17:06:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:06:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e11158

dev-util/meson: Stabilize 1.0.1 arm64, #900877

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.1.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
index 97dcdaf7e9fa..3635a1f38814 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
S=${WORKDIR}/${MY_P}
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-05 Thread Sam James

commit: d1ab501c38a13aeea6d2b4a61e408b523b620d46
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  6 04:39:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  6 04:39:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ab501c

dev-util/meson: add 1.0.1

Closes: https://bugs.gentoo.org/891337
Signed-off-by: Sam James  gentoo.org>

 dev-util/meson/Manifest  | 1 +
 dev-util/meson/{meson-.ebuild => meson-1.0.1.ebuild} | 3 ++-
 dev-util/meson/meson-.ebuild | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index dbdc1f6692a6..a3d0627d347f 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,4 @@
 DIST meson-0.63.3.tar.gz 2067612 BLAKE2B 
aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8
 SHA512 
6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
 DIST meson-0.64.1.tar.gz 2089752 BLAKE2B 
e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07
 SHA512 
4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
 DIST meson-1.0.0.tar.gz 2099642 BLAKE2B 
0be89aeaf103b19c21a6eaf9cba43608436986ba045198b9dbe73778e925b8340c92f24ec12f480a8527e9d10da422122f17ff4469bd1076c3e85903c0ed9610
 SHA512 
9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
+DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 
23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1
 SHA512 
3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc

diff --git a/dev-util/meson/meson-.ebuild 
b/dev-util/meson/meson-1.0.1.ebuild
similarity index 98%
copy from dev-util/meson/meson-.ebuild
copy to dev-util/meson/meson-1.0.1.ebuild
index 8140364c2c1b..97dcdaf7e9fa 100644
--- a/dev-util/meson/meson-.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -10,9 +10,10 @@ if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
inherit git-r3
 else
+   inherit pypi
+
MY_P=${P/_/}
S=${WORKDIR}/${MY_P}
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

diff --git a/dev-util/meson/meson-.ebuild b/dev-util/meson/meson-.ebuild
index 8140364c2c1b..97dcdaf7e9fa 100644
--- a/dev-util/meson/meson-.ebuild
+++ b/dev-util/meson/meson-.ebuild
@@ -10,9 +10,10 @@ if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
inherit git-r3
 else
+   inherit pypi
+
MY_P=${P/_/}
S=${WORKDIR}/${MY_P}
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-03-04 Thread Arthur Zamarin

commit: 979f9bf3df4466f619d6734bcb3c09a27c2ab103
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 14:59:12 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 14:59:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979f9bf3

dev-util/meson: Stabilize 1.0.0 hppa, #895002

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.0.ebuild 
b/dev-util/meson/meson-1.0.0.ebuild
index f14de1f9d52d..041c8396d96c 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-02-16 Thread Sam James

commit: 98e0d1bcd1e51dd7641f83d05084f07326382122
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 17 07:16:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 17 07:16:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e0d1bc

dev-util/meson: Stabilize 1.0.0 sparc, #895002

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.0.ebuild 
b/dev-util/meson/meson-1.0.0.ebuild
index 591ea6898d40..f14de1f9d52d 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-02-16 Thread Sam James

commit: 237bbd8bfa152335829a18138dfd31e1bbea7bd5
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 17 07:16:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 17 07:16:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=237bbd8b

dev-util/meson: Stabilize 1.0.0 arm64, #895002

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.0.ebuild 
b/dev-util/meson/meson-1.0.0.ebuild
index 113f51d40e9a..591ea6898d40 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-02-16 Thread Sam James

commit: 69d4aff5fac8d093e68049254bb05924efb88131
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 17 07:15:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 17 07:15:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d4aff5

dev-util/meson: Stabilize 1.0.0 amd64, #895002

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.0.ebuild 
b/dev-util/meson/meson-1.0.0.ebuild
index d0cce1d06ad4..97886baba964 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-02-16 Thread Sam James

commit: e3e8906f517920fb8dd63abab88bf54a57b902f4
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 17 07:15:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 17 07:15:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3e8906f

dev-util/meson: Stabilize 1.0.0 ppc, #895002

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.0.ebuild 
b/dev-util/meson/meson-1.0.0.ebuild
index 2712a59b3733..4d07850e6630 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-02-16 Thread Sam James

commit: c11bced79906a678f01d0dc2753d3e00488ae17a
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 17 07:15:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 17 07:15:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11bced7

dev-util/meson: Stabilize 1.0.0 ppc64, #895002

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.0.ebuild 
b/dev-util/meson/meson-1.0.0.ebuild
index 4d07850e6630..d0cce1d06ad4 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-02-16 Thread Sam James

commit: 40e7c4d9e7a59b319398d9eaab828b62c1fd6238
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 17 07:15:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 17 07:15:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e7c4d9

dev-util/meson: Stabilize 1.0.0 x86, #895002

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.0.ebuild 
b/dev-util/meson/meson-1.0.0.ebuild
index 97886baba964..113f51d40e9a 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-02-16 Thread Sam James

commit: 8233662ca3580765af43eefe1315f6184d76a96f
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 17 07:15:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 17 07:15:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8233662c

dev-util/meson: Stabilize 1.0.0 arm, #895002

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-1.0.0.ebuild 
b/dev-util/meson/meson-1.0.0.ebuild
index 8140364c2c1b..2712a59b3733 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2023-01-13 Thread Arthur Zamarin

commit: 985bd4afb5a5cb98f7e81dce156e85d247868c81
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 13 12:20:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 13 12:20:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=985bd4af

dev-util/meson: Stabilize 0.64.1 sparc, #81

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/meson/meson-0.64.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/meson/meson-0.64.1.ebuild 
b/dev-util/meson/meson-0.64.1.ebuild
index 89a3cad3630d..5ecbeec8fd6b 100644
--- a/dev-util/meson/meson-0.64.1.ebuild
+++ b/dev-util/meson/meson-0.64.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2022 Gentoo Authors
+# Copyright 2016-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2022-12-29 Thread Sam James

commit: 7eac5a3cc1bba8a7fd19e8f6ecdf1211e601e131
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 29 19:38:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 29 19:39:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eac5a3c

dev-util/meson: Stabilize 0.64.1 amd64, #81

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-0.64.1.ebuild 
b/dev-util/meson/meson-0.64.1.ebuild
index 0de2e0f28e56..2dbca43056e2 100644
--- a/dev-util/meson/meson-0.64.1.ebuild
+++ b/dev-util/meson/meson-0.64.1.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2022-12-29 Thread Sam James

commit: 247d39cc72b242e078d9798705e5b482dcea822e
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 29 19:38:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 29 19:39:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=247d39cc

dev-util/meson: Stabilize 0.64.1 x86, #81

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meson/meson-0.64.1.ebuild 
b/dev-util/meson/meson-0.64.1.ebuild
index 2dbca43056e2..89a3cad3630d 100644
--- a/dev-util/meson/meson-0.64.1.ebuild
+++ b/dev-util/meson/meson-0.64.1.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2022-12-29 Thread Arthur Zamarin

commit: 16d0e2f0ad339d893b6042695ce441cce1bf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 29 19:37:42 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 29 19:37:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d0e2f0

dev-util/meson: Stabilize 0.64.1 arm64, #81

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-util/meson/meson-0.64.1.ebuild 
b/dev-util/meson/meson-0.64.1.ebuild
index 24db91b55357..fb335304e4ce 100644
--- a/dev-util/meson/meson-0.64.1.ebuild
+++ b/dev-util/meson/meson-0.64.1.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
 fi

1 2 3 4 5 6 >

1 - 100 of 528 matches

Mail list logo