gentoo resync : 28.04.2021

3 files changed, 0 insertions, 84 deletions

diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 7d44b1f8d4c0..3b6c97fa17ec 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,9 +1,6 @@
-AUX yubico-piv-tool-2.1.1-install-man-page.patch 1288 BLAKE2B 00f00f10310f0aaa5a53596bc71bc332cbdbcf2060d03c1aa6eede7872dd3b2f129c7fe37a844a4a7fa50eef468e9fd99f34c9e219a71dbae37eef9dbacc1884 SHA512 df4a2a902014fd5da7d8870dce6bcf46c41b2bfd910ca9bec9429b685d6c02335efe923cd7ab4199dd8bc8f70bec5b14d7c9adb021f926e6ac549c28739d739e
 AUX yubico-piv-tool-2.1.1-no-Werror.patch 453 BLAKE2B 80e024475d4c5c648154a0cb7950b2bf02bfe0048d9213e04aa60e9898a17cc4332bb8aa2fec273d341a99939cf209ef8fa70868d6beba836d2080e779681cdc SHA512 14c535a05cb597698bf230fafed11dcf4f2165f3daddb647f31848ad0505ee7a266bd2f6120fd2a57d4301fdf974c8af690a9e0eed51806517175082013701f4
 AUX yubico-piv-tool-2.1.1-tests-optional.patch 881 BLAKE2B 02821ac155a75a213567958d33e5f9b25838c1b1ea9dc65efda223ee397643d2d6479b5e5bd5867dfaf057d64bdebf1f1379d2187e4f9fbca1fb4fa97133d0fa SHA512 f694e2d9e882cdb04728a3fc1f857c9c5c388ed439d6efbb385fa96414c8241ce918f7a2bbbe0ac2c94fbf3b2981fc68de4c7a999822a14068c8f43bd21de43d
 AUX yubico-piv-tool-2.1.1-ykcs11-threads.patch 1168 BLAKE2B ec91a73c7ad6c9ddd2e6250536b89f01d1778a79bc8df823e896323053dac8fe23c6b23a84b526da61146204df3cbc7889cae3ffc9a0414626e6ddb3b0806051 SHA512 d48787ff5de1ed5ff80fbf2f65308ea0c174500e32b55033508284aa05b0674f013479aaed5697a8f1207f821e7fdbf99cc206830725c023aa3a349fa0792172
-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
-EBUILD yubico-piv-tool-2.1.1-r2.ebuild 1299 BLAKE2B 7de823f32fadb2fbd5a2e4d54045aad3e6cc57f5080859dad40b5097a137aeeae803ddd5066a7c74ff1537cb3a215f68c9559a63ef7488937d4436e8ac6b6017 SHA512 23e1c093dad527fc434678cb6cacfeb4bd1f0c94efd24e8e1a1ed45c19c1ed5d12a3d8847473f1109136377acef25898375a7df5615e4b6181c28c490892aec3
 EBUILD yubico-piv-tool-2.2.0.ebuild 1276 BLAKE2B 2933f90f0cc0e923a2b84e6cb2a778172baa8d274156cf983d8ae2800b56e10231d95b37e89f26b78afeeead38a6d711ecab1d873f1d23cd786d30a5d5a27a63 SHA512 d93172defe4acbd2119596bee1eaff1dff2adfe9a560c4415766299725c2971770cded9d9afd93c4f661e700def83b14c5d6a45035abedd5b42914567580b040
 MISC metadata.xml 332 BLAKE2B cab42a159a3cd0da5f66dbbd7e542f4fbae2deb966a20e7392baa575ce00b65b40db1846abb69baced17c6feb6f9e3d565620ed5476735cfaa121b0a2b81dc22 SHA512 892f4b9d170c5bd2679a1777215d7b88249bd4347c918499b762aa9ad0132b7b15d847180e4d27527d5cead6a4f8e23a7a4d3dc89752bda3852a99782129c257
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch
deleted file mode 100644
index 1d782767b3aa..000000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e635608785ed374bfe5f1158ca4a4695f3ea2f08 Mon Sep 17 00:00:00 2001
-From: Dan Church <amphetamachine@gmail.com>
-Date: Fri, 5 Jun 2020 11:09:30 -0500
-Subject: [PATCH] Fix omission of man page
-
-It was omitting the man page upon first install, so in order to get the
-man page added to the installed set of files, one would have to run
-cmake, then run make, then run cmake again, then run make.
-
-Also clarify when the extra `install` step would be added.
----
- tool/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
-index c12a474..03efefe 100644
---- a/tool/CMakeLists.txt
-+++ b/tool/CMakeLists.txt
-@@ -66,8 +66,10 @@ if (GENERATE_MAN_PAGES)
-     add_help2man_manpage (yubico-piv-tool.1 yubico-piv-tool)
- 
-     add_custom_target (yubico-piv-tool-man ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1)
-+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1" DESTINATION "${YKPIV_INSTALL_MAN_DIR}/man1")
- endif(GENERATE_MAN_PAGES)
- 
-+# If somehow a manpage was generated before configure started, install that too
- find_file(MAN_PAGE yubico-piv-tool.1 PATHS ${CMAKE_CURRENT_SOURCE_DIR})
- if(MAN_PAGE)
-     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1" DESTINATION "${YKPIV_INSTALL_MAN_DIR}/man1")
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild
deleted file mode 100644
index 38068c17a3e7..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 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"
-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="libressl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/pcsc-lite
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( 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-install-man-page.patch
-	"${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() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIB=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	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
-}