commit:     2c2c9f9fe0aaf7cc8218d12134d30da182b241d1
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 21:17:02 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 21:38:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c2c9f9f

dev-build/meson: add 1.8.5

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

 dev-build/meson/Manifest           |   3 +
 dev-build/meson/meson-1.8.5.ebuild | 232 +++++++++++++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index f6a3bf2e2d8f..37d72ea1bdf2 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -16,6 +16,8 @@ DIST meson-1.8.3.tar.gz 2335924 BLAKE2B 
3c440854bd91c757d4370b498f0e6e903df4589f
 DIST meson-1.8.3.tar.gz.asc 833 BLAKE2B 
25f00f76819c74e64b3750ddd4507fdd8a0be764db54ea48ba49f0985bfbf04d294e5eff1ee799ec082cba24ed59b21a8fd75f81dee9d824e5f8cd9c775b0dcd
 SHA512 
9c28747ff4756422dae4eb4a86de24fe230e6676660aa9cfb72d29311012106a9edbcfff3559682917a7e0ed8c80af8b8ec37807d3f7e0f4005eed5793367307
 DIST meson-1.8.4.tar.gz 2336961 BLAKE2B 
fd574be17f1dde56fed13e18151cddc3265b4175b46bb45961f46a586e0e3b619ce5179df78505ac46cc6af7d8cbd4fc73f6434b8581b3e3518d791f6bb6e75c
 SHA512 
3325c3968649847621e4d39309222741e5158b204ff6cc88410f364634c9978b5fb4c02c73968b3b7df46c89371a5b27aec9a997917dae757415bd77f5db39f2
 DIST meson-1.8.4.tar.gz.asc 833 BLAKE2B 
33fea09355be6f3df1c9f82daf2c92cbebd79846f82039e697f390db4811ade49edaeb942a4d1da8cb95238cff400e4ef1a76e141189acf10bc5da70e3fb3c44
 SHA512 
e0e6474a020e320d940d8de1843b491d1906c38bca304168324cae333c5635c70b210ef14e1d31ada2a31e7d3b8e5ae4a8563373230f40c52c2cac017359fd29
+DIST meson-1.8.5.tar.gz 5056050 BLAKE2B 
4f67b140329d3b64dcc213e0c4e65d105dd98e0348d4c2bda622cfb617a6bd5434da13a0bc845cdb40ce376a30752d3183007f9b364cf54c699bc89cdecad195
 SHA512 
d0333380c4c9d8724212a100b7a4faa323c076ead9eed78e712974d68449271c6fd020e07ac8373fcdb18a0738a3ff5709dcacf8ff1aedf3a8ebd6edbb6b4c04
+DIST meson-1.8.5.tar.gz.asc 996 BLAKE2B 
ff8c1ffe8fd8488a00ffcc9d5d0c19dcadfca5216ad8c70daf44526f949c835d775dc558932237a891345e9d900385081ee1d7c76b41237aac423bf72b8f5f7b
 SHA512 
da9ff37ac207dbfbe8bca511e6b8ee233aaaf89653bf00c43d2fed2ecaf0b59b0b11bd4efafa4f87a6f70c8ad11f23834d313c7d1ae07a77baa0d9cfbbe535aa
 DIST meson-1.9.0.tar.gz 2366082 BLAKE2B 
54cef087a9629087e67a0d75422d08370e86273a202d9e054d160a4ae52b7b1ad612a2a2c8e72a00a8e29bd5857375bedca5935cd74a560950c6b45a48d69f19
 SHA512 
62e633e07e7e8be1bf4f62f9e5a2df9535750fc0047ee5c21b17bc851d190cc0cf8e6696614692091013dc72e68aa23d2c1fe04500e146f56876591250474d04
 DIST meson-1.9.0.tar.gz.asc 833 BLAKE2B 
3054c5f24b264fd5471b4094e6a37cfa4cad3567b8eda69d4b7a6c0e5486c95199b683c1b5b9ed1be44fd0eacaca1afb9dd95fd363a23753fdd0f71f194e9793
 SHA512 
7f2ce856cf16004ebdef1ce294e7efc44f644691cac2f704625b4a56b270d4b2db54564bef9f4c90360c1ec738e54b948aba336e1feb70dca2daf0e500f2b627
 DIST meson-1.9.1.tar.gz 5083044 BLAKE2B 
a4d1894636ee61fa0101153f07d53717d34ba9de620b69becf669e06dc09a85874b4c5d619a509347c97e4112502a431affecccc5faf96464b072b5563247b9e
 SHA512 
e5a167ff035f1494d6b1df7d3bf6feb37aa6421222fd27bfbebb36de4c7c3083e327679b82b7d9d3d4a2cc4dc2a3babb7cbf03358e4a2784d47eb34502014a1c
@@ -26,5 +28,6 @@ DIST meson-reference-1.6.1.3 343730 BLAKE2B 
55df822192781a70e4bc44cfe14fb363e3f8
 DIST meson-reference-1.7.2.3 344764 BLAKE2B 
82de9a7a01c2f1b45a2b3432deb4713af3cfd3b2dc9af8802488b7d1b86dde9b6ac81f90b144006a79e90b313e1d4d23f9cc90e17255ce9573e5487d3e20c286
 SHA512 
d482a3b3bed671705d6316e106984ad2c2169fe890349437e512455705ee8dddb31a29d31f44402a4c7c5bd2f78595b75bfc5ad34d8c0337b66f40837b08ee56
 DIST meson-reference-1.8.3.3 345855 BLAKE2B 
c8825ba7b72b36866ebfa8cdf63362f2d38673315378ea213c438057f5dafa36b9e729e8c415a29715c1da4fe72733a4a6a2cdbee4b7df57e5eb97f50152491b
 SHA512 
3085c10cfc08ce4f0edad7129ce4d9a0bf75c6522309e344ba14e27c34d46c3da25ebb46260de28caef4a6c8134857d63297ded26f1296639a8a097e62a1801c
 DIST meson-reference-1.8.4.3 345964 BLAKE2B 
a2840cfabe319cb244ad46bb3b72b7e19bcaf3bfbd0f804c3982a191f795284cc4d35ee00266bf069dd95c0fa99fdb565343007aed75a7a0859ad85528422667
 SHA512 
95385faa364103c9f38b497f6e021d81c0e08048863a046b5c9030d11f7554f8237d405fe04d2145513e3685a13c71b167f29a8727d0f8cb0ca591076e0b39b9
+DIST meson-reference-1.8.5.3 345964 BLAKE2B 
df514085c03c6cd84e31b1ea1aea18d34fdd5aebbcfa3ca96b31ca7dc97c89649f0b26e927288ed71beb3500a46d53cf6c42b740d9a8b3a22d75258cdf99c3c6
 SHA512 
ef8c4479b13bea4510dd57b0e18a4b86255853885763ae0a2ee19b3e0e846c6619bb6a646d656266650a58bc2afc7b1fa91b05bfc6f8fec9dcd73a7627a369fe
 DIST meson-reference-1.9.0.3 347286 BLAKE2B 
1fb96870791e7bdaefed5c9a0e807d412e922e965690ef2f8820075a27c2d20d7b8057f0f3b7b009dcc5f20cb7ba7ee778d2df6e4eac583cda58625d58fe9266
 SHA512 
6e0e127c988b6269c13ba901ce7bbedab135d81a0b4bcd8528a01371d9f74964381c446c2fa35876953ad0199866a0016b1e39f315b054b91499fc00597a9c5d
 DIST meson-reference-1.9.1.3 347286 BLAKE2B 
cae2e9a97bcb7fc6894723156280306ea0fb35d9cbe68d31785ac0678b17b8a4bdfdf2362834b9daf3c01e0ff8dd67c0f1d384595ef4e93858064bdad3e46840
 SHA512 
d79a772f4fdd55309acda104087d0bbdc707e8fd2816b516daf0b8d1c034892ddb0bec9a383d6f65184e9509a358e2a8b392a484b65ab9d26c0e68a02fd6db95

diff --git a/dev-build/meson/meson-1.8.5.ebuild 
b/dev-build/meson/meson-1.8.5.ebuild
new file mode 100644
index 000000000000..3b3b8ff73882
--- /dev/null
+++ b/dev-build/meson/meson-1.8.5.ebuild
@@ -0,0 +1,232 @@
+# Copyright 2016-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+       EGIT_REPO_URI="https://github.com/mesonbuild/meson";
+       inherit ninja-utils git-r3
+
+       BDEPEND="
+               ${NINJA_DEPEND}
+               $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+       "
+
+else
+       inherit verify-sig
+
+       MY_PV=${PV/_/}
+       MY_P=${P/_/}
+       S=${WORKDIR}/${MY_P}
+
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3
 -> meson-reference-${MY_PV}.3
