gentoo resync : 28.04.2021

3 files changed, 0 insertions, 70 deletions

diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index e0a94d679b81..282c6636b046 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -1,7 +1,4 @@
-AUX libnitrokey-3.5-tests-version-gitless.patch 789 BLAKE2B 9e184e9e51837796b65c15e4cae6979991f94721af3ab7f79566fb5b1af777960d400dee10325799e3b7448946f6c73f9b509be41a1b0925b2cc6d7e85dc90c6 SHA512 aa4a253822a25d906ae09f74c9c52683c517528386b24734ff75977b6d28a11382cce6cdeb66cf0ff981225a8c61c76e32e7df96880fd9ad9f53f63ca0ad6f9a
-DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7
 DIST libnitrokey-3.6.tar.gz 98038 BLAKE2B 27f99e7b6de93548fc7a373f37ce784da0aa50503a5c635b4d90282e6330a5ff4c0dcc03a83a7e57045b8a1aabaab27d76a090d7c49693a6ff1037b81e75ece9 SHA512 a00a6724e5c64715eca688ec254efd979acceb5ff4cad28a205f7128e44db8674a5924634fd7da6c69d589deafca7b28b99e1d05a244c321d5cb429f2e5a3bec
-EBUILD libnitrokey-3.5.ebuild 1123 BLAKE2B 3ae935e945aecc878babb981f1989d8105c02d95ccdc652b9367643449bab791e5ae8979a780c2aea3b7b5a235e1b0d0889bb5bea977a0c915dade5d9097b88b SHA512 ccdb2e813224866ac7955abb89d13f9e58f29e751b6fa5008940a3118cc607d6c1a775a0f0b72ab00a5fbba17e6a54b814b3495a0ff66d667b1179f12e02a85d
 EBUILD libnitrokey-3.6.ebuild 1046 BLAKE2B 19c6e6213b1200743567759d12f9328582273c5f0f1c4fb984e14f6d73e37a0c7fb67f0d874e6f3856a6ea6fee7e213b979f16b19caa3f1559eb6e6e8f823107 SHA512 89e10ca9584e329255753c24f496087b9ca09ba18e623a8938282b9d6f91ff0df457417ebc586aa6b5947d43c632499cd1fe007bdddb91f4788bb139cceabbba
 EBUILD libnitrokey-9999.ebuild 1048 BLAKE2B e49ec7cfed9deb08f1757d14762694638230366aa674cd07e90d65de6ebfef55e9de4c6ce8685a47ef7d07eda954a2036f0874d7e408b964cbc0c852781afc3e SHA512 8f4dd941bc7150e8fc3fb126d5ffa8009f2893b2d40da5c7a64347f3efdf080d7069dac4a1bc93567e41950e3c74c0bc470170577658a4c925a570a30b0d5b7d
 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
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
-}