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

2021-05-01 Thread Mikle Kolyada 
commit: b179062601bd0b91878c9433bd67429e1ac8aa82
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May  1 07:22:22 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May  1 07:22:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1790626

dev-libs/opencryptoki: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild
index a391a24d3fa..069fc5eb73b 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild
@@ -15,12 +15,11 @@ S="${WORKDIR}/${PN}"
 LICENSE="CPL-0.5"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
-IUSE="debug libressl +tpm"
+IUSE="debug +tpm"
 
 DEPEND="
tpm? ( app-crypt/trousers )
-   !libressl? ( >=dev-libs/openssl-1.1.0:0= )
-   libressl? ( >=dev-libs/libressl-2.7.0:0= )
+   >=dev-libs/openssl-1.1.0:0=
 "
 RDEPEND="
${DEPEND}

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

2021-04-11 Thread Conrad Kostecki 
commit: dd933faf9e40e8784e385b8d3dc08a91b4e3b3e0
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr 11 19:31:00 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr 11 19:31:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd933faf

dev-libs/opencryptoki: drop old version

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild | 102 
 1 file changed, 102 deletions(-)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
deleted file mode 100644
index 765c8841da1..000
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic user
-
-DESCRIPTION="PKCS#11 provider cryptographic hardware"
-HOMEPAGE="https://sourceforge.net/projects/opencryptoki;
-SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz"
-
-# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
-# token sources are under CPL-1.0 already.
-LICENSE="CPL-0.5"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
-IUSE="debug libressl +tpm"
-
-RDEPEND="tpm? ( app-crypt/trousers )
-   !libressl? ( >=dev-libs/openssl-1.1.0:0= )
-   libressl? ( >=dev-libs/libressl-2.7.0:0= )"
-DEPEND="${RDEPEND}"
-
-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
-}
-
-src_configure() {
-   # package uses ${localstatedir}/lib as the default path, so if we
-   # leave it to econf, it'll create /var/lib/lib.
-
-   # Since upstream by default seem to enable any possible token, even
-   # when they don't seem to be used, we limit ourselves to the
-   # software emulation token (swtok) and if the user enabled the tpm
-   # USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
-   # software-dependent even when they build fine without their
-   # requirements, but until somebody asks for those, I'd rather not
-   # enable them.
-
-   # We don't use --enable-debug because that tinkers with the CFLAGS
-   # and we don't want that. Instead we append -DDEBUG which enables
-   # debug information.
-   use debug && append-flags -DDEBUG
-
-   econf \
-   --localstatedir=/var \
-   --enable-fast-install \
-   --disable-debug \
-   --enable-daemon \
-   --enable-library \
-   --disable-icatok \
-   --enable-swtok \
-   $(use_enable tpm tpmtok) \
-   --disable-ccatok
-}
-
-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 || 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 || 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 || 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 || die
-   use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
-   newinitd "${T}/pkcsslotd.init" pkcsslotd
-
-   # We create /var dirs at runtime as needed, so don't bother installing
-   # our own.
-   rm -r "${ED}"/var/{lib,lock} || die
-}

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

2021-04-11 Thread Conrad Kostecki 
commit: 2d4d861149374fc302f73d3cf91835656d85ae70
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr 11 19:30:21 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr 11 19:30:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4d8611

dev-libs/opencryptoki: migrate to GLEP 81

Closes: https://bugs.gentoo.org/781563
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild | 102 +
 1 file changed, 102 insertions(+)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild
new file mode 100644
index 000..a391a24d3fa
--- /dev/null
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="PKCS#11 provider cryptographic hardware"
+HOMEPAGE="https://sourceforge.net/projects/opencryptoki;
+SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
+# token sources are under CPL-1.0 already.
+LICENSE="CPL-0.5"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
+IUSE="debug libressl +tpm"
+
+DEPEND="
+   tpm? ( app-crypt/trousers )
+   !libressl? ( >=dev-libs/openssl-1.1.0:0= )
+   libressl? ( >=dev-libs/libressl-2.7.0:0= )
+"
+RDEPEND="
+   ${DEPEND}
+   acct-group/pkcs11
+"
+
+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
+
+src_prepare() {
+   default
+   mv configure.in configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   # package uses ${localstatedir}/lib as the default path, so if we
+   # leave it to econf, it'll create /var/lib/lib.
+
+   # Since upstream by default seem to enable any possible token, even
+   # when they don't seem to be used, we limit ourselves to the
+   # software emulation token (swtok) and if the user enabled the tpm
+   # USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
+   # software-dependent even when they build fine without their
+   # requirements, but until somebody asks for those, I'd rather not
+   # enable them.
+
+   # We don't use --enable-debug because that tinkers with the CFLAGS
+   # and we don't want that. Instead we append -DDEBUG which enables
+   # debug information.
+   use debug && append-flags -DDEBUG
+
+   econf \
+   --localstatedir=/var \
+   --enable-fast-install \
+   --disable-debug \
+   --enable-daemon \
+   --enable-library \
+   --disable-icatok \
+   --enable-swtok \
+   $(use_enable tpm tpmtok) \
+   --disable-ccatok
+}
+
+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 || 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 || 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 || 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 || die
+   use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
+   newinitd "${T}/pkcsslotd.init" pkcsslotd
+
+   # We create /var dirs at runtime as needed, so don't bother installing
+   # our own.
+   rm -r "${ED}"/var/{lib,lock} || die
+}

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

2021-04-03 Thread Sam James 
commit: a6d325f4bac5eb0a9ef2a6bf3f559dee36a2035a
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  3 22:55:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  3 22:55:51 2021 +
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

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

2021-03-16 Thread Sam James 
commit: afc6c4232c063afd94cd94f0f241313befd52734
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 16 18:47:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 16 19:22:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc6c423

dev-libs/opencryptoki: drop 3.4.1

Signed-off-by: Sam James  gentoo.org>

 dev-libs/opencryptoki/Manifest  |   1 -
 dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild | 101 
 2 files changed, 102 deletions(-)

diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 9d6774ceda6..fadade59bcd 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,2 +1 @@
 DIST opencryptoki-3.6.1.tgz 1068197 BLAKE2B 
0e7d867bd21863f56471ac2c8664148e5a6988ffc30e71feaf960245a1908d676c1791f2b751de4bdd694096bf7360af3a8f79df895eef1b8f61391aba09aaad
 SHA512 
1874fabba6d3da49596622c7f8142a37329df95f129cb08319bb3900a944dde1ae5ce9d845d400726f4bda4579c730012b9bfd6c69c6d5a16b1f75b28a0ba4af
-DIST opencryptoki-v3.4.1.tgz 1014416 BLAKE2B 
f95f9c4923fb7ce283f2031c21221ec2dacf1afca50a5fcdb4e2e173c952bbc4402fda56664428087a2c5b33af8a94aba9fa361ef5c0e4f0b865391cbc304250
 SHA512 
98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6

diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
deleted file mode 100644
index 99428ccb4f7..000
--- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib flag-o-matic user
-
-DESCRIPTION="PKCS#11 provider cryptographic hardware"
-HOMEPAGE="https://sourceforge.net/projects/opencryptoki;
-SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.tgz"
-
-# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
-# token sources are under CPL-1.0 already.
-LICENSE="CPL-0.5"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~s390 ~x86"
-IUSE="debug libressl +tpm"
-
-RDEPEND="tpm? ( app-crypt/trousers )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-
-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
-}
-
-src_configure() {
-   # package uses ${localstatedir}/lib as the default path, so if we
-   # leave it to econf, it'll create /var/lib/lib.
-
-   # Since upstream by default seem to enable any possible token, even
-   # when they don't seem to be used, we limit ourselves to the
-   # software emulation token (swtok) and if the user enabled the tpm
-   # USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
-   # software-dependent even when they build fine without their
-   # requirements, but until somebody asks for those, I'd rather not
-   # enable them.
-
-   # We don't use --enable-debug because that tinkers with the CFLAGS
-   # and we don't want that. Instead we append -DDEBUG which enables
-   # debug information.
-   use debug && append-flags -DDEBUG
-
-   econf \
-   --localstatedir=/var \
-   --enable-fast-install \
-   --disable-debug \
-   --enable-daemon \
-   --enable-library \
-   --disable-icatok \
-   --enable-swtok \
-   $(use_enable tpm tpmtok) \
-   --disable-ccatok
-}
-
-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
-   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
-
-   # 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
-
-   # 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
-   use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
-   newinitd

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

2019-07-26 Thread Aaron Bauman 
commit: 65c76eab9ad96be68006aab007151c51835943f8
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Jul 26 20:46:29 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Jul 26 22:21:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c76eab

dev-libs/opencryptoki: arm64 keyworded

