gentoo resync : 18.08.2019

4 files changed, 61 insertions, 7 deletions

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 3b751df9cc2e..a720782671e2 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,4 +1,6 @@
+AUX konversation-1.7.5-fix-regex-for-cap-ack.patch 1040 BLAKE2B fb0e34812623079fcfaff022734f340b02bf1ee81cdf1819f034e203584fae922db1a8b7401942ea64df0c9dbdedb641c58d9c3688c9b7b47ca43b7ef64cf4de SHA512 e8f945919f21bbcb7ce9575fbb8b17e14b4c72fa736865bd7ed48c6806aa0be2778f63b9fbc05aa4580467587cba26b52ff7fea6e816208dd5048439dd8c9bbd
+AUX konversation-1.7.5-missing-header.patch 574 BLAKE2B a2a88b4d071685301fcf071f676eac814ab21ce4dcdcd9af7ced5ea2e595d0335f73a36011393fa7c54ae26d60486d9b4319d2e197bee79adda79c6158b1a0d5 SHA512 b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
-EBUILD konversation-1.7.5.ebuild 1760 BLAKE2B b158ed541854a14524eeb4309578d8ffce9805f2315ed8422de413b9fb8f1988666c63b850a26cbc34b2fbac263a00ffa750a5f5cbc29c670a78a04778308ce6 SHA512 56517f2248c40d5f486c3f40eba3888e84abf32aba95887ea7c08cafa01b4b0b39699df0ebdb83247d6cd383fad98cae3e4f01a08a56aafe34505961338d2e56
+EBUILD konversation-1.7.5-r1.ebuild 1837 BLAKE2B 772a337adf4236626228f97292dce4d0c82727ced7190055c4c7083ee4a8b586417493aacce2427791aae92c8b0a1bcefc52236a60d41187e96d237d5ce59022 SHA512 78d40daed9100b0195c6e45605c71e288c5c9876f2f8b68b47aab61ea07afad2e7532187c3ff2fc4b04c65e0ceaaaedf34f13dbe6a94035bfb788d7600e23c52
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
new file mode 100644
index 000000000000..f351dd00134f
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
@@ -0,0 +1,25 @@
+From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001
+From: Peter Simonsson <peter.simonsson@gmail.com>
+Date: Sun, 23 Sep 2018 08:29:43 +0200
+Subject: Fix regex for cap ack
+
+Seems to have worked despite being broken
+---
+ src/irc/inputfilter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
+index fbd268b..45d4f88 100644
+--- a/src/irc/inputfilter.cpp
++++ b/src/irc/inputfilter.cpp
+@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma
+ 
+                 foreach(const QString& capability, capabilities)
+                 {
+-                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive));
++                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive));
+                     QString modifierString = capability.left(nameStart);
+                     QString name = capability.mid(nameStart);
+ 
+-- 
+cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
new file mode 100644
index 000000000000..1ff14b81ec58
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
@@ -0,0 +1,23 @@
+From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:14:32 +0200
+Subject: Fix build with Qt 5.13
+
+---
+ src/irc/outputfilter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
+index f9e6253..45d11fb 100644
+--- a/src/irc/outputfilter.cpp
++++ b/src/irc/outputfilter.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <QStringList>
+ #include <QFile>
++#include <QMetaMethod>
+ #include <QRegExp>
+ #include <QTextCodec>
+ #include <QByteArray>
+-- 
+cgit v1.1
diff --git a/net-irc/konversation/konversation-1.7.5.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild
index 412eb10ff27c..c53563084a21 100644
--- a/net-irc/konversation/konversation-1.7.5.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r1.ebuild
@@ -1,19 +1,20 @@
-# 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
 
-DESCRIPTION="A user friendly IRC Client"
-HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org"
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://kde.org/applications/internet/konversation/ https://konversation.kde.org"
 SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"
 IUSE="+crypt"
 
+BDEPEND="sys-devel/gettext"
 DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
@@ -46,14 +47,17 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5(+)]
-	sys-devel/gettext
 	crypt? ( app-crypt/qca:2[qt5(+)] )
 "
 RDEPEND="${DEPEND}
-	!net-irc/konversation:4
 	crypt? ( app-crypt/qca:2[ssl] )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
+	"${FILESDIR}"/${P}-missing-header.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package crypt Qca-qt5)