| 1 |
commit: 410b99813dfc3923364964c83f9c0c8009be72b5 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 23 14:46:09 2018 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 23:51:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410b9981 |
| 7 |
|
| 8 |
dev-libs/opencryptoki: eapi bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild | 28 +++++++++++++------------ |
| 13 |
dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild | 10 ++++----- |
| 14 |
2 files changed, 20 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild |
| 17 |
index c2724bc8d3e..da43888b452 100644 |
| 18 |
--- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild |
| 19 |
+++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
# Copyright 1999-2018 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="5" |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
inherit autotools multilib flag-o-matic user |
| 28 |
|
| 29 |
@@ -21,18 +21,24 @@ RDEPEND="tpm? ( app-crypt/trousers ) |
| 30 |
libressl? ( dev-libs/libressl:0= )" |
| 31 |
DEPEND="${RDEPEND}" |
| 32 |
|
| 33 |
-S="${WORKDIR}/${PN}" |
| 34 |
+DOCS=( |
| 35 |
+ README AUTHORS FAQ TODO |
| 36 |
+ doc/openCryptoki-HOWTO.pdf |
| 37 |
+) |
| 38 |
|
| 39 |
# tests right now basically don't exist; the only available thing would |
| 40 |
# test against an installed copy and would kill a running pcscd, all |
| 41 |
# things that we're not interested to. |
| 42 |
RESTRICT=test |
| 43 |
|
| 44 |
+S="${WORKDIR}/${PN}" |
| 45 |
+ |
| 46 |
pkg_setup() { |
| 47 |
enewgroup pkcs11 |
| 48 |
} |
| 49 |
|
| 50 |
src_prepare() { |
| 51 |
+ default |
| 52 |
mv configure.in configure.ac || die |
| 53 |
eautoreconf |
| 54 |
} |
| 55 |
@@ -68,23 +74,21 @@ src_configure() { |
| 56 |
} |
| 57 |
|
| 58 |
src_install() { |
| 59 |
- emake install DESTDIR="${ED}" |
| 60 |
+ default |
| 61 |
+ find "${ED}" -name '*.la' -delete || die |
| 62 |
|
| 63 |
# Install libopencryptoki in the standard directory for libraries. |
| 64 |
- mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die |
| 65 |
- rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so |
| 66 |
+ mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die |
| 67 |
+ rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so |
| 68 |
dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so |
| 69 |
|
| 70 |
# Remove compatibility symlinks as we _never_ required those and |
| 71 |
# they seem unused even upstream. |
| 72 |
- find "${D}" -name 'PKCS11_*' -delete |
| 73 |
- |
| 74 |
- # doesn't use libltdl; only dlopen()-based interfaces |
| 75 |
- find "${D}" -name '*.la' -delete |
| 76 |
+ find "${ED}" -name 'PKCS11_*' -delete |
| 77 |
|
| 78 |
# We replace their ld.so and init files (mostly designed for RedHat |
| 79 |
# as far as I can tell) with our own replacements. |
| 80 |
- rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d |
| 81 |
+ rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d |
| 82 |
|
| 83 |
# make sure that we don't modify the init script if the USE flags |
| 84 |
# are enabled for the needed services. |
| 85 |
@@ -94,7 +98,5 @@ src_install() { |
| 86 |
|
| 87 |
# We create /var dirs at runtime as needed, so don't bother installing |
| 88 |
# our own. |
| 89 |
- rm -r "${D}"/var/{lib,lock} || die |
| 90 |
- |
| 91 |
- dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf |
| 92 |
+ rm -r "${ED}"/var/{lib,lock} || die |
| 93 |
} |
| 94 |
|
| 95 |
diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild |
| 96 |
index 4f6f1383102..c07161fde52 100644 |
| 97 |
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild |
| 98 |
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild |
| 99 |
@@ -1,9 +1,9 @@ |
| 100 |
-# Copyright 1999-2017 Gentoo Foundation |
| 101 |
+# Copyright 1999-2018 Gentoo Foundation |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
|
| 104 |
-EAPI="6" |
| 105 |
+EAPI=7 |
| 106 |
|
| 107 |
-inherit autotools multilib ltprune flag-o-matic user |
| 108 |
+inherit autotools multilib flag-o-matic user |
| 109 |
|
| 110 |
DESCRIPTION="PKCS#11 provider cryptographic hardware" |
| 111 |
HOMEPAGE="https://sourceforge.net/projects/opencryptoki" |
| 112 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz" |
| 113 |
# token sources are under CPL-1.0 already. |
| 114 |
LICENSE="CPL-0.5" |
| 115 |
SLOT="0" |
| 116 |
-KEYWORDS="~amd64 ~arm ~x86" |
| 117 |
+KEYWORDS="~amd64 ~arm ~s390 ~x86" |
| 118 |
IUSE="debug libressl +tpm" |
| 119 |
|
| 120 |
RDEPEND="tpm? ( app-crypt/trousers ) |
| 121 |
@@ -74,7 +74,7 @@ src_configure() { |
| 122 |
|
| 123 |
src_install() { |
| 124 |
default |
| 125 |
- prune_libtool_files --all |
| 126 |
+ find "${ED}" -name '*.la' -delete || die |
| 127 |
|
| 128 |
# Install libopencryptoki in the standard directory for libraries. |
| 129 |
mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die |
Archives