gentoo resync : 12.03.2021

3 files changed, 36 insertions, 30 deletions

diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index cd0605b7581d..46df8df35360 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,6 +1,6 @@
 AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
-EBUILD softhsm-2.5.0.ebuild 1112 BLAKE2B bec60391d1bd029ad7904113fb97acd9a1407cf355463f0a958ca6faeecda12e59cfde0ac4fc727d63d607936cb7b13e8beb7493eaeada5f179ded9490bb115f SHA512 56c3ddfadaeb674d1f9e56473729f8d99667933357a8fbc366384d5efa264f7edc8a1faafed0066848c52c9956e8cae92ff14bda340ea14bdc24ded7adc345e5
-EBUILD softhsm-2.6.1.ebuild 1067 BLAKE2B c90af1b02338d1310db49aca835d41a9afdc4fd8f559637cd103555d057c1c1f395d99fa394f80499136e122df42e5cb55ca86efd4d5d61b80f7cad11afeb24c SHA512 44b14f9490af89e3e63d4ae700fe9bf0c1fb11b0c99114740db4b25830783fd37ca51e9968ce2b5ea6f1ce756541547b9ff20391768a78e54e766c60ba1ba457
+EBUILD softhsm-2.5.0.ebuild 1111 BLAKE2B 86532145dfe22ff324a041b3e653d6d30f6a557f7dfc7c00c15c6ac54a52f0622324259ada1dea891da6429c496fc789490c29d6b45266ffb6b82137d124d53f SHA512 8b67f123f85c46ae3212aee3355e6e064fc840f5d79a726930dde851085b380c00d2ad29124991992d87044bf9c42a2c85b38d74fbe69a7d55ea1d2b850e1276
+EBUILD softhsm-2.6.1.ebuild 1066 BLAKE2B a4d14df59862d7d30c9f5bbfa34ea03f86dff1b23a47e2ca637e82538819a07797526179c28e727a1ba5f133b59f5b53f1596b142fdd52611eb57158a753219f SHA512 cee0e4c0c457e56392cbb2ed4e3c9476f7e518a9281bd699eedfdd99742f9e39cd24a21ff90813d5863789a1b2d2db2f61c63c98454dcfbaf457017c604810d1
 MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild
index c9d44cfbb66f..d9c6a91a08d5 100644
--- a/dev-libs/softhsm/softhsm-2.5.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,25 +7,27 @@ DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
+LICENSE="BSD"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bindist gost libressl migration-tool test"
+
 RESTRICT="!test? ( test )"
-SLOT="2"
-LICENSE="BSD"
 
-RDEPEND="migration-tool? ( dev-db/sqlite:3= )
+RDEPEND="
+	migration-tool? ( dev-db/sqlite:3= )
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:= )
-	!~dev-libs/softhsm-2.0.0:0"
+	!~dev-libs/softhsm-2.0.0:0
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
 	sys-devel/gcc:=[cxx]
-	test? ( dev-util/cppunit )"
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
 
-DOCS=(
-	NEWS
-	README.md
-)
+DOCS=( NEWS README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-libressl.patch"
@@ -36,7 +38,7 @@ src_configure() {
 		--disable-static \
 		--with-crypto-backend=openssl \
 		--disable-p11-kit \
-		--localstatedir="${EROOT}/var" \
+		--localstatedir="${EPREFIX}/var" \
 		$(use_enable !bindist ecc) \
 		$(use_enable gost) \
 		$(use_with migration-tool migrate)
@@ -44,7 +46,8 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
 
-	keepdir "${EROOT}/var/lib/softhsm/tokens"
+	find "${ED}" -name '*.la' -delete || die
+
+	keepdir /var/lib/softhsm/tokens
 }
diff --git a/dev-libs/softhsm/softhsm-2.6.1.ebuild b/dev-libs/softhsm/softhsm-2.6.1.ebuild
index 0d7093bbaa85..4fef59f66d56 100644
--- a/dev-libs/softhsm/softhsm-2.6.1.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,32 +7,34 @@ DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
+LICENSE="BSD"
+SLOT="2"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="bindist gost libressl migration-tool test"
+
 RESTRICT="!test? ( test )"
-SLOT="2"
-LICENSE="BSD"
 
-RDEPEND="migration-tool? ( dev-db/sqlite:3= )
+RDEPEND="
+	migration-tool? ( dev-db/sqlite:3= )
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:= )
-	!~dev-libs/softhsm-2.0.0:0"
+	!~dev-libs/softhsm-2.0.0:0
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
 	sys-devel/gcc:=[cxx]
-	test? ( dev-util/cppunit )"
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
 
-DOCS=(
-	NEWS
-	README.md
-)
+DOCS=( NEWS README.md )
 
 src_configure() {
 	econf \
 		--disable-static \
 		--with-crypto-backend=openssl \
 		--disable-p11-kit \
-		--localstatedir="${EROOT}/var" \
+		--localstatedir="${EPREFIX}/var" \
 		$(use_enable !bindist ecc) \
 		$(use_enable gost) \
 		$(use_with migration-tool migrate)
@@ -40,7 +42,8 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
 
-	keepdir "${EROOT}/var/lib/softhsm/tokens"
+	find "${ED}" -name '*.la' -delete || die
+
+	keepdir /var/lib/softhsm/tokens
 }