16 files changed, 48 insertions, 396 deletions
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 811da035a4da..daaf0b26df59 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/google-authenticator/Manifest b/sys-auth/google-authenticator/Manifest
index df4356c8ad5e..d3d9f85b3c2a 100644
--- a/sys-auth/google-authenticator/Manifest
+++ b/sys-auth/google-authenticator/Manifest
@@ -1,6 +1,4 @@
-DIST google-authenticator-1.04.tar.gz 54019 BLAKE2B 06afb1be1ceabb68bb7ba94921af415fe1dfd68b3b1ed75b58b3c5a58901ec482ae11063f487db0a7032868e833644022335ad9844f54734c2ad78c514f255a8 SHA512 e4b8ad74301312e17edd0a7f25257086fd805c8d5215b06b71d96e9a64a71b2c87d0c5a532d9eca21d6d67e30c02c2c2c77dbd338a2f49af25c32dcd355ee98e
 DIST google-authenticator-1.05.tar.gz 57778 BLAKE2B c31d7929e2aacffc159ee5384f6f31498585819b848f4f8b026519cf2f2fc566b8533e007844c64d348f1cf423a7175b3221f879c5c1ead360c4f1b3acea57ed SHA512 d97b26c6181dbce0612628484db37b1bf61e984fb2fb3d4974d04038e564404aa17415368dba524f0d17d96ec8d57ae4129b27f0c672d849d16ef03941d87996
-EBUILD google-authenticator-1.04-r1.ebuild 1256 BLAKE2B 6719a49bc90468a752125b7a9c123d4691210602635925e12756b28fccdef35d0633dc7479230613b0c1e1300079d9e7b7a41e615fdbc6dcb7a30954c843fe6e SHA512 4d05c0f31011bf8899554bf6de92d2d621c3528d73072d8904387c2ab3662506a5d39b5ae812bdd5b30103e512707d382ff58044d0b72d0776eaa74f74cf9e88
 EBUILD google-authenticator-1.05.ebuild 1262 BLAKE2B 3b27489b8d18d5805611098bbfaf343db4c80a392617b3b902b9a63141fe731e3802378d4817fe8b7aedb522a5b3ada5617cc825d71f169063b77f7942255586 SHA512 c76193bd06000d3eb5b207eec16942eebc5bb096ce5be5fdd72dd5b78fef9e2b07beafd390d94a95933acd504ab49cb177625291ad3ffecaf3702eb3f7a5eb4f
 EBUILD google-authenticator-9999.ebuild 1256 BLAKE2B 6719a49bc90468a752125b7a9c123d4691210602635925e12756b28fccdef35d0633dc7479230613b0c1e1300079d9e7b7a41e615fdbc6dcb7a30954c843fe6e SHA512 4d05c0f31011bf8899554bf6de92d2d621c3528d73072d8904387c2ab3662506a5d39b5ae812bdd5b30103e512707d382ff58044d0b72d0776eaa74f74cf9e88
 MISC metadata.xml 262 BLAKE2B 9190d29ce12a5f82e0fc23c1cfb1bbd8642fe74392e1cbfcbac723b93255048ab06bcafc1b94ff52afe63be6dc1856f27b21022aab5357ae1f5b0204fd5df169 SHA512 fe36d12281e055298607afc0209c8bc1d3a3b9d61464b6f0d69b98b2d38b9c25bf6c979392be9427fd1ad4621b49b8e6c4b41a53ef28d4696150d1ee4525d8c3