Signed-off-by: Aaron Bauman  gentoo.org>

 dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
index 3b129d8ab79..35d8afef583 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
@@ -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 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
 IUSE="debug libressl +tpm"
 
 RDEPEND="tpm? ( app-crypt/trousers )

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

2019-02-16 Thread Alon Bar-Lev 
commit: 3739349e3f5d2115b10a7479a4a5a71d25890467
Author: Stefan Strogin  gmail  com>
AuthorDate: Thu Feb 14 03:36:54 2019 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sat Feb 16 18:18:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3739349e

dev-libs/opencryptoki: fix libressl support

Closes: https://bugs.gentoo.org/587970
Closes: https://github.com/gentoo/gentoo/pull/11044
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Signed-off-by: Alon Bar-Lev  gentoo.org>

 dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
index c07161fde52..3b129d8ab79 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~arm ~s390 ~x86"
 IUSE="debug libressl +tpm"
 
 RDEPEND="tpm? ( app-crypt/trousers )
-   >=dev-libs/openssl-1.1.0:0="
+   !libressl? ( >=dev-libs/openssl-1.1.0:0= )
+   libressl? ( >=dev-libs/libressl-2.7.0:0= )"
 DEPEND="${RDEPEND}"
 
 DOCS=(

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

2018-09-27 Thread Alon Bar-Lev 
commit: 410b99813dfc3923364964c83f9c0c8009be72b5
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sun Sep 23 14:46:09 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Thu Sep 27 23:51:42 2018 +
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

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

2018-06-18 Thread Mikle Kolyada 
commit: d13f097c1a4d1d53fa0e2d312d30ea4b1e136a72
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jun 18 20:52:39 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jun 18 20:53:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13f097c

dev-libs/opencryptoki: readd s390 keyword

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
index f0786c997b5..c2724bc8d3e 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.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 )

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

2017-03-25 Thread Alon Bar-Lev 
commit: bc07b0f013800243d4c8ce96eec1bb5b452902d1
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Mar 25 17:48:42 2017 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sat Mar 25 18:11:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc07b0f0

dev-libs/opencryptoki: use ltprune

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
index d164ad367a1..4f6f1383102 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools multilib flag-o-matic user
+inherit autotools multilib ltprune flag-o-matic user
 
 DESCRIPTION="PKCS#11 provider cryptographic hardware"
 HOMEPAGE="https://sourceforge.net/projects/opencryptoki;

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

2016-06-25 Thread Anthony G. Basile 
commit: dbd4e2c6633b6d30471d7f75cfdcd4dbf44c133a
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Jun 25 23:58:15 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jun 25 23:58:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd4e2c6

dev-libs/opencryptoki: add libressl support

Package-Manager: portage-2.2.28

 dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
index ff61dcb..53c8192 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,13 +15,13 @@ 
SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.tgz"
 LICENSE="CPL-0.5"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug libressl +tpm"
 
 RDEPEND="tpm? ( app-crypt/trousers )
-dev-libs/openssl:*"
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}"
 
-IUSE="+tpm debug"
-
 S="${WORKDIR}/${PN}"
 
 # tests right now basically don't exist; the only available thing would

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

2016-06-12 Thread Alon Bar-Lev 
commit: 51e8cb98f7afb5be29c55521a621634c99370d5f
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sun Jun 12 02:09:33 2016 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sun Jun 12 03:22:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e8cb98

dev-libs/opencryptoki: cleanup

Package-Manager: portage-2.2.28

 dev-libs/opencryptoki/Manifest|   1 -
 dev-libs/opencryptoki/opencryptoki-3.3.ebuild | 102 --
 2 files changed, 103 deletions(-)

diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 48052ae..3cbb424 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,2 +1 @@
-DIST opencryptoki-v3.3.tgz 937619 SHA256 
e1deac5edd571621dc1624e9b7af8d1632d6db6f18815f5ed8824fc78f354609 SHA512 
53efbc6009da178473abf17d092249781b1eb465f68c83653bd5e88703b9ad74ce9e0128486dffec65beaf8b8974ea6852d206ec5bf035c7296a40c8f84791ab
 WHIRLPOOL 
d939eb97bb7f2b54d510326ac4dba4dc49f9f725fa8900687fd8ebe199ce1c2a797a6e514378995f24ef5b9e904b29434edf962537dc545c2fc2206d180b1d43
 DIST opencryptoki-v3.4.1.tgz 1014416 SHA256 
