mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
sys-auth/yubico-piv-tool: drop 2.1.1-r2
Signed-off-by: Marek Szuba <marecki@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
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
|
||||
|
||||
@@ -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")
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user