gentoo resync : 30.09.2018

3 files changed, 22 insertions, 20 deletions

diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index abc1ad84a75a..dbfb5d26a553 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,6 +1,6 @@
 AUX pkcsslotd.init.2 664 BLAKE2B de96f878e55ce5346a3846c99deae28e540964cf4a7dcd42e2893cf540484fa6b3bd914400c2fd39067e8cfc29d030691fd0e4e4fb83b229bc2c03085e5df2f0 SHA512 3bdc6d2f87b2209163ad08915afa900f9c14324d3e48619cffe462c3c651996fe0e0b485eb6331552fcb22297cfa7bda9b6440a8bad9419d6835a047f1b2a0e9
 DIST opencryptoki-3.6.1.tgz 1068197 BLAKE2B 0e7d867bd21863f56471ac2c8664148e5a6988ffc30e71feaf960245a1908d676c1791f2b751de4bdd694096bf7360af3a8f79df895eef1b8f61391aba09aaad SHA512 1874fabba6d3da49596622c7f8142a37329df95f129cb08319bb3900a944dde1ae5ce9d845d400726f4bda4579c730012b9bfd6c69c6d5a16b1f75b28a0ba4af
 DIST opencryptoki-v3.4.1.tgz 1014416 BLAKE2B f95f9c4923fb7ce283f2031c21221ec2dacf1afca50a5fcdb4e2e173c952bbc4402fda56664428087a2c5b33af8a94aba9fa361ef5c0e4f0b865391cbc304250 SHA512 98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
-EBUILD opencryptoki-3.4.1.ebuild 3174 BLAKE2B 5ab81d00513d55ee8c188407bc9a30f9ec05f1d24f8eb3e982214ab394c87cf3b413bb76e59a578d4dce349453cb10e70997dd88d96dfe550f27eb9aad741448 SHA512 076a6d9c12ca0548491fc4d1a0b39ba153f40432374b3ea8e6c870d4fcb8bdfcd7af6d12dd6b05f0ca2976d78f19d6404980fd12a3058dd911854f2f6174fa59
-EBUILD opencryptoki-3.6.1.ebuild 3060 BLAKE2B c7bd97265e5143f5b9502b49c28bd762ad83f5ea1f37975ff9ac9a9bf7dc57f07a6102d26d10ec323c5acc07fe8c010379d2b2eacad81197f5360e2689a56617 SHA512 83afe598c8cd2180f365110991415da4ef3ba0a3a6ec769b17c1093d9e8592ca3c945f186525966c9564d8a49aae901aa2dbbab194ec3d64ed73db15879d2190
+EBUILD opencryptoki-3.4.1.ebuild 3122 BLAKE2B 002036c45163500bf76e52b67e1178f55b22795e0490ceb955aef751874b19c2262f81e25b370b826e3e892de85c94fdb38afb6a4fd33a4dedefaf6fd2311935 SHA512 4aa6b7c580ccccd8e60f7a6c9510eeb86d8c33b6b79375dbb2fcb9f1711036ab014cd0f5e6419a6e37fc13e1a5d2a54bd6e2018f4deb553d4fde65c1949b6127
+EBUILD opencryptoki-3.6.1.ebuild 3071 BLAKE2B 9efc9e1305aba79d156410ce75fb645407ca20742df65e4ce2c9b90e4c8b5f175aa9713f006865f09ae8a9b0878d501196b7e6c992eedd6ff65b464ea7fe44bd SHA512 6098b9968f8b126f890ffca0acb31255facb864181762dc9fdf2e9f8ae6283f6ac3ef3ca2b9548e57ef1a1ad0ee21c45ace934d319d44e443e234fa5ce2fa0a1
 MISC metadata.xml 448 BLAKE2B c471621f15b751b55dd75e9b62d961bcb52df94359ae901119be884dbec71e41ced8bc3ddf9af33b70a78aa0c0ef6927a92d44e9901124ad5811b6fc38aa9fc0 SHA512 a325026f45754e53ae94b7a8d9f5836ab4974a4535a5492727062ee449ecb9d542e04f103662111b9eb3956be7fcad32189f4470b3d8e8c110e0023ae93318d2
diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
index c2724bc8d3ed..da43888b4524 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit autotools multilib flag-o-matic user
 
@@ -21,18 +21,24 @@ RDEPEND="tpm? ( app-crypt/trousers )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}"
+DOCS=(
+	README AUTHORS FAQ TODO
+	doc/openCryptoki-HOWTO.pdf
+)
 
 # tests right now basically don't exist; the only available thing would
 # test against an installed copy and would kill a running pcscd, all
 # things that we're not interested to.
 RESTRICT=test
 
+S="${WORKDIR}/${PN}"
+
 pkg_setup() {
 	enewgroup pkcs11
 }
 
 src_prepare() {
+	default
 	mv configure.in configure.ac || die
 	eautoreconf
 }
@@ -68,23 +74,21 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${ED}"
+	default
+	find "${ED}" -name '*.la' -delete || die
 
 	# Install libopencryptoki in the standard directory for libraries.
-	mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die
-	rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
+	mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die
+	rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
 	dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
 
 	# Remove compatibility symlinks as we _never_ required those and
 	# they seem unused even upstream.
-	find "${D}" -name 'PKCS11_*' -delete
-
-	# doesn't use libltdl; only dlopen()-based interfaces
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name 'PKCS11_*' -delete
 
 	# We replace their ld.so and init files (mostly designed for RedHat
 	# as far as I can tell) with our own replacements.
-	rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d
+	rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d
 
 	# make sure that we don't modify the init script if the USE flags
 	# are enabled for the needed services.
@@ -94,7 +98,5 @@ src_install() {
 
 	# We create /var dirs at runtime as needed, so don't bother installing
 	# our own.
-	rm -r "${D}"/var/{lib,lock} || die
-
-	dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf
+	rm -r "${ED}"/var/{lib,lock} || die
 }
diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
index 4f6f1383102a..c07161fde52a 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit autotools multilib ltprune flag-o-matic user
+inherit autotools multilib flag-o-matic user
 
 DESCRIPTION="PKCS#11 provider cryptographic hardware"
 HOMEPAGE="https://sourceforge.net/projects/opencryptoki"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz"
 # token sources are under CPL-1.0 already.
 LICENSE="CPL-0.5"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~s390 ~x86"
 IUSE="debug libressl +tpm"
 
 RDEPEND="tpm? ( app-crypt/trousers )
@@ -74,7 +74,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	# Install libopencryptoki in the standard directory for libraries.
 	mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die