018ea402f3a1b38b203282fb047dfac209d94bf2988f2c29793eca65455452c4 SHA512 
98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
 WHIRLPOOL 
c05b61c220e87af361cf67c5223f5745e305c5039a610bb740d2e729299517363d5d7d03175869ab517519857a526ac0272f1556bd9e1cd9dea84bd500595f7e

diff --git a/dev-libs/opencryptoki/opencryptoki-3.3.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.3.ebuild
deleted file mode 100644
index 48dbad5..000
--- a/dev-libs/opencryptoki/opencryptoki-3.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools multilib flag-o-matic user
-
-DESCRIPTION="PKCS#11 provider cryptographic hardware"
-HOMEPAGE="http://sourceforge.net/projects/opencryptoki;
-SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.tgz"
-
-# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
-# token sources are under CPL-1.0 already.
-LICENSE="CPL-0.5"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="tpm? ( app-crypt/trousers )
-dev-libs/openssl:*"
-DEPEND="${RDEPEND}"
-
-IUSE="+tpm debug"
-
-S="${WORKDIR}/${PN}"
-
-# 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
-
-pkg_setup() {
-   enewgroup pkcs11
-}
-
-src_prepare() {
-   mv configure.in configure.ac || die
-   eautoreconf
-}
-
-src_configure() {
-   # package uses ${localstatedir}/lib as the default path, so if we
-   # leave it to econf, it'll create /var/lib/lib.
-
-   # Since upstream by default seem to enable any possible token, even
-   # when they don't seem to be used, we limit ourselves to the
-   # software emulation token (swtok) and if the user enabled the tpm
-   # USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
-   # software-dependent even when they build fine without their
-   # requirements, but until somebody asks for those, I'd rather not
-   # enable them.
-
-   # We don't use --enable-debug because that tinkers with the CFLAGS
-   # and we don't want that. Instead we append -DDEBUG which enables
-   # debug information.
-   use debug && append-flags -DDEBUG
-
-   econf \
-   --localstatedir=/var \
-   --enable-fast-install \
-   --disable-dependency-tracking \
-   --disable-debug \
-   --enable-daemon \
-   --enable-library \
-   --disable-icatok \
-   --enable-swtok \
-   $(use_enable tpm tpmtok) \
-   --disable-ccatok \
-   --disable-pkcscca_migrate
-}
-
-src_install() {
-   emake install DESTDIR="${ED}"
-
-   # 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
-   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
-
-   # 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
-
-   # make sure that we don't modify the init script if the USE flags
-   # are enabled for the needed services.
-   cp

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

2015-12-23 Thread Alon Bar-Lev 
commit: b30c211e7fd5694865c9cca5a440950ddae23246
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Wed Dec 23 13:41:18 2015 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Wed Dec 23 13:49:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30c211e

dev-libs/opencryptoki: cleanup old

Package-Manager: portage-2.2.24

 dev-libs/opencryptoki/Manifest |   4 -
 .../files/opencryptoki-2.4.2-destdir.patch |  26 -
 dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild | 110 -
 dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild| 100 ---
 dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild| 103 ---
 5 files changed, 343 deletions(-)

diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index e0c6078..48052ae 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,6 +1,2 @@
-DIST opencryptoki-2.3.3-backports-3.tar.bz2 5972 SHA256 
fb913dbb5c2b0d87067d9738892b2a4c4a7c192d6335cc0bae2a7083e913aa74 SHA512 
bff2b1cd907d814a61296a99eaa5cdcb983355def8022ec09620048415e66b5feea425cba2d19b9f023073165969e981358dc6e406b1bc62f1e00f49e91ef943
 WHIRLPOOL 
c77b1aa0268043d31b3d9d9d53d6416d9d8af5fbb29b07f498aaed61807c1848961b046192ca7eab227f055ba829c13bfa2696d016795b4df71e467c2a0185cc
-DIST opencryptoki-2.3.3.tar.bz2 694854 SHA256 
7ccae6350a7043c2abade1eb1517edb987f13e98584dd28733172e8d36600aa2 SHA512 
2c7ea2f689daba92ec178198dc1a3ffbc4812f4547a574b86cc8b69ada4e3aefb2613d4d291829d81b97d91d5d3fbe1735bd9b3f99db415ddcb4ca03863ddc4a
 WHIRLPOOL 
3a955b464ea44c1dc50ce9869bbc48ced2a3962ef533491aa53956cccbca1fcf9411ffcccd1839384e7f3ba87368dba4c8c415f283139169391224a1f4cf5092
-DIST opencryptoki-2.4.2.tar.gz 1083876 SHA256 
0bfbcf956fec078af12c34cd447c6274a5e7e886335c3b8b81106d20ccefa0d9 SHA512 
2f760968cec7f15f7de38f0c74e0444d75d1a247d1efd9fc17a17ac5f2bcc4fd283def49d46baeea0c5adb6e19236993b4e8937f0e32162bcc7dbac8066144b9
 WHIRLPOOL 
d7df0db3450d33c3e28be0031b48f22d89387f12f35ca868f593f82a87abb9eea89f28be43fb4ce3b17dee6e1d226fc08586320fbce4e0bf7d57db871d3cd76c
-DIST opencryptoki-2.4.3.tar.gz 897 SHA256 
3ddc0a0e96957e64e61a960c8a7bfcff0030564ebf4f6848abe0740491fd52bc SHA512 
e33d8df344161909c1fc0626880d89e47ac902c5f780cc04af07691fff20c50bdea5bfa0368df39fff84b365342f704638e90b329a3ae12ab5fb5f668c50a164
 WHIRLPOOL 
ab5836f30749e7bb56b1ba882c15098096d7c36e1f9dd65a83a93d9b497231258a54c5a60cf4847fce8267c086a3aea380c33380fcb9d7a20c770f5f922846d7
 DIST opencryptoki-v3.3.tgz 937619 SHA256 
e1deac5edd571621dc1624e9b7af8d1632d6db6f18815f5ed8824fc78f354609 SHA512 
53efbc6009da178473abf17d092249781b1eb465f68c83653bd5e88703b9ad74ce9e0128486dffec65beaf8b8974ea6852d206ec5bf035c7296a40c8f84791ab
 WHIRLPOOL 
d939eb97bb7f2b54d510326ac4dba4dc49f9f725fa8900687fd8ebe199ce1c2a797a6e514378995f24ef5b9e904b29434edf962537dc545c2fc2206d180b1d43
 DIST opencryptoki-v3.4.1.tgz 1014416 SHA256 
018ea402f3a1b38b203282fb047dfac209d94bf2988f2c29793eca65455452c4 SHA512 
98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
 WHIRLPOOL 
c05b61c220e87af361cf67c5223f5745e305c5039a610bb740d2e729299517363d5d7d03175869ab517519857a526ac0272f1556bd9e1cd9dea84bd500595f7e

diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch 
b/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
deleted file mode 100644
index e1375c7..000
--- a/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fcc24176398ab2f40c33ebc686c2f803782af8d6 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev 
-Date: Sat, 15 Dec 2012 22:13:56 +0200
-Subject: [PATCH] Always use DESTDIR when installing
-

- usr/Makefile.am |6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/usr/Makefile.am b/usr/Makefile.am
-index bced120..20352d5 100644
 a/usr/Makefile.am
-+++ b/usr/Makefile.am
-@@ -5,6 +5,6 @@ endif
- SUBDIRS = lib $(DAEMONDIRS)
- 
- install-data-hook:
--  $(MKDIR_P) $(lockdir)
--  $(CHGRP) pkcs11 $(lockdir)
--  $(CHMOD) 0770 $(lockdir)
-+  $(MKDIR_P) $(DESTDIR)$(lockdir)
-+  $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)
-+  $(CHMOD) 0770 $(DESTDIR)$(lockdir)
--- 
-1.7.8.6
-

diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild 
b/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild
deleted file mode 100644
index 877a90e..000
--- a/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-# backports are maintained as tags on Diego's repository on gitorious:
-# http://gitorious.org/~flameeyes/opencryptoki/flameeyess-opencryptoki
-BACKPORTS=3
-
-inherit autotools eutils multilib flag-o-matic user
-
-DESCRIPTION="PKCS#11 provider cryptographic hardware"

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

2015-12-23 Thread Alon Bar-Lev 
commit: 75099c61ad835d4e283e5f02af17918f7d5a6b76
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Wed Dec 23 13:39:48 2015 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Wed Dec 23 13:49:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75099c61

dev-libs/opencryptoki: version bump

Package-Manager: portage-2.2.24

 dev-libs/opencryptoki/Manifest  |   1 +
 dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild | 101 
 2 files changed, 102 insertions(+)

diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 9f7f457..e0c6078 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -3,3 +3,4 @@ DIST opencryptoki-2.3.3.tar.bz2 694854 SHA256 
7ccae6350a7043c2abade1eb1517edb987
 DIST opencryptoki-2.4.2.tar.gz 1083876 SHA256 
0bfbcf956fec078af12c34cd447c6274a5e7e886335c3b8b81106d20ccefa0d9 SHA512 
2f760968cec7f15f7de38f0c74e0444d75d1a247d1efd9fc17a17ac5f2bcc4fd283def49d46baeea0c5adb6e19236993b4e8937f0e32162bcc7dbac8066144b9
 WHIRLPOOL 
