gentoo resync : 14.07.2018

6 files changed, 175 insertions, 0 deletions

diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
new file mode 100644
index 000000000000..43627fe05168
--- /dev/null
+++ b/dev-vcs/kdesvn/Manifest
@@ -0,0 +1,6 @@
+AUX kdesvn-2.0.0-deps.patch 1436 BLAKE2B edce1dd6ed89dd991b790aae05da128e585bafc20be94dd220176ec264b9db38c15973ea0b2ec7e4ba566849897bf82d25593a598c31c27e3c128defd725354b SHA512 8a4dffee12f8974d60662b4035baa564f02e69e6f24d81c8e63f03c102302c3b617c5b02a5734616fa614ac6984db600da8765aa1fddf78b2d07ed38436d9c36
+AUX kdesvn-2.0.0-desktop.patch 654 BLAKE2B 8f28395849e732c499ac205970da753af9ba7532cc078321fdb4c214927da38a7f566d7e5c3e30faa46e494599a5ee3c5a49604ccd58969f7fc0d10769b3fac8 SHA512 f12b78a2f5640639a9dc781b8754b7dbdc31fa8198c0f3157771ef199e0d17acb86cd592cb903022ee46fca035c55d6cb80108b76891454ceb630086d88be6eb
+AUX kdesvn-2.0.0-qt-5.11.patch 706 BLAKE2B 8c8aae9d62aae648b6c72239c3ebaf13202953b583c8b6b471e9cd142f04701a5bd1c479eb1388a90732ce379f06ff88855ae5a706a0fae249769709c5da2724 SHA512 f706636642d26f9c97f4c917ac388c9903bce9349dc0607cf35e88d72c70e60a969c0ad94cae0896ed5dddea0ff22341ef720a150d1f20224b285c40c3dcc9c4
+DIST kdesvn-2.0.0.tar.xz 2014660 BLAKE2B 41999913ecb1cd3a526bc898feaddd1385773ffdd64bee4b037625745172da62281cf34da284d1dabdae652fad0e4ab31bf0d305ca30309290c35003a2488d9c SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2
+EBUILD kdesvn-2.0.0.ebuild 1575 BLAKE2B 66adeca1e53695dd3d268c0f877c88b0d50782c6f68e3d71602621dd4cc6b9313a40dfebd733e9446bd51d541650387132b570ee72e3c29e18f6b202cc1bd775 SHA512 9f14f4b5802c74c3019ddff981cc0676ca678a3c391169337238305ddf9deeb8044780986acb24923b95554269c19deb39d402cf203b435ad1f6f9d0d6657004
+MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
new file mode 100644
index 000000000000..d943ded7d74f
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
@@ -0,0 +1,47 @@
+commit f62020c59ffb2d8ec84ff3328dddc06cd57d73ed
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Apr 1 15:12:20 2017 +0200
+
+    Replace KF5TextEditor with actual implicit deps
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08a2104a..53d279fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,13 +46,14 @@ include(FeatureSummary)
+ include(ECMInstallIcons)
+ 
+ find_package(KF5 REQUIRED COMPONENTS
+-    Bookmarks Config ConfigWidgets CoreAddons
+-    DBusAddons DocTools I18n IconThemes ItemViews
+-    JobWidgets KIO Notifications Parts Service
+-    TextEditor Wallet WidgetsAddons
++    Bookmarks Codecs Completion Config
++    ConfigWidgets CoreAddons DBusAddons DocTools
++    I18n IconThemes ItemViews JobWidgets KIO
++    Notifications Parts Service TextWidgets
++    Wallet WidgetsAddons XmlGui
+ )
+ find_package(Qt5 REQUIRED COMPONENTS
+-    Core DBus Gui Sql Widgets
++    Core DBus Gui Sql Widgets Xml
+ )
+ 
+ # Set the version
+diff --git a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt
+index 44b8d219..2b0087c8 100644
+--- a/src/ksvnwidgets/CMakeLists.txt
++++ b/src/ksvnwidgets/CMakeLists.txt
+@@ -79,5 +79,11 @@ target_link_libraries(ksvnwidgets
+     PUBLIC
+         svnqt
+         Qt5::Widgets
+-        KF5::TextEditor
++        KF5::Completion
++        KF5::ConfigWidgets
++        KF5::I18n
++        KF5::KIOWidgets
++        KF5::Parts
++        KF5::TextWidgets
++        KF5::XmlGui
+ )
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch
new file mode 100644
index 000000000000..d6427c57f912
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch
@@ -0,0 +1,21 @@
+commit 5ea40285741a885198a351bd9afe58ff746a1192
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Dec 4 23:26:07 2016 +0100
+
+    Fix startup: s/caption/qwindowtitle/
+    
+    REVIEW: 129614
+
+diff --git a/src/org.kde.kdesvn.desktop b/src/org.kde.kdesvn.desktop
+index 0fbac0d..5455338 100644
+--- a/src/org.kde.kdesvn.desktop
++++ b/src/org.kde.kdesvn.desktop
+@@ -49,7 +49,7 @@ GenericName[sl]=Odjemalec za SVN
+ GenericName[sv]=SVN-klient
+ GenericName[uk]=Клієнт SVN
+ GenericName[x-test]=xxSVN Clientxx
+-Exec=kdesvn -caption "%c" %u
++Exec=kdesvn -qwindowtitle "%c" %u
+ Icon=kdesvn
+ Type=Application
+ X-DocPath=kdesvn/index.html
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
new file mode 100644
index 000000000000..019d2271001a
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
@@ -0,0 +1,25 @@
+From 605484fd9fc873b9b8d571f398c3cab05c68d860 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 09:28:15 +0200
+Subject: Fix build with Qt 5.11
+
+Some includes added transitively previously now need to be explicitly
+put.
+---
+ src/svnfrontend/blamedisplay.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp
+index 2d87502..5673181 100644
+--- a/src/svnfrontend/blamedisplay.cpp
++++ b/src/svnfrontend/blamedisplay.cpp
+@@ -30,6 +30,7 @@
+ #include <KTextEdit>
+ #include <KTreeWidgetSearchLine>
+ 
++#include <QAction>
+ #include <QBrush>
+ #include <QFontDatabase>
+ #include <QInputDialog>
+-- 
+cgit v0.11.2
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
new file mode 100644
index 000000000000..b89d778a3a1f
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A frontend to the subversion vcs"
+HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git"
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="+man"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/apr:1
+	dev-libs/apr-util:1
+	dev-vcs/subversion
+"
+RDEPEND="${DEPEND}
+	!dev-vcs/kdesvn:4
+	!kde-apps/kdesdk-kioslaves:4[subversion(-)]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-deps.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use man ; then
+		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+	fi
+}
diff --git a/dev-vcs/kdesvn/metadata.xml b/dev-vcs/kdesvn/metadata.xml
new file mode 100644
index 000000000000..ac7f14a78a1d
--- /dev/null
+++ b/dev-vcs/kdesvn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="man">Build and install man pages</flag>
+	</use>
+</pkgmetadata>