diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-libs/libjcat | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-libs/libjcat')
-rw-r--r-- | dev-libs/libjcat/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch | 45 | ||||
-rw-r--r-- | dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch | 29 | ||||
-rw-r--r-- | dev-libs/libjcat/libjcat-0.1.0.ebuild | 56 | ||||
-rw-r--r-- | dev-libs/libjcat/metadata.xml | 23 |
5 files changed, 158 insertions, 0 deletions
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest new file mode 100644 index 000000000000..b682ab3194f6 --- /dev/null +++ b/dev-libs/libjcat/Manifest @@ -0,0 +1,5 @@ +AUX libjcat-0.1.0-disable_installed_tests.patch 1115 BLAKE2B 32ad1de4665efd498b7928fce8b1c92f38a059cefcbba245639baad0724afc6701016e965fe98a0f91f70caebea5337acf9af57cba25a9b15bfd53a6db1e37d9 SHA512 a049084c228dcbb7355b67a0a0c90a038f94bda30fd1d274f4cab9994b61b8fffbea62734e3f4ca1938a0e36754a72d86e907b7e86a2193f6dd37cc36e427b0b +AUX libjcat-0.1.0-use_right_python.patch 1079 BLAKE2B 99d9adf5e55d395232db9454cfcdaa42964c40728ae5f34ac559feba5c35cc7668815054b454b9bb3032ca1cfd991a10e18075074825b2105dbe97ad15b1e633 SHA512 abfc5c355f0c12be96ad045d0be3b57b41121d9b77966f1575b2ebc07f27f7b2997df53c1037d77b49ef027fcaf6cc79b60405b734e26839bbdb52a9ba28c560 +DIST libjcat-0.1.0.tar.gz 60808 BLAKE2B 384e5a846fb7c49c8a6d6ace5f2b17715693d7e9ecfce020859c6fb5d96f9b9398606a2161a2c9f795c16c90e8b7a0e9d08970c1f81e4412783097f4ca599083 SHA512 2172fd621c86b3a2d507c3bb8fcc5f40a46656a5352f4963a014c76642bb2c34e316bb8608c121fa7d728d63dc2593ed28d3e3478e1ec5bcf32daeffc43627fd +EBUILD libjcat-0.1.0.ebuild 1227 BLAKE2B 9d9d232d74137bc7f75fa471bd775d8d6d31c40a01384cd8090851c551f51c5756f6bc1729182c9ed0551b2f941ba86746a91a8720d143fff2801beeba8141ea SHA512 0c6bc0f880fd9c467b395ae532091d03f0a3e35502cfc3f5dbba070415aea27bd72d355d64819b3baad7344b0616039332fd2b9d9f67bd3e6d2d0eac08b14dc2 +MISC metadata.xml 881 BLAKE2B d62ca31ca9bbed501e107ace34b346f1952097d9e8b97a5851ab237a9a9da3558dad259f5f73fe8625dd3ad237938ffbf278d55bc9b1bf867c72abb96c27c5ac SHA512 429970f0a12a0d2484080f6d99e65f5e0c7fc1a5b5b203bbadcddb07346930ddc0b3101bcad6e1ceb2ac947e3c69c89aeaccc20bf4619f4b707216885b0b922b diff --git a/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch new file mode 100644 index 000000000000..823d713b7918 --- /dev/null +++ b/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch @@ -0,0 +1,45 @@ +--- a/data/tests/colorhug/meson.build ++++ b/data/tests/colorhug/meson.build +@@ -1,9 +1,11 @@ ++if false + install_data([ + 'firmware.bin', + 'firmware.bin.asc', + ], + install_dir: installed_test_datadir, + ) ++endif + + if get_option('pkcs7') + # generate self-signed detached signature +@@ -16,7 +18,7 @@ + '--load-certificate', pkcs7_certificate, + '--infile', '@INPUT@', + '--outfile', '@OUTPUT@'], +- install: true, ++ install: false, + install_dir: installed_test_datadir, + ) + 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 +@@ -225,7 +225,7 @@ + '-DTESTDATADIR_SRC="' + testdatadir_src + '"', + '-DTESTDATADIR_DST="' + testdatadir_dst + '"', + ], +- install : true, ++ install : false, + install_dir : installed_test_bindir + ) + test('jcat-self-test', e) diff --git a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch b/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch new file mode 100644 index 000000000000..9cbc63a08c01 --- /dev/null +++ b/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch @@ -0,0 +1,29 @@ +By default generate-version-script.py uses /usr/bin/python3, whatever +version that may be - which causes problems if the default python3 +installation is one either built without XML support or not included +in PYTHON_TARGETS of dev-python/setuptools. Make sure the script is +invoked using the same interpreter as meson itself, as that one is +already guaranteed to provide both 'xml' and 'pkg_resources'. + +--- a/libjcat/meson.build ++++ b/libjcat/meson.build +@@ -129,6 +129,11 @@ + install : true, + ) + ++ # Make sure generate-version-script.py is invoked by the same python as meson, ++ # as that one must already have both XML support and setuptools. ++ python = import('python') ++ python_interpreter = python.find_installation() ++ + # Verify the map file is correct -- note we can't actually use the generated + # file for two reasons: + # +@@ -141,6 +146,7 @@ + input: jcat_gir[0], + output: 'jcat.map', + command: [ ++ python_interpreter, + join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), + 'LIBJCAT', + '@INPUT@', diff --git a/dev-libs/libjcat/libjcat-0.1.0.ebuild b/dev-libs/libjcat/libjcat-0.1.0.ebuild new file mode 100644 index 000000000000..0956f965a22b --- /dev/null +++ b/dev-libs/libjcat/libjcat-0.1.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson 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" +IUSE="gpg gtk-doc +introspection +man pkcs7 test" + +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 ) + dev-lang/vala:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + man? ( sys-apps/help2man ) + test? ( net-libs/gnutls[tools] )" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.1.0-disable_installed_tests.patch + "${FILESDIR}"/${PN}-0.1.0-use_right_python.patch +) + +src_prepare() { + xdg_environment_reset +# TODO: make vala optional + 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_src_configure +} diff --git a/dev-libs/libjcat/metadata.xml b/dev-libs/libjcat/metadata.xml new file mode 100644 index 000000000000..8d98279081e4 --- /dev/null +++ b/dev-libs/libjcat/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <longdescription lang="en"> + 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. + + This provides equivalent functionality to the catalog files supported + in Microsoft Windows. + </longdescription> + <use> + <flag name="gpg">Enable GPG verification support via <pkg>app-crypt/gpgme</pkg></flag> + <flag name="man">Generate and install man pages</flag> + <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg></flag> + </use> + <upstream> + <remote-id type="github">hughsie/libjcat</remote-id> + </upstream> +</pkgmetadata> |