+       "
+       # Releases may be signed by those listed in Releasing.md. Jussi
+       # remains the default release manager.
+       # 
https://github.com/mesonbuild/meson/commit/c2d795735fa1c46c54d6aed4d4a30f36a1f853cb
+       BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-eschwartz-20250723-r1 
sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eschwartz.asc
+       #VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
+       if [[ ${PV} != *_rc* ]] ; then
+               KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+       fi
+fi
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test test-full"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test-full? ( test )"
+
+DEPEND="
+       test? (
+               dev-libs/glib:2
+               dev-libs/gobject-introspection
+               app-alternatives/ninja
+               dev-vcs/git
+               sys-libs/zlib[static-libs(+)]
+               virtual/pkgconfig
+               dev-build/cmake
+       )
+       test-full? (
+               || ( dev-lang/rust dev-lang/rust-bin )
+               dev-lang/nasm
+               >=dev-lang/pypy-3
+               dev-lang/vala
+               dev-python/cython
+               virtual/fortran
+               virtual/jdk
+
+               app-text/doxygen
+               dev-cpp/gtest
+               dev-libs/protobuf
+               dev-util/bindgen
+               dev-util/gtk-doc
+               dev-util/itstool
+               llvm-core/llvm
+               media-libs/libsdl2
+               media-libs/libwmf
+               net-libs/libpcap
+               sci-libs/hdf5[fortran]
+               sci-libs/netcdf
+               sys-cluster/openmpi[fortran]
+               sys-devel/bison
+               sys-devel/flex
+
+               dev-qt/linguist-tools:5
+               dev-qt/qtwidgets:5
+               dev-qt/qtbase:6[gui,widgets]
+               dev-qt/qtdeclarative:6
+               dev-qt/qttools:6
+               dev-util/gdbus-codegen
+               x11-libs/gtk+:3
+
+               dev-libs/wayland
+               dev-util/wayland-scanner
+       )
+"
+RDEPEND="
+       !<dev-build/muon-0.2.0-r2[man(-)]
+       virtual/pkgconfig
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.2.1-python-path.patch
+)
+
+src_unpack() {
+       if [[ ${PV} = *9999* ]]; then
+               git-r3_src_unpack
+       else
+               default
+               use verify-sig && verify-sig_verify_detached 
"${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+       fi
+}
+
+python_prepare_all() {
+       local disable_unittests=(
+               # ASAN and sandbox both want control over LD_PRELOAD
+               # https://bugs.gentoo.org/673016
+               -e 's/test_generate_gir_with_address_sanitizer/_&/'
+               -e 's/test_env_cflags_ldflags/_&/'
+               -e 's/test_c_link_args_and_env/_&/'
+
+               # ASAN is unsupported on some targets
+               # https://bugs.gentoo.org/692822
+               -e 's/test_pch_with_address_sanitizer/_&/'
+
+               # clippy-driver fails, but only when run via portage.
+               #
+               #   error[E0463]: can't find crate for `std`
+               #   error: requires `sized` lang_item
+               -e 's/test_rust_clippy/_&/'
+       )
+
+       sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+       # Broken due to python2 script created by python_wrapper_setup
+       rm -r "test cases/frameworks/1 boost" || die
+       # nvcc breaks on essentially any LDFLAGS
+       # https://bugs.gentoo.org/936757
+       # https://github.com/mesonbuild/meson/issues/11234
+       rm -r "test cases/cuda"/* || die
+
+       distutils-r1_python_prepare_all
+}
+
+python_check_deps() {
+       if [[ ${PV} = *9999* ]]; then
+               python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+       fi
+}
+
+python_configure_all() {
+       if [[ ${PV} = *9999* ]]; then
+               # We use the unsafe_yaml loader because strictyaml is not 
packaged. In
+               # theory they produce the same results, but pyyaml is faster and
+               # without safety checks.
+               edo ./meson.py setup \
+                       --prefix "${EPREFIX}/usr" \
+                       -Dhtml=false \
+                       -Dunsafe_yaml=true \
+                       docs/ docs/builddir
+       fi
+}
+
+python_compile_all() {
+       if [[ ${PV} = *9999* ]]; then
+               eninja -C docs/builddir
+       fi
+}
+
+src_test() {
+       tc-export PKG_CONFIG
+       if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; 
then
+               ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+       else
+               distutils-r1_src_test
+       fi
+}
+
+python_test() {
+       (
+               # meson has its own tests for LTO support. We don't need to 
verify that
+               # all tests work when they happen to use it. And in particular, 
this
+               # breaks rust.
+               filter-lto
+
+               # remove unwanted python_wrapper_setup contents
+               # We actually do want to non-error if python2 is installed and 
tested.
+               remove="${T}/${EPYTHON}/bin:"
+               PATH=${PATH/${remove}/}
+
+               # test_meson_installed
+               unset PYTHONDONTWRITEBYTECODE
+
+               # https://bugs.gentoo.org/687792
+               unset PKG_CONFIG
+
+               # test_cross_file_system_paths
+               unset XDG_DATA_HOME
+
+               # 'test cases/unit/73 summary' expects 80 columns
+               export COLUMNS=80
+
+               # If JAVA_HOME is not set, meson looks for javac in PATH.
+               # If javac is in /usr/bin, meson assumes /usr/include is a valid
+               # JDK include path. Setting JAVA_HOME works around this broken
+               # autodetection. If no JDK is installed, we should end up with 
an empty
+               # value in JAVA_HOME, and the tests should get skipped.
+               export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+               ${EPYTHON} -u run_tests.py
+       ) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+       distutils-r1_python_install_all
+
+       insinto /usr/share/vim/vimfiles
+       doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+       dozshcomp data/shell-completions/zsh/_meson
+       dobashcomp data/shell-completions/bash/meson
+
+       if [[ ${PV} = *9999* ]]; then
+               DESTDIR="${ED}" eninja -C docs/builddir install
+       else
+               newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3
+       fi
+}

Reply via email to