gentoo resync : 25.08.2020

5 files changed, 100 insertions, 16 deletions

diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
index b8d247185e63..a79decc1ab43 100644
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@@ -1,4 +1,7 @@
+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.ebuild 892 BLAKE2B b16701e4b785540064ff71f651c579a28920ac496f8f16456596661c3097421ee40f8612b219fb1ca8c70020b3e5f2b283654f8c4f2f5286be5e05b0c357826a SHA512 9c41720e78912bbdf59f60c84524b0f6b3bf491fcd7d520e5718893574336a32120f0c8419352a9f9909ad65f4dafb0b162eff7a4896802e4feb7ba6df182766
-EBUILD nitrokey-app-9999.ebuild 894 BLAKE2B 63c279f2871365ccf206ce3b32129e1e2593fc7d89ac2622519788e8d81ccfa3769f80f6f10e0d6174957b81b344a09e893d51b70ffa1d6d0496a21a8b47f7be SHA512 4266239af611b00053fda5ec1fda3c2a70b971316f8cc901a71bf6b6c837f87c2b9237b2a2393ceecf7863f93493059e3467bfefc00882427bbad672360a8351
+EBUILD nitrokey-app-1.4-r1.ebuild 950 BLAKE2B f6c280df5648b3f1956c644b3812aa9d933355cb16b91518c52546786206ec10a1b8dc4f08a9cc680ca6abbbd655afe8458352a90ff1b16b372dd616a42e676f SHA512 1699ca1466c640dfa905695ee3ec52fb9776f5c2feb0228cc16a0ccd2e66f3d33ead61a6550d59c3b20472b153c570cca4f17a5b08c483d4a92553f22dbccc4e
+EBUILD nitrokey-app-1.4.2.ebuild 926 BLAKE2B cf80f445940780b1b5d0a266af7365cb517a04f9deacb668f27b0d1604cd427ee58c8949f1aba57ff543679a095ff183fedd9c9def6e88c680ea468ccfae3645 SHA512 c86eeaf31d53771a27b89c6657897d697dfd2ab165b994ca8b39f52f79b966d3d3f4f473e5ebc852aa9715ece96ed5683ade9f769ae254516bb9140e88b02b2a
+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
new file mode 100644
index 000000000000..4acfe55abd05
--- /dev/null
+++ b/app-crypt/nitrokey-app/files/nitrokey-app-1.4-Make-BASH_COMPLETION_DIR-user-overridable.patch
@@ -0,0 +1,46 @@
+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.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.4-r1.ebuild
index 959c79c33783..0adeec0e0297 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit xdg cmake
 
 DESCRIPTION="Cross platform personalization tool for the Nitrokey"
 HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
@@ -36,10 +36,6 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-pkg_postinst() {
-	xdg_icon_cache_update
-}
+PATCHES=( "${FILESDIR}"/${P}-Make-BASH_COMPLETION_DIR-user-overridable.patch )
 
-pkg_postrm() {
-	xdg_icon_cache_update
-}
+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
new file mode 100644
index 000000000000..fbcae50c1f6b
--- /dev/null
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 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"
+
+src_configure() {
+	local mycmakeargs=( -DBASH_COMPLETION_PATH="$(get_bashcompdir)" )
+	cmake_src_configure
+}
diff --git a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
index 7b3dab537ea4..fbcae50c1f6b 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit bash-completion-r1 xdg cmake
 
 DESCRIPTION="Cross platform personalization tool for the Nitrokey"
 HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
@@ -36,10 +36,7 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
+src_configure() {
+	local mycmakeargs=( -DBASH_COMPLETION_PATH="$(get_bashcompdir)" )
+	cmake_src_configure
 }