From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/libnitrokey/, app-crypt/libnitrokey/files/
Date: Sun, 25 Apr 2021 23:11:47 +0000 (UTC) [thread overview]
Message-ID: <1619392296.77ae86b54ac33d5590534eacd066932ed4a7f5fd.asturm@gentoo> (raw)
commit: 77ae86b54ac33d5590534eacd066932ed4a7f5fd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 5 12:54:54 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 23:11:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ae86b5
app-crypt/libnitrokey: Drop 3.5
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-crypt/libnitrokey/Manifest | 1 -
.../libnitrokey-3.5-tests-version-gitless.patch | 18 --------
app-crypt/libnitrokey/libnitrokey-3.5.ebuild | 49 ----------------------
3 files changed, 68 deletions(-)
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index 0a7271fec1e..db77f8d535c 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 99fc5af0378..00000000000
--- 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 ca4417a0c16..00000000000
--- 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
-}
next reply other threads:[~2021-04-25 23:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-25 23:11 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-10 20:17 [gentoo-commits] repo/gentoo:master commit in: app-crypt/libnitrokey/, app-crypt/libnitrokey/files/ David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1619392296.77ae86b54ac33d5590534eacd066932ed4a7f5fd.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox