[gentoo-commits] repo/gentoo:master commit in: net-dns/opendnssec/

["Marc Schiffbauer" <mschiff@gentoo.org>]

commit:     98a218efd4ed121ed1a8f8ffc7b4fbb880fe90eb
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 28 01:48:55 2021 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 01:49:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a218ef

net-dns/opendnssec: cleanups and improve tests

Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 net-dns/opendnssec/opendnssec-2.1.10.ebuild | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/net-dns/opendnssec/opendnssec-2.1.10.ebuild b/net-dns/opendnssec/opendnssec-2.1.10.ebuild
index 2df181514c42..fc1cc54c2d14 100644
--- a/net-dns/opendnssec/opendnssec-2.1.10.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.10.ebuild
@@ -45,6 +45,8 @@ BDEPEND="
 	doc? ( app-doc/doxygen )
 	test? (
 		app-text/trang
+		dev-libs/softhsm:*
+		dev-util/cunit
 	)
 "
 
@@ -53,13 +55,6 @@ REQUIRED_USE="
 	^^ ( softhsm opensc external-hsm )
 "
 
-#PATCHES=(
-#	"${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
-#	"${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
-#	"${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
-#	"${FILESDIR}/${PN}-use-system-trang.patch"
-#	"${FILESDIR}/${PN}-openssl1.1.patch"
-#)
 PATCHES=(
 	"${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch"
 	"${FILESDIR}/${PN}-use-system-trang.patch"
@@ -73,11 +68,7 @@ check_pkcs11_setup() {
 
 	if use softhsm; then
 		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
+		PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm2.so
 		elog "Building with SoftHSM PKCS#11 library support."
 	fi
 	if use opensc; then