From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5451E13835D for ; Sat, 3 Apr 2021 23:07:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DC08E0891; Sat, 3 Apr 2021 23:07:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77F36E0891 for ; Sat, 3 Apr 2021 23:07:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 976603406F2 for ; Sat, 3 Apr 2021 23:07:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B49D646 for ; Sat, 3 Apr 2021 23:07:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617490551.a6d325f4bac5eb0a9ef2a6bf3f559dee36a2035a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencryptoki/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild X-VCS-Directories: dev-libs/opencryptoki/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a6d325f4bac5eb0a9ef2a6bf3f559dee36a2035a X-VCS-Branch: master Date: Sat, 3 Apr 2021 23:07:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 48a27b39-9877-49b6-b4db-96f96743bb15 X-Archives-Hash: 138be4dbdaf5ec63ddc31e8b9d208a04 commit: a6d325f4bac5eb0a9ef2a6bf3f559dee36a2035a Author: Sam James gentoo org> AuthorDate: Sat Apr 3 22:55:51 2021 +0000 Commit: Sam James gentoo 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 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