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 0291B138334 for ; Thu, 27 Sep 2018 23:55:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39605E0950; Thu, 27 Sep 2018 23:55:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 018EBE0950 for ; Thu, 27 Sep 2018 23:55:24 +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 530B1335CDD for ; Thu, 27 Sep 2018 23:55:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B6FB42B for ; Thu, 27 Sep 2018 23:55:20 +0000 (UTC) From: "Alon Bar-Lev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alon Bar-Lev" Message-ID: <1538092302.410b99813dfc3923364964c83f9c0c8009be72b5.alonbl@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.4.1.ebuild dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild X-VCS-Directories: dev-libs/opencryptoki/ X-VCS-Committer: alonbl X-VCS-Committer-Name: Alon Bar-Lev X-VCS-Revision: 410b99813dfc3923364964c83f9c0c8009be72b5 X-VCS-Branch: master Date: Thu, 27 Sep 2018 23:55:20 +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-Archives-Salt: 3b81c020-556d-43f9-a1d1-e4f4e443b5ac X-Archives-Hash: 95980c39b4db27ae3c035c7e4e541a09 commit: 410b99813dfc3923364964c83f9c0c8009be72b5 Author: Alon Bar-Lev gentoo org> AuthorDate: Sun Sep 23 14:46:09 2018 +0000 Commit: Alon Bar-Lev gentoo org> CommitDate: Thu Sep 27 23:51:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410b9981 dev-libs/opencryptoki: eapi bump Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild | 28 +++++++++++++------------ dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild | 10 ++++----- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild index c2724bc8d3e..da43888b452 100644 --- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild +++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit autotools multilib flag-o-matic user @@ -21,18 +21,24 @@ RDEPEND="tpm? ( app-crypt/trousers ) libressl? ( dev-libs/libressl:0= )" DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}" +DOCS=( + README AUTHORS FAQ TODO + doc/openCryptoki-HOWTO.pdf +) # tests right now basically don't exist; the only available thing would # test against an installed copy and would kill a running pcscd, all # things that we're not interested to. RESTRICT=test +S="${WORKDIR}/${PN}" + pkg_setup() { enewgroup pkcs11 } src_prepare() { + default mv configure.in configure.ac || die eautoreconf } @@ -68,23 +74,21 @@ src_configure() { } src_install() { - emake install DESTDIR="${ED}" + default + find "${ED}" -name '*.la' -delete || die # Install libopencryptoki in the standard directory for libraries. - mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die - rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so + mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die + rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so # Remove compatibility symlinks as we _never_ required those and # they seem unused even upstream. - find "${D}" -name 'PKCS11_*' -delete - - # doesn't use libltdl; only dlopen()-based interfaces - find "${D}" -name '*.la' -delete + find "${ED}" -name 'PKCS11_*' -delete # We replace their ld.so and init files (mostly designed for RedHat # as far as I can tell) with our own replacements. - rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d + rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d # make sure that we don't modify the init script if the USE flags # are enabled for the needed services. @@ -94,7 +98,5 @@ src_install() { # We create /var dirs at runtime as needed, so don't bother installing # our own. - rm -r "${D}"/var/{lib,lock} || die - - dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf + rm -r "${ED}"/var/{lib,lock} || die } diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild index 4f6f1383102..c07161fde52 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-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools multilib ltprune flag-o-matic user +inherit autotools multilib flag-o-matic user DESCRIPTION="PKCS#11 provider cryptographic hardware" HOMEPAGE="https://sourceforge.net/projects/opencryptoki" @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz" # token sources are under CPL-1.0 already. LICENSE="CPL-0.5" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~s390 ~x86" IUSE="debug libressl +tpm" RDEPEND="tpm? ( app-crypt/trousers ) @@ -74,7 +74,7 @@ src_configure() { src_install() { default - prune_libtool_files --all + 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