gentoo resync : 28.12.2017

4 files changed, 5 insertions, 101 deletions

diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 4aeabaabad1c..82b28827c958 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,6 +1,3 @@
-AUX kraft-0.80_pre20171115-deps.patch 1564 BLAKE2B 8f80a7debb8a3a2e6312f687aeb5fc9134c4cf6f37f51b6bbbe392c63a66ce27982c7e90fc0904265fe5882eae3da07b31b53601bd73ecadbfaa3fd9835f8493 SHA512 b1d2b93a3f375ea7f05366626b3d542e1bf4b39fd9fc381082d101a61d742f68c0596c9f213836e18d0ac0746bd4351adc7eea223bed12050a78cdbb4e0ca877
-DIST kraft-0.59.tar.xz 560116 BLAKE2B bd9ab18015582c34343e0fa93601937c8bb874a063ae37a6ed481170206ba6430cbe09068c4cdc879f80a37f1cd770b350b3841752f3146ef95680a565e4126f SHA512 53576855e3a4ac054818cc3fcb5d123222c0a5839ba621ea7c1f390f1e3180b5c87b00daa09a57fbea64cbd1dc857c4cb7645c5f539635811ef236c76483dc36
-DIST kraft-0.80_pre20171115.tar.gz 572784 BLAKE2B cfc0718d137e57ba7e217ba3d92f14e64ef61daffdc38dd85acc19a6eb0169200550fae098c4fbf2238eb794676daebc0de1a3669cfed1cb7cd59bec308fecb6 SHA512 7c9fa4b8c17809c36f4f6d94f4d6b900f91083c86b332d7680db1ad721904823b25cab5b8393913220dea9b16937bc90ac403af8f57fc6f963d59af41e1f51c3
-EBUILD kraft-0.59.ebuild 755 BLAKE2B 75109107d8f906400db82a3c78cd62fee7f8af3d5838d4433e53b37ddcdc5e201edc52143cc67f920faed73168a2799b0a35cb7e7a98ae2cf54f9991714c649b SHA512 0517e87d4bb3639c1380330fe6ed94dd2e26ba355fa6e584537482dfc5c4a400bfafc5cd545663cf4bacf939a107d597a2806f7767e791c790f6553d6822f3ec
-EBUILD kraft-0.80_pre20171115.ebuild 1202 BLAKE2B eafeddcdbdedc69f5229347c01a6389f220950998c021d0b6eb3d91914257d95f022b2a64bf658e995387edb2976aeda2dcbac860d0351d5da0502df7aa50882 SHA512 95c6348f93ca01df0cf9dc55a0774b5e4186d7b3236a80bfaf7a8143038d13955c9c717966ff8f42570a364a8d610e5051076cfcba62807232e50aa3529e190b
+DIST kraft-0.80_beta3.tar.gz 625756 BLAKE2B ecbad304b76b7bec827573d4f001ac36b55c84df1a78fcdee25d71dc6efc9b341aa6d708bd288beee3a7c75d2f1b60f01aa6877a29ef750487a516d7575de5a3 SHA512 d94b00fb8b366473948641425288118acf276b429169c4e187b66dfb1ce4bc0d326ee215bd8b3dcbde25d2ec04ab2f0c3dcf4c22ada676a31e761a8278bc06da
+EBUILD kraft-0.80_beta3.ebuild 1128 BLAKE2B 5929e31d759e445ea1bcc932869abbca16723d91a26b210d91ce98903147e185999fd17aeeaf3c256840a5a5e86448bd0cf1da6ed32a048bba8a81e4e5221c5b SHA512 cad140f88e0f1569b5e500eea74d33e565fa451e7f6c57e4721d7d4cc95d458bad2f2603310f35706b72e85643d33b4f488f0fa57017b5b5456638ef43b1a473
 MISC metadata.xml 418 BLAKE2B b99b3d436a90af1cd1a791e8cd1aeaed2c654a659a45f5e88b5c5b0cd02d57bc15df8e225cd93e9041732dfbf45792721d29df8c2187d409ecf3a4202855266e SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232
diff --git a/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch b/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
deleted file mode 100644
index cebf558fd355..000000000000
--- a/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 63248f8004e7e0b05fe1716f6ff432b16b382e8f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 16 Nov 2017 22:14:05 +0100
-Subject: [PATCH] Sort deps, add implicit, and split PIM from real KF5 libs
-
-Add descriptions to PIM dependencies.
----
- CMakeLists.txt | 33 ++++++++++++++++++++++++++-------
- 1 file changed, 26 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 739daac..9f95ecf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,21 +25,40 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
- 
- find_package(Qt5 CONFIG REQUIRED
-     Core
--    Network
--    Widgets
-+    Gui
-     Sql
-+    Widgets
-+    Xml
- )
- 
- find_package(KF5 REQUIRED COMPONENTS
--    Contacts
-+    Config
-+    ConfigWidgets
-+    CoreAddons
-     I18n
-+    WidgetsAddons
-     XmlGui
--    OPTIONAL_COMPONENTS
--    Akonadi
--    AkonadiContact
- )
- 
--if(KF5Akonadi_FOUND)
-+find_package(KF5Contacts REQUIRED)
-+
-+find_package(KF5Akonadi)
-+set_package_properties(KF5Akonadi PROPERTIES
-+    DESCRIPTION "Library for general Access to Akonadi"
-+    URL "https://www.kde.org/"
-+    PURPOSE "Optionally used for addressbook integration"
-+    TYPE OPTIONAL
-+)
-+
-+find_package(KF5AkonadiContact)
-+set_package_properties(KF5AkonadiContact PROPERTIES
-+    DESCRIPTION "Library for Accessing Contacts stored in Akonadi"
-+    URL "https://www.kde.org/"
-+    PURPOSE "Optionally used for addressbook integration"
-+    TYPE OPTIONAL
-+)
-+
-+if(KF5Akonadi_FOUND AND KF5AkonadiContact_FOUND)
-    add_definitions(-DHAVE_AKONADI)
- endif()
- 
diff --git a/app-office/kraft/kraft-0.59.ebuild b/app-office/kraft/kraft-0.59.ebuild
deleted file mode 100644
index 48777bb0f346..000000000000
--- a/app-office/kraft/kraft-0.59.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="ast bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nds
-nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
-QT3SUPPORT_REQUIRED="true"
-SQL_REQUIRED="always"
-inherit kde4-base
-
-DESCRIPTION="Software for operating a small business, creating documents such as invoices"
-HOMEPAGE="http://www.volle-kraft-voraus.de/"
-SRC_URI="mirror://sourceforge/kraft/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	dev-cpp/ctemplate
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[mysql,sqlite]
-	$(add_kdeapps_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
diff --git a/app-office/kraft/kraft-0.80_pre20171115.ebuild b/app-office/kraft/kraft-0.80_beta3.ebuild
index c6fd91b04ec3..8046838cfbcf 100644
--- a/app-office/kraft/kraft-0.80_pre20171115.ebuild
+++ b/app-office/kraft/kraft-0.80_beta3.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=6
 
-COMMIT=6618f5203f80a52e673cfad1a12dcee9154e2831
 KDE_HANDBOOK="forceoptional"
-inherit kde5 vcs-snapshot
+inherit kde5
 
 DESCRIPTION="Software to manage quotes and invoices in small enterprises"
 HOMEPAGE="http://www.volle-kraft-voraus.de/"
-SRC_URI="https://github.com/dragotin/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/dragotin/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="pim"
@@ -38,7 +37,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
 
-PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+S="${WORKDIR}/${PN}-${PV/_/}"
 
 src_configure() {
 	local mycmakeargs=(