gentoo resync : 16.09.2020

7 files changed, 154 insertions, 23 deletions

diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 395508b1194f..f1e91679807a 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,6 +1,8 @@
 AUX yubico-piv-tool-2.1.1-install-man-page.patch 1288 BLAKE2B 00f00f10310f0aaa5a53596bc71bc332cbdbcf2060d03c1aa6eede7872dd3b2f129c7fe37a844a4a7fa50eef468e9fd99f34c9e219a71dbae37eef9dbacc1884 SHA512 df4a2a902014fd5da7d8870dce6bcf46c41b2bfd910ca9bec9429b685d6c02335efe923cd7ab4199dd8bc8f70bec5b14d7c9adb021f926e6ac549c28739d739e
-DIST yubico-piv-tool-1.6.2.tar.gz 182957 BLAKE2B 0ca9bdcda68f7ee100078604854caccc5141ab01e40f894ae36c3175afa3989c1d0074ef0994e1e369d67499a9778e22f0c5a3cf930d1ba162b0ee0ddbc05f91 SHA512 fc72b9d381f10b63c8958b6c90c1ee97e3ef6b5fb283a9513e6f2ace972710c2872903f38350d9e4a3576b16cb0890b067dd55f5c125f443d353df3f628a9f96
+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
-EBUILD yubico-piv-tool-1.6.2.ebuild 987 BLAKE2B f955799cc5d3bd303c3e6ae5adcdc7eaa1536a99b2cb63854ae44788da0da0f581dc85909e8977fc45df337b859cde5a5a55ca849d069876f133bcf5857bda01 SHA512 20a64c7174d48ced1f65e5491797f3f6aaee1458028f19691ba499bee43b9f4638c865b25bdb1fb71666ef2ee43b576e95d95768f3cfacf5055145bc62c7c4eb
-EBUILD yubico-piv-tool-2.1.1.ebuild 806 BLAKE2B 834ad120ee1d0a43992bc17c53d2374aa683cd4ba7310005d50b653dd36c7cda05db8d766c64453690976cdf7fd7ac18dd31638dda61fde3f206fafb210cc6e4 SHA512 28ffa7b82df0c830fb777445861f8b7d1b3578c7eef04b32624a820e9ac00c39b800202b613018c0ab8caf8de4ca41722b954d6565efd6793de4b9e6f92da30b
-MISC metadata.xml 254 BLAKE2B 469b2f4552e9db14cd35556a77359913ea2470137cd26ae2ecc0dd253c155a1e3bd04d19d16a8588c7e72b85057da2f3d62c5ca093992f121d9a32835f1b5ed4 SHA512 b30ec6f0a6c90d7e5d21552c23b34d6326e29fed03c766edf9da7a2a0848edbf694c0fca4fbb81cf291e607cd5de342b9e2f59a3ea5cf27e5b50d6dc2384e8b1
+EBUILD yubico-piv-tool-2.1.1-r1.ebuild 1172 BLAKE2B 4bcc8d5c4b8f44f333566b3ce5621edaded3dc75dd84f23b8a582aad053af04587de62bcbdbb1a93c06f8e1f0c7073e366c1d4b6f10d87f09d0df61ad4bdcceb SHA512 6949de3e602cf6ac2b1af1a0cb89b30e583eb491cdc3646bb6ac0f4d48acf3f26fd109aca5a3a2a63b508505c757e0718239157f015ab01597051d3bfaadc944
+EBUILD yubico-piv-tool-2.1.1-r2.ebuild 1238 BLAKE2B c3857b1f545fdee689f150d68c4c7fdae0713dc4ff54a951e6252ba13394e387b435c8bdb5b4996f53d6a1b960eae0e74a3d795b0d8099d9ca5cba428eb610d8 SHA512 2b288cf8982c334dac610fade490ad0e236a89c4e702b56f0ddecead50c2d5ea5979cfd99c5b66b8a1082c78582c041d96613d64efab71ef2640e291d74b9f33
+EBUILD yubico-piv-tool-2.1.1.ebuild 895 BLAKE2B e522a33a6c819787dc3d3c846991e54ca8aecfb10e8b6f654421964913887e4c2118dbd5d1934bbe554381b0f834512906f7c70826a6a2fd8c83bfe8ade67740 SHA512 fb1a0ddb6769f9fb83187a00aa8b14ee0fed7dc556932d91a9ddcd2eb2a4a75310ea886a68b549cd1fd5d93452f9d1926c4a0f33e55d019a282cbfb13e05b6ea
+MISC metadata.xml 332 BLAKE2B cab42a159a3cd0da5f66dbbd7e542f4fbae2deb966a20e7392baa575ce00b65b40db1846abb69baced17c6feb6f9e3d565620ed5476735cfaa121b0a2b81dc22 SHA512 892f4b9d170c5bd2679a1777215d7b88249bd4347c918499b762aa9ad0132b7b15d847180e4d27527d5cead6a4f8e23a7a4d3dc89752bda3852a99782129c257
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-tests-optional.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-tests-optional.patch
new file mode 100644
index 000000000000..6653ef2949c0
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-tests-optional.patch
@@ -0,0 +1,39 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -125,7 +125,9 @@
+ find_libcrypto()
+ include_directories(${LIBCRYPTO_INCLUDE_DIRS})
+ 
++if (BUILD_TESTING)
+ enable_testing()
++endif()
+ find_package(codecov)
+ 
+ add_subdirectory (lib)
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -92,4 +92,6 @@
+ 
+ install(FILES ykpiv.pc DESTINATION ${YKPIV_INSTALL_PKGCONFIG_DIR})
+ 
++if (BUILD_TESTING)
+ add_subdirectory(tests)
++endif ()
+--- a/tool/CMakeLists.txt
++++ b/tool/CMakeLists.txt
+@@ -78,4 +78,6 @@
+     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1" DESTINATION "${YKPIV_INSTALL_MAN_DIR}/man1")
+ endif(MAN_PAGE)
+ 
++if (BUILD_TESTING)
+ add_subdirectory(tests)
++endif ()
+--- a/ykcs11/CMakeLists.txt
++++ b/ykcs11/CMakeLists.txt
+@@ -102,4 +102,6 @@
+ 
+ install(FILES ykcs11.pc DESTINATION ${YKPIV_INSTALL_PKGCONFIG_DIR})
+ 
++if (BUILD_TESTING)
+ add_subdirectory(tests)
++endif ()
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch
new file mode 100644
index 000000000000..cd85616b5e6a
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch
@@ -0,0 +1,29 @@
+--- a/ykcs11/CMakeLists.txt
++++ b/ykcs11/CMakeLists.txt
+@@ -30,7 +30,7 @@
+ link_directories(${PCSC_LIBRARY_DIRS})
+ add_definitions(-DCRYPTOKI_EXPORTS)
+ if(NOT WIN32)
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -pthread")
+ endif(NOT WIN32)
+ 
+ set(
+@@ -63,7 +63,7 @@
+ # static library
+ if(BUILD_STATIC_LIB)
+     add_library(ykcs11 STATIC ${SOURCE})
+-    target_link_libraries(ykcs11 ${LIBCRYPTO_LDFLAGS} ykpiv_static)
++    target_link_libraries(ykcs11 ${LIBCRYPTO_LDFLAGS} -pthread ykpiv_static)
+     set_target_properties (ykcs11 PROPERTIES COMPILE_FLAGS "-DSTATIC ")
+     if(WIN32)
+         set_target_properties(ykcs11 PROPERTIES OUTPUT_NAME ykcs11_static)
+@@ -73,7 +73,7 @@
+ 
+ # dynamic library
+ add_library(ykcs11_shared SHARED ${SOURCE})
+-target_link_libraries(ykcs11_shared ${LIBCRYPTO_LDFLAGS} ykpiv_shared)
++target_link_libraries(ykcs11_shared ${LIBCRYPTO_LDFLAGS} -pthread ykpiv_shared)
+ set_target_properties(ykcs11_shared PROPERTIES SOVERSION ${SO_VERSION} VERSION ${VERSION})
+ set_target_properties(ykcs11_shared PROPERTIES INSTALL_RPATH "${YKPIV_INSTALL_LIB_DIR}")
+ if(WIN32)
diff --git a/sys-auth/yubico-piv-tool/metadata.xml b/sys-auth/yubico-piv-tool/metadata.xml
index 6b15d203069d..7dc418cb37cb 100644
--- a/sys-auth/yubico-piv-tool/metadata.xml
+++ b/sys-auth/yubico-piv-tool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Yubico/yubico-piv-tool</remote-id>
 	</upstream>
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.6.2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild
index 64ebd5a99bb2..07beb0c0d0d4 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.6.2.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools
+inherit cmake
 
 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"
@@ -26,24 +26,27 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
 "
 
-S=${WORKDIR}/${PN}-${P}
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1-install-man-page.patch
+	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
+	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.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
-}
+S="${WORKDIR}/${PN}-${P}"
 
 src_configure() {
-	econf --disable-static
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIB=OFF
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	default
-	rm "${D}"/usr/$(get_libdir)/*.la || die
+	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
 }
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
new file mode 100644
index 000000000000..a7a762e6a8df
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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="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-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
+}
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
index e61b928b9a35..e250affc1b84 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
@@ -26,13 +26,17 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
 "
 
-PATCHES=("${FILESDIR}/${P}-install-man-page.patch")
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1-install-man-page.patch
+	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
+)
 
 S="${WORKDIR}/${PN}-${P}"
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIB=OFF
+		-DBUILD_TESTING=$(usex test)
 	)
 	cmake_src_configure
 }