diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-30 16:00:34 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-30 16:00:34 +0100 |
commit | 8b63b46fda85d54cfbe94df2444a3ddd3e63b8e4 (patch) | |
tree | ced0310e563ec21deb23ca12d5459aebadba36f6 /sys-apps | |
parent | 93c735f5f1ff867aadcc947348d984ff2c5a29cb (diff) |
gentoo auto-resync : 30:03:2023 - 16:00:34
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/Manifest.gz | bin | 49128 -> 49139 bytes | |||
-rw-r--r-- | sys-apps/fwupd-efi/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild | 51 | ||||
-rw-r--r-- | sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/fwupd/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch | 406 | ||||
-rw-r--r-- | sys-apps/fwupd/fwupd-1.8.13.ebuild (renamed from sys-apps/fwupd/fwupd-1.8.11.ebuild) | 10 | ||||
-rw-r--r-- | sys-apps/openrc/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.46.ebuild | 2 |
9 files changed, 416 insertions, 65 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex b50424ae93a9..51be3410f3e4 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index 12b8a0f0d7ac..60ad4c6a0e81 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,6 +1,4 @@ AUX fwupd-efi-1.4-efi_ld_override.patch 1219 BLAKE2B f501bd949a82d28bc9daaef5b62e726e18825a081a584b50358e566b5c3af1eb0eaf409d17d5947b85b4f15098bb5d12025037ddb7a74489b88a945fc8eafbbc SHA512 31f966a7babdaa3a232ca86df065ff8e3724829455a9a3ce733bbd8454bd2f45cd3abf0b2526793a6b20b60ed9fce39f87f3528fd89c8c15093d016b65fb3784 -DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991 -EBUILD fwupd-efi-1.3.ebuild 1082 BLAKE2B 2106918286e351384b7a4a851062d9b73f3acdfa75d2f2fd098d9cc46164616bcd587f2721ae2390211a24a5ced69ac591770283efe93e7d933384479b6cc7ee SHA512 114686c628b89414fa26940c42065498436acd202aaa97e4f3b1abc1b51acfe888454db9e303bc92c24a02a03ae438158c1598fb186412b5d775ba6e4f5ad828 -EBUILD fwupd-efi-1.4.ebuild 1266 BLAKE2B e5d1387acb69459951304e642ba98fbb2a6c0878f3b3714d511e7f0f805389f5f0c8cf243d73bfb40d7bbf3ec0f34f51150cc531890504f74c1a5a1073985162 SHA512 580afe4482c22a5917d17679bef417cd64727b7fd36b5110cbab9490ba89875e328a74ea94bec2566ac4e46493c895a8b7695325902e0c2c81e5cb3c5b6e3d6b +EBUILD fwupd-efi-1.4.ebuild 1264 BLAKE2B 4d35c471519353411751957cd8a13714bf50d15b9130bc8c6ab6156645b666baf68c144e5c032b3aaf634cf04ddba219d8b59e4ffa42b035f305ef106fb23a7b SHA512 6117816905c51eb22a9f0f79a311ea6e55c010ac2ddd95e7f7980c8a8e2d318a5db55bb703a7d675a8c4d9ce7fa303105f0f63e4469671c0988b249d08642b1e MISC metadata.xml 502 BLAKE2B 37525a0056ad72eab2b2b7b15436181a8581075053704012670e1f0434c8af74bd0780f16f31fa5cd2c8836bc2e4d8f55dfd5a77140be83ebffda5ca9e1a1382 SHA512 70ccf403ddb8e4d33ee9cc6ba438583d42ab313784c3251919b74a6596c4e3593263a6400513605c1004bc0d3ebb1677febc31449096b825f688ed1cc7052c31 diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild deleted file mode 100644 index 728b9a2e949e..000000000000 --- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit meson python-any-r1 toolchain-funcs - -DESCRIPTION="EFI executable for fwupd" -HOMEPAGE="https://fwupd.org" - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git" -else - SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="" - -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig" - -DEPEND="sys-boot/gnu-efi" - -RDEPEND="!<sys-apps/fwupd-1.6.0" - -src_prepare() { - default - - python_fix_shebang "${S}/efi" -} - -src_configure() { - local emesonargs=( - -Defi-cc="$(tc-getCC)" - -Defi-ld="$(tc-getLD)" - -Defi-libdir="${EPREFIX}"/usr/$(get_libdir) - -Defi_sbat_distro_id="gentoo" - -Defi_sbat_distro_summary="Gentoo GNU/Linux" - -Defi_sbat_distro_pkgname="${PN}" - -Defi_sbat_distro_version="${PVR}" - -Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}" - ) - - meson_src_configure -} diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild index a10efcfde644..873f7f279123 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git" else SRC_URI="https://github.com/fwupd/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="LGPL-2.1+" diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 96d45ef6ed23..60c254036135 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,10 +1,12 @@ AUX fwupd-1.8.10-installed_tests.patch 10892 BLAKE2B 27f52fd33ddcf9d64aecf40105413047668e538ace3efe25a87abfc3100c264515b238252b303aed43dde6ca6ddd788ada826f52ec0a0e7bc7b1e2fe47142025 SHA512 f581dfac2e2a94659751958b8c05a54eb2cfc0c23fd89dc1cf3e2a460e3079e15ee60898b5bdb6d399bdc997a82b5bb8a581f5db21cbf6830a94b6f01c443a5a AUX fwupd-1.8.11-empty_kernel_cmdline.patch 812 BLAKE2B 5542b3df5de628a069ab26ab53576073a2d4ef30da970061c1129883181d7adfe2fd22f18f1179e7f179a52e55126b12235478c66f3a5e921339e74a7adc34ab SHA512 317f26e6317878c8886e4adeb3a7fca4c4ca823a5f35865f11fac7a810fb5d76dd726526b496069edb7f8a6f8ae86965f07530ec751b616f63dc3e8eef30707e AUX fwupd-1.8.11-installed_tests.patch 11562 BLAKE2B ae49094cf8b8312fa529424c5235cd12c68d368ab9a6b5f7520351683c31f71a824d50987869858454c27f6f6868df311042785618eb9bf18e424d5ea00ff987 SHA512 a4ddfd3c36dcb2ad47c4640180c301f0244f056d6812c2c722a84e33232694fd051305fb13600bea100e2ab5f692a039091238cf24d6aa29ca9044825b7dba35 +AUX fwupd-1.8.13-installed_tests.patch 11799 BLAKE2B 7d1b5e18f27a95aabda2421a9ba2ff98ae68f74fc82b103d199fe57905fbe40d21d88c60f2a0708bd575f6ce013abda848c9d0830f2489fb88ff1810926505db SHA512 3edd59a52310a454a86470feb9b17f627def0362947788c65743e0cbbc4670b94a227080caddc1e7808fc9b63f5e045d4a0638b63ae1ff850f70db9e3b748910 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7 DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97 DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de +DIST fwupd-1.8.13.tar.xz 3734812 BLAKE2B fb4d172e88dd15e13e4a682e87ce65f7b7ff25bd952fc2efed54bf5d8ad32874f91f143c17c90d4d63ec9138f214338f55d073a2c82bc86bf01b2531ef4a88cc SHA512 82616a3a239574020edbe6d026fb1652a0b0d1e173cb67f85d05829d4ab498852d5137019665de3c7102f16853aa4b195a9de7df039bc18857b226b04b5aec71 EBUILD fwupd-1.8.10.ebuild 4877 BLAKE2B 374ad7b6b8f3332a00716dcd46d9904833ef7c52e95d9e269fde77fe810ef17cfb3a76c0bff112b2831b2d80b985b1257386c092363e9e542bcb53afaac8ffc4 SHA512 b1435e3079eae1f76433511b13473fc72665c09b095d21ddba889178ea636ffa53f30f5e8055db3f8c33149af7041e9741aa89d4a2c87aaf60a124253837afdd EBUILD fwupd-1.8.11-r1.ebuild 4865 BLAKE2B c654e52b393d0772c96977ce6ba8ca3da83be3738e00e7c7c3475d51bf8c1173e18b2c69da31570e13bbb4d754c55baf92fa43cfb52b217e8471d82da8cca82e SHA512 c0aa1a103ce2f59789bd32e1859daae68e7c42fb589f2f63e980c2f6db9420a3e12096eb9522c9fbc32b2853ec028c951c4882016d81170c6866f6634dd611e6 -EBUILD fwupd-1.8.11.ebuild 4879 BLAKE2B bcb4bc55a2db90ef65d1dfcf217ca677cd8f87790395828a7be8fc24c24557bf97b757bfe8ba21391a270cff7cf3993c6457f9bfee338eb95d86899254e0f00c SHA512 129634825e136cf9d4a243d3386f5f3d9e6d2b9a81ed1a55e92fbf1419b30f3f6a7bb3f123c915e5f059e81f1f048c799872ce270765b18323b03d78647d163d +EBUILD fwupd-1.8.13.ebuild 4810 BLAKE2B eda66e330abc30b2a7dab73a15b5778326e54cde68da66d1c9dbaa0458059223b34ef5f3a1e18f20c5eb32a73ad6958d9463c361c8ef3f02503b2e05d97ceb43 SHA512 dd8cb5e60205fe0fc8664b39d629f24766070bad9800cb8f4eaba0668a62a9b3cadba3b9a13e9fd54e21d2c78603f1a62453b9b41e5e19e938a9ec50dc63795c MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de 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 new file mode 100644 index 000000000000..f97343be5224 --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch @@ -0,0 +1,406 @@ +--- 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/fwupd-1.8.11.ebuild b/sys-apps/fwupd/fwupd-1.8.13.ebuild index ae2c0c6958c2..0689a45a9731 100644 --- a/sys-apps/fwupd/fwupd-1.8.11.ebuild +++ b/sys-apps/fwupd/fwupd-1.8.13.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi" +IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi" REQUIRED_USE="${PYTHON_REQUIRED_USE} ^^ ( elogind minimal systemd ) dell? ( uefi ) @@ -40,10 +40,6 @@ BDEPEND="$(vala_depend) ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) - man? ( - app-text/docbook-sgml-utils - sys-apps/help2man - ) test? ( dev-util/umockdev net-libs/gnutls[tools] @@ -96,7 +92,7 @@ DEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.8.11-installed_tests.patch + "${FILESDIR}"/${PN}-1.8.13-installed_tests.patch ) src_prepare() { @@ -143,6 +139,7 @@ src_configure() { -Dconsolekit="disabled" -Dcurl="enabled" -Defi_binary="false" + -Dman="true" -Dsupported_build="enabled" -Dudevdir="${EPREFIX}$(get_udevdir)" $(meson_feature archive libarchive) @@ -154,7 +151,6 @@ src_configure() { $(meson_feature gtk-doc docs) $(meson_feature gusb) $(meson_feature lzma) - $(meson_use man) $(meson_feature introspection) $(meson_feature policykit polkit) $(meson_feature sqlite) diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index fdcc5a3da30f..297fd52403a2 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -4,6 +4,6 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6 DIST openrc-0.45.2.tar.gz 246515 BLAKE2B bb7d52b183612eb8924a2d0f9ec63eea88253d8d83964d6341a4715a6cdc372b3fd99ad0f972f4f539da9d741548777dabf4ced86fd20be741a89a69ffe2ff01 SHA512 ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9 DIST openrc-0.46.tar.gz 247679 BLAKE2B 55490afc179e1e56a58408e8a2b7ebd5376ffee25cb61f2838a47cc97ad1e4eadabcc7f74e5cc2a2d9217917eb42517cf01766de2e82b50a3500bdbe263b0d88 SHA512 7c837e4b553511f0621944222ca0d35bd553a9888bd482ca0f8f3d2923d5b51cbd1f1c2f33cccb26d9f13dfb488939b95064673bedb7fcbf78d68664df2678c7 EBUILD openrc-0.45.2-r2.ebuild 4595 BLAKE2B da0df99c14b6984dc97aee9beaf5cb777bb3d15076d6f6be64459327c4848fecd0957a3e42c2135bbc3dd6e2e9ee17f4004a4750108a4b3e33c4dc22c2e68e2c SHA512 e2a3fd3dc7aab7bcdcc81aaa8f9ac4b889cfaf82229054f0c71e9caeb49a8fa9395fa39eb215b66d73b78b7c18a661a4289ca2844a907a5c92250898b7809e35 -EBUILD openrc-0.46.ebuild 4552 BLAKE2B 951c7dcd2bf5f6e438917c11a4b339bdaf79608d909d34114e9e8722cfa02edfe55d8fe0754194d6a56161c0223c82248420f749b25c94823e6aae5114e188a7 SHA512 6731d090a7118a3257818143841ce15f259ac18ff0e8581c3464d97312756456a94487f415662b502757dd35bf892e4af931599af68a59a9791fb3cf46a493c0 +EBUILD openrc-0.46.ebuild 4545 BLAKE2B 529f2105d4467fe318614477074d566f66f36260196f452def87a06b3d643ea972e6c27a4cd3ad66733f67ff219a63ac9b096581efc16140b7719b0fe54ae9e9 SHA512 4ee4c58d32d8c3d2665498c78a622508d97c07f74e976ca26d62a07bfe302b62fa5aff25c9325db5bcbd34efc5969de2d86049c1e8bbd28af932e719b6a308ca EBUILD openrc-9999.ebuild 4553 BLAKE2B f806b0547ff994c52c342715043d2f0c7fff2a6dfe61151e58c0bb46a40afae03ce3d5c0e45220b89c89f70018981d97390a181603a134447169d1ade94aea3b SHA512 5215b2129a086deefc099f802329189faf219feab85897ced9b47d4c31405e64ca85d98ca9a1218ddb671204e5678c60a02c9551c7a8ff57d5c4681a4ec7a973 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37 diff --git a/sys-apps/openrc/openrc-0.46.ebuild b/sys-apps/openrc/openrc-0.46.ebuild index 78f0255fffd5..1e7df85b3c5f 100644 --- a/sys-apps/openrc/openrc-0.46.ebuild +++ b/sys-apps/openrc/openrc-0.46.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} =~ ^9{4,}$ ]]; then inherit git-r3 else SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="BSD-2" |