[gentoo-commits] repo/gentoo:master commit in: dev-libs/opencryptoki/

["Sam James" <sam@gentoo.org>]

commit:     a6d325f4bac5eb0a9ef2a6bf3f559dee36a2035a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 22:55:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 22:55:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d325f4

dev-libs/opencryptoki: multilib--, missing dies

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
index f3666b16096..765c8841da1 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib flag-o-matic user
+inherit autotools flag-o-matic user
 
 DESCRIPTION="PKCS#11 provider cryptographic hardware"
 HOMEPAGE="https://sourceforge.net/projects/opencryptoki"
@@ -74,24 +74,25 @@ src_configure() {
 
 src_install() {
 	default
+
 	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
-	rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
+	rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so || die
 	dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
 
 	# Remove compatibility symlinks as we _never_ required those and
 	# they seem unused even upstream.
-	find "${ED}" -name 'PKCS11_*' -delete
+	find "${ED}" -name 'PKCS11_*' -delete || die
 
 	# We replace their ld.so and init files (mostly designed for RedHat
 	# as far as I can tell) with our own replacements.
-	rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d
+	rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d || die
 
 	# make sure that we don't modify the init script if the USE flags
 	# are enabled for the needed services.
-	cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
+	cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init || die
 	use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
 	newinitd "${T}/pkcsslotd.init" pkcsslotd