From 3529f1bf2739399905cd55b27c7609459bfc069f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Oct 2023 14:48:06 +0100 Subject: gentoo auto-resync : 27:10:2023 - 14:48:06 --- sys-apps/Manifest.gz | Bin 49545 -> 49540 bytes sys-apps/eza/Manifest | 2 + sys-apps/eza/eza-0.15.1.ebuild | 247 +++++++++++++ sys-apps/fwupd/Manifest | 3 - .../fwupd/files/fwupd-1.8.13-installed_tests.patch | 406 --------------------- .../fwupd/files/fwupd-1.9.4-fragile_tests.patch | 24 -- .../fwupd/files/fwupd-1.9.5-parallel_build.patch | 16 - sys-apps/nawk/Manifest | 2 +- sys-apps/nawk/nawk-20230909-r1.ebuild | 2 +- 9 files changed, 251 insertions(+), 451 deletions(-) create mode 100644 sys-apps/eza/eza-0.15.1.ebuild delete mode 100644 sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch delete mode 100644 sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch delete mode 100644 sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 456a33627ae0..945c778026dc 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/eza/Manifest b/sys-apps/eza/Manifest index 52376dca76c3..4c36fdabb561 100644 --- a/sys-apps/eza/Manifest +++ b/sys-apps/eza/Manifest @@ -46,6 +46,7 @@ DIST eza-0.13.1.tar.gz 1210338 BLAKE2B 5ae9b8274f3f22d72e6480db71b6817ead49bd2c1 DIST eza-0.14.0.tar.gz 1214132 BLAKE2B 89c0cc5055aab6730a66606b9a9ae040ea7d1f1fbcd278c4a2277738ca9a406fbeae33686d32d8f51382684f1fc57c465af61a06773490bb75b3e4f41a1a866c SHA512 7d7d0fa6b1e936bbafcad7bc537c678d30a40f586d8518966bf210985e585986f7a811b279c28e6df1e500653ffbeb05299f6b33366fad84e6545bcf656845d0 DIST eza-0.14.2.tar.gz 1217105 BLAKE2B 9835f66dcd481c8afcde3e9fdac741f67c371f3d58b43a4114789f6a2c5c816b9f131128e010973f7ffe91761b311c421d62e02ab95f80ec957c3e3426bdf441 SHA512 e807424814840cfbdc37f12e3b4ee9ea79287e1c9ee2fbd8f681346e5f7ed55523529d75c96eadbc7f1029c07086ce6d47bf6bbc125e7083bb67ae8be139ab7f DIST eza-0.15.0.tar.gz 1218228 BLAKE2B 570d95d21e7d284658dac6129dfba996090f53d8b0621c6cfe3b4143427d2663ea02bf6d6e528eff75d90b30625efdd1a0aa349fbf6d98a283724a1d127247ea SHA512 2eb15b51a26eab2999fbaaa282f19ccbebc176d0730a626c3ff6f41101afd7e9002e99ffa8c602a1ceb518570f029e960c25ada85661df18afc77d27c8f90cb2 +DIST eza-0.15.1.tar.gz 1222218 BLAKE2B c85069fb9c4cfc8efb70a1cbf9cc1744a4c90069c61bb2a10794b2e6e4514ef68052b081a594cd481f44aae7de1eefe705db637215f37b8cd4177a01e4e1791c SHA512 3ca0d45949e494b8dd7bc187c9ad573abdd505f2c7c32ef5cd660fbc23e1512a8bc43f0b90ba084dfb7cda1e58383aeb487c148c869f94e1ae3b5cbf91617924 DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc DIST filetime-0.2.22.crate 15029 BLAKE2B 068f4a84388d04d900bc5518a94895985ecba9c618a47b6483cabc31abd267e37ce69d78c51703ec5745307800d96ac801f37ac9959c60283c3c3d6ccd349c0a SHA512 d40d8baeb57ec85bb9ccf76ff0f898915c4e6cf384020121b53f4a2a1ef2840af5b4c9e8e1ff177034273f4f7a6bf81d2dd7a02cf498b61ea31ceaa30b877067 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68 @@ -191,4 +192,5 @@ EBUILD eza-0.13.1.ebuild 5441 BLAKE2B c9a4dccf69a350e15a79bd8bf0d1b03ae0fb71a535 EBUILD eza-0.14.0.ebuild 5441 BLAKE2B e61032e83d3dd727cccdc73d7a0a0173409bad5ef9118d053cae8c3e69137bb4c71e04eaa371f69512d3fe2312b611aab4d116046bb89eb0b7e9cf601b4258ba SHA512 79e95494e292dbdb203137cc711789ff38a005cd9df662565d00b55d1247eb8c969dd719e52b1156e952bc5cd05dbc9ccfbba3d9977f72c537bcdaab73cf619f EBUILD eza-0.14.2.ebuild 5435 BLAKE2B 866f20d20516f1828e46c806c6f594cc81ad1f96431f538ecb15892d2cffae7199ac2209c978f2df5fca581f5a45e2c0057745f3d90b810c1987490a7af6a3ee SHA512 8090220f44efaeebf0eccb7012bce5009698fd1ca85c0489544a64320b878167a7d4d8fb99a9624e1fe61f818f2b51cb8481076b17f03fd041fd500d747d9d02 EBUILD eza-0.15.0.ebuild 5449 BLAKE2B 630f8c7c59fb381730726fe92fde8025feb39819c650a68f85347198dae18270280449b1bc0fff594b47d466256e75dcb0c85ebacbd172219de9412c2f0a620a SHA512 edd274874ab61fe83ef2d6da2adbbf7cd0a5c12e90740ea0548e6e3b8423cc359a57295d2c3ad106d2bd61ca8c2ae66db13f7576d6692a1fe23fd5fa1f62214f +EBUILD eza-0.15.1.ebuild 5449 BLAKE2B 630f8c7c59fb381730726fe92fde8025feb39819c650a68f85347198dae18270280449b1bc0fff594b47d466256e75dcb0c85ebacbd172219de9412c2f0a620a SHA512 edd274874ab61fe83ef2d6da2adbbf7cd0a5c12e90740ea0548e6e3b8423cc359a57295d2c3ad106d2bd61ca8c2ae66db13f7576d6692a1fe23fd5fa1f62214f MISC metadata.xml 495 BLAKE2B 306ca308e3132da0688cee3f358d239c0b5ab3014c01d8624344d3a68643741a3d4303c1199454589f7fbc3a22d80fcc8ac66377b02895a39c1b54e078aee787 SHA512 09872a6228f3f3884044a8d08970ca5933a2de28049b900f85a99c749b7710268f7981f7115b796dbff159c471af3a60a4326da4412e660206b9ecbb6d24d11e diff --git a/sys-apps/eza/eza-0.15.1.ebuild b/sys-apps/eza/eza-0.15.1.ebuild new file mode 100644 index 000000000000..76623c74ec44 --- /dev/null +++ b/sys-apps/eza/eza-0.15.1.ebuild @@ -0,0 +1,247 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + aho-corasick@1.0.5 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anes@0.1.6 + ansiterm@0.12.2 + anstream@0.6.4 + anstyle-parse@0.2.1 + anstyle-query@1.0.0 + anstyle-wincon@3.0.1 + anstyle@1.0.3 + autocfg@1.1.0 + bitflags@1.3.2 + bitflags@2.4.0 + bumpalo@3.13.0 + byteorder@1.4.3 + cast@0.3.0 + cc@1.0.79 + cfg-if@1.0.0 + chrono@0.4.31 + ciborium-io@0.2.1 + ciborium-ll@0.2.1 + ciborium@0.2.1 + clap@4.4.3 + clap_builder@4.4.2 + clap_lex@0.5.1 + colorchoice@1.0.0 + content_inspector@0.2.4 + core-foundation-sys@0.8.4 + criterion-plot@0.5.0 + criterion@0.5.1 + crossbeam-channel@0.5.8 + crossbeam-deque@0.8.3 + crossbeam-epoch@0.9.15 + crossbeam-utils@0.8.16 + datetime@0.5.2 + dunce@1.0.4 + either@1.9.0 + equivalent@1.0.1 + errno-dragonfly@0.1.2 + errno@0.3.3 + fastrand@2.0.0 + filetime@0.2.22 + form_urlencoded@1.0.1 + git2@0.18.1 + glob@0.3.1 + half@1.8.2 + hashbrown@0.14.0 + hermit-abi@0.3.2 + humantime-serde@1.1.1 + humantime@2.1.0 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.57 + idna@0.2.3 + indexmap@2.0.0 + is-terminal@0.4.9 + itertools@0.10.5 + itoa@1.0.9 + jobserver@0.1.22 + js-sys@0.3.64 + lazy_static@1.4.0 + libc@0.2.149 + libgit2-sys@0.16.1+1.7.1 + libz-sys@1.1.2 + linux-raw-sys@0.4.7 + locale@0.2.2 + log@0.4.20 + matches@0.1.8 + memchr@2.6.3 + memoffset@0.9.0 + natord@1.0.9 + normalize-line-endings@0.3.0 + num-traits@0.2.14 + num_cpus@1.16.0 + number_prefix@0.4.0 + once_cell@1.18.0 + oorandom@11.1.3 + openssl-src@111.26.0+1.1.1u + openssl-sys@0.9.61 + os_pipe@1.1.4 + partition-identity@0.3.0 + percent-encoding@2.3.0 + phf@0.11.2 + phf_generator@0.11.2 + phf_macros@0.11.2 + phf_shared@0.11.2 + pkg-config@0.3.19 + plotters-backend@0.3.5 + plotters-svg@0.3.5 + plotters@0.3.5 + proc-macro2@1.0.66 + proc-mounts@0.3.0 + quote@1.0.33 + rand@0.8.5 + rand_core@0.6.4 + rayon-core@1.11.0 + rayon@1.7.0 + redox_syscall@0.1.57 + redox_syscall@0.3.5 + regex-automata@0.3.8 + regex-syntax@0.7.5 + regex@1.9.5 + rustix@0.38.13 + ryu@1.0.15 + same-file@1.0.6 + scoped_threadpool@0.1.9 + scopeguard@1.2.0 + serde@1.0.188 + serde_derive@1.0.188 + serde_json@1.0.107 + serde_spanned@0.6.3 + shlex@1.2.0 + similar@2.2.1 + siphasher@0.3.11 + snapbox-macros@0.3.6 + snapbox@0.4.14 + syn@2.0.29 + tempfile@3.8.0 + terminal_size@0.3.0 + thiserror-impl@1.0.48 + thiserror@1.0.48 + timeago@0.4.2 + tinytemplate@1.2.1 + tinyvec@1.2.0 + tinyvec_macros@0.1.0 + toml_datetime@0.6.3 + toml_edit@0.20.1 + trycmd@0.14.19 + unicode-bidi@0.3.5 + unicode-ident@1.0.11 + unicode-normalization@0.1.17 + unicode-width@0.1.11 + url@2.2.1 + utf8parse@0.2.1 + uutils_term_grid@0.3.0 + uzers@0.11.3 + vcpkg@0.2.12 + wait-timeout@0.2.0 + walkdir@2.4.0 + wasm-bindgen-backend@0.2.87 + wasm-bindgen-macro-support@0.2.87 + wasm-bindgen-macro@0.2.87 + wasm-bindgen-shared@0.2.87 + wasm-bindgen@0.2.87 + web-sys@0.3.64 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows@0.48.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + winnow@0.5.15 + zoneinfo_compiled@0.5.1 +" + +inherit shell-completion cargo + +DESCRIPTION="A modern, maintained replacement for ls" +HOMEPAGE="https://github.com/eza-community/eza" +SRC_URI="https://github.com/eza-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+git man" + +DEPEND="git? ( dev-libs/libgit2:= )" +RDEPEND="${DEPEND}" +BDEPEND=" + >=virtual/rust-1.70.0 + man? ( virtual/pandoc ) +" + +QA_FLAGS_IGNORED="usr/bin/${PN}" + +src_prepare() { + default + if use man; then + mkdir -p contrib/man || die "failed to create man directory" + pandoc --standalone -f markdown -t man man/eza.1.md \ + -o contrib/man/eza.1 || die "failed to create man page" + pandoc --standalone -f markdown -t man man/eza_colors.5.md \ + -o contrib/man/eza_colors.5 || die "failed to create colors man page" + pandoc --standalone -f markdown -t man man/eza_colors-explanation.5.md \ + -o contrib/man/eza_colors-explanation.5 || die "failed to create colors-explanation man page" + fi + + # "source" files only, but cargo.eclass will attempt to install them. + rm -r man || die "failed to remove man directory from source" + + # Known failing test, upstream says it could potentially be ignored for know + # bug #914214 + # https://github.com/eza-community/eza/issues/393 + rm tests/cmd/{icons,basic}_all.toml || die + rm tests/cmd/only_dir_{,recursive_}unix.toml || die + rm tests/cmd/recursive_unix.toml || die + rm tests/cmd/only_file_unix.toml || die + + sed -i -e 's/^strip = true$/strip = false/g' Cargo.toml || die "failed to disable stripping" +} + +src_configure() { + local myfeatures=( + $(usev git) + ) + export LIBGIT2_SYS_USE_PKG_CONFIG=1 + export PKG_CONFIG_ALLOW_CROSS=1 + cargo_src_configure --no-default-features +} + +src_install() { + cargo_src_install + + dobashcomp "completions/bash/${PN}" + dozshcomp "completions/zsh/_${PN}" + dofishcomp "completions/fish/${PN}.fish" + + if use man; then + doman contrib/man/* + fi +} + +pkg_postinst() { + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt "0.13.0"; then + elog "Starting with 0.13.0 \$EXA_COLORS using style codes nh and uh" + elog "will need to be updated to use nt and ut" + fi + done +} diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 40b6a1f4e9ac..75e8ca2a7ab5 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,6 +1,3 @@ -AUX fwupd-1.8.13-installed_tests.patch 11799 BLAKE2B 7d1b5e18f27a95aabda2421a9ba2ff98ae68f74fc82b103d199fe57905fbe40d21d88c60f2a0708bd575f6ce013abda848c9d0830f2489fb88ff1810926505db SHA512 3edd59a52310a454a86470feb9b17f627def0362947788c65743e0cbbc4670b94a227080caddc1e7808fc9b63f5e045d4a0638b63ae1ff850f70db9e3b748910 -AUX fwupd-1.9.4-fragile_tests.patch 1571 BLAKE2B b051c32ac4decb4f7eab52b532fe866382ebf203fa47a6a24cd6069a8c231da6a9cc42306a877511a3521f28f52fef4b65cead85bc89118019629f0cebd0d736 SHA512 b80f490ee00e4528adcabfb556a39fbcd581911ad3fa29d416a98b149d955f0cbe8b68089d9f47f569fee76e5f6eb75e05aaebe4d3f5670f2a0f3ef6d172c93a -AUX fwupd-1.9.5-parallel_build.patch 432 BLAKE2B 584949820b5c6e6840b48fe7ed6128ddf0ea43d9871148d8c68db0f154a7dcec62f77745fe4dd9f4e5472eac57aa6f77e5f2d7738ed215093c1bb819f4beb56b SHA512 13888a32a9af7e5aec26fbe51305b571783a952732a34c2ddcc1c38417664936fb4e6bb85df6fe99f73118b4a5e819e451ee0851e632015d7e852e2afe320607 AUX fwupd-1.9.6-fragile_tests.patch 1051 BLAKE2B 01ae6cae17b911d055eb820a041329e4347eb26533e372a540f08d6a7ab521118550e97c0ae3762d2532a9131a3ecdcfd719f6c1af6fb4c674688ee170c92581 SHA512 f1f22997477589f5a1fe18c7cca56309a365ff472aee0eaeaa1831a24b878d7301519f46e0b36e70fe5c0729b792fbeaa4430eee43c0169bcdbef8d1171bc107 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7 DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0 diff --git a/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch deleted file mode 100644 index f97343be5224..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch +++ /dev/null @@ -1,406 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -10,20 +10,10 @@ - subdir('fish-completion') - endif - --if get_option('tests') --subdir('device-tests') --endif -- - if build_daemon - subdir('motd') - endif - --if get_option('tests') -- if build_daemon -- subdir('installed-tests') -- endif --endif -- - if build_standalone - install_data(['daemon.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') ---- a/libfwupdplugin/meson.build -+++ b/libfwupdplugin/meson.build -@@ -371,6 +371,7 @@ - ) - test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env) - -+ if false - install_data([ - 'tests/chassis_type', - 'tests/sys_vendor', -@@ -389,6 +390,7 @@ - ], - install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'), - ) -+ endif - endif - - fwupdplugin_incdir = include_directories('.') ---- a/libfwupdplugin/tests/meson.build -+++ b/libfwupdplugin/tests/meson.build -@@ -10,6 +10,5 @@ - command: [ - python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@', - ], -- install: true, - install_dir: installed_test_datadir, - ) ---- a/plugins/acpi-dmar/meson.build -+++ b/plugins/acpi-dmar/meson.build -@@ -28,7 +28,6 @@ - plugin_libs, - plugin_builtin_acpi_dmar, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/acpi-facp/meson.build -+++ b/plugins/acpi-facp/meson.build -@@ -28,7 +28,6 @@ - plugin_libs, - plugin_builtin_acpi_facp, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/acpi-ivrs/meson.build -+++ b/plugins/acpi-ivrs/meson.build -@@ -28,7 +28,6 @@ - plugin_libs, - plugin_builtin_acpi_ivrs, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/acpi-phat/meson.build -+++ b/plugins/acpi-phat/meson.build -@@ -31,7 +31,6 @@ - plugin_libs, - plugin_builtin_acpi_phat, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/ata/meson.build -+++ b/plugins/ata/meson.build -@@ -33,7 +33,6 @@ - plugin_libs, - plugin_builtin_ata, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/bcm57xx/meson.build -+++ b/plugins/bcm57xx/meson.build -@@ -25,8 +25,6 @@ - plugin_builtins += plugin_builtin_bcm57xx - - if get_option('tests') -- install_data(['tests/bcm57xx.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -41,7 +39,6 @@ - plugin_libs, - plugin_builtin_bcm57xx, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/ccgx/meson.build -+++ b/plugins/ccgx/meson.build -@@ -29,8 +29,6 @@ - plugin_builtins += plugin_builtin_ccgx - - if get_option('tests') -- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -45,7 +43,6 @@ - plugin_libs, - plugin_builtin_ccgx, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/dfu/meson.build -+++ b/plugins/dfu/meson.build -@@ -70,7 +70,6 @@ - plugin_libs, - plugin_builtin_dfu, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/elantp/meson.build -+++ b/plugins/elantp/meson.build -@@ -22,8 +22,6 @@ - plugin_builtins += plugin_builtin_elantp - - if get_option('tests') -- install_data(['tests/elantp.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -38,7 +36,6 @@ - plugin_libs, - plugin_builtin_elantp, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/linux-swap/meson.build -+++ b/plugins/linux-swap/meson.build -@@ -28,7 +28,6 @@ - plugin_libs, - plugin_builtin_linux_swap, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/mtd/meson.build -+++ b/plugins/mtd/meson.build -@@ -29,7 +29,6 @@ - plugin_libs, - plugin_builtin_mtd, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/nitrokey/meson.build -+++ b/plugins/nitrokey/meson.build -@@ -33,7 +33,6 @@ - plugin_libs, - plugin_builtin_nitrokey, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/nvme/meson.build -+++ b/plugins/nvme/meson.build -@@ -38,7 +38,6 @@ - plugin_libs, - plugin_builtin_nvme, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/pixart-rf/meson.build -+++ b/plugins/pixart-rf/meson.build -@@ -19,8 +19,6 @@ - plugin_builtins += plugin_builtin_pxi - - if get_option('tests') -- install_data(['tests/pixart.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -35,7 +33,6 @@ - plugin_libs, - plugin_builtin_pxi, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/redfish/meson.build -+++ b/plugins/redfish/meson.build -@@ -40,16 +40,6 @@ - ) - - if get_option('tests') -- install_data(['tests/redfish-smbios.bin'], -- install_dir: join_paths(installed_test_datadir, 'tests')) -- install_data(['tests/redfish.conf'], -- install_dir: join_paths(installed_test_datadir, 'tests'), -- install_mode: 'rw-r-----', -- ) -- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'], -- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars')) -- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'], -- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -69,7 +59,6 @@ - fwupdplugin, - plugin_builtin_redfish, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/synaptics-mst/meson.build -+++ b/plugins/synaptics-mst/meson.build -@@ -22,8 +22,6 @@ - plugin_builtins += plugin_builtin_synaptics_mst - - if get_option('tests') -- install_data(['tests/synaptics-mst.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -44,7 +42,6 @@ - fwupdplugin, - plugin_builtin_synaptics_mst, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/synaptics-prometheus/meson.build -+++ b/plugins/synaptics-prometheus/meson.build -@@ -18,8 +18,6 @@ - plugin_builtins += plugin_builtin_synaprom - - if get_option('tests') -- install_data(['tests/synaptics-prometheus.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -34,7 +32,6 @@ - plugin_libs, - plugin_builtin_synaprom, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/synaptics-rmi/meson.build -+++ b/plugins/synaptics-rmi/meson.build -@@ -25,8 +25,6 @@ - plugin_builtins += plugin_builtin_synaptics_rmi - - if get_option('tests') -- install_data(['tests/synaptics-rmi-0x.builder.xml','tests/synaptics-rmi-10.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -41,7 +39,6 @@ - plugin_libs, - plugin_builtin_synaptics_rmi, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/uefi-capsule/meson.build -+++ b/plugins/uefi-capsule/meson.build -@@ -149,25 +149,6 @@ - ], - ) - test('uefi-self-test', e, env: env) -- --# to use these do `sudo systemctl edit fwupd.service` and set --# Environment="FWUPD_SYSFSFWDIR=/usr/share/installed-tests/fwupd" --install_data([ -- 'tests/efi/esrt/entries/entry0/capsule_flags', -- 'tests/efi/esrt/entries/entry0/fw_class', -- 'tests/efi/esrt/entries/entry0/fw_type', -- 'tests/efi/esrt/entries/entry0/fw_version', -- 'tests/efi/esrt/entries/entry0/last_attempt_status', -- 'tests/efi/esrt/entries/entry0/last_attempt_version', -- 'tests/efi/esrt/entries/entry0/lowest_supported_fw_version', -- ], -- install_dir: join_paths(installed_test_datadir, 'efi/esrt/entries/entry0'), --) --install_data([ -- 'tests/efi/efivars/CapsuleMax-39b68c46-f7fb-441b-b6ec-16b0f69821f3', -- ], -- install_dir: join_paths(installed_test_datadir, 'efi/efivars'), --) - endif - - endif ---- a/plugins/uefi-dbx/meson.build -+++ b/plugins/uefi-dbx/meson.build -@@ -31,7 +31,6 @@ - plugin_libs, - plugin_builtin_uefi_dbx, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/uf2/meson.build -+++ b/plugins/uf2/meson.build -@@ -18,8 +18,6 @@ - plugin_builtins += plugin_builtin_uf2 - - if get_option('tests') -- install_data(['tests/uf2.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -34,7 +32,6 @@ - plugin_libs, - plugin_builtin_uf2, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/vli/meson.build -+++ b/plugins/vli/meson.build -@@ -48,7 +48,6 @@ - plugin_libs, - plugin_builtin_vli, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/plugins/wacom-usb/meson.build -+++ b/plugins/wacom-usb/meson.build -@@ -23,8 +23,6 @@ - plugin_builtins += plugin_builtin_wac - - if get_option('tests') -- install_data(['tests/wacom-usb.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -39,7 +37,6 @@ - plugin_libs, - plugin_builtin_wac, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - c_args: [ ---- a/src/tests/host-emulate/meson.build -+++ b/src/tests/host-emulate/meson.build -@@ -8,7 +8,6 @@ - output: '@0@.gz'.format(input_file), - capture: true, - command: [gzip, '-k', '--stdout', '@INPUT@'], -- install: true, - install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'), - ) - endforeach diff --git a/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch b/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch deleted file mode 100644 index 95105177499b..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -umockdev-based tests appear not to play nicely with the sandbox, -often they work but on some systems they persistently fail. - ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -60,6 +60,7 @@ - option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on') - option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'}) - option('tests', type : 'boolean', value : true, description : 'enable tests') -+option('test-full', type : 'boolean', value : false, description : 'enable tests known to be fragile when called from Gentoo ebuilds') - option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'}) - option('udevdir', type: 'string', value: '', description: 'Directory for udev rules') - option('efi_os_dir', type: 'string', description : 'the hardcoded name of OS directory in ESP, e.g. fedora') ---- a/plugins/thunderbolt/meson.build -+++ b/plugins/thunderbolt/meson.build -@@ -19,7 +19,7 @@ - plugin_builtins += plugin_builtin_thunderbolt - - # we use functions from 2.52 in the tests --if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') -+if get_option('tests') and get_option('test-full') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) diff --git a/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch b/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch deleted file mode 100644 index fb9d3562841e..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch +++ /dev/null @@ -1,16 +0,0 @@ -From 085a89ce3f7734fd9bc0527df7f0bb05e27fbaef Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Tue, 12 Sep 2023 07:42:23 +0100 -Subject: [PATCH] trivial: Fix parallel build, harder still - -Fixes https://github.com/fwupd/fwupd/issues/6175 ---- a/src/meson.build -+++ b/src/meson.build -@@ -17,6 +17,7 @@ engine_dep = [ - polkit, - sqlite, - cbor, -+ fwupdplugin_rs_dep, - ] - - if get_option('passim').allowed() diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest index 40ad1f1d1a8f..3f07f1235166 100644 --- a/sys-apps/nawk/Manifest +++ b/sys-apps/nawk/Manifest @@ -2,6 +2,6 @@ AUX nawk-20230909-big-endian.patch 1661 BLAKE2B 7d67e8c1df3e67eadc226885959b79f0 DIST nawk-20220122.tar.gz 1832761 BLAKE2B f704ff9cf5012545ec3adc1887c0d43625d7e38e19589cba91fe31f664e72ccce20dee3f2484067a31af793be16439c1389603fbdb33c119efeafb18559a0d97 SHA512 46ab7936705288c9cd22867ad9f5b080ade67c4b05d674304e0e5cae8ea329420a9a46e3578bf3a014b7066a1185b7506b0f74445bb52aafb1090e7a82a5bf28 DIST nawk-20230909.tar.gz 1833391 BLAKE2B 1a8dc9805d144953d6ad5d0539847b1d83661a8e2c0e029e13201ee44f5f6a29cf487c4368c8578d01577b99349968415503fb0c2f7f8f37f4a55fb57cec2b07 SHA512 28687dfbd797fb1f758bd356824110602045b7249a41f47e2cda15ac3d256d57260f1fc74119dc30fbb0e909295bd676a52ec24d3b3cc35e417d46a1749f856f EBUILD nawk-20220122-r1.ebuild 1223 BLAKE2B 085fb2b121a121d20152056dce2a244c25d380d90d61da7e62028f2d607155dbd050f98417e0c6d2824c3ddf2d9a8c5197c7091159f8baf035a0e73e90d725ec SHA512 bc40324399e6be4ef25b011e264861b88bf776c10cba6538d644ddd46034efc5ab5b7e148187cb1f391e023203b7796503121a7d906817ff569473c40f57aaea -EBUILD nawk-20230909-r1.ebuild 1298 BLAKE2B 3da3e50ea78df33d841715c5650e1eb7bbafde15b29c9611655f267d1bcd1e1c659f7400015aa15749fe1bf52810ea8f91086abc06d1e2222d8eea99b4d97a10 SHA512 69085a9be2f1caf79b32a357eaf15fbb0aa0c5b83eaaa3d6229819b965cd845ebc23f75a1c3e2fc9b63b959913b8f2f09054854c0d9ccec3d219173ff476525b +EBUILD nawk-20230909-r1.ebuild 1297 BLAKE2B 3700bd2b4baaf9eab08cd2604602e86c409f5f1f030fcfe54414623459d92ba401810de5531909417095f7f0250578a03dcdd330288988d2175af80953d4e469 SHA512 3c978a3e5c1683dda75bcce41e54bcd8db933335e36a05bac6a0b6f6589df008205bce0f0ab8e4f5ea092a9f2eab16b430ae24a7eea311f675be896df99b0913 EBUILD nawk-20230909.ebuild 1231 BLAKE2B 3c3d13a2e1d58127dce448c3716be61b29c921b80c01fe6554be424aaaf858e54b8b736684483e6bfea21c0053dbdd16466d8c7d49417c6e6c24433eb59da9e7 SHA512 c8be2b47a50c91f1bdb39377e5338f5043f132bc1ce3dd5941fed2901ae09ec7cd30468ba1ed0288376125f0cbf97d834d8b361c302393ff00831efed110c883 MISC metadata.xml 337 BLAKE2B 39b318d3780c5249fbf02ea024166015bb8d7798da072dbaf95318ce222f9722cf86d04e9a7c8c92c27377f5b6e09e2d8c11906c9d4e1977102ff6611f1ee6fa SHA512 8dd91d8652fa219ac793b361e5ee2bdc5337c4c098a851a1d19bf03cf2eb9a0c5ef7087f2b4ab7f51a0492ee03a7ea471f990a717e20f492dd9a57c1111237f6 diff --git a/sys-apps/nawk/nawk-20230909-r1.ebuild b/sys-apps/nawk/nawk-20230909-r1.ebuild index 1f7348f747b9..258a55a11a5b 100644 --- a/sys-apps/nawk/nawk-20230909-r1.ebuild +++ b/sys-apps/nawk/nawk-20230909-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/awk-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux" BDEPEND=" app-alternatives/yacc -- cgit v1.2.3