gentoo resync : 20.11.2017

4 files changed, 120 insertions, 2 deletions

diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 9b0e89f5ffed..c408400f4b0f 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,5 +1,8 @@
+AUX kraft-0.80_pre20171115-deps.patch 1564 SHA256 6410674e15e50881f773d00d4ca05ed2510d3794758ca99d7ee8d11f7ae5d74a SHA512 b1d2b93a3f375ea7f05366626b3d542e1bf4b39fd9fc381082d101a61d742f68c0596c9f213836e18d0ac0746bd4351adc7eea223bed12050a78cdbb4e0ca877 WHIRLPOOL acd07a8f08b783d24edf3bf04bfb2e84fa22878db6b4781fa47ee5065543cf7febf16dd328a1bbe552c6cb6ead517729520bc9f3d02b320eaac45172d789bf9a
 DIST kraft-0.59.tar.xz 560116 SHA256 e05ff0b78a073bafffa5c0e41fe458461216b66fd57fc9432a1064a7be2b2034 SHA512 53576855e3a4ac054818cc3fcb5d123222c0a5839ba621ea7c1f390f1e3180b5c87b00daa09a57fbea64cbd1dc857c4cb7645c5f539635811ef236c76483dc36 WHIRLPOOL d442c33ecbee4f0b3d8f33b358a5f7fab9f9c99d5e70019ca9d5910a3b717530008b6b09c3573132a27681f9e554f83f1798bc6b5a71d71fd10c81884692dd6e
+DIST kraft-0.80_pre20171115.tar.gz 572784 SHA256 b5ded884a9377fe88013aef9a230580e9f6fb9873764abe226736843489c1eae SHA512 7c9fa4b8c17809c36f4f6d94f4d6b900f91083c86b332d7680db1ad721904823b25cab5b8393913220dea9b16937bc90ac403af8f57fc6f963d59af41e1f51c3 WHIRLPOOL 2a62d59153a43bd473ad565baf09775b981047b6d998a2fd6f4e32ae4d57a56bb577b375e2896e67b23b2abef80f453e1cd44dc39b5dbe7c3b74a1236d1eeb87
 EBUILD kraft-0.59.ebuild 755 SHA256 9850e0843dfbf70b8cda110fb4451474e4cfe1632b9a744c0a37e6c753ebfb0e SHA512 0517e87d4bb3639c1380330fe6ed94dd2e26ba355fa6e584537482dfc5c4a400bfafc5cd545663cf4bacf939a107d597a2806f7767e791c790f6553d6822f3ec WHIRLPOOL 2979d205517c6c8617f3b884ad05713280fc572a41746258a75b8fd55abdf5a112478103438e45f46a2eb85fdd25df355ae11d111c0c35841923e129c52b077f
+EBUILD kraft-0.80_pre20171115.ebuild 1202 SHA256 b85f3fc0a15228e3289f5fa623f2639dabdc3e21fd8c55d47a1d01f059149896 SHA512 95c6348f93ca01df0cf9dc55a0774b5e4186d7b3236a80bfaf7a8143038d13955c9c717966ff8f42570a364a8d610e5051076cfcba62807232e50aa3529e190b WHIRLPOOL bd57376e169b63c548aa54829cf9e0be5d03455ded4be9c1c1018bae2b980d2cf5ad2d5ff6a67fe8bffe36777ba38d6783077e9e0c8939e73e08afb3debda097
 MISC ChangeLog 3994 SHA256 04496dcdbf9c68f0311d268cab777a25e7f78ce06201dfb513ca4a96eab75e00 SHA512 98fdbf3036940f252d937e4bfc63ff2ecf0cf8e5228c7e9a79e75de73f124b9be11ab3eaf0c57ac822845cab8aadbb996edac91aaf20d9c84c6acf20ec10db5b WHIRLPOOL e1ac4bdae81aa6cc3679f3aeac5a2e10019ff8ab783b89d510615766cef2f759de8f9a2a03a7d9a55569a5359aa11c90a090774503e15a22875bbae705eb56ce
 MISC ChangeLog-2015 2564 SHA256 dc0f232741405c27b965d900725fc52ff1035e110c83e362f8bf2c6ce61dd3bb SHA512 df98953b22a5fb9850533946cf689a382cfdc62f8db15a1e43b8541b08b47261fdcaadb71c9dc32b7e7b282a1d9ac48d0b223bd3c061605ba0d4b34aa67f6f7c WHIRLPOOL 54119dbe54926341cd1c35b9e53d4b06abdd8faa507b328970d0eccc6a1c62b2b8d3b6db8366b19187a5561259832e2d6e6436df68bdcb4dfce0b19474313f2c
-MISC metadata.xml 324 SHA256 85191ed8715e115fc87a453e1cd407e35e3bcd5c3af4d4993a109081217a3144 SHA512 daa8d6137a400ea0c63cc6562ed5b1e30b84f9decfe0d8c6bd89b6a4e13915435f777cb324bc83e2fd293f1d498ed545c09ea02a3aa8d3cd32b2c1c7456d50dd WHIRLPOOL c060b3ead31d17ead377a4e662fca286eb35fa3350a3c1b537fda3aa719d4ecc607cd529518b18f81c940535e06444b7ef46e9677e868a1840d1b77c71872e15
+MISC metadata.xml 418 SHA256 2e050c308682a99cb74a1809762c3265e5f99f706e3740b1531abe0fb90aea70 SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232 WHIRLPOOL 4d012260c10e867a9420d71abf23b3355087758ad52feecfb2c2ca9c44ec0a681191b2f6aaa85ed7b7655413b06644bbcf98443a8329438ade2e15d8686f1ab6
diff --git a/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch b/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
new file mode 100644
index 000000000000..cebf558fd355
--- /dev/null
+++ b/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
@@ -0,0 +1,62 @@
+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.80_pre20171115.ebuild b/app-office/kraft/kraft-0.80_pre20171115.ebuild
new file mode 100644
index 000000000000..c6fd91b04ec3
--- /dev/null
+++ b/app-office/kraft/kraft-0.80_pre20171115.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=6618f5203f80a52e673cfad1a12dcee9154e2831
+KDE_HANDBOOK="forceoptional"
+inherit kde5 vcs-snapshot
+
+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"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="pim"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-cpp/ctemplate
+	pim? (
+		$(add_kdeapps_dep akonadi)
+		$(add_kdeapps_dep akonadi-contacts)
+	)
+"
+RDEPEND="${DEPEND}
+	!app-office/kraft:4
+"
+
+DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pim KF5Akonadi)
+		$(cmake-utils_use_find_package pim KF5AkonadiContact)
+	)
+
+	kde5_src_configure
+}
diff --git a/app-office/kraft/metadata.xml b/app-office/kraft/metadata.xml
index 38bfeaed7bbc..5884c2d79636 100644
--- a/app-office/kraft/metadata.xml
+++ b/app-office/kraft/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">kraft</remote-id>
+		<remote-id type="github">dragotin/kraft</remote-id>
 	</upstream>
+	<use>
+		<flag name="pim">Enable support for KDE PIM resources integration</flag>
+	</use>
 </pkgmetadata>