[gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/

[Marek Szuba]

commit:     022da5ba99be2b208ba8ae6ba60c15b118bbac5f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 20:23:13 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 20:27:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022da5ba

sys-auth/yubico-piv-tool: only build tests when FEATURES=test is set

This means we no longer need dev-libs/check present even when one does
not wish to run the test suite.

Closes: https://bugs.gentoo.org/739040
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../yubico-piv-tool-2.1.1-tests-optional.patch     | 39 ++++++++++++++++++++++
 .../yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild   |  6 +++-
 2 files changed, 44 insertions(+), 1 deletion(-)

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 00000000000..6653ef2949c
--- /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/yubico-piv-tool-2.1.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
index e61b928b9a3..e250affc1b8 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
 }