diff --git a/sys-auth/google-authenticator/google-authenticator-1.04-r1.ebuild b/sys-auth/google-authenticator/google-authenticator-1.04-r1.ebuild
deleted file mode 100644
index 2d682decb665..000000000000
--- a/sys-auth/google-authenticator/google-authenticator-1.04-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/google/google-authenticator-libpam.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/google/google-authenticator-libpam/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	S="${WORKDIR}/google-authenticator-libpam-${PV}"
-fi
-
-DESCRIPTION="PAM Module for two step verification via mobile platform"
-HOMEPAGE="https://github.com/google/google-authenticator-libpam"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/pam"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# We might want to use getpam_mod_dir from pam eclass,
-	# but the build already appends "/security" for us.
-	econf --libdir="/$(get_libdir)"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "For further information see"
-		elog "https://wiki.gentoo.org/wiki/Google_Authenticator"
-		elog ""
-		elog "If you want support for QR-Codes, install media-gfx/qrencode."
-	fi
-}
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 11d2161af122..ef8c4cd49fac 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,4 +1,6 @@
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
 DIST libfprint-0.99.0.tar.gz 473925 BLAKE2B 799e3600393e4b25f7b0685ff0456ca391e5fcaef36e5b4475371cd07c848e40820dbbdc5a241fe11c6ee08b818380967129f85e177b5d8714b9dbc4d7b68ea1 SHA512 eca1d45baa23b7db1fcc5d7a9a396fe504aadc6ec2e68da32b5415fb0fff1227566d579271e0b34895ce7f3baa55314a0ccd20bb8c4adba253063b7b61284748
+DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
 EBUILD libfprint-0.99.0.ebuild 1062 BLAKE2B ed6620cb8f8f1da04c4ea8cc68d5f08a491ad7199816bda0514451dd43fdbca9e6176b155ae178a6b994874da2fd2a836b9d343293ae1a9728266bdb825268a7 SHA512 422ca65e9ecbc14b8ac37ef608a19d806f0435778eeb8b61234a59add034c07d1c02d5b1b2aefe4c64979a533181550ab2ff425e6d73ab580ae74738b61271cc
+EBUILD libfprint-1.0.ebuild 1070 BLAKE2B e0e493c3286514549b4649c595d4bc90b133891973e5826c572381d19e1bdcc20c70253e585ccbe0cebf6f3a9ce8d54d3d0a81468d04dabbed0872bd1b025d04 SHA512 8d0a321813e7330e385d7fc2f7f7c361cd6c04a4347877c0a78b289d9ecdcd7a885cd33847a56d626369f8f23476448c68c7d392606254bbc777427e0c74d091
 MISC metadata.xml 347 BLAKE2B dd0d99ac1a5a8cc925618bc556216a23f14fab90dd2e1d66747e4af3fd64d410812aac366a0e11cc169af7345c8bbf304577da5a1faf75f557bb4ba18033fb0f SHA512 f3303670a2e7d4b30732d335b313edda6c97952f2f6290ff6b1d67a8a237e147ba7c7c4edcb58994679ff9cbf606fb82b79bec1ba840a22b46ee21cfd26aefc9
diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild
new file mode 100644
index 000000000000..b3d49b6892ca
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson udev
+
+DESCRIPTION="library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint"
+SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="dev-libs/glib:2
+	 dev-libs/nss
+	 virtual/libusb:1=
+	 x11-libs/gtk+:3
+	 x11-libs/pixman
+	 x11-libs/libX11
+	 x11-libs/libXv"
+
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+
+S="${WORKDIR}/${PN}-V_$(ver_rs 0-3 '_')"
+
+src_configure() {
+		local emesonargs=(
+			-Ddoc=false
+			-Dx11-examples=$(usex examples true false)
+			-Ddrivers=all
+			-Dudev_rules=true
+			-Dudev_rules_dir=$(get_udevdir)/rules.d
+			--libdir=/usr/$(get_libdir)
+		)
+		meson_src_configure
+}
diff --git a/sys-auth/pam-afs-session/Manifest b/sys-auth/pam-afs-session/Manifest
index a26f8512d4cc..66371168d35f 100644
--- a/sys-auth/pam-afs-session/Manifest
+++ b/sys-auth/pam-afs-session/Manifest
@@ -1,7 +1,3 @@
-DIST pam-afs-session-1.3.tar.gz 98643 BLAKE2B 0366a7b223e2d58f19a32286e7464b917976d5da2c377ebbf55f5e1de5c476bca68a93de87e1e627db47bc0ad3d8eda6e36c50b1bfae21262f5567d90981725c SHA512 a9019551a9ac35db4a5b7a430b01aac63561828ddef2c63fa751696aa57aa52d2769f8008b214222b9f2933be69134d7bb6750460bfa23c3b7df098886a575ea
-DIST pam-afs-session-1.5.tar.gz 101464 BLAKE2B 7713feb40997bfbd05499a761845eb17986802a949e64fde55bcffa60f8364da3c860dd03fa647ccaa4a2b628da5e3f52948987b54aece756319670ef563a6f0 SHA512 a0f449a1dd3365158fbaee1ac9719dcf0358c01234e0aad29b3738020a0fc0a3ec7328afbbd5d661db47e357c5a57f36200c03bfe7684c159b3099384313059e
 DIST pam-afs-session-1.6.tar.gz 115666 BLAKE2B f57e24fdccc803e5074b814a74309e3278678a6c45ce5a99b8c317eaafbc7ab9d25bae58b76774d51b08ed51db4d0f2c7743ca4ce08497ddb2207253f8071264 SHA512 ac7bc1af43de5d08e6893b7411a0004e20a871f572a86c0322b883a45eb566717b8db77c3ad4825daeb89ab04039c6412cde6342056d544cb2189093ea95381f
-EBUILD pam-afs-session-1.3.ebuild 624 BLAKE2B da58330bec02d0807871b702a4487847b40a2ed424a61548b0cd6bc80c61c42073bd584af6d20857f40b9755b99759c18aa3f572e41c4bc8cd4a9d86a6dfdb34 SHA512 ee2fdf93bc11f56e16570d17ddc60625eaff83a3348f9218ce3377fa8e08e25fa5095ca73ba8a7cd3969fc8bdd27384d9efe3f475c613556fca7fa99a9286f36
-EBUILD pam-afs-session-1.5.ebuild 624 BLAKE2B da58330bec02d0807871b702a4487847b40a2ed424a61548b0cd6bc80c61c42073bd584af6d20857f40b9755b99759c18aa3f572e41c4bc8cd4a9d86a6dfdb34 SHA512 ee2fdf93bc11f56e16570d17ddc60625eaff83a3348f9218ce3377fa8e08e25fa5095ca73ba8a7cd3969fc8bdd27384d9efe3f475c613556fca7fa99a9286f36
 EBUILD pam-afs-session-1.6.ebuild 624 BLAKE2B da58330bec02d0807871b702a4487847b40a2ed424a61548b0cd6bc80c61c42073bd584af6d20857f40b9755b99759c18aa3f572e41c4bc8cd4a9d86a6dfdb34 SHA512 ee2fdf93bc11f56e16570d17ddc60625eaff83a3348f9218ce3377fa8e08e25fa5095ca73ba8a7cd3969fc8bdd27384d9efe3f475c613556fca7fa99a9286f36
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-auth/pam-afs-session/pam-afs-session-1.3.ebuild b/sys-auth/pam-afs-session/pam-afs-session-1.3.ebuild
deleted file mode 100644
index 2d895f991d10..000000000000
--- a/sys-auth/pam-afs-session/pam-afs-session-1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam
-
-DESCRIPTION="OpenAFS PAM Module"
-HOMEPAGE="https://www.eyrie.org/~eagle/software/pam-afs-session/"
-SRC_URI="https://archives.eyrie.org/software/ARCHIVE/${PN}/${P}.tar.gz"
-
-LICENSE="HPND openafs-krb5-a"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/krb5 virtual/pam"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf --with-kerberos || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dopammod pam_afs_session.so
-	doman pam_afs_session.5
-	dodoc CHANGES NEWS README TODO
-}
diff --git a/sys-auth/pam-afs-session/pam-afs-session-1.5.ebuild b/sys-auth/pam-afs-session/pam-afs-session-1.5.ebuild
deleted file mode 100644
index 2d895f991d10..000000000000
--- a/sys-auth/pam-afs-session/pam-afs-session-1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam
-
-DESCRIPTION="OpenAFS PAM Module"
-HOMEPAGE="https://www.eyrie.org/~eagle/software/pam-afs-session/"
-SRC_URI="https://archives.eyrie.org/software/ARCHIVE/${PN}/${P}.tar.gz"
-
-LICENSE="HPND openafs-krb5-a"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/krb5 virtual/pam"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf --with-kerberos || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dopammod pam_afs_session.so
-	doman pam_afs_session.5
-	dodoc CHANGES NEWS README TODO
-}
diff --git a/sys-auth/sakcl/Manifest b/sys-auth/sakcl/Manifest
index cf51dda9cb1a..40248c33362b 100644
--- a/sys-auth/sakcl/Manifest
+++ b/sys-auth/sakcl/Manifest
@@ -103,4 +103,4 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD sakcl-0.1.0.ebuild 2249 BLAKE2B f46fb927d596525daeb6c7b0b12a8844a576cf900ef45ef3e5c77afedab04ea79b41cda79af0a81f2691fe49f96e09b9ede4c7d378a4f385e7f75f0683801e60 SHA512 50f4847b09e33ff7ebcc6aef35bd9cfef473f920257177d944e74fc7aa10d403e215f35cebed85d2541d3a963edee57409a7663927d06dd2e9196456981b020b
-MISC metadata.xml 324 BLAKE2B 5d7fd03823e79ac64adb2876944d9d866eaeb26476cd32679b1bb786db219c83dde67975ef6520a3bf826c700119798a51cb9a6db5484d44cc2bfe116d6b7263 SHA512 b2a5ed95983a9fd4b630e92ae1b3579d2b31edcbf08c5564c9fd7303908c4eff2b02bb5e338202c84b78692a6c628bf92aaef592ae9d2116e05217cada9804bb
+MISC metadata.xml 244 BLAKE2B 7177daf39270783a69096a90fb14820fa3af27a866de3dfea5fbcef92f605529920277148ddea77a384d9732c06103a474d85de4739b32015ebbbec0acd01710 SHA512 d168bf106a3677d8ba817c0170783804105641c8a60e846e121a08d36193ac3a735b0d707524b9d975a11cee6e4516733e9da7edac1af9c9acf3c82f57cc65ce
diff --git a/sys-auth/sakcl/metadata.xml b/sys-auth/sakcl/metadata.xml
index 52445b8dfdd0..478166bcbd9a 100644
--- a/sys-auth/sakcl/metadata.xml
+++ b/sys-auth/sakcl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="gitlab">cardoe/sakcl</remote-id>
 	</upstream>
