8 files changed, 114 insertions, 9 deletions
diff --git a/sys-auth/pam_pkcs11/Manifest b/sys-auth/pam_pkcs11/Manifest
index 33305cb70bfc..00b43a9286aa 100644
--- a/sys-auth/pam_pkcs11/Manifest
+++ b/sys-auth/pam_pkcs11/Manifest
@@ -1 +1 @@
-DIST pam_pkcs11-0.6.9.tar.gz 1358280 SHA256 b27e8ba40ffc5b847abf95d2e636ed58640f068398a233f27e211363c20eba91 SHA512 954c37b9aa93d007ca3c0c49790bf6840d3b902b5dacda485c9020f4362db4a5a41670ad95f672757f3a7e60fe430765023f1a57e9a79260c052c45854d5ba51 WHIRLPOOL fcca466565978701e128396f69de6ce1e9b8a3c0771865a71e22f0e23c1641c1ffe7d6e36435bbf93b11fb4e34ecab71e580685e1d481f7df0bfd5b5b52c37b6
+DIST pam_pkcs11-0.6.11.tar.gz 271552 BLAKE2B 6023b3a08da0b5a98ab7135818535f185cc7ff5505649ab39c80b93e23eb78f8e821b2de9718f18ef0d9142a3d5e9d4d35f0296cf55087ab6e9bca0e91952bc6 SHA512 74a4b61577b31a806c58e55f34f746b9cc8390b2ce5c8e1765fadeb26d12d60da85f237d4f89825801afad3f38a8ea98be8382de2e0c26667ff8c9cbefb5a0e7
diff --git a/sys-auth/pam_pkcs11/metadata.xml b/sys-auth/pam_pkcs11/metadata.xml
new file mode 100644
index 000000000000..313994f3a4b5
--- /dev/null
+++ b/sys-auth/pam_pkcs11/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">OpenSC/pam_pkcs11</remote-id>
+  </upstream>
+  <use>
+	<flag name="nss">Enable nss ssl backend</flag>
+	<flag name="pcsc-lite">Enable pcsc-lite</flag>
+  </use>
+	<origin>ports</origin>
+</pkgmetadata>
+
diff --git a/sys-auth/pam_pkcs11/pam_pkcs11-0.6.9.ebuild b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.11.ebuild
index cfd1dd2348e7..cfeeb3a2acd8 100644
--- a/sys-auth/pam_pkcs11/pam_pkcs11-0.6.9.ebuild
+++ b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.11.ebuild
@@ -1,18 +1,17 @@
+# Copyright 2020-2021 LiGurOs Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=6
 
 inherit ltprune pam
 
 DESCRIPTION="PKCS#11 PAM library"
 HOMEPAGE="https://github.com/opensc/pam_pkcs11/wiki"
-SRC_URI="mirror://funtoo/${P}.tar.gz"
-RESTRICT="mirror"
+SRC_URI="https://github.com/OpenSC/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="curl doc ldap nss +pcsc-lite"
-#S="${WORKDIR}/${PN}-${P}"
+IUSE="curl doc ldap nss pcsc-lite"
+S="${WORKDIR}/${PN}-${P}"
 
 RDEPEND="sys-libs/pam
 	curl? ( net-misc/curl )
@@ -22,7 +21,7 @@ RDEPEND="sys-libs/pam
 		curl? ( || ( net-misc/curl[-ssl] net-misc/curl[ssl,curl_ssl_nss] ) )
 	)
 	!nss? (
-		dev-libs/openssl:=
+		dev-libs/openssl
 		curl? ( || ( net-misc/curl[-ssl] net-misc/curl[ssl,-curl_ssl_nss] ) )
 	)
 	pcsc-lite? ( sys-apps/pcsc-lite )"
