gentoo resync : 29.05.2018

3 files changed, 11 insertions, 6 deletions

diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
index fda239a38f24..8915b8a8950e 100644
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@@ -1,6 +1,6 @@
 DIST nitrokey-app-0.6.3.tar.gz 769503 BLAKE2B 97b4f9951cb1ca1e3da1a2af32756b72a9a9e1f8b55d087115a6a95fe26a7aabde6c9503330f43308c3824211524dd1780e104ae6e28e3d60c38cc1b4158edeb SHA512 23960b0ca740a4c9520a3d7043f396ffb6fb730ef28ad44b299aadbb0b7d2fa1a182c38a88fd684fe664c2079c5a03c5a6b8e6ceb7f8ca69a37fb64ef64237a6
 DIST nitrokey-app-1.3.tar.gz 1132479 BLAKE2B 96a20ed4156137e13c0b0eb3f69edd537cf2a236781ba55d295b797a2a273ef3a412f27c2302c035569756146acb006752dd91d9176377f142e2a8c8108ef4a1 SHA512 b78830dee0957601b2e2de97ef267154e9b3444e9ef49e307f7aad5810e4184f1b5d5a278711431cac098e51217eda30d27425cd6a83040fb16bc27d6b1aec5b
 EBUILD nitrokey-app-0.6.3.ebuild 723 BLAKE2B 568bdb73d8a109ae377ba3f189ebd5c1760a13f886394f9421d7ee22ab9537a58aefe5adcb1b2204cd388edb4ba6865d0a96dfdcff575126602be61cf999d867 SHA512 11c36ae01ed31273939bf775b12d29063d9a08c9dd3d26a270f814b75c03e18863c10f702a0f7f6e00ee7b198e027d4fee31aa142b973e5fc08048fab0336c8a
-EBUILD nitrokey-app-1.3.ebuild 912 BLAKE2B b18d2a5a3529af0e70649a3d00dcbef8050f9b5c21ee4f82b98624b191ca925b9045328b9fe21ab7167bf6b0c2b9070e83915267e878499e4c936047a0bf5c35 SHA512 54f1277dd88ffa41e877eadae14b5e0576ef0e596e9fe4a77f6e5782cb20644e850c460d3edda1ef49c159702dd0959e3d4ec8b40212b9956053b7c57333d79c
-EBUILD nitrokey-app-9999.ebuild 912 BLAKE2B b18d2a5a3529af0e70649a3d00dcbef8050f9b5c21ee4f82b98624b191ca925b9045328b9fe21ab7167bf6b0c2b9070e83915267e878499e4c936047a0bf5c35 SHA512 54f1277dd88ffa41e877eadae14b5e0576ef0e596e9fe4a77f6e5782cb20644e850c460d3edda1ef49c159702dd0959e3d4ec8b40212b9956053b7c57333d79c
+EBUILD nitrokey-app-1.3.ebuild 1012 BLAKE2B c7c13573c023e7b98f4f79b9e0333855171ef2bc5c38d734c2722cae2c41fcf87399c07bcd48436676bc63d7a84ef0b7059094ce6b7465f35e4b3cd584f75069 SHA512 66f7f0610ada624a2c5f687a145033d321b31c20a579eac74cc192969f212ece0ee8f2e491de099e93d22f3d551881a9f5f9383577a27fce6b8dab728a36c464
+EBUILD nitrokey-app-9999.ebuild 914 BLAKE2B 88dee3884a2974d8985e344bc3d23f9198108acd50cae3c8a91c72054e4012cb7260d2184351e007bfd424ce13a5091b8d82871306673d5ecf5eb5cb27695a6a SHA512 5930fc79a9c1962bb2277c8a8305ae3ad219db553214801b45773d3c62ae6621910292b474bd00183d4c43eabdc70d1dff9a96bb7b75475f06f01989fb105a48
 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
index 045fd86b4d05..1bd4aaad0693 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
@@ -36,10 +36,15 @@ DEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-pkg_postinst(){
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i '/^qt5_add_resources/d' CMakeLists.txt || die
+}
+
+pkg_postinst() {
 	gnome2_icon_cache_update
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	gnome2_icon_cache_update
 }
diff --git a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
index 045fd86b4d05..f1ed0d3dfac3 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
@@ -36,10 +36,10 @@ DEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-pkg_postinst(){
+pkg_postinst() {
 	gnome2_icon_cache_update
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	gnome2_icon_cache_update
 }