gentoo resync : 25.04.2020

7 files changed, 403 insertions, 0 deletions

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 84aca1d02fc4..4b7d35c701f3 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,12 @@
+AUX konversation-1.7.5-QElapsedTimer.patch 2292 BLAKE2B 88cdfd06b20f75aa85a61792ac797a4315b7d7d0b1df8056a1967b50fcf827ab073ed8961e5be462b829b1b56c3ff9325a52d6a6d09429011fde55b732295215 SHA512 75408a7efb8b6e3d1e5e17b2c11111b487da92939680555f284d066e0507237b81bda34aa24cc73e519319853189edf38f6cbf74e8f2a76a02df3261e5084c52
 AUX konversation-1.7.5-fix-regex-for-cap-ack.patch 1040 BLAKE2B fb0e34812623079fcfaff022734f340b02bf1ee81cdf1819f034e203584fae922db1a8b7401942ea64df0c9dbdedb641c58d9c3688c9b7b47ca43b7ef64cf4de SHA512 e8f945919f21bbcb7ce9575fbb8b17e14b4c72fa736865bd7ed48c6806aa0be2778f63b9fbc05aa4580467587cba26b52ff7fea6e816208dd5048439dd8c9bbd
+AUX konversation-1.7.5-kf5bookmarks-5.69.patch 1491 BLAKE2B 4041825268ca0968cb4c21b3e2b2503600ebb0d1af3c91623091abf75875962b57c75de5f2936b1dc39c457d928df0990aec2db3472336cc51e9ad243727c7e1 SHA512 cb71fed6944c7b5299fb535bb650f607feb1417b3e648246162110ce89dbc3d65c65d2d077ea471762bd3941a725c02f54fdfd78927c88f3854ea80adae2263c
+AUX konversation-1.7.5-kf5windowsystem-5.63.patch 1074 BLAKE2B cd24488b5892d75fd81492e736c077fa8b109293c15fa8ba90ac7fe9c9928903f14f9de706784f6203b944a2aa87b45c6d79269b97e7fb22b5be82012c8b32d5 SHA512 55bfff05b0ac8d992312b821e507abdf397e23ff127544a2cd3c76654bcb575ff72fad82d44a852479ca2c9463c5ed08aa945e0bbf7ca735c2798c9aafd1aabd
 AUX konversation-1.7.5-missing-header.patch 574 BLAKE2B a2a88b4d071685301fcf071f676eac814ab21ce4dcdcd9af7ced5ea2e595d0335f73a36011393fa7c54ae26d60486d9b4319d2e197bee79adda79c6158b1a0d5 SHA512 b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386
+AUX konversation-1.7.5-qt-5.15.patch 814 BLAKE2B 3c5ddf41f0dc05244b69546616e7df2b98e2b51125954f7c5c9a75aaae750ee45a8a3fc3175dea6e0c171c4ee06d43002fdbcd6d08fc8e1bd9e316c25774ca4c SHA512 056a3d6c17b04734e446b623b88dfa9fd4a90133c251b427460f5c6f3f85a52ad46abe92b055e8a5eb86f433f67e4645f9999d6124d3343466b741d99c11b076
+AUX konversation-1.7.5-unused-kemoticons.patch 3192 BLAKE2B b1882f31639e17e2927ca7b7eecde12511a122ca6ebcc8fc2ab70cd38b28f973ba07e043aeed16dd029281b3c413515df707120c964105257960d23feee24e1f SHA512 3158d47aad3920715bd9dc010585e4a2e7488872a24cac8f69bff8ebafc4445d54611756ad05399d8bbd1b4be37fb28d8566577fbc040559fdad3ab18927e3df
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
 EBUILD konversation-1.7.5-r1.ebuild 2072 BLAKE2B 30748529d81e48df25598047d5dcb078e9ce44aafcd102d36ecac01c0f9b395ddceb19e6d47842d8ab396d87803447191d78b213fd8249212958c7b203ac2bc3 SHA512 7598b801ade04ed967942e24f653271e7a07b7ace7c16264bd4e285bfbe7f6bc83d449c255a27367d462216d5bceec74f0203a956043d8b3f757df6a53fca4b7
