From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- dev-libs/libjcat/Manifest | 10 +--- .../libjcat-0.1.1-disable_installed_tests.patch | 46 --------------- .../libjcat-0.1.11-disable_installed_tests.patch | 60 ++++++++++++++++++++ dev-libs/libjcat/libjcat-0.1.10.ebuild | 65 ---------------------- dev-libs/libjcat/libjcat-0.1.11.ebuild | 8 +-- dev-libs/libjcat/libjcat-0.1.9-r1.ebuild | 65 ---------------------- dev-libs/libjcat/metadata.xml | 4 ++ 7 files changed, 71 insertions(+), 187 deletions(-) delete mode 100644 dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch create mode 100644 dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch delete mode 100644 dev-libs/libjcat/libjcat-0.1.10.ebuild delete mode 100644 dev-libs/libjcat/libjcat-0.1.9-r1.ebuild (limited to 'dev-libs/libjcat') diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest index 25e1ec2597f0..8aa7862b9be0 100644 --- a/dev-libs/libjcat/Manifest +++ b/dev-libs/libjcat/Manifest @@ -1,8 +1,4 @@ -AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf -DIST libjcat-0.1.10.tar.gz 68126 BLAKE2B 7e8bd2dd42f784bdf0c067ea870c8095a0fc9579f6041bb9a984d45d46950861d285238d49181243cd320f83c25f443300dd405fb0c1d50c8055fbd5a0af6b90 SHA512 437a792d438657e5b92dfab332d16eb430d8c3be2a8f0d82f1f1cfd5d3a0db1a0a1175dabb87dcd57ac7cddc8017e27c00f7a959cb57244a1e63fb963cae445b +AUX libjcat-0.1.11-disable_installed_tests.patch 1473 BLAKE2B 5b5705f44fcaf6f74126d4ee62c08966dc1d1816974f8fc82a57fa8f1d44ac32f0b813a669b0f638df0e5d3604864671b0a0cce47f966cce578dc0471489e794 SHA512 4bb721822d3b8965119e30f5d1b0854d5f6ec8caed04dc8fea8811fdce9847d553197ae8042ef9a39de3109a4c12564f7c3f1c56d5c0b64e7924865a58aaafa6 DIST libjcat-0.1.11.tar.gz 68455 BLAKE2B 7414fcff85237a2a95ea50569470a0f35d18e201b351f2a67ca83276b76975983c23b1dc3ee0090e582713d120635bd9c92b43389a7f78529e22bd18ff88dfb9 SHA512 02c5cd1e8d7e59a171ee878bd2538858830f0b4f7b27c337db77d84a30f66cae83f1a4832750550c1f5ba31a312837a383e0af489aae476c2f54687cd28064e4 -DIST libjcat-0.1.9.tar.gz 64884 BLAKE2B 30e7c9f6c5fc971144f27bc495443928b8406a199e3a03399f2081a5ec3d09d10261bec6804e8d92c8c4a44ad31f821f302954fee66abe16a6b0b0400b627036 SHA512 d4d51d95edf1223d5876464feb476d3e9a47f60fed7724690d247cb3b759c5adaa04ba71a0221d5e520d0077d52ea6610c0188f2e5c70a323210ad68c134e83d -EBUILD libjcat-0.1.10.ebuild 1457 BLAKE2B e07e712e1a37587f34937015bd63086f0e03de2e8cc24f7eca2eee2274fdda4896ae6057a262f6481eff4841089afb7c461c47b32c62e0c20c981b4bf95d4982 SHA512 3a557acb78e3338a4aab6305101391a76c218a060a36c064c92b0ba524cdaf70144e947206dea2e682c84d2875ecd33a7d92493a53682e5ddbbcafe8ba9e8d28 -EBUILD libjcat-0.1.11.ebuild 1470 BLAKE2B ed2a59c2aa731b930a31c19d1f977856d9ede4089df8478151de9dca95d09bea39c770aa85c509813fba8ab7a0ecad6722c5bbe5c89cca833c37e77d217cdbdb SHA512 f9b7f964fc64dcdece80314e44318de7b0fa9e458bc59a9c3580a4c40719b7bbdfaccdb4717054ef8df0f2cdedc63438f592a0d79f4afa991b379800ce91d7ec -EBUILD libjcat-0.1.9-r1.ebuild 1457 BLAKE2B e07e712e1a37587f34937015bd63086f0e03de2e8cc24f7eca2eee2274fdda4896ae6057a262f6481eff4841089afb7c461c47b32c62e0c20c981b4bf95d4982 SHA512 3a557acb78e3338a4aab6305101391a76c218a060a36c064c92b0ba524cdaf70144e947206dea2e682c84d2875ecd33a7d92493a53682e5ddbbcafe8ba9e8d28 -MISC metadata.xml 825 BLAKE2B 156d9e84141c87c747a23ee11241fbcc753e992e511ecd1028fb6ec904ecb1c309a1a062b18b8c6f19ab5b23107c65fc5a6c8e7f2422edf807f6e9344f5a19d5 SHA512 29b60a241062bf9d2671a648eb8d36d58f7717a098e71cbebc49f7291173c30c5de8ab1365fdf1af937d7b7ad8c401c587905de3cf2eb1f886598873fb2fde08 +EBUILD libjcat-0.1.11.ebuild 1472 BLAKE2B 49262b5cbd2656bbd9bdddd6b8ea6c195c1f50a3e279df833f9f4074dfa7897dd8f76218aa3965f471ecf2723033494689c88098d1f0268d9e6b3737cd0267f9 SHA512 0ba4c8434bd1818bf5205821a861ec0cea9ef52f6a66d9152bc465428b9f0a132834f4a5d315abbaa85162bffd569d754b7c08470f63826ecd8f5a5c9733c813 +MISC metadata.xml 938 BLAKE2B 3b6d63d78a61aabdc8e6b7316af5e682513a02ba64bc733c788d356d0d2cbcd0071506d20dfcf3fbad5da9303c69341d5c2839be7518415c2174466c081244d7 SHA512 acb07c600ec49121f27ebf0252913345fb4dacc6a003934c16deae3ea4c055abc0db73cca204b06ca1e4a415879a645690ffe26473cf646112ac7497ea842956 diff --git a/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch deleted file mode 100644 index 5cb3e00c6778..000000000000 --- a/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/data/tests/colorhug/meson.build -+++ b/data/tests/colorhug/meson.build -@@ -1,3 +1,4 @@ -+if false - install_data([ - 'firmware.bin', - 'firmware.bin.asc', -@@ -5,6 +6,7 @@ - ], - install_dir: join_paths(installed_test_bindir, 'colorhug'), - ) -+endif - - if get_option('pkcs7') - # generate self-signed detached signature -@@ -17,7 +19,7 @@ - '--load-certificate', pkcs7_certificate, - '--infile', '@INPUT@', - '--outfile', '@OUTPUT@'], -- install: true, -+ install: false, - install_dir: join_paths(installed_test_bindir, 'colorhug'), - ) - endif ---- a/data/tests/meson.build -+++ b/data/tests/meson.build -@@ -2,7 +2,7 @@ - input : 'libjcat.test.in', - output : 'libjcat.test', - configuration : conf, -- install: true, -+ install: false, - install_dir: installed_test_datadir, - ) - ---- a/libjcat/meson.build -+++ b/libjcat/meson.build -@@ -235,7 +235,7 @@ - dependencies : [ - libjcat_deps, - ], -- install : true, -+ install : false, - install_dir : installed_test_bindir - ) - test('jcat-self-test', e, env : testdatadirs) diff --git a/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch new file mode 100644 index 000000000000..18ef4000293e --- /dev/null +++ b/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch @@ -0,0 +1,60 @@ +--- a/data/tests/colorhug/meson.build ++++ b/data/tests/colorhug/meson.build +@@ -1,3 +1,4 @@ ++if false + install_data([ + 'firmware.bin', + 'firmware.bin.asc', +@@ -5,6 +6,7 @@ + ], + install_dir: join_paths(installed_test_bindir, 'colorhug'), + ) ++endif + + if get_option('pkcs7') + # generate self-signed detached signature +@@ -17,7 +19,7 @@ + '--load-certificate', pkcs7_certificate, + '--infile', '@INPUT@', + '--outfile', '@OUTPUT@'], +- install: true, ++ install: false, + install_dir: join_paths(installed_test_bindir, 'colorhug'), + ) + endif +--- a/data/tests/meson.build ++++ b/data/tests/meson.build +@@ -2,7 +2,7 @@ + input : 'libjcat.test.in', + output : 'libjcat.test', + configuration : conf, +- install: true, ++ install: false, + 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 +@@ -248,7 +248,7 @@ + dependencies : [ + libjcat_deps, + ], +- install : true, ++ install : false, + install_dir : installed_test_bindir + ) + test('jcat-self-test', e, env : testdatadirs) diff --git a/dev-libs/libjcat/libjcat-0.1.10.ebuild b/dev-libs/libjcat/libjcat-0.1.10.ebuild deleted file mode 100644 index 2918fd5e21df..000000000000 --- a/dev-libs/libjcat/libjcat-0.1.10.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" - -inherit meson python-any-r1 vala xdg-utils - -DESCRIPTION="Library and tool for reading and writing Jcat files" -HOMEPAGE="https://github.com/hughsie/libjcat" -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala" - -RDEPEND="dev-libs/glib:2 - dev-libs/json-glib:= - gpg? ( - app-crypt/gpgme:= - dev-libs/libgpg-error - ) - introspection? ( dev-libs/gobject-introspection:= ) - pkcs7? ( net-libs/gnutls ) - vala? ( dev-lang/vala:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - $(python_gen_any_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - gtk-doc? ( dev-util/gtk-doc ) - man? ( sys-apps/help2man ) - test? ( net-libs/gnutls[tools] )" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch -) - -python_check_deps() { - has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" -} - -src_prepare() { - xdg_environment_reset - use vala && vala_src_prepare - default -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtkdoc) - $(meson_use gpg) - $(meson_use introspection) - $(meson_use man) - $(meson_use pkcs7) - $(meson_use test tests) - $(meson_use vala vapi) - ) - meson_src_configure -} diff --git a/dev-libs/libjcat/libjcat-0.1.11.ebuild b/dev-libs/libjcat/libjcat-0.1.11.ebuild index 78a0e9473c03..b949816c5858 100644 --- a/dev-libs/libjcat/libjcat-0.1.11.ebuild +++ b/dev-libs/libjcat/libjcat-0.1.11.ebuild @@ -3,8 +3,8 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="xml(+)" inherit meson python-any-r1 vala xdg-utils @@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala" RDEPEND="dev-libs/glib:2 @@ -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() { diff --git a/dev-libs/libjcat/libjcat-0.1.9-r1.ebuild b/dev-libs/libjcat/libjcat-0.1.9-r1.ebuild deleted file mode 100644 index 2918fd5e21df..000000000000 --- a/dev-libs/libjcat/libjcat-0.1.9-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" - -inherit meson python-any-r1 vala xdg-utils - -DESCRIPTION="Library and tool for reading and writing Jcat files" -HOMEPAGE="https://github.com/hughsie/libjcat" -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala" - -RDEPEND="dev-libs/glib:2 - dev-libs/json-glib:= - gpg? ( - app-crypt/gpgme:= - dev-libs/libgpg-error - ) - introspection? ( dev-libs/gobject-introspection:= ) - pkcs7? ( net-libs/gnutls ) - vala? ( dev-lang/vala:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - $(python_gen_any_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - gtk-doc? ( dev-util/gtk-doc ) - man? ( sys-apps/help2man ) - test? ( net-libs/gnutls[tools] )" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch -) - -python_check_deps() { - has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" -} - -src_prepare() { - xdg_environment_reset - use vala && vala_src_prepare - default -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtkdoc) - $(meson_use gpg) - $(meson_use introspection) - $(meson_use man) - $(meson_use pkcs7) - $(meson_use test tests) - $(meson_use vala vapi) - ) - meson_src_configure -} diff --git a/dev-libs/libjcat/metadata.xml b/dev-libs/libjcat/metadata.xml index aa3846c8eacb..38cfe165fd55 100644 --- a/dev-libs/libjcat/metadata.xml +++ b/dev-libs/libjcat/metadata.xml @@ -5,6 +5,10 @@ marecki@gentoo.org Marek Szuba + + slashbeast@gentoo.org + Piotr Karbowski + This library allows reading and writing gzip-compressed JSON catalog files, which can be used to store GPG, PKCS-7 and SHA-256 checksums for each file. -- cgit v1.2.3