From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 18 Aug 2019 18:16:17 +0100
Subject: gentoo resync : 18.08.2019

---
 app-crypt/libnitrokey/Manifest                         |  3 ++-
 .../files/libnitrokey-3.5-tests-version-gitless.patch  | 18 ++++++++++++++++++
 app-crypt/libnitrokey/libnitrokey-3.5.ebuild           |  4 +++-
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch

(limited to 'app-crypt/libnitrokey')

diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index 3283b6863bd9..927f5c1b10d9 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -1,4 +1,5 @@
+AUX libnitrokey-3.5-tests-version-gitless.patch 789 BLAKE2B 9e184e9e51837796b65c15e4cae6979991f94721af3ab7f79566fb5b1af777960d400dee10325799e3b7448946f6c73f9b509be41a1b0925b2cc6d7e85dc90c6 SHA512 aa4a253822a25d906ae09f74c9c52683c517528386b24734ff75977b6d28a11382cce6cdeb66cf0ff981225a8c61c76e32e7df96880fd9ad9f53f63ca0ad6f9a
 DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7
-EBUILD libnitrokey-3.5.ebuild 1053 BLAKE2B 13357a8bcb750ebaf5abfa3275ec1dcb7c296688b0ccaf09c8b3caf3fe841911985c915fcc3efa0c1e8e187baf9917d2bf8b7c38e95a34faeb718f24889305f4 SHA512 9f51e075f5849f1085f0d0bbd6e31abef85a5b2e56ff176b126e5ae39fb56a5fdb47ae058ab191cc5e12dfa4c8a148f7fed236afc6df6ed4b566f0ab6871c41f
+EBUILD libnitrokey-3.5.ebuild 1116 BLAKE2B 2bbc6ddbf18443bdec8056c1bf5e647e9ea7a29189cb216c5b7f7b41cad77154feada3d5c8308398bb1f78796c406453fb0153b34eb1b84890d91b91b6b40334 SHA512 e980520dd1ac1489916204ca70af7fecbce989d39aaf8b06d9655349b20847600bea5d70f5f367014b9ac90b6fe35b6ebcfb3d7fde34f1c6ed08f4241cb0c4ea
 EBUILD libnitrokey-9999.ebuild 1048 BLAKE2B 4a94192b8ca59009b7f06224e332acbcec2d40238c1cdbc0b8ea6c3e3dbfd3dcfdd0d5eaf7004ec1c5faac66392aa1c256a8c798625aa6b152ea39a97b687d49 SHA512 ad2ba4576a581cc5b59bdbb4f36147ed6adee78e3f72aabd8963d89247f8ad30b939247d42ec89614fd308b0413b93df4c2a8e4082a6e7ff31b986d2cd2d1838
 MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e
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
new file mode 100644
index 000000000000..99fc5af03787
--- /dev/null
+++ b/app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch
@@ -0,0 +1,18 @@
+--- 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
index 35712a337225..6a74fb21ae15 100644
--- a/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
@@ -32,6 +32,8 @@ DEPEND="
 	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
-- 
cgit v1.2.3