gentoo resync : 11.07.2019

4 files changed, 19 insertions, 71 deletions

diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
index a2e3e1bae745..3a4a4ac7acb2 100644
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@@ -1,6 +1,4 @@
-DIST nitrokey-app-1.3.1.tar.gz 1167832 BLAKE2B 803f2fd4476e17b55a2223e45f5db520b4590ed14745627de4f365661fa63c84855423acee927a952956167ebe21bcfe0fe8a46f4a69457006b36e8343a6d0d7 SHA512 d964e02fb3feadb130a6261921d87f8c4758723fab76b05c1ed45a5d0f46b5ec865b52b514dfc9aa4a87ce7b774c004fae951749e2322e3c3fff8f150196cd34
-DIST nitrokey-app-1.3.tar.gz 1132479 BLAKE2B 96a20ed4156137e13c0b0eb3f69edd537cf2a236781ba55d295b797a2a273ef3a412f27c2302c035569756146acb006752dd91d9176377f142e2a8c8108ef4a1 SHA512 b78830dee0957601b2e2de97ef267154e9b3444e9ef49e307f7aad5810e4184f1b5d5a278711431cac098e51217eda30d27425cd6a83040fb16bc27d6b1aec5b
-EBUILD nitrokey-app-1.3.1.ebuild 914 BLAKE2B 88dee3884a2974d8985e344bc3d23f9198108acd50cae3c8a91c72054e4012cb7260d2184351e007bfd424ce13a5091b8d82871306673d5ecf5eb5cb27695a6a SHA512 5930fc79a9c1962bb2277c8a8305ae3ad219db553214801b45773d3c62ae6621910292b474bd00183d4c43eabdc70d1dff9a96bb7b75475f06f01989fb105a48
-EBUILD nitrokey-app-1.3.ebuild 1012 BLAKE2B c7c13573c023e7b98f4f79b9e0333855171ef2bc5c38d734c2722cae2c41fcf87399c07bcd48436676bc63d7a84ef0b7059094ce6b7465f35e4b3cd584f75069 SHA512 66f7f0610ada624a2c5f687a145033d321b31c20a579eac74cc192969f212ece0ee8f2e491de099e93d22f3d551881a9f5f9383577a27fce6b8dab728a36c464
-EBUILD nitrokey-app-9999.ebuild 914 BLAKE2B 88dee3884a2974d8985e344bc3d23f9198108acd50cae3c8a91c72054e4012cb7260d2184351e007bfd424ce13a5091b8d82871306673d5ecf5eb5cb27695a6a SHA512 5930fc79a9c1962bb2277c8a8305ae3ad219db553214801b45773d3c62ae6621910292b474bd00183d4c43eabdc70d1dff9a96bb7b75475f06f01989fb105a48
+DIST nitrokey-app-1.4.tar.gz 1205541 BLAKE2B 3e2e3ed85aff85168f9669cd16df026cc2108c601998222f6f6411b19bc4f027541e2c9368f50d383c21bdf2f38d19c69559616d89f5736d4634973d686f2310 SHA512 e0a29bd312b5f8bd1a5bd09ac118b9191a9261341e31f59d355e119fce488c23978af804113f96a93d1b5301ad17e53c2cfaefc9f5ec3b37fdd1ba304325f8a9
+EBUILD nitrokey-app-1.4.ebuild 882 BLAKE2B 5ff121ed98b96662913b726f400b20e888a8fae24b3519a46d48061baed9d0d4199aef2cdcec8c590dc8ddd901df7958173d0712b95dae834b4963116edc7aa6 SHA512 a27c004d08d0e352af55943bf21bc182fbb3239ff381df5b7a4246e9d699fbf8a34cef154d2708b166637fc77222b5aab37db78f715a2f362459b4acdcea5e17
+EBUILD nitrokey-app-9999.ebuild 882 BLAKE2B 5ff121ed98b96662913b726f400b20e888a8fae24b3519a46d48061baed9d0d4199aef2cdcec8c590dc8ddd901df7958173d0712b95dae834b4963116edc7aa6 SHA512 a27c004d08d0e352af55943bf21bc182fbb3239ff381df5b7a4246e9d699fbf8a34cef154d2708b166637fc77222b5aab37db78f715a2f362459b4acdcea5e17
 MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab
diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
deleted file mode 100644
index 1bd4aaad0693..000000000000
--- a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils gnome2-utils
-
-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"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	app-crypt/libnitrokey:=
-	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
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i '/^qt5_add_resources/d' CMakeLists.txt || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.3.1.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
index f1ed0d3dfac3..69510a7dc8f1 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-1.3.1.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Cross platform personalization tool for the Nitrokey"
 HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
@@ -24,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 RDEPEND="
-	app-crypt/libnitrokey:=
+	>=app-crypt/libnitrokey-3.5:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -32,14 +31,15 @@ RDEPEND="
 	dev-qt/qtwidgets:5"
 DEPEND="
 	${RDEPEND}
-	dev-libs/cppcodec
+	dev-libs/cppcodec"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
index f1ed0d3dfac3..69510a7dc8f1 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Cross platform personalization tool for the Nitrokey"
 HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
@@ -24,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 RDEPEND="
-	app-crypt/libnitrokey:=
+	>=app-crypt/libnitrokey-3.5:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -32,14 +31,15 @@ RDEPEND="
 	dev-qt/qtwidgets:5"
 DEPEND="
 	${RDEPEND}
-	dev-libs/cppcodec
+	dev-libs/cppcodec"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }