Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/files/, dev-libs/libjcat/
Date: Tue, 27 Apr 2021 11:05:29
Message-Id: 1619521461.c5ca217c3532dada8121adcf36a77ae864a900f3.marecki@gentoo
1 commit: c5ca217c3532dada8121adcf36a77ae864a900f3
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 27 10:28:25 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 27 11:04:21 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ca217c
7
8 dev-libs/libjcat: drop 0.1.4, 0.1.5
9
10 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
11
12 dev-libs/libjcat/Manifest | 2 -
13 .../files/libjcat-0.1.3-optional_vala.patch | 28 ---------
14 dev-libs/libjcat/libjcat-0.1.4.ebuild | 66 ----------------------
15 dev-libs/libjcat/libjcat-0.1.5.ebuild | 65 ---------------------
16 4 files changed, 161 deletions(-)
17
18 diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
19 index a8e8fd337c3..7d38411b10f 100644
20 --- a/dev-libs/libjcat/Manifest
21 +++ b/dev-libs/libjcat/Manifest
22 @@ -1,3 +1 @@
23 -DIST libjcat-0.1.4.tar.gz 63900 BLAKE2B 509a9916aa77193835e5a29a152acb0eb1cee24b6aae3e256dee42c1fd598b9c181009cdea4c276cc0d8c8cb56d22b9073f44dd11b7fab59d29df3633af6d042 SHA512 d58860410ce6e9d35a1eefcd0c6fcd956db42a12a3e8f856e19e3abe8bd6ae304ab7a60e2c1ee28f3848f2fee3b406dd900d7c1024eca5602797711528d3f7e3
24 -DIST libjcat-0.1.5.tar.gz 64244 BLAKE2B fce5324981b757c7d5f9196790984a0d02e4dad3a0f75bf7262dcadc82838137537865395d75cdb6c59dade45babe0143243202bc01e41a9af5696ef79a44ec4 SHA512 ad4fb27582d24d3a7f62c8fd39c6a45d77e4e8cb005b73fe2f0cf4d697b555ca3e503c5edb05694526609d8baf7e9c21dad1465c78c8e3ee125df6a1bb79835a
25 DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
26
27 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
28 deleted file mode 100644
29 index 3c31e63eff5..00000000000
30 --- a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
31 +++ /dev/null
32 @@ -1,28 +0,0 @@
33 -Make installation of dev-lang/vala bindings optional. Unfortunately
34 -the option name "vala" is reserved so we must use a different one.
35 -
36 ---- a/libjcat/meson.build
37 -+++ b/libjcat/meson.build
38 -@@ -122,6 +122,7 @@
39 - install : true
40 - )
41 -
42 -+ if get_option('vala-bindings')
43 - gnome.generate_vapi('jcat',
44 - sources : jcat_gir[0],
45 - packages : [
46 -@@ -130,6 +131,7 @@
47 - ],
48 - install : true,
49 - )
50 -+ endif
51 -
52 - python = import('python')
53 - python_interpreter = python.find_installation('python3',
54 ---- a/meson_options.txt
55 -+++ b/meson_options.txt
56 -@@ -4,3 +4,4 @@
57 - option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support')
58 - option('pkcs7', type : 'boolean', value : true, description : 'enable the PKCS7 verification support')
59 - option('man', type : 'boolean', value : true, description : 'enable man pages')
60 -+option('vala-bindings', type : 'boolean', value : true, description : 'enable vala bindings')
61
62 diff --git a/dev-libs/libjcat/libjcat-0.1.4.ebuild b/dev-libs/libjcat/libjcat-0.1.4.ebuild
63 deleted file mode 100644
64 index 649a9b130eb..00000000000
65 --- a/dev-libs/libjcat/libjcat-0.1.4.ebuild
66 +++ /dev/null
67 @@ -1,66 +0,0 @@
68 -# Copyright 1999-2021 Gentoo Authors
69 -# Distributed under the terms of the GNU General Public License v2
70 -
71 -EAPI=7
72 -
73 -PYTHON_COMPAT=( python3_{7..9} )
74 -PYTHON_REQ_USE="xml"
75 -
76 -inherit meson python-any-r1 vala xdg-utils
77 -
78 -DESCRIPTION="Library and tool for reading and writing Jcat files "
79 -HOMEPAGE="https://github.com/hughsie/libjcat"
80 -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
81 -
82 -LICENSE="LGPL-2.1+"
83 -SLOT="0"
84 -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
85 -IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
86 -
87 -RDEPEND="dev-libs/glib:2
88 - dev-libs/json-glib:=
89 - gpg? (
90 - app-crypt/gpgme
91 - dev-libs/libgpg-error
92 - )
93 - introspection? ( dev-libs/gobject-introspection:= )
94 - pkcs7? ( net-libs/gnutls )
95 - vala? ( dev-lang/vala:= )"
96 -DEPEND="${RDEPEND}"
97 -BDEPEND="virtual/pkgconfig
98 - $(python_gen_any_dep '
99 - dev-python/setuptools[${PYTHON_USEDEP}]
100 - ')
101 - gtk-doc? ( dev-util/gtk-doc )
102 - man? ( sys-apps/help2man )
103 - test? ( net-libs/gnutls[tools] )"
104 -
105 -RESTRICT="!test? ( test )"
106 -
107 -PATCHES=(
108 - "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
109 - "${FILESDIR}"/${PN}-0.1.3-optional_vala.patch
110 -)
111 -
112 -python_check_deps() {
113 - has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
114 -}
115 -
116 -src_prepare() {
117 - xdg_environment_reset
118 - use vala && vala_src_prepare
119 - default
120 -}
121 -
122 -src_configure() {
123 - local emesonargs=(
124 - $(meson_use gtk-doc gtkdoc)
125 - $(meson_use gpg)
126 - $(meson_use introspection)
127 - $(meson_use man)
128 - $(meson_use pkcs7)
129 - $(meson_use test tests)
130 - $(meson_use vala vala-bindings)
131 - )
132 - meson_src_configure
133 -}
134
135 diff --git a/dev-libs/libjcat/libjcat-0.1.5.ebuild b/dev-libs/libjcat/libjcat-0.1.5.ebuild
136 deleted file mode 100644
137 index bada11c0c7e..00000000000
138 --- a/dev-libs/libjcat/libjcat-0.1.5.ebuild
139 +++ /dev/null
140 @@ -1,65 +0,0 @@
141 -# Copyright 1999-2021 Gentoo Authors
142 -# Distributed under the terms of the GNU General Public License v2
143 -
144 -EAPI=7
145 -
146 -PYTHON_COMPAT=( python3_{7..9} )
147 -PYTHON_REQ_USE="xml"
148 -
149 -inherit meson python-any-r1 vala xdg-utils
150 -
151 -DESCRIPTION="Library and tool for reading and writing Jcat files "
152 -HOMEPAGE="https://github.com/hughsie/libjcat"
153 -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
154 -
155 -LICENSE="LGPL-2.1+"
156 -SLOT="0"
157 -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
158 -IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
159 -
160 -RDEPEND="dev-libs/glib:2
161 - dev-libs/json-glib:=
162 - gpg? (
163 - app-crypt/gpgme
164 - dev-libs/libgpg-error
165 - )
166 - introspection? ( dev-libs/gobject-introspection:= )
167 - pkcs7? ( net-libs/gnutls )
168 - vala? ( dev-lang/vala:= )"
169 -DEPEND="${RDEPEND}"
170 -BDEPEND="virtual/pkgconfig
171 - $(python_gen_any_dep '
172 - dev-python/setuptools[${PYTHON_USEDEP}]
173 - ')
174 - gtk-doc? ( dev-util/gtk-doc )
175 - man? ( sys-apps/help2man )
176 - test? ( net-libs/gnutls[tools] )"
177 -
178 -RESTRICT="!test? ( test )"
179 -
180 -PATCHES=(
181 - "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
182 -)
183 -
184 -python_check_deps() {
185 - has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
186 -}
187 -
188 -src_prepare() {
189 - xdg_environment_reset
190 - use vala && vala_src_prepare
191 - default
192 -}
193 -
194 -src_configure() {
195 - local emesonargs=(
196 - $(meson_use gtk-doc gtkdoc)
197 - $(meson_use gpg)
198 - $(meson_use introspection)
199 - $(meson_use man)
200 - $(meson_use pkcs7)
201 - $(meson_use test tests)
202 - $(meson_use vala vapi)
203 - )
204 - meson_src_configure
205 -}