[gentoo-commits] repo/gentoo:master commit in: net-im/choqok/, net-im/choqok/files/

[Andreas Sturmlechner]

commit:     220778769634b0a09582aa4f862f09bdfc998c21
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  8 12:37:34 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 12:38:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22077876

net-im/choqok: Drop 1.6.0_p20190726

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-im/choqok/Manifest                             |  1 -
 net-im/choqok/choqok-1.6.0_p20190726.ebuild        | 70 ----------------
 .../choqok-1.6.0_p20190726-missing-header.patch    | 94 ----------------------
 3 files changed, 165 deletions(-)

diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 36d4b972d64..968126781e4 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,2 +1 @@
-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

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 c6bfef43b41..00000000000
--- 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/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 d8b58183e2b..00000000000
--- 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@×××.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@×××××.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@×××××.com\>
- */
--- 
-cgit v1.1
-
-From bef6784596bf0b41287ebad81f138e1c8c2a6be2 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@×××.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