diff --git a/sys-auth/ykclient/Manifest b/sys-auth/ykclient/Manifest
index 3020d6ebd0d6..08d82b83ddf1 100644
--- a/sys-auth/ykclient/Manifest
+++ b/sys-auth/ykclient/Manifest
@@ -1,5 +1,3 @@
-DIST ykclient-2.14.tar.gz 386915 BLAKE2B fc102be66224551ec25ddd6e4008146fd569692bc6fcc331b5a35c95fa24d4ff3100cbfff78f5700ace0f12859c758d5eb12d2d56384f7548b92ac1a7a1d1b4a SHA512 743249f52eed1b07a5e582b644b4819e1defcd18a4c2d812b7738cb161e3152e2a49fba54fbf0fe3dfcda9f8477536660b9d2b0bb5c2eb84b106d435c91efe8d
 DIST ykclient-2.15.tar.gz 388738 BLAKE2B 10f56d97c337de5ae8fe15fb526f89208e8e69563cd7b2f1494e5a972da0a218c1c89e608ed490b7f17efc619bfeacfb51d1615b6eff36d4bfa5351cf80e4061 SHA512 a6e00309330225c681702616aa9f5d7e042f33a22ebe7719c2d71276f1a660ed0dc180d7f50c24b1c65d7bba6e2f2285d03037d504e926ac75506c24e6826279
-EBUILD ykclient-2.14.ebuild 519 BLAKE2B 755100be4c7b0f0ef757519b08fdfe749e1da3c59aa8fdd39057c93c7db04db30f0d4bbb7a655170a4d371aabd9fd696c28ea69a7f860cc764a5742550a90456 SHA512 94226ed6f721788db1c7c7eaf28912c95666697d4b8350e47c005a64d4175a245d331776d20606c5d5416fc71b9dfe0c04640ad2ff16afadf54aec64cfc1c8ce
 EBUILD ykclient-2.15.ebuild 494 BLAKE2B a7104c7f71c473d0a3f0ac03b8011d44f478decad2fefcb11e56d378e1d42231fa56baad5ca8a134be8ee8f258730296c3e53fa2a1b4bf24472854f25fe76471 SHA512 5f5a3fe705a77caf1f42f3960eedd93baf8786ffb130b969cb77d5eb93712af0245d3d9b4c8864e62e0128142494be56904d429fe4f3f32362bdc2f6229ff4af
 MISC metadata.xml 321 BLAKE2B 189e81fb02e188f57bb417a5036fe6812e90debb69aa73140f9f1375450b1cc37c6f947c313e3bd93298b9bce2805075e0ff0d7ef610aec7a35aa4b2f9465c95 SHA512 a19889c9f91a995a6c1f4c753481271de980fb1d3b7653ea4160f1b4eb3443d2260e3ddd223b05b508b6dfa607f86a4d0412b666a6915fffcd2bd07e954a2870
