diff options
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/libnitrokey/Manifest | 1 | ||||
| -rw-r--r-- | app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch | 18 | ||||
| -rw-r--r-- | app-crypt/libnitrokey/libnitrokey-3.5.ebuild | 49 |
3 files changed, 0 insertions, 68 deletions
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest index 0a7271fec1e5..db77f8d535ce 100644 --- a/app-crypt/libnitrokey/Manifest +++ b/app-crypt/libnitrokey/Manifest @@ -1,2 +1 @@ -DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7 DIST libnitrokey-3.6.tar.gz 98038 BLAKE2B 27f99e7b6de93548fc7a373f37ce784da0aa50503a5c635b4d90282e6330a5ff4c0dcc03a83a7e57045b8a1aabaab27d76a090d7c49693a6ff1037b81e75ece9 SHA512 a00a6724e5c64715eca688ec254efd979acceb5ff4cad28a205f7128e44db8674a5924634fd7da6c69d589deafca7b28b99e1d05a244c321d5cb429f2e5a3bec diff --git a/app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch b/app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch deleted file mode 100644 index 99fc5af03787..000000000000 --- a/app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -129,7 +129,14 @@ - ERROR_QUIET - ) - ENDIF() --IF((NOT ${ADD_GIT_INFO}) OR (${PROJECT_VERSION_GIT_RETURN_CODE})) -+# the version.h generation logic is tricky in a number of ways: -+# 1. git describe on a release tarball will always fail with -+# a non-zero return code, usually 128 -+# 2. If git is not installed, PROJECT_VERSION_GIT_RETURN_CODE -+# will contain the string 'No such file or directory' -+# Hence fallback to PROJECT_VERSION when the return code is NOT 0. -+IF((NOT ${ADD_GIT_INFO}) OR (NOT ${PROJECT_VERSION_GIT_RETURN_CODE} STREQUAL "0")) -+ MESSAGE(STATUS "Setting fallback Git library version") - SET(PROJECT_VERSION_GIT "v${PROJECT_VERSION}") - ENDIF() - MESSAGE(STATUS "Setting Git library version to: " ${PROJECT_VERSION_GIT} ) diff --git a/app-crypt/libnitrokey/libnitrokey-3.5.ebuild b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild deleted file mode 100644 index ca4417a0c16e..000000000000 --- a/app-crypt/libnitrokey/libnitrokey-3.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils udev - -DESCRIPTION="Support library for the Nitrokey" -HOMEPAGE="https://github.com/Nitrokey/libnitrokey" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Nitrokey/libnitrokey.git" - - # Disable pulling in bundled dependencies - EGIT_SUBMODULES=() -else - SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~ppc64 x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/hidapi:= - virtual/udev" -DEPEND=" - ${RDEPEND} - test? ( >=dev-cpp/catch-2.5.0:0 )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-3.5-tests-version-gitless.patch ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d - - # actual hardware tests - # 1. require a connected Nitrokey - # 2. may kill data on your Nitrokey - # hence the main testsuite is disabled - -DCOMPILE_TESTS=OFF - -DCOMPILE_OFFLINE_TESTS=$(usex test) - ) - cmake-utils_src_configure -} |