From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 30 Sep 2018 11:19:18 +0100
Subject: gentoo resync : 30.09.2018

---
 dev-libs/softhsm/Manifest             |  2 +-
 dev-libs/softhsm/softhsm-2.4.0.ebuild | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'dev-libs/softhsm')

diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 03546bfbcc00..b971cbcb3616 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,3 @@
 DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
-EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B d723f065d6b76ee5132af9f6b5c7e6d330a0ce283c71fd1b1a40187cfdf6d91e3d42edae2270ee71757b47e0ffc7b278a1d98b534be224c0e57c371fdeeffd8f SHA512 9442882ac0c14345d5c16b02f25fdf4eee75352c22f385c809973fca18edc5f15c4ef195d32dcf5793b5cceab719b8f9fa372ba38a72a09275a775a5c22e7be8
+EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B c20642ae2741ce0941fa12b8ab4ba3162df9484c775a88c5e4a15b0e774471fc872b0c9d486a081afdda800d4e08b4798b05b44c32a387dd93b4ea1f433c2309 SHA512 721f120e09c2fc85154cecd824a85c36d499fcb11eb5173a52cb3c73c941fa7234d97492a1e675f04ceca192475cd31fde61313f0951eb0ba5618b434e483662
 MISC metadata.xml 322 BLAKE2B 64433451cd97495272e25d2bd1a4ad951781f7a61e47f1f048b13b4a1b4f577f9eb37f1145f1d9710969cfd9e38dd89aacc83641ec8b3bf0b36027c39a8dfe8b SHA512 b145c1ee8c20a9aad9c9b8e6f6526c596dd80a993faecb8e8caf6e930cf05e32f3e6ef5ad72c337a43c48cf57224f209e65d177567e3c5c577d3872eb11841a8
diff --git a/dev-libs/softhsm/softhsm-2.4.0.ebuild b/dev-libs/softhsm/softhsm-2.4.0.ebuild
index 419485df8258..ec4f819aecca 100644
--- a/dev-libs/softhsm/softhsm-2.4.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.4.0.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit ltprune
+EAPI=7
 
 DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="https://www.opendnssec.org/"
@@ -14,17 +12,14 @@ IUSE="bindist libressl migration-tool test"
 SLOT="2"
 LICENSE="BSD"
 
-RDEPEND="
-	sys-devel/gcc:=[cxx]
-	migration-tool? ( dev-db/sqlite:3 )
+RDEPEND="migration-tool? ( dev-db/sqlite:3 )
 	!libressl? ( dev-libs/openssl:=[bindist=] )
 	libressl? ( dev-libs/libressl )
-	!=dev-libs/softhsm-2.0.0:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/cppunit )
-"
+	!~dev-libs/softhsm-2.0.0:0"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/gcc:=[cxx]
+	test? ( dev-util/cppunit )"
 
 DOCS=(
 	NEWS
@@ -34,9 +29,9 @@ DOCS=(
 src_configure() {
 	econf \
 		--disable-static \
-		--localstatedir="${EROOT}var" \
 		--with-crypto-backend=openssl \
 		--disable-p11-kit \
+		--localstatedir="${EROOT}/var" \
 		$(use_enable !bindist ecc) \
 		$(use_enable !libressl gost) \
 		$(use_with migration-tool migrate)
@@ -44,6 +39,7 @@ src_configure() {
 
 src_install() {
 	default
+	find "${D}" -name '*.la' -delete || die
+
 	keepdir "${EROOT}/var/lib/softhsm/tokens"
-	prune_libtool_files --modules
 }
-- 
cgit v1.2.3