diff --git a/sys-auth/ykclient/ykclient-2.14.ebuild b/sys-auth/ykclient/ykclient-2.14.ebuild
deleted file mode 100644
index fb692e4fa79d..000000000000
--- a/sys-auth/ykclient/ykclient-2.14.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Yubico C client library"
-SRC_URI="http://opensource.yubico.com/yubico-c-client/releases/${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/yubico-c-client"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE="static-libs"
-
-RDEPEND=">=net-misc/curl-7.21.1"
-DEPEND="${RDEPEND}"
-
-# Tests require an active network connection, we don't want to run them
-RESTRICT="test"
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index c91aba3a2a11..d15231aac03e 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,8 +1,3 @@
-AUX yubico-piv-tool-1.5.0-openssl110.patch 5114 BLAKE2B f21851a171dc94a7862b47d094d25e1c39aa874c62c8753b5b6d6f01dbcecfe2db7b94322a9e8326fe66f6c800199e407a964a4cdf3a2dca7e5fb88fa83e4290 SHA512 d7561f1d9e0cc2f1ffae2ae46ad140ac63ee77daac0e0fc8c4e975678e3abe33c9ac2181ce7c1e237ebbd54511ecd65271f463fec55672e6e904c2edafd97b0e
-DIST yubico-piv-tool-1.4.4.tar.gz 109397 BLAKE2B ed1299508cd5f90c662a184527ae696e7cd463b0e8d327413c8acff47d41de7393570798b9582e845262afb1780e0c759246980051a62335d7033de913147bb9 SHA512 3edc341fdbeeacfbf541adc37d0bd2b1df9777ca04e13bc1825e99a151008213b816ff811e83e623f52eb1400a8146c36a5a874fc5e26a89c9398e79a0e234e1
-DIST yubico-piv-tool-1.5.0.tar.gz 179092 BLAKE2B d15eed89699989ff545f18cf54fd42349fc81862e7bb3e182fad59d0604cc9729dedcc4aaa40d3f28c1d40b78ddbb5ed073c107cb233d0fa66a17a2ef1e29d68 SHA512 10d7f7a2f163e5f61d6f7463f2124d06213506bff39f3fe0c5b361f90f8bc372de97ab1fa8d6bfcb77659f086d71f8ff536a064ee8f300a620b929ee76e8f8b9
 DIST yubico-piv-tool-1.6.2.tar.gz 182957 BLAKE2B 0ca9bdcda68f7ee100078604854caccc5141ab01e40f894ae36c3175afa3989c1d0074ef0994e1e369d67499a9778e22f0c5a3cf930d1ba162b0ee0ddbc05f91 SHA512 fc72b9d381f10b63c8958b6c90c1ee97e3ef6b5fb283a9513e6f2ace972710c2872903f38350d9e4a3576b16cb0890b067dd55f5c125f443d353df3f628a9f96
