From 06617f385b21ef2262c88f17869c15c424e67d21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2024 06:50:06 +0000 Subject: gentoo auto-resync : 19:03:2024 - 06:50:06 --- dev-build/Manifest.gz | Bin 6522 -> 6526 bytes dev-build/libtool/Manifest | 2 +- dev-build/libtool/libtool-2.4.7-r2.ebuild | 2 +- dev-build/meson/Manifest | 6 +- dev-build/meson/meson-1.3.1-r1.ebuild | 2 +- dev-build/meson/meson-1.4.0-r1.ebuild | 179 ++++++++++++++++++++++++++++++ dev-build/meson/meson-9999.ebuild | 76 +++++++++++-- dev-build/muon/Manifest | 3 +- dev-build/muon/muon-0.2.0-r1.ebuild | 31 +----- 9 files changed, 257 insertions(+), 44 deletions(-) create mode 100644 dev-build/meson/meson-1.4.0-r1.ebuild (limited to 'dev-build') diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz index ee47d6e02e7b..04708f8647a1 100644 Binary files a/dev-build/Manifest.gz and b/dev-build/Manifest.gz differ diff --git a/dev-build/libtool/Manifest b/dev-build/libtool/Manifest index 74886363cfc7..b032d2ee4e85 100644 --- a/dev-build/libtool/Manifest +++ b/dev-build/libtool/Manifest @@ -9,6 +9,6 @@ AUX libtool-2.4.7-grep-3.8.patch 1282 BLAKE2B b64b6eab6bed4b5595ef228c9d3bc65a8b AUX libtool-2.4.7-werror-lto.patch 2248 BLAKE2B 3537c599ee310fda695b1a671770e1d2c5a943e763641515738e8d13907b807b92727182a34af4c20598c3ad228a2b660f10fd582c2f65d1fdef11b92f5fc68a SHA512 b16f835fbec1ecf6c8408c0705fc94886f35443394298e9ae1d1893dbf7dbad11325b636ccc9d0ddeecc00a13a7b5ae78867dd1369b0fc2fcd9276808f326146 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da EBUILD libtool-2.4.7-r1.ebuild 3328 BLAKE2B b6be29a2ba3ef55e4f0ef285965c5575bb890a5627f12918ce4757394e2125a11415aa96a992598e6d55af33de27ceafd56bedc66576bfbadeec49750cd9b495 SHA512 0041100d2d6897a0e37eec7fdd3446194c7231c018a1736d826ec5d7d88ec4c3204c39911b2c120b0e4a4c45a44728f7595c21210b3fbd462610064373212351 -EBUILD libtool-2.4.7-r2.ebuild 3609 BLAKE2B 41beb905f649ecb70aabfa00ad5bdb9e2c2e463154ac078b1fdcf2e180470aeaf115d5a1461271ef123288321098fff3c0a9c2c0c84308741a45b5801b8cdec8 SHA512 97bf28b0e71000496254b0c316c4d3e7aae60a3169142f96f418244b57e7c73fd8c8d7c7d794c71870857008604b4dc0b8e094e9ea99dd4303d81d8cab23b35d +EBUILD libtool-2.4.7-r2.ebuild 3608 BLAKE2B a26fd7cb7e75058c6b11d8e1483845c72ced47cc374388dbf83ca25ace2e1e512b99275d013e131803be8135a6d61fedeeb14df0a30a1ae73d1caac337d437cd SHA512 e75c5a3153792c2da20a516bb797bb97fe53908d06588817f98c059c401cf4d2c35fb605b63850a2f8f3597b65e4220f243f1ad230af677928741d675f52f783 EBUILD libtool-9999.ebuild 3530 BLAKE2B 4ca095c93f68e20d424d57f61370ed310efc3411776f2e204e476bc5657b16bcbd729723b77c27847818de832b595162e52e596400b12946d95376cf3146654f SHA512 a2c51bece0819f9d003a2a3b4f31aa3be1c564c39ba945337bd0efbbb4ccbaea109e51d3d6084caefd1d8b80bf5c21bb4104a4c179f97952b7a9bf272b6ccb92 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609 diff --git a/dev-build/libtool/libtool-2.4.7-r2.ebuild b/dev-build/libtool/libtool-2.4.7-r2.ebuild index 85e337147b83..9aeb0ed28993 100644 --- a/dev-build/libtool/libtool-2.4.7-r2.ebuild +++ b/dev-build/libtool/libtool-2.4.7-r2.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - 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 DESCRIPTION="A shared library tool for developers" diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest index 659380bedf68..e9d7b5587e78 100644 --- a/dev-build/meson/Manifest +++ b/dev-build/meson/Manifest @@ -23,11 +23,13 @@ DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb5 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3 DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486 SHA512 2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad +DIST meson-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768 EBUILD meson-1.1.1.ebuild 3287 BLAKE2B d449d5e7511b47baf4d26aae0359183d4ef9ea21bf163d5af5fbe6cc78c44bd9788d5c807486f106be3a8abfb07cc1d34782616cffed333e94dd4225f6650056 SHA512 9fca53429ebd722f91084a4796bc1c466216b2021cb6b88e76cdaa559fefa17651d76e744e32c3126b2bad5b4ca36f5b17d402cec57a764340406610e7c97dae EBUILD meson-1.2.3.ebuild 3285 BLAKE2B f937d7add71afbfb05e1ce2f7a07c9077a76b8018d6cc3e7e5ebc029419aa45e57cb98f0b05e7236500bfdcee35a35ddbedad9c3c00133817c4b0867cea71730 SHA512 e8415edf199ad281e253331e72e7ed4e2398c658d006b54a7a89b24b9e2ce3950fb6d750c8a6b728849e973af7e576e9d95b7510d3aa27a320fc38614ec439bc EBUILD meson-1.3.0-r2.ebuild 3565 BLAKE2B 45aebd9f7f4978385d339588d5177418e3fc6e77878b3b5f095e95d30b0b237e5481f94225c651043888ab4af27510315de5f747eec45566e9b018dd5f2e9c22 SHA512 89646f67dbc7182a5808664125bc6d370b280f298fe3359a8837ebda3320b2e244adfbe39742c530da0a342f74aed5d3ba1d9b476440f393fd09a4af2babff85 -EBUILD meson-1.3.1-r1.ebuild 3707 BLAKE2B 226db24d4109bb63b65a8b15eb3aeb2824e4f6cafc93b2478f9d18c31f74ff4bde7a32aa36bdf63398cc90391b6b680ea20186d713670143209adf80f7bae93c SHA512 edc1096b30e6c4fd2bbf9d87fdd04ab4ac278ae007a1bb722f4905b663977d6448c3e0a5cba923c20db9dd13307b8499852cd9de73850ed738c6ccc554e4b591 +EBUILD meson-1.3.1-r1.ebuild 3706 BLAKE2B b7ba27a07e480500a8876d56286a4be4fc734011f253deb05465147e3babc99d81b70a54c0918c8db79179327eb92bd7e16a7758552ed92a42e53de29500cebc SHA512 e065666d6a70bdcc83040911cc6dcc8c4fd0e994509356a1cff13d6a64f2165e5e5a5b16c27361537a0c7b8eb7381cf19a9a6ad50551ff4b42702744ce6c971e EBUILD meson-1.3.2.ebuild 3425 BLAKE2B 05c2379e5d969467428bfd4ffe4c338aeefb7397b1b43f9adcebf514a4d4e069a77c62d8f075e7424921635cd8d2929c468c17e7cbceef76835a82bc09ddc290 SHA512 ad181c8f23d6fdde31ce37f0faacf83c1466faace2b7be9775b06f4a71388e55e2b85502eb1ae09c253f760aabd9c77f450ddb49c5d26ab90371220fad0ae503 +EBUILD meson-1.4.0-r1.ebuild 4542 BLAKE2B 279470e8ffbfe591a212836ba1957ca9b53614328253bc0303691cea8de742512e26804160befa0c49aca0f0d57cb12cd7d8f798362b72c1c7099ecb2f62e8a9 SHA512 95b0c7bd599572fcd65d0144186a433410d5cca9427c93ad20c1f18112b3f720a2bedd581728208b8aa72b7b3fd0d1370719d1f6aca67bd39a422d3efd36af81 EBUILD meson-1.4.0.ebuild 3451 BLAKE2B f7b685c9f0c03b9f0205a8be9e14827bcc54f7bef8131607001711b3b70419d9b88ef0f3d27c14d9a503e5e2cd3c7763f00c0061393a1e53ace5a09f779b9ddc SHA512 3b9609b4eb8ed93ba48bed4d9916ce082a318484b6a9dface0c200c79896b7001b5c4e35dce5cd56ef8dbb66c24b0e9e943e0c169c9142be249595ee83126126 -EBUILD meson-9999.ebuild 3235 BLAKE2B a70383fb27538f5539c16d0ca07f1cff24def033d6bde05053657c8c5217798ce65c3e15f599aa15f54f173b7ddcceefc4debb5af4ab53284cf75900a1e97152 SHA512 6d6afb4820807ef0d852ea7d7284ca574d089767917a4f1157726505e98aad1e4c485701023bbb99d7bec174dda802ccb16375237d5e05c874b59f058eceda43 +EBUILD meson-9999.ebuild 4542 BLAKE2B 279470e8ffbfe591a212836ba1957ca9b53614328253bc0303691cea8de742512e26804160befa0c49aca0f0d57cb12cd7d8f798362b72c1c7099ecb2f62e8a9 SHA512 95b0c7bd599572fcd65d0144186a433410d5cca9427c93ad20c1f18112b3f720a2bedd581728208b8aa72b7b3fd0d1370719d1f6aca67bd39a422d3efd36af81 MISC metadata.xml 472 BLAKE2B 559073667cf007cd507f379014c8d0d494908742f606ca5eeb2a0cef3b5a8cb63cea4e9aa33b228163211dff8f794d178cbcd6c91bb283f894e6b072db28bacc SHA512 9232fe05900dca57d21f41023255c9a6fba57b213737ac8842ea180681488d9a2a306c8fbeba66cf02204f4523192e64af745aa65db946beac723cfe271e4fd5 diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.3.1-r1.ebuild index 6bbfeaeaa0e0..8a1bba292f2a 100644 --- a/dev-build/meson/meson-1.3.1-r1.ebuild +++ b/dev-build/meson/meson-1.3.1-r1.ebuild @@ -24,7 +24,7 @@ else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.0-r1.ebuild new file mode 100644 index 000000000000..76daad8a812e --- /dev/null +++ b/dev-build/meson/meson-1.4.0-r1.ebuild @@ -0,0 +1,179 @@ +# Copyright 2016-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=setuptools + +inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/mesonbuild/meson" + inherit ninja-utils git-r3 + + BDEPEND=" + ${NINJA_DEPEND} + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + " + +else + inherit verify-sig + + MY_PV=${PV/_/} + MY_P=${P/_/} + S=${WORKDIR}/${MY_P} + + SRC_URI=" + https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz + verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) + https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3 + " + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +DESCRIPTION="Open source build system" +HOMEPAGE="https://mesonbuild.com/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + app-alternatives/ninja + dev-vcs/git + sys-libs/zlib[static-libs(+)] + virtual/pkgconfig + ) +" +RDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.1-python-path.patch +) + +src_unpack() { + if [[ ${PV} = *9999* ]]; then + git-r3_src_unpack + else + default + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} + fi +} + +python_prepare_all() { + local disable_unittests=( + # ASAN and sandbox both want control over LD_PRELOAD + # https://bugs.gentoo.org/673016 + -e 's/test_generate_gir_with_address_sanitizer/_&/' + + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + -e 's/test_pch_with_address_sanitizer/_&/' + ) + + sed -i "${disable_unittests[@]}" unittests/*.py || die + + # Broken due to python2 script created by python_wrapper_setup + rm -r "test cases/frameworks/1 boost" || die + + distutils-r1_python_prepare_all +} + +python_check_deps() { + if [[ ${PV} = *9999* ]]; then + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + fi +} + +python_configure_all() { + if [[ ${PV} = *9999* ]]; then + # We use the unsafe_yaml loader because strictyaml is not packaged. In + # theory they produce the same results, but pyyaml is faster and + # without safety checks. + edo ./meson.py setup \ + --prefix "${EPREFIX}/usr" \ + -Dhtml=false \ + -Dunsafe_yaml=true \ + docs/ docs/builddir + fi +} + +python_compile_all() { + if [[ ${PV} = *9999* ]]; then + eninja -C docs/builddir + fi +} + +src_test() { + tc-export PKG_CONFIG + if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then + ewarn "Found Qt5Core but not Qt5Gui; skipping tests" + else + distutils-r1_src_test + fi +} + +python_test() { + ( + # meson has its own tests for LTO support. We don't need to verify that + # all tests work when they happen to use it. And in particular, this + # breaks rust. + filter-lto + + # remove unwanted python_wrapper_setup contents + # We actually do want to non-error if python2 is installed and tested. + remove="${T}/${EPYTHON}/bin:" + PATH=${PATH/${remove}/} + + # test_meson_installed + unset PYTHONDONTWRITEBYTECODE + + # https://bugs.gentoo.org/687792 + unset PKG_CONFIG + + # test_cross_file_system_paths + unset XDG_DATA_HOME + + # 'test cases/unit/73 summary' expects 80 columns + export COLUMNS=80 + + # If JAVA_HOME is not set, meson looks for javac in PATH. + # If javac is in /usr/bin, meson assumes /usr/include is a valid + # JDK include path. Setting JAVA_HOME works around this broken + # autodetection. If no JDK is installed, we should end up with an empty + # value in JAVA_HOME, and the tests should get skipped. + export JAVA_HOME=$(java-config -O 2>/dev/null) + + ${EPYTHON} -u run_tests.py + ) || die "Testing failed with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /usr/share/vim/vimfiles + doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} + + insinto /usr/share/zsh/site-functions + doins data/shell-completions/zsh/_meson + + dobashcomp data/shell-completions/bash/meson + + if [[ ${PV} = *9999* ]]; then + DESTDIR="${ED}" eninja -C docs/builddir install + else + newman "${DISTDIR}"/meson-reference-${PV}.3 meson-reference.3 + fi +} diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild index 4e7497b5c819..76daad8a812e 100644 --- a/dev-build/meson/meson-9999.ebuild +++ b/dev-build/meson/meson-9999.ebuild @@ -6,9 +6,17 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} pypy3 ) DISTUTILS_USE_PEP517=setuptools +inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs + if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit git-r3 + inherit ninja-utils git-r3 + + BDEPEND=" + ${NINJA_DEPEND} + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + " + else inherit verify-sig @@ -19,6 +27,7 @@ else SRC_URI=" https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) + https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3 " BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg @@ -28,8 +37,6 @@ else fi fi -inherit bash-completion-r1 distutils-r1 toolchain-funcs - DESCRIPTION="Open source build system" HOMEPAGE="https://mesonbuild.com/" @@ -52,6 +59,19 @@ RDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-1.2.1-python-path.patch +) + +src_unpack() { + if [[ ${PV} = *9999* ]]; then + git-r3_src_unpack + else + default + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} + fi +} + python_prepare_all() { local disable_unittests=( # ASAN and sandbox both want control over LD_PRELOAD @@ -61,12 +81,6 @@ python_prepare_all() { # ASAN is unsupported on some targets # https://bugs.gentoo.org/692822 -e 's/test_pch_with_address_sanitizer/_&/' - - # https://github.com/mesonbuild/meson/issues/7203 - -e 's/test_templates/_&/' - - # Broken due to python2 wrapper - -e 's/test_python_module/_&/' ) sed -i "${disable_unittests[@]}" unittests/*.py || die @@ -77,6 +91,31 @@ python_prepare_all() { distutils-r1_python_prepare_all } +python_check_deps() { + if [[ ${PV} = *9999* ]]; then + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + fi +} + +python_configure_all() { + if [[ ${PV} = *9999* ]]; then + # We use the unsafe_yaml loader because strictyaml is not packaged. In + # theory they produce the same results, but pyyaml is faster and + # without safety checks. + edo ./meson.py setup \ + --prefix "${EPREFIX}/usr" \ + -Dhtml=false \ + -Dunsafe_yaml=true \ + docs/ docs/builddir + fi +} + +python_compile_all() { + if [[ ${PV} = *9999* ]]; then + eninja -C docs/builddir + fi +} + src_test() { tc-export PKG_CONFIG if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then @@ -88,6 +127,16 @@ src_test() { python_test() { ( + # meson has its own tests for LTO support. We don't need to verify that + # all tests work when they happen to use it. And in particular, this + # breaks rust. + filter-lto + + # remove unwanted python_wrapper_setup contents + # We actually do want to non-error if python2 is installed and tested. + remove="${T}/${EPYTHON}/bin:" + PATH=${PATH/${remove}/} + # test_meson_installed unset PYTHONDONTWRITEBYTECODE @@ -107,8 +156,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}" } @@ -122,4 +170,10 @@ python_install_all() { doins data/shell-completions/zsh/_meson dobashcomp data/shell-completions/bash/meson + + if [[ ${PV} = *9999* ]]; then + DESTDIR="${ED}" eninja -C docs/builddir install + else + newman "${DISTDIR}"/meson-reference-${PV}.3 meson-reference.3 + fi } diff --git a/dev-build/muon/Manifest b/dev-build/muon/Manifest index 3e5818d80617..1daf92f71b4e 100644 --- a/dev-build/muon/Manifest +++ b/dev-build/muon/Manifest @@ -1,4 +1,3 @@ -DIST meson-docs-0.64.1-19-g39c6fa4bc.tar.gz 78525 BLAKE2B 19f4768e70f38f744de9bebfcc7416f8ab7f414693dc1f3e379bbbc8370e3d3187e6a9e311a08c054bdfaf1d15efd225558de7d41d688fc4c4a10e3215af85ae SHA512 59c986c4c4d545a6488cd74a2b6563b867716b74aab95fd19a745ce46a99fe5222232e132c80c5ed80f3e61d13e74cf2dc13b1b6d4638fd40a69d82d0d74faaa DIST muon-0.2.0.tar.gz 510533 BLAKE2B 6ec67f8875e84fbc2f23f412825dd47b820cd44e97a16d9ac0ab0ba9db6e755a604b66b79d3dbe13d99440daf21c2f0ccbe69661b1fb3c7df3f636c61a0e4dcb SHA512 b2e90048756bdc26bdea24fe227a87ad4d0e57176e217e22ea492a55229c62e2a70243f60af1e162e2dde8468fdda9662a32ea5cfadd69fab95a83499efa077b -EBUILD muon-0.2.0-r1.ebuild 1488 BLAKE2B 7b2051050662728fecd15aabcb3069c658c0b965e61991afe1f96a9787c7e4e7aea5e4d9e814cac539b2ded39bb4de1e513040a676c1d7f403d57ded1c717d27 SHA512 199a51813c21b41960a4a7344436b7ea8c6db35bb4807359207c849969d71378ba693cef975f624dd0ed503369798769561737f4e7c912b4349670b3f068cdd6 +EBUILD muon-0.2.0-r1.ebuild 1055 BLAKE2B f02431d85724eee02653bc7f439717687320a88a4d24fff757fa9140dc06dccb2a42d39931dc56ffc7419e370115807b6502753779e119a8e02e5b0f0e3f073f SHA512 dcb0e044e5899ca63b1d421d4e4874ded32a73c792b2f4861781a9d0a17687d57b6a8663f427526bf378c9b7fd31e365d358cf6d33673fd35a0e39159d76d8f6 MISC metadata.xml 569 BLAKE2B 8712259e11150e15ad3e4db4291bb9091fab91cfa0901a9457e8538d13ef83fa3da0f0506257f47d4b43b160b1ac9088fe7dab1cd749300cdcd22a27917801ab SHA512 93910e7b6bff19ff5ca1a5987adfcc90eab1b90434c4003622b416a1a035d379ef0561f81f7be4edadcaf07fdbd491dcf0c52952f940d8545e79d4bb3c7c67e0 diff --git a/dev-build/muon/muon-0.2.0-r1.ebuild b/dev-build/muon/muon-0.2.0-r1.ebuild index a6f3e8102624..6f2e8fcbdd8d 100644 --- a/dev-build/muon/muon-0.2.0-r1.ebuild +++ b/dev-build/muon/muon-0.2.0-r1.ebuild @@ -3,8 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit meson python-any-r1 +inherit meson COMMIT_HASH="${PV}" MESON_DOCS_TAR=meson-docs-0.64.1-19-g39c6fa4bc.tar.gz @@ -13,16 +12,13 @@ DESCRIPTION="A meson-compatible build system" HOMEPAGE="https://muon.build/" SRC_URI=" https://git.sr.ht/~lattis/muon/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz - man? ( - https://mochiro.moe/wrap/${MESON_DOCS_TAR} - ) " # Apache-2.0 for meson-docs -LICENSE="GPL-3 man? ( Apache-2.0 )" +LICENSE="GPL-3 Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" -IUSE="+archive +curl +libpkgconf +man" +IUSE="+archive +curl +libpkgconf" S="${WORKDIR}/${PN}-${COMMIT_HASH}" @@ -30,31 +26,14 @@ DEPEND=" curl? ( net-misc/curl ) archive? ( app-arch/libarchive:= ) libpkgconf? ( dev-util/pkgconf:= ) - man? ( app-text/scdoc ) " RDEPEND="${DEPEND}" BDEPEND=" - man? ( - $(python_gen_any_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - ) + app-text/scdoc " -python_check_deps() { - python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use man && python-any-r1_pkg_setup -} - src_prepare() { default - - if use man; then - mv "${WORKDIR}/meson-docs" "${S}/subprojects" || die - fi } src_configure() { @@ -62,7 +41,7 @@ src_configure() { $(meson_feature curl libcurl) $(meson_feature archive libarchive) $(meson_feature libpkgconf) - $(meson_feature man docs) + -Ddocs=enabled -Dsamurai=disabled # patched version of samurai downloaded via wraps -Dbestline=enabled # vendored bestline, an insignificant addition ) -- cgit v1.2.3