gentoo (valentine's day) resync : 14.02.2021

4 files changed, 2 insertions, 92 deletions

diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
index f07e2dc97a34..ff8c08a693ca 100644
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@@ -1,7 +1,4 @@
-AUX nitrokey-app-1.4-Make-BASH_COMPLETION_DIR-user-overridable.patch 2247 BLAKE2B bcc3ef78b8c64bc7c25a45dbf1ce0ffe69996054163486839123f707ca2e18773f28eedc17f511226bfc54446d3437999d5162c9dcc754d1c9ea90cfb922ffa1 SHA512 195d6073b7f304f180ddacbfd3ab342dfe034f2c1ca0d579e299b290b5a512915106599d71f56849a6d0e4efcbbd299d47ac8e463bf9679cf0f092e71c7cddee
 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
-EBUILD nitrokey-app-1.4-r1.ebuild 950 BLAKE2B f6c280df5648b3f1956c644b3812aa9d933355cb16b91518c52546786206ec10a1b8dc4f08a9cc680ca6abbbd655afe8458352a90ff1b16b372dd616a42e676f SHA512 1699ca1466c640dfa905695ee3ec52fb9776f5c2feb0228cc16a0ccd2e66f3d33ead61a6550d59c3b20472b153c570cca4f17a5b08c483d4a92553f22dbccc4e
-EBUILD nitrokey-app-1.4.2.ebuild 925 BLAKE2B c4d85eda845dd92b4fa7910ff937662ecb308d336a472cc1ad80c91f123fd5382a4d1904b9b60b5c1af5c9b56c464d1115dd510d9e68b7c0971838f855def882 SHA512 4bae209a98b2acf4ebb2e833eef723b23c47e0c9e407b7022b73c89a0771ba88f628ec12c47832eb2b584527e69c613167fb8420573ee2d8b59c43614a14ec54
+EBUILD nitrokey-app-1.4.2.ebuild 924 BLAKE2B df8dcfc8ae2eac4a33f5104534d7e73673a85f0e324cfc186618d645271d7d2165f1b328431acecbbf12dd1f0ad64a3f63fcf4477f317060bbe73959c2169462 SHA512 ea81f40c7c71e776f07cb10db68d1623f1f16fd3190b355b1ed6e4e59b4c21893ccebd47ffdd8145de2e5ad35d64811680603f048ce88ddba2a326744a038004
 EBUILD nitrokey-app-9999.ebuild 926 BLAKE2B cf80f445940780b1b5d0a266af7365cb517a04f9deacb668f27b0d1604cd427ee58c8949f1aba57ff543679a095ff183fedd9c9def6e88c680ea468ccfae3645 SHA512 c86eeaf31d53771a27b89c6657897d697dfd2ab165b994ca8b39f52f79b966d3d3f4f473e5ebc852aa9715ece96ed5683ade9f769ae254516bb9140e88b02b2a
 MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab
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 4acfe55abd05..000000000000
--- 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 <soap@gentoo.org>
-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 0adeec0e0297..000000000000
--- 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 )
diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.4.2.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.4.2.ebuild
index 3240ee318cd4..aeff51dcb356 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-1.4.2.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.4.2.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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"