gentoo resync : 28.04.2019

3 files changed, 4 insertions, 72 deletions

diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 541522e2b56f..cac7079530b4 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,4 +1,3 @@
-AUX kraft-0.80-qt-5.11.patch 1810 BLAKE2B d7225869ca03b2723d40d0d0218e93bb57abe0f1e43c3198d513801083ad64021c32de980c92b155f43100165f4c2867f4d685f5fbab76dd1fbdc8e50eb037de SHA512 db33309419879abaa644a0a7aa50648c3e8d93543c9bbf8f2db34326a82d47113cc1896702ad1cc5d71cc87b8a88613917f10c0e1dfdce65f86200914509e4dd
-DIST kraft-0.80.tar.gz 673818 BLAKE2B 80d9608c458b793e7f1fe2f568243c72512ff9bd7a4e3b4ba8232d7b47b890e60b6e93cd0fcf2204027abc942198f6f2f5d10248e77b2f4729d3345631883dbc SHA512 a8a1496db434f899e293c765a9733bfb2d5ec6d461da3a3d805f52befa4e71526a3b5f21a7edf214d4946b8d409133dac77050452db97fb46256377960649fe9
-EBUILD kraft-0.80.ebuild 1175 BLAKE2B 2a6b010f412f77fcf76c195685d5173238e9988650232603b9e3635c99d562aede6991e3457e32f725e94105868a03b27fb161b48a5bcaa46c6475775ca1e3b9 SHA512 9b528b6989dfe26470fc6f810f23492a923d5e6edac3f79a286dbe8e0d66d975d4bc601b1350dd446b972b192f207e57cd1a7aa79784a1de11f3177a8e596f67
+DIST kraft-0.82.tar.gz 668251 BLAKE2B 82ef37b695d0e7a2c72e0525c4aa9b9742d6c8d73c95e3ef5517c49c01869a5f1ba0fed1f18200f2a39ada5a92bcca5cabfac901f07c0a968783506d298ff164 SHA512 7a342bf94e2fe0de42004a69a29ce07a32dd70eb0f16b1dc18c889b7f0a0290142d5c0bc26b40a321753b0a0e62f6b91ecc8fbed98d32913881996a2507070e8
+EBUILD kraft-0.82.ebuild 1095 BLAKE2B f498b651ca8bfb0a20e4e37d60bb0534a55e56c984bcd8513489b20fd7e6bcae981b92bf559ecbc131d8049bf6530ce2056d63c033f969251b41e0335057b732 SHA512 7ceb3021200d16a951f9452fa8239a70ebd0d0a546ea23753eea6a8ba6660d7eace0ac75ae273119c37a7977e6c7a97987b345a98f619bf8d242391db2e20204
 MISC metadata.xml 418 BLAKE2B b99b3d436a90af1cd1a791e8cd1aeaed2c654a659a45f5e88b5c5b0cd02d57bc15df8e225cd93e9041732dfbf45792721d29df8c2187d409ecf3a4202855266e SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232
diff --git a/app-office/kraft/files/kraft-0.80-qt-5.11.patch b/app-office/kraft/files/kraft-0.80-qt-5.11.patch
deleted file mode 100644
index 33a6a769bd5f..000000000000
--- a/app-office/kraft/files/kraft-0.80-qt-5.11.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 29cd92c31705fbe63dfb324b5beb3758967dc900 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 3 Apr 2018 17:05:06 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- src/flostempldialog.cpp     | 1 +
- src/importitemdialog.cpp    | 1 +
- src/materialkatalogview.cpp | 1 +
- src/setupassistant.cpp      | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/src/flostempldialog.cpp b/src/flostempldialog.cpp
-index 420b10e..e705ec7 100644
---- a/src/flostempldialog.cpp
-+++ b/src/flostempldialog.cpp
-@@ -16,6 +16,7 @@
-  ***************************************************************************/
- 
- // include files for Qt
-+#include <QButtonGroup>
- #include <QRadioButton>
- #include <QLabel>
- #include <QString>
-diff --git a/src/importitemdialog.cpp b/src/importitemdialog.cpp
-index a02c7d4..70d524e 100644
---- a/src/importitemdialog.cpp
-+++ b/src/importitemdialog.cpp
-@@ -19,6 +19,7 @@
- 
- // include files for Qt
- #include <QLabel>
-+#include <QButtonGroup>
- #include <QComboBox>
- #include <QCheckBox>
- #include <QToolTip>
-diff --git a/src/materialkatalogview.cpp b/src/materialkatalogview.cpp
-index 76c0b2b..fd0f277 100644
---- a/src/materialkatalogview.cpp
-+++ b/src/materialkatalogview.cpp
-@@ -15,6 +15,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <QHeaderView>
- #include <QLayout>
- #include <QLabel>
- #include <QSplitter>
-diff --git a/src/setupassistant.cpp b/src/setupassistant.cpp
-index 1ea1d5b..4dd0ef3 100644
---- a/src/setupassistant.cpp
-+++ b/src/setupassistant.cpp
-@@ -17,6 +17,7 @@
- #include <QtGui>
- 
- #include <QDebug>
-+#include <QTabWidget>
- 
- #include <kcontacts/address.h>
- #include <kcontacts/vcardconverter.h>
--- 
-2.17.0
-
diff --git a/app-office/kraft/kraft-0.80.ebuild b/app-office/kraft/kraft-0.82.ebuild
index ea0cd15a44f1..5b85fbff4614 100644
--- a/app-office/kraft/kraft-0.80.ebuild
+++ b/app-office/kraft/kraft-0.82.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -37,10 +37,6 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS Changes.txt README.md Releasenotes.txt TODO )
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-S="${WORKDIR}/${PN}-${PV/_/}"
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package pim KF5Akonadi)