commit: 8073e979e38e4104f9243893755054a9f9e80928 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Thu Jun 30 09:31:20 2022 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Thu Jun 30 09:31:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8073e979
dev-libs/libjcat: expand non-installation of test data No revbump because this bug only affected users who have had tests enabled on this package, and in any case the spurious files ARE known to the package manager so they'll be gone come next release anyway. Closes: https://bugs.gentoo.org/855302 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> ...atch => libjcat-0.1.11-disable_installed_tests.patch} | 16 +++++++++++++++- dev-libs/libjcat/libjcat-0.1.11.ebuild | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch similarity index 75% rename from dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch rename to dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch index 5cb3e00c6778..18ef4000293e 100644 --- a/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch +++ b/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch @@ -33,9 +33,23 @@ install_dir: installed_test_datadir, ) +--- a/data/tests/pki/meson.build ++++ b/data/tests/pki/meson.build +@@ -1,9 +1,11 @@ ++if false + install_data([ + 'GPG-KEY-Linux-Vendor-Firmware-Service', + 'LVFS-CA.pem', + ], + install_dir: join_paths(installed_test_bindir, 'pki'), + ) ++endif + + # generate certificate + pkcs7_config = join_paths(meson.current_source_dir(), 'test.cfg') --- a/libjcat/meson.build +++ b/libjcat/meson.build -@@ -235,7 +235,7 @@ +@@ -248,7 +248,7 @@ dependencies : [ libjcat_deps, ], diff --git a/dev-libs/libjcat/libjcat-0.1.11.ebuild b/dev-libs/libjcat/libjcat-0.1.11.ebuild index 1e2e8e341b96..b949816c5858 100644 --- a/dev-libs/libjcat/libjcat-0.1.11.ebuild +++ b/dev-libs/libjcat/libjcat-0.1.11.ebuild @@ -38,7 +38,7 @@ BDEPEND="virtual/pkgconfig RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch + "${FILESDIR}"/${PN}-0.1.11-disable_installed_tests.patch ) python_check_deps() {