@@ -47,6 +46,7 @@ src_prepare() {
 }
 
 src_configure() {
+	./bootstrap
 	econf \
 		$(use_with curl) \
 		$(use_with doc docbook) \
diff --git a/sys-auth/solo-python/Manifest b/sys-auth/solo-python/Manifest
index 8bbc1177b9e0..838e3bfdccd9 100644
--- a/sys-auth/solo-python/Manifest
+++ b/sys-auth/solo-python/Manifest
@@ -1 +1,2 @@
 DIST solo-python-0.0.26.tar.gz 35251 BLAKE2B 76e515667220a8efdd16e159008eed8232721e0a8a1a1bffbc773cfa832b2f112d8dc229bf69dc4ccbee1d11b41d630a2d91e2383ebd19158d8c46ccf4f355de SHA512 f97da4a4ed3b0e0f4715407b179d8a8c1385076611fe8669cec6b514313d38dd14c6c22434b73e2c72f7456407a6c942b26b72cca7a56969cfbc630ee25aad85
+DIST solo-python-0.0.27.tar.gz 35657 BLAKE2B 747d8849ad4bdda7c0e4b079dce2d7162f07dad4784bb941242dd8ea759cccd763537cec2c7cd9ecf6f467c771729217648b72aa36292622f5fc3adb8a0c280c SHA512 50d564916e07a0c65a843bd2d0328a735ba71eadcfc893b13fac84a3e51822ed2bf80fc3f7662943a5635c6cd6b3ded8ba5b5a9ac2282c9f9bcdfe9de191e445
diff --git a/sys-auth/solo-python/solo-python-0.0.26.ebuild b/sys-auth/solo-python/solo-python-0.0.26.ebuild
index 04f131572301..546fb4a8b88f 100644
--- a/sys-auth/solo-python/solo-python-0.0.26.ebuild
+++ b/sys-auth/solo-python/solo-python-0.0.26.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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/solokeys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-python/click-7.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/sys-auth/solo-python/solo-python-0.0.27.ebuild b/sys-auth/solo-python/solo-python-0.0.27.ebuild
new file mode 100644
index 000000000000..396118144b21
--- /dev/null
+++ b/sys-auth/solo-python/solo-python-0.0.27.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+
+inherit distutils-r1
+
+DESCRIPTION="Python tool and library for SoloKeys"
+HOMEPAGE="https://github.com/solokeys/solo-python"
+SRC_URI="https://github.com/solokeys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/click-7.0.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	>=dev-python/fido2-0.8.1[${PYTHON_USEDEP}]
+	dev-python/intelhex[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	# For some reason the version file gets omitted by src_install (a bug in pyproject2setuppy?),
+	# and in any case there is no advantage to using one once a specific version has been released.
+	sed -i -e "s/^__version__ = open(.\+$/__version__ = '${PV}'/" solo/__init__.py || die "Failed to set the version number"
+	distutils-r1_src_prepare
+}
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 5f22756f38b7..fc99860636e1 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1 +1,2 @@
 DIST yubico-piv-tool-2.1.1.tar.gz 1302573 BLAKE2B da4419b7074930f7d264f21a12973511d350e687d0487b93d25a528f4a79d5df44dbbdde34ef7cd0d14507ba1a00f776fcd7eaf503f2253d8ee8da3e9a68010f SHA512 14d880088f7624f600c6badb6504c4c71ef29ff82e9c29bd837013e62273c6b198ca581705cc7fb9f3c0c13334767ea7b340fb033ce99fb60fb0478281affc9f
+DIST yubico-piv-tool-2.2.0.tar.gz 1309359 BLAKE2B a5be7a48549f864b9322b5bf53726007b593ce7d08cd06f2251aef98cb065d90586e0189e6f3da94d6d274d6998459afa4a55a0d4c1145395f55830f53d334e4 SHA512 b2f8cd73800e0e0778ce36148b962026479f5d3ada3e313acb5a780993c28c41b03e9aa9335ac5b79fed7a418a2d3d3697231adf2da0dd06cd8d22ea5a01aca5
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild
new file mode 100644
index 000000000000..986733af196b
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
+HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/pcsc-lite
+	dev-libs/openssl:0=[-bindist]"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+BDEPEND="dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1-no-Werror.patch
+	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
+	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
+)
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	# As of 2.2.0, man pages end up in /usr/usr/... without the MANDIR override
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIB=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DCMAKE_INSTALL_MANDIR="share/man"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \
+		|| die "Failed to generate p11-kit module configuration"
+	insinto /usr/share/p11-kit/modules
+	doins ${PN}.module
+}