commit: 152c6b8aa8d9b9ccd6554d889224a3ad1140304e Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jan 31 19:32:28 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jan 31 19:32:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=152c6b8a
app-crypt/nitrokey-app: Remove old 1.4-r1 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: David Seifert <soap <AT> gentoo.org> app-crypt/nitrokey-app/Manifest | 1 - ...Make-BASH_COMPLETION_DIR-user-overridable.patch | 46 ---------------------- app-crypt/nitrokey-app/nitrokey-app-1.4-r1.ebuild | 41 ------------------- 3 files changed, 88 deletions(-) diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest index 5e241aa5e88..f3cf21ed71c 100644 --- a/app-crypt/nitrokey-app/Manifest +++ b/app-crypt/nitrokey-app/Manifest @@ -1,2 +1 @@ DIST nitrokey-app-1.4.2.tar.gz 1204482 BLAKE2B 27490295300ec47c58425f4009e0be8038844c76e03cfc4725a2e9f6c43eebf949ecda4d0593eb62a0ebee9af387d26606c53d22ff97ccd32f978df2a5e3d0d8 SHA512 48234e9ab594d52123c7d3f538f1520bf21e0be81acacd1dbddc96727ae148ef2840a29bf165c566eb03ed4bef2203eb616db1f157652e0b896125d3fe524f53 -DIST nitrokey-app-1.4.tar.gz 1205541 BLAKE2B 3e2e3ed85aff85168f9669cd16df026cc2108c601998222f6f6411b19bc4f027541e2c9368f50d383c21bdf2f38d19c69559616d89f5736d4634973d686f2310 SHA512 e0a29bd312b5f8bd1a5bd09ac118b9191a9261341e31f59d355e119fce488c23978af804113f96a93d1b5301ad17e53c2cfaefc9f5ec3b37fdd1ba304325f8a9 diff --git a/app-crypt/nitrokey-app/files/nitrokey-app-1.4-Make-BASH_COMPLETION_DIR-user-overridable.patch b/app-crypt/nitrokey-app/files/nitrokey-app-1.4-Make-BASH_COMPLETION_DIR-user-overridable.patch deleted file mode 100644 index 4acfe55abd0..00000000000 --- a/app-crypt/nitrokey-app/files/nitrokey-app-1.4-Make-BASH_COMPLETION_DIR-user-overridable.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e5036fab19c11a09ab350761ec03f54aa5fcb70c Mon Sep 17 00:00:00 2001 -From: David Seifert <[email protected]> -Date: Sun, 16 Aug 2020 19:54:18 +0200 -Subject: [PATCH] Make BASH_COMPLETION_DIR user overridable - ---- - CMakeLists.txt | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5feb2c0..1ab3f1a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -163,14 +163,22 @@ IF(NOT WIN32) - # Removed - should be provided by libnitrokey - - # Install autocompletion scripts -- set(PKG_GET_BASH_COMPLETION ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion) -- execute_process(COMMAND ${PKG_GET_BASH_COMPLETION} RESULT_VARIABLE ERR OUTPUT_VARIABLE BASH_COMPLETION_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -- IF(${ERR}) -- set(BASH_COMPLETION_DIR "etc/bash_completion.d") -+ set(BASH_COMPLETION_PATH "" CACHE STRING "Directory for installing bash autocompletion files. The default (empty) means we will try to autodetect it") -+ -+ IF(BASH_COMPLETION_PATH STREQUAL "") -+ message(STATUS "Trying to autodetect bash autocompletion directory") -+ set(PKG_GET_BASH_COMPLETION ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion) -+ execute_process(COMMAND ${PKG_GET_BASH_COMPLETION} RESULT_VARIABLE ERR OUTPUT_VARIABLE BASH_COMPLETION_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -+ IF(${ERR}) -+ set(BASH_COMPLETION_DIR "etc/bash_completion.d") -+ ENDIF() -+ string(REGEX REPLACE "^/" "" BASH_COMPLETION_DIR "${BASH_COMPLETION_DIR}") -+ string(REGEX REPLACE "^usr/" "" BASH_COMPLETION_DIR "${BASH_COMPLETION_DIR}") # usual prefix is usr/local -+ message(STATUS "Setting bash-completion dir to ${BASH_COMPLETION_DIR}") -+ ELSE() -+ message(STATUS "User-provided bash autocompletion directory: ${BASH_COMPLETION_PATH}") -+ set(BASH_COMPLETION_DIR ${BASH_COMPLETION_PATH}) - ENDIF() -- string(REGEX REPLACE "^/" "" BASH_COMPLETION_DIR "${BASH_COMPLETION_DIR}") -- string(REGEX REPLACE "^usr/" "" BASH_COMPLETION_DIR "${BASH_COMPLETION_DIR}") # usual prefix is usr/local -- message(STATUS "Setting bash-completion dir to ${BASH_COMPLETION_DIR}") - - install(FILES - ${CMAKE_SOURCE_DIR}/data/bash-autocomplete/nitrokey-app --- -2.28.0 - diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.4-r1.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.4-r1.ebuild deleted file mode 100644 index 0adeec0e029..00000000000 --- a/app-crypt/nitrokey-app/nitrokey-app-1.4-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg cmake - -DESCRIPTION="Cross platform personalization tool for the Nitrokey" -HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"; - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Nitrokey/nitrokey-app"; - - # 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" - -RDEPEND=" - >=app-crypt/libnitrokey-3.5:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5" -DEPEND=" - ${RDEPEND} - dev-libs/cppcodec" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-Make-BASH_COMPLETION_DIR-user-overridable.patch ) - -mycmakeargs=( -DBASH_COMPLETION_PATH=share/bash-completion/completions )
