gentoo resync : 05.04.2019

6 files changed, 206 insertions, 4 deletions

diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index 43627fe05168..3fe1541bf1a0 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,6 +1,10 @@
+AUX kdesvn-2.0.0-askpass-porting-fix.patch 1643 BLAKE2B c7f249589e5cd32741dbe59de7aaf2c41372a59be2b646099f570c7060378a1c83a2980cacb56a08cb391e3f6c0c7cf6124a5d0fb0e059cd34d1ba1fd7b01df0 SHA512 fe6abc4fd09ef69a655a791cf9ccd60084e32a029414bf9a0279a4823cac798078ce8232da33bb0329c30d1f42625a1dd98076c59dacf3fb742b81875a1f5fda
+AUX kdesvn-2.0.0-cmake.patch 810 BLAKE2B 0a6096bc9c0d7d315bcbd0d30ac2cff02111857a9496c725fcfd98efc591a15b98d93ae75e7112ca5d1e9630599a30d0d37054b927c71345d3f2fcce5640e8e0 SHA512 a35faaf75c5e8051dc6b5ba8d7220a123086b09800e18f0a3f5f2330d8f35765ff1153a3e57f8dc7ac47f096a3b621e9183012479691a0e855e013c57ecc1589
 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-fix-outofbounds.patch 3678 BLAKE2B 2ee02647d7cb936056a08006c2a9e0484df1f45673cb9b14376c28dda3eeed6230b739b62f7ccb3560924fc3a877950d5a8b450cfa042881e512a1e98066739a SHA512 2e740ca5cb0211b26c4631df464d71f97d896f5c44049040acad830eb0b642f6d65eb09add1b5dcf1c9f0a40e3d60811a192bbcbb908413fbfc05ab0aa006306
+AUX kdesvn-2.0.0-fix-runtime-warning.patch 1084 BLAKE2B d0dd97c332e378473b17e8512dbcdbd1b09dcf447f844cdf532541694e16d0e3cc2436ab9164b19517b9ad86bcc534da280bb7670185916a8e3afeae9c8a596c SHA512 ad5158c65498ab15e1a98c51ddfad959fe3b502eca7c5047189d8d9068dcc94c8406a209c684966cdb70579a409aac2122b709a4f0c190b7ae47e77af6c6f651
 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
+EBUILD kdesvn-2.0.0-r1.ebuild 1719 BLAKE2B ad1eef7c6fec29a74f9b0c5dfd715a7e1f5c4d30b976e85483d0cd526dc112fd882f07f448fd9b06cc3af17c7b538ed2d1260ce3833fc079006e9a9eecdd6f4e SHA512 1d6e5e8fc22973dbf8dede4946eba02db342843c6a85bb022f3e621a2faa3bb2b368e4032ee36398a00f23523552f9a3b344f1d9b223825b8cd50668dec883c0
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch
new file mode 100644
index 000000000000..8e95270f4294
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch
@@ -0,0 +1,42 @@
+From 8be5c9f4f27d3312715c0d60ea6c088ae32283b7 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Tue, 31 Jan 2017 01:29:58 +0100
+Subject: Fix porting issues with kdesvn-askpass
+
+- properly setup and run the command line parser, fixing the order
+  of the operations;
+- set the translation catalog;
+- remove a porting-related comment.
+---
+ src/askpass/kdesvn-askpass.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/askpass/kdesvn-askpass.cpp b/src/askpass/kdesvn-askpass.cpp
+index aea5986..030fa9c 100644
+--- a/src/askpass/kdesvn-askpass.cpp
++++ b/src/askpass/kdesvn-askpass.cpp
+@@ -30,7 +30,8 @@
+ 
+ int main(int argc, char **argv)
+ {
+-    QApplication app(argc, argv); // PORTING SCRIPT: move this to before the KAboutData initialization
++    QApplication app(argc, argv);
++    KLocalizedString::setApplicationDomain("kdesvn");
+     KAboutData aboutData(QStringLiteral("kdesvnaskpass"), i18n("kdesvnaskpass"), QStringLiteral("0.2"),
+                          i18n("ssh-askpass for kdesvn"),
+                          KAboutLicense::LicenseKey::LGPL,
+@@ -39,10 +40,10 @@ int main(int argc, char **argv)
+     KAboutData::setApplicationData(aboutData);
+     parser.addVersionOption();
+     parser.addHelpOption();
+-    aboutData.setupCommandLine(&parser);
+-    aboutData.processCommandLine(&parser);
+     parser.addPositionalArgument(QStringLiteral("[prompt]"), i18n("Prompt"));
++    aboutData.setupCommandLine(&parser);
+     parser.process(app);
++    aboutData.processCommandLine(&parser);
+     // no need for session management
+     //app.disableSessionManagement();
+ 
+-- 
+cgit v1.1
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch
new file mode 100644
index 000000000000..f331cdb49da2
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch
@@ -0,0 +1,26 @@
+From 18039eb7a3a6c5a24cd58b3e9c924ba63d60ca61 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 3 Feb 2018 11:32:44 +0100
+Subject: Fix cmake syntax, this was adding -I settingsdlgs -I PUBLIC to the
+ command line
+
+(detected by -Wmissing-include-dirs)
+---
+ src/settings/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
+index a983484..259a256 100644
+--- a/src/settings/CMakeLists.txt
++++ b/src/settings/CMakeLists.txt
+@@ -56,7 +56,7 @@ target_link_libraries(settingsdlgs
+         KF5::Completion
+         KF5::I18n
+ )
+-include_directories(settingsdlgs
++target_include_directories(settingsdlgs
+     PUBLIC
+         ${CMAKE_CURRENT_SOURCE_DIR}/../
+         ${CMAKE_CURRENT_BINARY_DIR}/../
+-- 
+cgit v1.1
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch
new file mode 100644
index 000000000000..fa12c2db868d
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch
@@ -0,0 +1,99 @@
+From f87f3c9cfc5924742236bee606cc2107475968ce Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Fri, 15 Feb 2019 16:22:50 +0100
+Subject: Fix ASSERTs when calling beginRemoveRows with out of bounds
+ parameters.
+
+The last param must be the last row, not the row count.
+---
+ src/ksvnwidgets/models/commitmodel.cpp  | 49 +++++++++++++++++++--------------
+ src/svnfrontend/models/svnitemmodel.cpp |  6 ++--
+ 2 files changed, 33 insertions(+), 22 deletions(-)
+
+diff --git a/src/ksvnwidgets/models/commitmodel.cpp b/src/ksvnwidgets/models/commitmodel.cpp
+index 4b5be8a..ac9d1ff 100644
+--- a/src/ksvnwidgets/models/commitmodel.cpp
++++ b/src/ksvnwidgets/models/commitmodel.cpp
+@@ -46,33 +46,42 @@ CommitModel::~CommitModel()
+ 
+ void CommitModel::setCommitData(const svn::CommitItemList &aList)
+ {
+-    beginRemoveRows(QModelIndex(), 0, m_List.count());
+-    m_List.clear();
+-    endRemoveRows();
+-
+-    m_List.reserve(aList.size());
+-    beginInsertRows(QModelIndex(), 0, aList.size() - 1);
+-    for (int j = 0; j < aList.size(); ++j) {
+-        m_List.append(CommitModelNodePtr(new CommitModelNode(aList[j])));
++    if (!m_List.isEmpty()) {
++        beginRemoveRows(QModelIndex(), 0, m_List.count() - 1);
++        m_List.clear();
++        endRemoveRows();
++    }
++
++    if (!aList.isEmpty()) {
++        m_List.reserve(aList.size());
++        beginInsertRows(QModelIndex(), 0, aList.size() - 1);
++        for (int j = 0; j < aList.size(); ++j) {
++            m_List.append(CommitModelNodePtr(new CommitModelNode(aList[j])));
++        }
++        endInsertRows();
+     }
+-    endInsertRows();
+ }
+ 
+ void CommitModel::setCommitData(const CommitActionEntries &checked, const CommitActionEntries &notchecked)
+ {
+-    beginRemoveRows(QModelIndex(), 0, m_List.count());
+-    m_List.clear();
+-    endRemoveRows();
+-
+-    m_List.reserve(checked.size() + notchecked.size());
+-    beginInsertRows(QModelIndex(), 0, checked.size() + notchecked.size() - 1);
+-    for (int j = 0; j < checked.size(); ++j) {
+-        m_List.append(CommitModelNodePtr(new CommitModelNode(checked[j], true)));
++    if (!m_List.isEmpty()) {
++        beginRemoveRows(QModelIndex(), 0, m_List.count() - 1);
++        m_List.clear();
++        endRemoveRows();
+     }
+-    for (int j = 0; j < notchecked.size(); ++j) {
+-        m_List.append(CommitModelNodePtr(new CommitModelNode(notchecked[j], false)));
++
++    const int totalSize = checked.size() + notchecked.size();
++    if (totalSize > 0) {
++        m_List.reserve(totalSize);
++        beginInsertRows(QModelIndex(), 0, totalSize - 1);
++        for (int j = 0; j < checked.size(); ++j) {
++            m_List.append(CommitModelNodePtr(new CommitModelNode(checked[j], true)));
++        }
++        for (int j = 0; j < notchecked.size(); ++j) {
++            m_List.append(CommitModelNodePtr(new CommitModelNode(notchecked[j], false)));
++        }
++        endInsertRows();
+     }
+-    endInsertRows();
+ }
+ 
+ int CommitModel::ActionColumn()const
+diff --git a/src/svnfrontend/models/svnitemmodel.cpp b/src/svnfrontend/models/svnitemmodel.cpp
+index 0c76e50..8e99e64 100644
+--- a/src/svnfrontend/models/svnitemmodel.cpp
++++ b/src/svnfrontend/models/svnitemmodel.cpp
+@@ -173,9 +173,11 @@ void SvnItemModel::setRootNodeStat(const svn::StatusPtr &stat)
+ void SvnItemModel::clear()
+ {
+     int numRows = m_Data->m_rootNode->childList().count();
+-    beginRemoveRows(QModelIndex(), 0, numRows);
++    if (numRows > 0)
++        beginRemoveRows(QModelIndex(), 0, numRows - 1);
+     m_Data->clear();
+-    endRemoveRows();
++    if (numRows > 0)
++        endRemoveRows();
+ }
+ 
+ void SvnItemModel::beginRemoveRows(const QModelIndex &parent, int first, int last)
+-- 
+cgit v1.1
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch
new file mode 100644
index 000000000000..6b9dda46c81c
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch
@@ -0,0 +1,28 @@
+From f81a246839b459c57ed89e2d267ae7e07c8c73c1 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Fri, 15 Feb 2019 16:24:07 +0100
+Subject: Fix copy/paste typo on variable name
+
+Detected by this Qt warning showing up:
+QObject::connect: Cannot connect (null)::checkModifiedFinished() to SvnActions::checkUpdateThread()
+
+CCMAIL: Ch.Ehrlicher@gmx.de
+---
+ src/svnfrontend/svnactions.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
+index 0f27fed..9a5b4e3 100644
+--- a/src/svnfrontend/svnactions.cpp
++++ b/src/svnfrontend/svnactions.cpp
+@@ -2675,7 +2675,7 @@ bool SvnActions::createUpdateCache(const QString &what)
+         return false;
+     }
+     m_UThread = new CheckModifiedThread(this, what, true);
+-    connect(m_CThread, SIGNAL(checkModifiedFinished()),
++    connect(m_UThread, SIGNAL(checkModifiedFinished()),
+             this, SLOT(checkUpdateThread()));
+     m_UThread->start();
+     emit sigExtraStatusMessage(i18n("Checking for updates started in background"));
+-- 
+cgit v1.1
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild
index b89d778a3a1f..3bbcbf96af47 100644
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.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
@@ -46,7 +46,6 @@ DEPEND="
 	dev-vcs/subversion
 "
 RDEPEND="${DEPEND}
-	!dev-vcs/kdesvn:4
 	!kde-apps/kdesdk-kioslaves:4[subversion(-)]
 "
 
@@ -54,6 +53,10 @@ PATCHES=(
 	"${FILESDIR}/${P}-desktop.patch"
 	"${FILESDIR}/${P}-deps.patch"
 	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-askpass-porting-fix.patch"
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-fix-outofbounds.patch"
+	"${FILESDIR}/${P}-fix-runtime-warning.patch"
 )
 
 src_prepare(){