diff options
Diffstat (limited to 'dev-libs/libjcat')
| -rw-r--r-- | dev-libs/libjcat/Manifest | 8 | ||||
| -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.2.ebuild (renamed from dev-libs/libjcat/libjcat-0.1.0.ebuild) | 15 | ||||
| -rw-r--r-- | dev-libs/libjcat/metadata.xml | 4 |
5 files changed, 19 insertions, 82 deletions
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest index 126848e56082..ebe1c006b9cf 100644 --- a/dev-libs/libjcat/Manifest +++ b/dev-libs/libjcat/Manifest @@ -1,8 +1,6 @@ -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 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf -DIST libjcat-0.1.0.tar.gz 60808 BLAKE2B 384e5a846fb7c49c8a6d6ace5f2b17715693d7e9ecfce020859c6fb5d96f9b9398606a2161a2c9f795c16c90e8b7a0e9d08970c1f81e4412783097f4ca599083 SHA512 2172fd621c86b3a2d507c3bb8fcc5f40a46656a5352f4963a014c76642bb2c34e316bb8608c121fa7d728d63dc2593ed28d3e3478e1ec5bcf32daeffc43627fd DIST libjcat-0.1.1.tar.gz 62579 BLAKE2B fed33602d2b036605238945d09ede1c524847624f1be6301a7f5ff64d21ba27c7c765b37c522f81dfd49071db6339738ad82b2ad0b25f0494bf4fd806c64b5de SHA512 fd644c003ad3a317a9f8886c2bad6dcfabf953e61bcbf02b30a292e9a85a591f854f71d7ac17692d5d98d976a435cf53beba1394c662fa78836389d66d4a5824 -EBUILD libjcat-0.1.0.ebuild 1227 BLAKE2B 9d9d232d74137bc7f75fa471bd775d8d6d31c40a01384cd8090851c551f51c5756f6bc1729182c9ed0551b2f941ba86746a91a8720d143fff2801beeba8141ea SHA512 0c6bc0f880fd9c467b395ae532091d03f0a3e35502cfc3f5dbba070415aea27bd72d355d64819b3baad7344b0616039332fd2b9d9f67bd3e6d2d0eac08b14dc2 +DIST libjcat-0.1.2.tar.gz 62630 BLAKE2B cb333098d984f840a80c4ea4b7feab32ca7d04882f2f4aa788c01dd13c616b85576af5bbcd0ca343a7f5b7221ab69b202c7a8cacb230eeeefab9a3a9a61d7d3f SHA512 9184b761cad5a43ac1f0b0cd4ff54c372ec067785c9b796d813aab6a936fbb522f419e965b70d4d71fbec9f7c25f9d185f957cf1e73cb0e5bdeca9492e11b0fd EBUILD libjcat-0.1.1.ebuild 1400 BLAKE2B 6f821af2a998b8e9b3d1d1f079f3974718393a4895b75f3a9996572351157c4d6035c0302fbcf79dc0392834ce9a63774793b9e77ad0ee5d09bf45e80bddd0fb SHA512 87715c486fc5caf8e43c06cf07a60cc3ffe2e56ceeecca1385d28acdefbb0eb18eb449bea697ffff93b4742c907484b73ecdfd78bc441c4ff5e72ceb5799b63b -MISC metadata.xml 881 BLAKE2B d62ca31ca9bbed501e107ace34b346f1952097d9e8b97a5851ab237a9a9da3558dad259f5f73fe8625dd3ad237938ffbf278d55bc9b1bf867c72abb96c27c5ac SHA512 429970f0a12a0d2484080f6d99e65f5e0c7fc1a5b5b203bbadcddb07346930ddc0b3101bcad6e1ceb2ac947e3c69c89aeaccc20bf4619f4b707216885b0b922b +EBUILD libjcat-0.1.2.ebuild 1400 BLAKE2B 6f821af2a998b8e9b3d1d1f079f3974718393a4895b75f3a9996572351157c4d6035c0302fbcf79dc0392834ce9a63774793b9e77ad0ee5d09bf45e80bddd0fb SHA512 87715c486fc5caf8e43c06cf07a60cc3ffe2e56ceeecca1385d28acdefbb0eb18eb449bea697ffff93b4742c907484b73ecdfd78bc441c4ff5e72ceb5799b63b +MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc 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 deleted file mode 100644 index 823d713b7918..000000000000 --- a/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 deleted file mode 100644 index 9cbc63a08c01..000000000000 --- a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch +++ /dev/null @@ -1,29 +0,0 @@ -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.2.ebuild index 0956f965a22b..06f0e8d33d08 100644 --- a/dev-libs/libjcat/libjcat-0.1.0.ebuild +++ b/dev-libs/libjcat/libjcat-0.1.2.ebuild @@ -3,7 +3,10 @@ EAPI=7 -inherit meson vala xdg-utils +PYTHON_COMPAT=( python3_{6,7,8} ) +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" @@ -25,6 +28,9 @@ RDEPEND="dev-libs/glib:2 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] )" @@ -32,10 +38,13 @@ BDEPEND="virtual/pkgconfig RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-0.1.0-disable_installed_tests.patch - "${FILESDIR}"/${PN}-0.1.0-use_right_python.patch + "${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 # TODO: make vala optional diff --git a/dev-libs/libjcat/metadata.xml b/dev-libs/libjcat/metadata.xml index 8d98279081e4..c32b3c52e6e2 100644 --- a/dev-libs/libjcat/metadata.xml +++ b/dev-libs/libjcat/metadata.xml @@ -5,6 +5,10 @@ <email>marecki@gentoo.org</email> <name>Marek Szuba</name> </maintainer> + <maintainer type="person"> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</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. |