+EBUILD konversation-1.7.5-r2.ebuild 2272 BLAKE2B 3c87dc8a8f1102d8a3b3b13c757de4502b3d59d4d8fdd8841dcae85eda66f3cccaf052fb31831bb8bd41722ec667291ec48453bae560e09d5bbe4a3d0a93da4d SHA512 f5cbe6112c22fefe5a9af3a61e169ca2409b7da6eb1fd6fa3cb698246561e91d7cbc1d68585d4ab4d9057b222917cf2a1aa3e84141182ddb2712fb65430208ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
new file mode 100644
index 000000000000..74fd23e58d3c
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
@@ -0,0 +1,81 @@
+From 0efede7857a86f729bec0fdfd1789f7faf23d957 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Thu, 28 Nov 2019 17:41:33 +0100
+Subject: Port to QElapsedTimer; remove unused default constructor
+
+Tested by printing out the value of age(), works like before.
+---
+ src/irc/ircqueue.cpp |  8 ++++++++
+ src/irc/ircqueue.h   | 18 +++++++-----------
+ 2 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/src/irc/ircqueue.cpp b/src/irc/ircqueue.cpp
+index 1101623..3cc33a5 100644
+--- a/src/irc/ircqueue.cpp
++++ b/src/irc/ircqueue.cpp
+@@ -19,6 +19,14 @@
+ 
+ #include "server.h"
+ 
++IRCMessage::IRCMessage(const QString &str)
++    : s(str) //, codec(QTextCodec::codecForName("utf8"))
++{
++    t.start();
++}
++
++////
++
+ int IRCQueue::EmptyingRate::nextInterval(int, int elapsed)
+ {
+     if (!isValid())
+diff --git a/src/irc/ircqueue.h b/src/irc/ircqueue.h
+index 3f7f0c8..7a91776 100644
+--- a/src/irc/ircqueue.h
++++ b/src/irc/ircqueue.h
+@@ -19,6 +19,7 @@
+ #include <QObject>
+ #include <QList>
+ #include <QTime>
++#include <QElapsedTimer>
+ 
+ class QTimer;
+ class Server;
+@@ -34,29 +35,24 @@ class Server;
+  */
+ struct IRCMessage
+ {
+-    IRCMessage() : t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8"))
+-    {} ///< this constructor required for QValueList, do not use
+-
+     /**
+         Make a new IRCMessage with timestamp of QTime::currentTime().
+ 
+         Note the constructor takes a QString, not a const QString& or a QString *. If you want to modify the
+         contained text, put it back with setText.
+     */
+-    IRCMessage(QString i) : s(i), t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8"))
+-    {}
++    IRCMessage(const QString &str);
+ 
+-    QString text() { return s; }
+-    int age() { return t.elapsed(); }
+-    QTime time() { return t; }
+-    void setText(QString text) { s=text; }
++    QString text() const { return s; }
++    int age() const { return t.elapsed(); } // in milliseconds
++    void setText(const QString &text) { s=text; }
+ private:
+     QString s;
+-    QTime t;
++    QElapsedTimer t;
+ 
+     //FIXME wire this up
+     //QTextCodec* codec;
+-    //operator const char * () const { return codec->fromUnicode(text()); }
++    //operator QByteArray () const { return codec->fromUnicode(text()); }
+ 
+ };
+ 
+-- 
+cgit v1.1
+
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
new file mode 100644
index 000000000000..2c36f69aa99c
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
@@ -0,0 +1,51 @@
+From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 17 Apr 2020 13:14:26 +0200
+Subject: Adapt the code to KBookmarkMenu-5.69 changes
+
+Test Plan:
+Bookmarks menu still works, and the bookmark actions still show in the
+shortcuts editor dialog.
+
+Reviewers: #konversation, psn
+
+Reviewed By: #konversation, psn
+
+Subscribers: #konversation
+
+Differential Revision: https://phabricator.kde.org/D28911
+---
+ src/bookmarkhandler.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp
+index 5a70591..74b51ff 100644
+--- a/src/bookmarkhandler.cpp
++++ b/src/bookmarkhandler.cpp
+@@ -21,7 +21,10 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
+ #include "connectionmanager.h"
+ #include "viewer/viewcontainer.h"
+ 
++#include <KActionCollection>
++#include <kbookmarks_version.h>
+ #include <KBookmarkMenu>
++#include <QMenu>
+ #include <QStandardPaths>
+ 
+ 
+@@ -41,7 +44,12 @@ m_mainWindow(mainWindow)
+     manager->setEditorOptions(i18n("Konversation Bookmarks Editor"), false);
+     manager->setUpdate( true );
+ 
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
+     m_bookmarkMenu = new KBookmarkMenu(manager, this, menu, m_mainWindow->actionCollection());
++#else
++    m_bookmarkMenu = new KBookmarkMenu(manager, this, menu);
++    m_mainWindow->actionCollection()->addActions(menu->actions());
++#endif
+ }
+ 
+ KonviBookmarkHandler::~KonviBookmarkHandler()
+-- 
+cgit v1.1
+
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
new file mode 100644
index 000000000000..cf93b3b66def
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
@@ -0,0 +1,37 @@
+From 4295aba5c02533040723d140e062aebd231b3f18 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Thu, 28 Nov 2019 12:56:34 +0100
+Subject: Port away from deprecated KWindowSystem API (with ifdefs)
+
+---
+ src/application.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/application.cpp b/src/application.cpp
+index 4667c24..538624b 100644
+--- a/src/application.cpp
++++ b/src/application.cpp
+@@ -50,6 +50,7 @@
+ #include <KTextEdit>
+ #include <KSharedConfig>
+ #include <KStartupInfo>
++#include <kwindowsystem_version.h>
+ 
+ using namespace Konversation;
+ 
+@@ -1392,7 +1393,12 @@ void Application::handleActivate(const QStringList& arguments)
+ 
+     newInstance(m_commandLineParser);
+ 
++#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 62, 0)
+     KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
++#else
++    mainWindow->setAttribute(Qt::WA_NativeWindow, true);
++    KStartupInfo::setNewStartupId(mainWindow->windowHandle(), KStartupInfo::startupId());
++#endif
+     mainWindow->show();
+     mainWindow->raise();
+ }
+-- 
+cgit v1.1
+
diff --git a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
new file mode 100644
index 000000000000..a17c0a432314
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
@@ -0,0 +1,31 @@
+From f88c73cf278da9907496eab0777903f942c50cb9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 21 Apr 2020 10:34:49 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing header)
+
+Test Plan: Build succeeds with Qt 5.15.0_beta4
+
+Reviewers: #konversation, psn
+
+Reviewed By: #konversation, psn
+
+Differential Revision: https://phabricator.kde.org/D29038
+---
+ src/viewer/viewtree.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/viewer/viewtree.cpp b/src/viewer/viewtree.cpp
+index eeee8fb4..04ec4e54 100644
+--- a/src/viewer/viewtree.cpp
++++ b/src/viewer/viewtree.cpp
+@@ -21,6 +21,7 @@
+ #include <QFontDatabase>
+ #include <QGuiApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QItemSelectionModel>
+ #include <QStyleHints>
+ #include <QToolTip>
+-- 
+2.26.1
+
diff --git a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
new file mode 100644
index 000000000000..d856a17215a9
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
@@ -0,0 +1,112 @@
+From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Mon, 16 Sep 2019 18:18:49 +0100
+Subject: Drop effectively unused kemoticons support
+
+Summary:
+Konversation only supported emoticons if config value EnableEmotIcons
+was true. This by default was false and there is no UI for configuring
+this, making it effectively unused.
+
+This appears to be deliberate from the code comments.
+
+This helps clear up some KEmoticon library usage for future KF6
+transitioning.
+
+UTF-8 emoticons work correctly.
+
+Test Plan: Compiles
+
+Differential Revision: https://phabricator.kde.org/D24000
+---
+ src/CMakeLists.txt           |  2 --
+ src/config/konversation.kcfg |  8 --------
+ src/viewer/ircview.cpp       |  3 ---
+ 3 files changed, 13 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c2077b3..89616a6 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -138,7 +138,6 @@ set(viewer_SRCS
+     viewer/topiclabel.cpp
+     viewer/awaylabel.cpp
+     viewer/editnotifydialog.cpp
+-    viewer/emoticons.cpp
+     viewer/images.cpp
+     viewer/quickbutton.cpp
+     viewer/searchbar.cpp
+@@ -224,7 +223,6 @@ target_link_libraries(konversation
+     KF5::Bookmarks
+     KF5::ConfigWidgets
+     KF5::Crash
+-    KF5::Emoticons
+     KF5::I18n
+     KF5::IdleTime
+     KF5::NotifyConfig
+diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg
+index 1d59eaf..3f0b7a6 100644
+--- a/src/config/konversation.kcfg
++++ b/src/config/konversation.kcfg
+@@ -844,14 +844,6 @@
+       <label></label>
+       <whatsthis></whatsthis>
+     </entry>
+-    <entry key="EnableEmotIcons" type="Bool">
+-      <default>false</default>
+-      <label>Enable emoticons</label>
+-    </entry>
+-    <entry key="EmotIconTheme" type="String">
+-      <default>Default</default>
+-      <label>Emoticons theme</label>
+-    </entry>
+   </group>
+   <group name="PreferencesDialog">
+     <entry name="PreferencesDialogSize" key="Size" type="Size">
+diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
+index c129f61..15f78ca 100644
+--- a/src/viewer/ircview.cpp
++++ b/src/viewer/ircview.cpp
+@@ -20,7 +20,6 @@
+ #include "application.h"
+ #include "highlight.h"
+ #include "sound.h"
+-#include "emoticons.h"
+ #include "notificationhandler.h"
+ 
+ #include <QDrag>
+@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const QString& defaultColor, const
+             QLatin1String("\">") + filteredLine + QLatin1String("</font>");
+     }
+ 
+-    filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine);
+-
+     return filteredLine;
+ }
+ 
+-- 
+cgit v1.1
+
+From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001
+From: Peter Simonsson <peter.simonsson@gmail.com>
+Date: Tue, 7 Apr 2020 16:37:53 +0200
+Subject: Remove KEmoticons from dependencies as it's not used
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5315dbd..19facd8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+     CoreAddons
+     Crash
+     DocTools
+-    Emoticons
+     I18n
+     IdleTime
+     NotifyConfig
+-- 
+cgit v1.1
diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
new file mode 100644
index 000000000000..22ed78f5a2d3
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org
+https://kde.org/applications/internet/org.kde.konversation"
+SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+crypt"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5=
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-libs/phonon[qt5(+)]
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+"
+RDEPEND="${DEPEND}
+	crypt? ( app-crypt/qca:2[ssl] )
+"
+
+PATCHES=(
+	# 1.7 branch
+	"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
+	"${FILESDIR}"/${P}-missing-header.patch
+	"${FILESDIR}"/${P}-QElapsedTimer.patch
+	"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
+	# git master
+	"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
+	"${FILESDIR}"/${P}-unused-kemoticons.patch
+	"${FILESDIR}"/${P}-qt-5.15.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# Bug 616162
+	insinto /etc/xdg
+	doins "${FILESDIR}"/konversationrc
+}