-EBUILD yubico-piv-tool-1.4.4.ebuild 647 BLAKE2B 527ff9328cdc01228974aaa7b4f846ec22aea8dc1b7b63078784a6100293db1b4c0992558fb26fd9b33f5b7f72404e06a675141b11fd785919d5a981362af184 SHA512 96360ad999f9f1af146b2ea6f2795791221f8b0803b4f6de2accd20d03e2bf5b1b8091cf00cdb05aea52995664bdafabe3a3bbf695f909de85d44ec9d8e3a0ac
-EBUILD yubico-piv-tool-1.5.0.ebuild 1012 BLAKE2B 9f43dc92c0d0cdac06620494838a5f555d9bf7236289f48ed12a71a4579206202e0df3c471a88a2ac4fe1f680072b80ba13efb582f50826278174e36f679a672 SHA512 16de41a9380636e55add90752abc9cace3364607cfc6f4dac90fa3d11e5b59c7d28e8bdf14d702ec4216f324695ce96bb6a9eb0829dd1d8d45b48385e45727d2
 EBUILD yubico-piv-tool-1.6.2.ebuild 960 BLAKE2B 73eafe198e477a1d1cc0e5e49546c9fc4ee90f50359259e6715e63756ac21c2cbcca5aca0553f4109e0115cc43ff1080a5368cef7b4ac412676dad88e55e8c35 SHA512 007572085768d401170351ee740ff5fcbdfb18648ab889ed4ac3d5cbcfeeecb0cfe77451e6ac4a8da931e127375f17390abe95b465b954d3576d69ae526eb027
 MISC metadata.xml 254 BLAKE2B 469b2f4552e9db14cd35556a77359913ea2470137cd26ae2ecc0dd253c155a1e3bd04d19d16a8588c7e72b85057da2f3d62c5ca093992f121d9a32835f1b5ed4 SHA512 b30ec6f0a6c90d7e5d21552c23b34d6326e29fed03c766edf9da7a2a0848edbf694c0fca4fbb81cf291e607cd5de342b9e2f59a3ea5cf27e5b50d6dc2384e8b1
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch
deleted file mode 100644
index 86b8bf9bedc9..000000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From c8372f27d791aa445e879ded4efe4a267e3ff48e Mon Sep 17 00:00:00 2001
-From: quentin <quentin@minster.io>
-Date: Mon, 26 Feb 2018 02:43:41 +0100
-Subject: [PATCH] Improve compatibility with OpenSSL 1.1.0
-
-* add missing headers
-* stop using deprecated APIs
----
- tool/util.c            |  1 +
- tool/yubico-piv-tool.c | 24 +++++++++++++++++++++++-
- ykcs11/openssl_types.h |  1 +
- ykcs11/openssl_utils.c | 11 +++++++++++
- 4 files changed, 36 insertions(+), 1 deletion(-)
-
-diff --git a/tool/util.c b/tool/util.c
-index de6b071..5b299ca 100644
---- a/tool/util.c
-+++ b/tool/util.c
-@@ -38,6 +38,7 @@
- #endif
- 
- #include "openssl-compat.h"
-+#include <openssl/bn.h>
- #include <openssl/evp.h>
- #include <openssl/x509.h>
- #include <openssl/rsa.h>
-diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c
-index c40b027..f8b72b1 100644
---- a/tool/yubico-piv-tool.c
-+++ b/tool/yubico-piv-tool.c
-@@ -43,10 +43,12 @@
- #endif
- 
- #include "openssl-compat.h"
-+#include <openssl/bn.h>
- #include <openssl/des.h>
- #include <openssl/pem.h>
- #include <openssl/pkcs12.h>
- #include <openssl/rand.h>
-+#include <openssl/rsa.h>
- 
- #include "cmdline.h"
- #include "util.h"
-@@ -868,11 +870,19 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo
-     fprintf(stderr, "Failed to set certificate serial.\n");
-     goto selfsign_out;
-   }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   if(!X509_gmtime_adj(X509_get_notBefore(x509), 0)) {
-+#else
-+  if(!X509_gmtime_adj(X509_getm_notBefore(x509), 0)) {
-+#endif
-     fprintf(stderr, "Failed to set certificate notBefore.\n");
-     goto selfsign_out;
-   }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   if(!X509_gmtime_adj(X509_get_notAfter(x509), 60L * 60L * 24L * validDays)) {
-+#else
-+  if(!X509_gmtime_adj(X509_getm_notAfter(x509), 60L * 60L * 24L * validDays)) {
-+#endif
-     fprintf(stderr, "Failed to set certificate notAfter.\n");
-     goto selfsign_out;
-   }
-@@ -1241,7 +1251,7 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M
- 
-   if(*ptr++ == 0x70) {
-     unsigned int md_len = sizeof(data);
--    ASN1_TIME *not_before, *not_after;
-+    const ASN1_TIME *not_before, *not_after;
- 
-     ptr += get_length(ptr, &cert_len);
-     x509 = X509_new();
-@@ -1299,13 +1309,21 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M
-     dump_data(data, md_len, output, false, format_arg_hex);
- 
-     bio = BIO_new_fp(output, BIO_NOCLOSE | BIO_FP_TEXT);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     not_before = X509_get_notBefore(x509);
-+#else
-+    not_before = X509_get0_notBefore(x509);
-+#endif
-     if(not_before) {
-       fprintf(output, "\tNot Before:\t");
-       ASN1_TIME_print(bio, not_before);
-       fprintf(output, "\n");
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     not_after = X509_get_notAfter(x509);
-+#else
-+    not_after = X509_get0_notAfter(x509);
-+#endif
-     if(not_after) {
-       fprintf(output, "\tNot After:\t");
-       ASN1_TIME_print(bio, not_after);
-@@ -1950,7 +1968,9 @@ int main(int argc, char *argv[]) {
- 
- 
-   /* openssl setup.. */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   OpenSSL_add_all_algorithms();
-+#endif
- 
- 
-   for(i = 0; i < args_info.action_given; i++) {
-@@ -2191,6 +2211,8 @@ int main(int argc, char *argv[]) {
-   }
- 
-   ykpiv_done(state);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   EVP_cleanup();
-+#endif
-   return ret;
- }
-diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h
-index 307f746..08170fc 100644
---- a/ykcs11/openssl_types.h
-+++ b/ykcs11/openssl_types.h
-@@ -31,6 +31,7 @@
- #ifndef OPENSSL_TYPES_H
- #define OPENSSL_TYPES_H
- 
-+#include <openssl/bn.h>
- #include <openssl/x509.h>
- #include <openssl/evp.h>
- #include <openssl/rsa.h>
-diff --git a/ykcs11/openssl_utils.c b/ykcs11/openssl_utils.c
-index 5a7f85d..edfe0ea 100644
---- a/ykcs11/openssl_utils.c
-+++ b/ykcs11/openssl_utils.c
-@@ -35,6 +35,11 @@
- #include "debug.h"
- #include <string.h>
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# define X509_set_notBefore X509_set1_notBefore
-+# define X509_set_notAfter X509_set1_notAfter
-+#endif
-+
- CK_RV do_store_cert(CK_BYTE_PTR data, CK_ULONG len, X509 **cert) {
- 
-   const unsigned char *p = data; // Mandatory temp variable required by OpenSSL
-@@ -580,7 +585,9 @@ CK_RV do_pkcs_pss(ykcs11_rsa_key_t *key, CK_BYTE_PTR in, CK_ULONG in_len,
-           int nid, CK_BYTE_PTR out, CK_ULONG_PTR out_len) {
-   unsigned char em[RSA_size(key)];
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   OpenSSL_add_all_digests();
-+#endif
- 
-   DBG("Apply PSS padding to %lu bytes and get %d", in_len, RSA_size(key));
- 
-@@ -590,14 +597,18 @@ CK_RV do_pkcs_pss(ykcs11_rsa_key_t *key, CK_BYTE_PTR in, CK_ULONG in_len,
- 
-   // In case of raw PSS (no hash) this function will fail because OpenSSL requires an MD
-   if (RSA_padding_add_PKCS1_PSS(key, em, out, EVP_get_digestbynid(nid), -2) == 0) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     EVP_cleanup();
-+#endif
-     return CKR_FUNCTION_FAILED;
-   }
- 
-   memcpy(out, em, sizeof(em));
-   *out_len = (CK_ULONG) sizeof(em);
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   EVP_cleanup();
-+#endif
- 
-   return CKR_OK;
- }
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild
deleted file mode 100644
index 689eca071a9b..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Command line tool for the YubiKey PIV application"
-SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0=[-bindist]
-	sys-apps/pcsc-lite"
-DEPEND="dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild
deleted file mode 100644
index 7a72c9087c3f..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Command line tool for the YubiKey PIV application"
-SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/openssl:0=[-bindist]
-	sys-apps/pcsc-lite
-"
-DEPEND="${RDEPEND}
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-PATCHES=( "${FILESDIR}/${P}-openssl110.patch" )
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "/PKG_CHECK_MODULES(\[CHECK/d" configure.ac || die
-		sed -i -e "s/@CHECK_CFLAGS@//" -e "s/@CHECK_LIBS@//" */*/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	rm "${D}"/usr/$(get_libdir)/*.la || die
-}