Gentoo Archives: gentoo-commits

From: Alon Bar-Lev <alonbl@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencryptoki/files/, dev-libs/opencryptoki/
Date: Wed, 23 Dec 2015 13:50:21
Message-Id: 1450878591.b30c211e7fd5694865c9cca5a440950ddae23246.alonbl@gentoo
1 commit: b30c211e7fd5694865c9cca5a440950ddae23246
2 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 23 13:41:18 2015 +0000
4 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 23 13:49:51 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30c211e
7
8 dev-libs/opencryptoki: cleanup old
9
10 Package-Manager: portage-2.2.24
11
12 dev-libs/opencryptoki/Manifest | 4 -
13 .../files/opencryptoki-2.4.2-destdir.patch | 26 -----
14 dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild | 110 ---------------------
15 dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild | 100 -------------------
16 dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild | 103 -------------------
17 5 files changed, 343 deletions(-)
18
19 diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
20 index e0c6078..48052ae 100644
21 --- a/dev-libs/opencryptoki/Manifest
22 +++ b/dev-libs/opencryptoki/Manifest
23 @@ -1,6 +1,2 @@
24 -DIST opencryptoki-2.3.3-backports-3.tar.bz2 5972 SHA256 fb913dbb5c2b0d87067d9738892b2a4c4a7c192d6335cc0bae2a7083e913aa74 SHA512 bff2b1cd907d814a61296a99eaa5cdcb983355def8022ec09620048415e66b5feea425cba2d19b9f023073165969e981358dc6e406b1bc62f1e00f49e91ef943 WHIRLPOOL c77b1aa0268043d31b3d9d9d53d6416d9d8af5fbb29b07f498aaed61807c1848961b046192ca7eab227f055ba829c13bfa2696d016795b4df71e467c2a0185cc
25 -DIST opencryptoki-2.3.3.tar.bz2 694854 SHA256 7ccae6350a7043c2abade1eb1517edb987f13e98584dd28733172e8d36600aa2 SHA512 2c7ea2f689daba92ec178198dc1a3ffbc4812f4547a574b86cc8b69ada4e3aefb2613d4d291829d81b97d91d5d3fbe1735bd9b3f99db415ddcb4ca03863ddc4a WHIRLPOOL 3a955b464ea44c1dc50ce9869bbc48ced2a3962ef533491aa53956cccbca1fcf9411ffcccd1839384e7f3ba87368dba4c8c415f283139169391224a1f4cf5092
26 -DIST opencryptoki-2.4.2.tar.gz 1083876 SHA256 0bfbcf956fec078af12c34cd447c6274a5e7e886335c3b8b81106d20ccefa0d9 SHA512 2f760968cec7f15f7de38f0c74e0444d75d1a247d1efd9fc17a17ac5f2bcc4fd283def49d46baeea0c5adb6e19236993b4e8937f0e32162bcc7dbac8066144b9 WHIRLPOOL d7df0db3450d33c3e28be0031b48f22d89387f12f35ca868f593f82a87abb9eea89f28be43fb4ce3b17dee6e1d226fc08586320fbce4e0bf7d57db871d3cd76c
27 -DIST opencryptoki-2.4.3.tar.gz 1111897 SHA256 3ddc0a0e96957e64e61a960c8a7bfcff0030564ebf4f6848abe0740491fd52bc SHA512 e33d8df344161909c1fc0626880d89e47ac902c5f780cc04af07691fff20c50bdea5bfa0368df39fff84b365342f704638e90b329a3ae12ab5fb5f668c50a164 WHIRLPOOL ab5836f30749e7bb56b1ba882c15098096d7c36e1f9dd65a83a93d9b497231258a54c5a60cf4847fce8267c086a3aea380c33380fcb9d7a20c770f5f922846d7
28 DIST opencryptoki-v3.3.tgz 937619 SHA256 e1deac5edd571621dc1624e9b7af8d1632d6db6f18815f5ed8824fc78f354609 SHA512 53efbc6009da178473abf17d092249781b1eb465f68c83653bd5e88703b9ad74ce9e0128486dffec65beaf8b8974ea6852d206ec5bf035c7296a40c8f84791ab WHIRLPOOL d939eb97bb7f2b54d510326ac4dba4dc49f9f725fa8900687fd8ebe199ce1c2a797a6e514378995f24ef5b9e904b29434edf962537dc545c2fc2206d180b1d43
29 DIST opencryptoki-v3.4.1.tgz 1014416 SHA256 018ea402f3a1b38b203282fb047dfac209d94bf2988f2c29793eca65455452c4 SHA512 98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6 WHIRLPOOL c05b61c220e87af361cf67c5223f5745e305c5039a610bb740d2e729299517363d5d7d03175869ab517519857a526ac0272f1556bd9e1cd9dea84bd500595f7e
30
31 diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch b/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
32 deleted file mode 100644
33 index e1375c7..0000000
34 --- a/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
35 +++ /dev/null
36 @@ -1,26 +0,0 @@
37 -From fcc24176398ab2f40c33ebc686c2f803782af8d6 Mon Sep 17 00:00:00 2001
38 -From: Alon Bar-Lev <alon.barlev@×××××.com>
39 -Date: Sat, 15 Dec 2012 22:13:56 +0200
40 -Subject: [PATCH] Always use DESTDIR when installing
41 -
42 ----
43 - usr/Makefile.am | 6 +++---
44 - 1 files changed, 3 insertions(+), 3 deletions(-)
45 -
46 -diff --git a/usr/Makefile.am b/usr/Makefile.am
47 -index bced120..20352d5 100644
48 ---- a/usr/Makefile.am
49 -+++ b/usr/Makefile.am
50 -@@ -5,6 +5,6 @@ endif
51 - SUBDIRS = lib $(DAEMONDIRS)
52 -
53 - install-data-hook:
54 -- $(MKDIR_P) $(lockdir)
55 -- $(CHGRP) pkcs11 $(lockdir)
56 -- $(CHMOD) 0770 $(lockdir)
57 -+ $(MKDIR_P) $(DESTDIR)$(lockdir)
58 -+ $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)
59 -+ $(CHMOD) 0770 $(DESTDIR)$(lockdir)
60 ---
61 -1.7.8.6
62 -
63
64 diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild b/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild
65 deleted file mode 100644
66 index 877a90e..0000000
67 --- a/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild
68 +++ /dev/null
69 @@ -1,110 +0,0 @@
70 -# Copyright 1999-2012 Gentoo Foundation
71 -# Distributed under the terms of the GNU General Public License v2
72 -# $Id$
73 -
74 -EAPI="2"
75 -
76 -# backports are maintained as tags on Diego's repository on gitorious:
77 -# http://gitorious.org/~flameeyes/opencryptoki/flameeyess-opencryptoki
78 -BACKPORTS=3
79 -
80 -inherit autotools eutils multilib flag-o-matic user
81 -
82 -DESCRIPTION="PKCS#11 provider cryptographic hardware"
83 -HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
84 -SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.bz2
85 - ${BACKPORTS:+
86 - https://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
87 -
88 -# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
89 -# token sources are under CPL-1.0 already.
90 -LICENSE="CPL-0.5"
91 -SLOT="0"
92 -KEYWORDS="~amd64 ~arm ~x86"
93 -
94 -RDEPEND="tpm? ( app-crypt/trousers )
95 - dev-libs/openssl"
96 -DEPEND="${RDEPEND}"
97 -
98 -IUSE="+tpm debug"
99 -
100 -# tests right now basically don't exist; the only available thing would
101 -# test against an installed copy and would kill a running pcscd, all
102 -# things that we're not interested to.
103 -RESTRICT=test
104 -
105 -pkg_setup() {
106 - enewgroup pkcs11
107 -}
108 -
109 -src_prepare() {
110 - [[ -n ${BACKPORTS} ]] && \
111 - EPATCH_MULTI_MSG="Applying backports patches #${BACKPORTS} ..." \
112 - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
113 - epatch
114 -
115 - eautoreconf
116 -}
117 -
118 -src_configure() {
119 - # package uses ${localstatedir}/lib as the default path, so if we
120 - # leave it to econf, it'll create /var/lib/lib.
121 -
122 - # Since upstream by default seem to enable any possible token, even
123 - # when they don't seem to be used, we limit ourselves to the
124 - # software emulation token (swtok) and if the user enabled the tpm
125 - # USE flag, tpmtok. The rest of the tokens seem to be hardware- or
126 - # software-dependent even when they build fine without their
127 - # requirements, but until somebody asks for those, I'd rather not
128 - # enable them.
129 -
130 - # We don't use --enable-debug because that tinkers with the CFLAGS
131 - # and we don't want that. Instead we append -DDEBUG which enables
132 - # debug information.
133 - use debug && append-flags -DDEBUG
134 -
135 - econf \
136 - --localstatedir=/var \
137 - --enable-fast-install \
138 - --disable-dependency-tracking \
139 - --disable-debug \
140 - --enable-daemon \
141 - --enable-library \
142 - --disable-icatok \
143 - --enable-swtok \
144 - $(use_enable tpm tpmtok) \
145 - --disable-aeptok \
146 - --disable-bcomtok \
147 - --disable-ccatok \
148 - --disable-crtok \
149 - --disable-icctok \
150 - --disable-pkcscca_migrate
151 -}
152 -
153 -src_install() {
154 - emake install DESTDIR="${D}" || die "emake install failed"
155 -
156 - # Install libopencryptoki in the standard directory for libraries.
157 - mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die
158 - rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
159 - dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
160 -
161 - # Remove compatibility symlinks as we _never_ required those and
162 - # they seem unused even upstream.
163 - find "${D}" -name 'PKCS11_*' -delete
164 -
165 - # doesn't use libltdl; only dlopen()-based interfaces
166 - find "${D}" -name '*.la' -delete
167 -
168 - # We replace their ld.so and init files (mostly designed for RedHat
169 - # as far as I can tell) with our own replacements.
170 - rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d
171 -
172 - # make sure that we don't modify the init script if the USE flags
173 - # are enabled for the needed services.
174 - cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
175 - use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
176 - newinitd "${T}/pkcsslotd.init" pkcsslotd
177 -
178 - dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die
179 -}
180
181 diff --git a/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild b/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild
182 deleted file mode 100644
183 index fb736c0..0000000
184 --- a/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild
185 +++ /dev/null
186 @@ -1,100 +0,0 @@
187 -# Copyright 1999-2012 Gentoo Foundation
188 -# Distributed under the terms of the GNU General Public License v2
189 -# $Id$
190 -
191 -EAPI="2"
192 -
193 -inherit autotools eutils multilib flag-o-matic user
194 -
195 -DESCRIPTION="PKCS#11 provider cryptographic hardware"
196 -HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
197 -SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.gz"
198 -
199 -# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
200 -# token sources are under CPL-1.0 already.
201 -LICENSE="CPL-0.5"
202 -SLOT="0"
203 -KEYWORDS="~amd64 ~arm ~x86"
204 -
205 -RDEPEND="tpm? ( app-crypt/trousers )
206 - dev-libs/openssl"
207 -DEPEND="${RDEPEND}"
208 -
209 -IUSE="+tpm debug"
210 -
211 -# tests right now basically don't exist; the only available thing would
212 -# test against an installed copy and would kill a running pcscd, all
213 -# things that we're not interested to.
214 -RESTRICT=test
215 -
216 -pkg_setup() {
217 - enewgroup pkcs11
218 -}
219 -
220 -src_prepare() {
221 - epatch "${FILESDIR}/${P}-destdir.patch"
222 - eautoreconf
223 -}
224 -
225 -src_configure() {
226 - # package uses ${localstatedir}/lib as the default path, so if we
227 - # leave it to econf, it'll create /var/lib/lib.
228 -
229 - # Since upstream by default seem to enable any possible token, even
230 - # when they don't seem to be used, we limit ourselves to the
231 - # software emulation token (swtok) and if the user enabled the tpm
232 - # USE flag, tpmtok. The rest of the tokens seem to be hardware- or
233 - # software-dependent even when they build fine without their
234 - # requirements, but until somebody asks for those, I'd rather not
235 - # enable them.
236 -
237 - # We don't use --enable-debug because that tinkers with the CFLAGS
238 - # and we don't want that. Instead we append -DDEBUG which enables
239 - # debug information.
240 - use debug && append-flags -DDEBUG
241 -
242 - econf \
243 - --localstatedir=/var \
244 - --enable-fast-install \
245 - --disable-dependency-tracking \
246 - --disable-debug \
247 - --enable-daemon \
248 - --enable-library \
249 - --disable-icatok \
250 - --enable-swtok \
251 - $(use_enable tpm tpmtok) \
252 - --disable-aeptok \
253 - --disable-bcomtok \
254 - --disable-ccatok \
255 - --disable-crtok \
256 - --disable-icctok \
257 - --disable-pkcscca_migrate
258 -}
259 -
260 -src_install() {
261 - emake install DESTDIR="${D}" || die "emake install failed"
262 -
263 - # Install libopencryptoki in the standard directory for libraries.
264 - mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die
265 - rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
266 - dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
267 -
268 - # Remove compatibility symlinks as we _never_ required those and
269 - # they seem unused even upstream.
270 - find "${D}" -name 'PKCS11_*' -delete
271 -
272 - # doesn't use libltdl; only dlopen()-based interfaces
273 - find "${D}" -name '*.la' -delete
274 -
275 - # We replace their ld.so and init files (mostly designed for RedHat
276 - # as far as I can tell) with our own replacements.
277 - rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d
278 -
279 - # make sure that we don't modify the init script if the USE flags
280 - # are enabled for the needed services.
281 - cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
282 - use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
283 - newinitd "${T}/pkcsslotd.init" pkcsslotd
284 -
285 - dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die
286 -}
287
288 diff --git a/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild b/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild
289 deleted file mode 100644
290 index 60a26ba..0000000
291 --- a/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild
292 +++ /dev/null
293 @@ -1,103 +0,0 @@
294 -# Copyright 1999-2013 Gentoo Foundation
295 -# Distributed under the terms of the GNU General Public License v2
296 -# $Id$
297 -
298 -EAPI="2"
299 -
300 -inherit autotools multilib flag-o-matic user
301 -
302 -DESCRIPTION="PKCS#11 provider cryptographic hardware"
303 -HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
304 -SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.gz"
305 -
306 -# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
307 -# token sources are under CPL-1.0 already.
308 -LICENSE="CPL-0.5"
309 -SLOT="0"
310 -KEYWORDS="~amd64 ~arm ~x86"
311 -
312 -RDEPEND="tpm? ( app-crypt/trousers )
313 - dev-libs/openssl"
314 -DEPEND="${RDEPEND}"
315 -
316 -IUSE="+tpm debug"
317 -
318 -# tests right now basically don't exist; the only available thing would
319 -# test against an installed copy and would kill a running pcscd, all
320 -# things that we're not interested to.
321 -RESTRICT=test
322 -
323 -pkg_setup() {
324 - enewgroup pkcs11
325 -}
326 -
327 -src_prepare() {
328 - eautoreconf
329 -}
330 -
331 -src_configure() {
332 - # package uses ${localstatedir}/lib as the default path, so if we
333 - # leave it to econf, it'll create /var/lib/lib.
334 -
335 - # Since upstream by default seem to enable any possible token, even
336 - # when they don't seem to be used, we limit ourselves to the
337 - # software emulation token (swtok) and if the user enabled the tpm
338 - # USE flag, tpmtok. The rest of the tokens seem to be hardware- or
339 - # software-dependent even when they build fine without their
340 - # requirements, but until somebody asks for those, I'd rather not
341 - # enable them.
342 -
343 - # We don't use --enable-debug because that tinkers with the CFLAGS
344 - # and we don't want that. Instead we append -DDEBUG which enables
345 - # debug information.
346 - use debug && append-flags -DDEBUG
347 -
348 - econf \
349 - --localstatedir=/var \
350 - --enable-fast-install \
351 - --disable-dependency-tracking \
352 - --disable-debug \
353 - --enable-daemon \
354 - --enable-library \
355 - --disable-icatok \
356 - --enable-swtok \
357 - $(use_enable tpm tpmtok) \
358 - --disable-aeptok \
359 - --disable-bcomtok \
360 - --disable-ccatok \
361 - --disable-crtok \
362 - --disable-icctok \
363 - --disable-pkcscca_migrate
364 -}
365 -
366 -src_install() {
367 - emake install DESTDIR="${D}" || die "emake install failed"
368 -
369 - # Install libopencryptoki in the standard directory for libraries.
370 - mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die
371 - rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
372 - dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
373 -
374 - # Remove compatibility symlinks as we _never_ required those and
375 - # they seem unused even upstream.
376 - find "${D}" -name 'PKCS11_*' -delete
377 -
378 - # doesn't use libltdl; only dlopen()-based interfaces
379 - find "${D}" -name '*.la' -delete
380 -
381 - # We replace their ld.so and init files (mostly designed for RedHat
382 - # as far as I can tell) with our own replacements.
383 - rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d
384 -
385 - # make sure that we don't modify the init script if the USE flags
386 - # are enabled for the needed services.
387 - cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
388 - use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
389 - newinitd "${T}/pkcsslotd.init" pkcsslotd
390 -
391 - # We create /var dirs at runtime as needed, so don't bother installing
392 - # our own.
393 - rm -r "${D}"/var/{lib,lock} || die
394 -
395 - dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die
396 -}