d7df0db3450d33c3e28be0031b48f22d89387f12f35ca868f593f82a87abb9eea89f28be43fb4ce3b17dee6e1d226fc08586320fbce4e0bf7d57db871d3cd76c
 DIST opencryptoki-2.4.3.tar.gz 897 SHA256 
3ddc0a0e96957e64e61a960c8a7bfcff0030564ebf4f6848abe0740491fd52bc SHA512 
e33d8df344161909c1fc0626880d89e47ac902c5f780cc04af07691fff20c50bdea5bfa0368df39fff84b365342f704638e90b329a3ae12ab5fb5f668c50a164
 WHIRLPOOL 
ab5836f30749e7bb56b1ba882c15098096d7c36e1f9dd65a83a93d9b497231258a54c5a60cf4847fce8267c086a3aea380c33380fcb9d7a20c770f5f922846d7
 DIST opencryptoki-v3.3.tgz 937619 SHA256 
e1deac5edd571621dc1624e9b7af8d1632d6db6f18815f5ed8824fc78f354609 SHA512 
53efbc6009da178473abf17d092249781b1eb465f68c83653bd5e88703b9ad74ce9e0128486dffec65beaf8b8974ea6852d206ec5bf035c7296a40c8f84791ab
 WHIRLPOOL 
d939eb97bb7f2b54d510326ac4dba4dc49f9f725fa8900687fd8ebe199ce1c2a797a6e514378995f24ef5b9e904b29434edf962537dc545c2fc2206d180b1d43
+DIST opencryptoki-v3.4.1.tgz 1014416 SHA256 
018ea402f3a1b38b203282fb047dfac209d94bf2988f2c29793eca65455452c4 SHA512 
98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
 WHIRLPOOL 
c05b61c220e87af361cf67c5223f5745e305c5039a610bb740d2e729299517363d5d7d03175869ab517519857a526ac0272f1556bd9e1cd9dea84bd500595f7e

diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild 
b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
new file mode 100644
index 000..ff61dcb
--- /dev/null
+++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools multilib flag-o-matic user
+
+DESCRIPTION="PKCS#11 provider cryptographic hardware"
+HOMEPAGE="http://sourceforge.net/projects/opencryptoki;
+SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.tgz"
+
+# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
+# token sources are under CPL-1.0 already.
+LICENSE="CPL-0.5"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="tpm? ( app-crypt/trousers )
+dev-libs/openssl:*"
+DEPEND="${RDEPEND}"
+
+IUSE="+tpm debug"
+
+S="${WORKDIR}/${PN}"
+
+# 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
+
+pkg_setup() {
+   enewgroup pkcs11
+}
+
+src_prepare() {
+   mv configure.in configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   # package uses ${localstatedir}/lib as the default path, so if we
+   # leave it to econf, it'll create /var/lib/lib.
+
+   # Since upstream by default seem to enable any possible token, even
+   # when they don't seem to be used, we limit ourselves to the
+   # software emulation token (swtok) and if the user enabled the tpm
+   # USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
+   # software-dependent even when they build fine without their
+   # requirements, but until somebody asks for those, I'd rather not
+   # enable them.
+
+   # We don't use --enable-debug because that tinkers with the CFLAGS
+   # and we don't want that. Instead we append -DDEBUG which enables
+   # debug information.
+   use debug && append-flags -DDEBUG
+
+   econf \
+   --localstatedir=/var \
+   --enable-fast-install \
+   --disable-dependency-tracking \
+   --disable-debug \
+   --enable-daemon \
+   --enable-library \
+   --disable-icatok \
+   --enable-swtok \
+   $(use_enable tpm tpmtok) \
+   --disable-ccatok
+}
+
+src_install() {
+   emake install DESTDIR="${ED}"
+
+   # Install libopencryptoki in the standard directory for libraries.
+