gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 169 deletions

diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index acc45bfbf89e..0097871d3639 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,6 +1,3 @@
-AUX choqok-1.6.0_p20190726-missing-header.patch 2633 BLAKE2B 337a69d5addaf10e55cda74d40f0ebf7e768be12cf9b9315a29b622fddb5e2ae0ade9107907b8be495ab285f8cc94bb556c1103191b884620e4469f9ec43c390 SHA512 31b87f27d697afabbc41516715e35b5c28a884db454275c22cc5014af965bcd8ba5faac7ef029754a9c706052972fac39df6e4320f346e450bb808a2f409932c
-DIST choqok-1.6.0_p20190726.tar.xz 1184148 BLAKE2B c0c0459de362aa58337ab2d0c4ea03ff516de87bded48f73c47aa48ed791cfeb82c4085c4d333bff4ac1489a27e038da29d5419569aacb17366dc119e776dd67 SHA512 6471d9b37cc78fd3a14cc970512db3a8d44b21d49efb503917a57332f229c34ed735edfea6a74d6c25d8ab8d153331226effd677405d447c4a2faea3e396decf
 DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
-EBUILD choqok-1.6.0_p20190726.ebuild 1983 BLAKE2B 9d5a949f3c6016c414b490ab99f44c27e5b3e4f1c0cf3beee786e652c0c20e0b249ccb7b96069bd3514e6beee748d0df322c1b1fdd8bf6ca33fb72ffe15c20ad SHA512 502c690d6408f2c5eca575f2dab37c7537248e536b686fead44c3b0b2ec5f7e625436e87b673e530728bcd58b44ea8edc974de9874993fa3966888d83cb95a48
-EBUILD choqok-1.7.0.ebuild 2211 BLAKE2B 67536efba6f6d9b50e702a8ba67a9529355b823710865c7cde5559425d0a86d51aec3fab4810f6f8d53998ccfef3eea8929cf6f9af36ec020dd909fe1738aa6f SHA512 f91ed01d97b3bb62da2ea93a2fd068d6d34c1ff6c04cdf8906d3b416fe5faa46830d95b74f686d483ae36dda44da227c1b94b1f85032c3d8db7002f515645f9a
+EBUILD choqok-1.7.0.ebuild 2209 BLAKE2B 69bb8ba8cdc7f0404cdd141a2f4165bba705ad72365cfca447028214b5e330b7c1296ec63521f58055498a83a66b1730792e93d1563ed8ca47cd1b899e085489 SHA512 dbcca756a8293db4d7fd4ea12c56c2e4dfe1c0b5e062e494eb28c0e9ef75f48670740d68d2a5b61c200098be4a30e2ae91e80521e7bdb208b9f8bb30e2295126
 MISC metadata.xml 634 BLAKE2B 30e3ee2973d1de819dba64ce8f5029627248786d73d13a6203d24c9714cd160481b7170c04a4d7e78c2e1d9a2061b4b952938be2df31b3883fabe2323a2a9154 SHA512 fae64251578632ac8f3f74f2a75b30b2e470aaab9103a5a92978681f8194ecd65f8d2162800ede82b7f2574bb1a5142de8bd68db2e383342ec1ac958e39dd599
diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
deleted file mode 100644
index c6bfef43b416..000000000000
--- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Free/Open Source micro-blogging client by KDE"
-HOMEPAGE="https://choqok.kde.org/
-https://kde.org/applications/internet/org.kde.choqok"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="attica konqueror telepathy"
-
-DEPEND="
-	app-crypt/qca[qt5(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
-	konqueror? (
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-		>=kde-frameworks/kparts-${KFMIN}:5
-	)
-	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package attica KF5Attica)
-		$(cmake_use_find_package konqueror KF5Parts)
-		$(cmake_use_find_package konqueror KF5WebKit)
-		$(cmake_use_find_package telepathy TelepathyQt5)
-	)
-
-	ecm_src_configure
-}
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
diff --git a/net-im/choqok/choqok-1.7.0.ebuild b/net-im/choqok/choqok-1.7.0.ebuild
index a6a4bf140c46..dc005d25d769 100644
--- a/net-im/choqok/choqok-1.7.0.ebuild
+++ b/net-im/choqok/choqok-1.7.0.ebuild
@@ -14,7 +14,7 @@ https://kde.org/applications/internet/org.kde.choqok"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch b/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
deleted file mode 100644
index d8b58183e2bf..000000000000
--- a/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 28 Jul 2019 00:14:30 +0200
-Subject: Fix compile on CI
-
-plugins/uploaders/flickr/flickr.h:50:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
-plugins/uploaders/imageshack/imageshack.h:48:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
----
- plugins/uploaders/flickr/flickr.h         | 2 ++
- plugins/uploaders/imageshack/imageshack.h | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/plugins/uploaders/flickr/flickr.h b/plugins/uploaders/flickr/flickr.h
-index 890219a..7b26609 100644
---- a/plugins/uploaders/flickr/flickr.h
-+++ b/plugins/uploaders/flickr/flickr.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- /**
- @author Andrey Esin \<gmlastik@gmail.com\>
- */
-diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h
-index d9ddc88..63d0e3f 100644
---- a/plugins/uploaders/imageshack/imageshack.h
-+++ b/plugins/uploaders/imageshack/imageshack.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- /**
- @author Mehrdad Momeny \<mehrdad.momeny@gmail.com\>
- */
--- 
-cgit v1.1
-
-From bef6784596bf0b41287ebad81f138e1c8c2a6be2 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 28 Jul 2019 00:20:34 +0200
-Subject: Fix build on CI
-
-Even more missing QMap includes
----
- plugins/uploaders/mobypicture/mobypicture.h | 2 ++
- plugins/uploaders/posterous/posterous.h     | 2 ++
- plugins/uploaders/twitgoo/twitgoo.h         | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/plugins/uploaders/mobypicture/mobypicture.h b/plugins/uploaders/mobypicture/mobypicture.h
-index 098f411..86f61fd 100644
---- a/plugins/uploaders/mobypicture/mobypicture.h
-+++ b/plugins/uploaders/mobypicture/mobypicture.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- class KJob;
- 
- class Mobypicture : public Choqok::Uploader
-diff --git a/plugins/uploaders/posterous/posterous.h b/plugins/uploaders/posterous/posterous.h
-index c7f6fe1..5c9442d 100644
---- a/plugins/uploaders/posterous/posterous.h
-+++ b/plugins/uploaders/posterous/posterous.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- class KJob;
- 
- class Posterous : public Choqok::Uploader
-diff --git a/plugins/uploaders/twitgoo/twitgoo.h b/plugins/uploaders/twitgoo/twitgoo.h
-index ee3f496..020080e 100644
---- a/plugins/uploaders/twitgoo/twitgoo.h
-+++ b/plugins/uploaders/twitgoo/twitgoo.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- class KJob;
- 
- class Twitgoo : public Choqok::Uploader
--- 
-cgit v1.1