From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-libs/libjcat/Manifest | 7 +-- .../files/libjcat-0.1.3-optional_vala.patch | 28 --------- dev-libs/libjcat/libjcat-0.1.4.ebuild | 66 ---------------------- dev-libs/libjcat/libjcat-0.1.5.ebuild | 65 --------------------- dev-libs/libjcat/libjcat-0.1.6.ebuild | 2 +- 5 files changed, 2 insertions(+), 166 deletions(-) delete mode 100644 dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch delete mode 100644 dev-libs/libjcat/libjcat-0.1.4.ebuild delete mode 100644 dev-libs/libjcat/libjcat-0.1.5.ebuild (limited to 'dev-libs/libjcat') diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest index b4ffa9f3e3a4..fb4393cb88bd 100644 --- a/dev-libs/libjcat/Manifest +++ b/dev-libs/libjcat/Manifest @@ -1,9 +1,4 @@ AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf -AUX libjcat-0.1.3-optional_vala.patch 944 BLAKE2B 4a764d59a429f7d0d78e5cffa6f63d6cc88db92a41a46a5e3ed47fde2b358209aa4e61302d071e4e15366232992961c0837eb708f840f36c8468aee48f3fc3a2 SHA512 0b9879099933b4f5eb31af48994597a17e5e0331c55df7711271a4e65e375a85c7301801038d62ff3c7704ae4e4a0baa01ff160d92fd7522c2d81b050154dea0 -DIST libjcat-0.1.4.tar.gz 63900 BLAKE2B 509a9916aa77193835e5a29a152acb0eb1cee24b6aae3e256dee42c1fd598b9c181009cdea4c276cc0d8c8cb56d22b9073f44dd11b7fab59d29df3633af6d042 SHA512 d58860410ce6e9d35a1eefcd0c6fcd956db42a12a3e8f856e19e3abe8bd6ae304ab7a60e2c1ee28f3848f2fee3b406dd900d7c1024eca5602797711528d3f7e3 -DIST libjcat-0.1.5.tar.gz 64244 BLAKE2B fce5324981b757c7d5f9196790984a0d02e4dad3a0f75bf7262dcadc82838137537865395d75cdb6c59dade45babe0143243202bc01e41a9af5696ef79a44ec4 SHA512 ad4fb27582d24d3a7f62c8fd39c6a45d77e4e8cb005b73fe2f0cf4d697b555ca3e503c5edb05694526609d8baf7e9c21dad1465c78c8e3ee125df6a1bb79835a DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d -EBUILD libjcat-0.1.4.ebuild 1502 BLAKE2B 8818aae450ccb38e1bd1dc0d43fc6932a0fd3713dcdf1aac649980dd1958c8aa7a1103642a672cbac0e9cf29153ce12fc67961764704c9bc3d16c642d6a9024c SHA512 f4257592f032bb21b7213a98a14ebddde72d3dd09a25147fdbe9980cb6d890d6833fac0f47d5b683493de910f5db2347cda7abf1f32f6d2ab55f2467e08d6e95 -EBUILD libjcat-0.1.5.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6 -EBUILD libjcat-0.1.6.ebuild 1448 BLAKE2B 8ef5e0b4182290748af282e03cbda8473d0fefd60e01ad38a00e2c010bbe0dfa359b57fdc48d8f5414266f306b001672c0acf66dc1f2489d3e745ec74c1c45f3 SHA512 fd6c4594d5adb9fda3bf63a2231dd9591e83db4915f2934250952b784aa1f93ea923c53ab3b60b2d565af1fc64b12d4445df17f7e0bdd1315e8afa7b0d044906 +EBUILD libjcat-0.1.6.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6 MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b diff --git a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch b/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch deleted file mode 100644 index 3c31e63eff59..000000000000 --- a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch +++ /dev/null @@ -1,28 +0,0 @@ -Make installation of dev-lang/vala bindings optional. Unfortunately -the option name "vala" is reserved so we must use a different one. - ---- a/libjcat/meson.build -+++ b/libjcat/meson.build -@@ -122,6 +122,7 @@ - install : true - ) - -+ if get_option('vala-bindings') - gnome.generate_vapi('jcat', - sources : jcat_gir[0], - packages : [ -@@ -130,6 +131,7 @@ - ], - install : true, - ) -+ endif - - python = import('python') - python_interpreter = python.find_installation('python3', ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,3 +4,4 @@ - option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support') - option('pkcs7', type : 'boolean', value : true, description : 'enable the PKCS7 verification support') - option('man', type : 'boolean', value : true, description : 'enable man pages') -+option('vala-bindings', type : 'boolean', value : true, description : 'enable vala bindings') diff --git a/dev-libs/libjcat/libjcat-0.1.4.ebuild b/dev-libs/libjcat/libjcat-0.1.4.ebuild deleted file mode 100644 index 649a9b130eb3..000000000000 --- a/dev-libs/libjcat/libjcat-0.1.4.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -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 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 - "${FILESDIR}"/${PN}-0.1.3-optional_vala.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 vala-bindings) - ) - meson_src_configure -} diff --git a/dev-libs/libjcat/libjcat-0.1.5.ebuild b/dev-libs/libjcat/libjcat-0.1.5.ebuild deleted file mode 100644 index bada11c0c7e3..000000000000 --- a/dev-libs/libjcat/libjcat-0.1.5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -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 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.6.ebuild b/dev-libs/libjcat/libjcat-0.1.6.ebuild index ef894f74d4c7..bada11c0c7e3 100644 --- a/dev-libs/libjcat/libjcat-0.1.6.ebuild +++ b/dev-libs/libjcat/libjcat-0.1.6.ebuild @@ -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 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" IUSE="gpg gtk-doc +introspection +man pkcs7 test vala" RDEPEND="dev-libs/glib:2 -- cgit v1.2.3