gentoo resync : 18.12.2020

4 files changed, 13 insertions, 69 deletions

diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
index 405b7c8308bb..bd61c58725b9 100644
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@@ -1,5 +1,4 @@
-AUX kuroo-0.90.5_p20180410-qt-5.11.patch 1178 BLAKE2B 944d08100d9b3a75bddc9fa44127ed4d71c043c96c1ed267ec2ecd4a4ccffad4f7c65f0be539ebc40392834b4217e057c611dd6912b33d2904a7b4ba2484a0ba SHA512 fb7e746ce8354ce71a38d4a850ffa7cb270727b26d08353cb5d8661583e02e7e0b45013f03aac71a0058e2f0a567ab963669336bde8819bc212083eb19be2c1d
-DIST kuroo-0.90.5_p20180410.tar.xz 241920 BLAKE2B d182df57f0c6628b849f6f6e4d7919281117396ea30360e6eb0993b3c61ba67956a8e0648926f77e23d8222a8337108599f657cb7e49091fd51b98febb6593ce SHA512 f1894c90b8b6df06818cab6cc3fb55a3348f8a9df669b515796dabe9a0df3773d69ba89a4aa3569250b2fb379c1169d8789c82fcd3868ddb9f640f010aee811d
-EBUILD kuroo-0.90.5_p20180410.ebuild 1384 BLAKE2B 644a144a5a39494938163492fd9b812116ca0758561bb8e2203b99ec2dbac7c4175e7f892480bb751ac3fd91c9a0e3124de2f0a3344021e8aee594ff14fbd1ed SHA512 bd034155f09c646e6c8c9ccf8d6bd7ea597f9546b3a821cd83b2cb4a1bb503ee5e3cf2615ae225f96a3bc21d24f3a6759fd129bb3f11aabf7eea4211391ad1a2
-EBUILD kuroo-9999.ebuild 1133 BLAKE2B 5a0366878956d76cbf889aba9f644d7347381c3652ad4c5ea819b0e7c4c6a33a505eee697270a2e8b41a9ca6db6f6fd6f1ab77381f9c643b562a8e42e78b266b SHA512 c984911f4c74eec46a55046dfef46bddb0d42c0374a07185a9b773370fceaab54dbaa5e3b48c0bc8af1100727420b84302beefc3c2f9ebb01473ef7094a082e6
+DIST kuroo-1.0.0.tar.xz 248912 BLAKE2B b7b556fb833052890038a8186d0d5c9eae127633449b542ccad3e38c8c888f31b1dc73bd6b5ecbbfe332917c72f0b1511e25df4360b8057c95172188cee8ae12 SHA512 af90554604aa9ae4776f207202a6a1313e104a9a0883fa924241dc5b14b7d39a4c60b226d2606f55a210b7dfe80c84b952ab3cdca14da77c150e7ae6e7782bc2
+EBUILD kuroo-1.0.0.ebuild 1082 BLAKE2B dfe189437085e3705b9992a48f1209d423552281115e57fb66a244ac44622f4684617021a9cc865fd5ca694bb6d2f6e9b87e1387c24be388e235488c8b20e3ff SHA512 d5c3e0d33b7f84a73e1b17e23119cec37d1b3a3f5b7dc13c76a1a6679d632ca925a2881785db70301626566bacd933e11e484ef5e2c74cad21e738ebc6000424
+EBUILD kuroo-9999.ebuild 1099 BLAKE2B c042dd6f8b908e40471974decb763dd405ba689e3fd57e9527562b690ea7f27d6540974b7588f5164bed5b9e64f01e25c2c29b66a886b4725e4dfb9c5a35ee22 SHA512 659d25f521e86e616974a17a11ea69079d8fe6cb456c4edc41f2ad6c6d4a934e1a9217a86392dd872335ad6fe6d3b0c09851def2ecedb5a5acb99f4c0a75eab1
 MISC metadata.xml 757 BLAKE2B 338d2d4cb0c2d198f8d38ccaa33dac9b9b745baaecbd642f6a0cbf4a3471642db421918eb292a1e7ebed9305429decd70c1cb27f98328cea17f3dc87c893fc53 SHA512 86b24f163496aff68fdfe3ad7fb1648100d1f9757dd18194899b512242236b8e3130b70f74576adbdcc7f570ddccea6655714875f39b52fb6bf4c2bc46b55b11
diff --git a/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch b/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch
deleted file mode 100644
index b7a146e20095..000000000000
--- a/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 77941829f2aba22e05142a47b689e17d594da610 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 16:27:47 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- src/core/categorieslistview.cpp | 5 +++--
- src/core/versionview.cpp        | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/categorieslistview.cpp b/src/core/categorieslistview.cpp
-index d499397..1246aad 100644
---- a/src/core/categorieslistview.cpp
-+++ b/src/core/categorieslistview.cpp
-@@ -22,9 +22,10 @@
- #include "categorieslistview.h"
- 
- #include <qpainter.h>
--#include <QTreeWidget>
--#include <QScrollBar>
- #include <QFrame>
-+#include <QHeaderView>
-+#include <QScrollBar>
-+#include <QTreeWidget>
- 
- #include <kglobal.h>
- 
-diff --git a/src/core/versionview.cpp b/src/core/versionview.cpp
-index 1a2b701..e83e265 100644
---- a/src/core/versionview.cpp
-+++ b/src/core/versionview.cpp
-@@ -21,6 +21,7 @@
- #include "common.h"
- #include "versionview.h"
- 
-+#include <QHeaderView>
- #include <QTreeWidget>
- 
- VersionView::VersionItem::VersionItem( QTreeWidget* parent, const QString& version, const bool& isInstalled, const int& stability )
--- 
-2.17.0
-
diff --git a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild b/app-portage/kuroo/kuroo-1.0.0.ebuild
index c48facaa7beb..cff3675995b0 100644
--- a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
+++ b/app-portage/kuroo/kuroo-1.0.0.ebuild
@@ -1,28 +1,27 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit ecm
 
 DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
 HOMEPAGE="https://sourceforge.net/projects/kuroo/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	dev-db/sqlite:3
-	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
+	kde-frameworks/kauth:5
 	kde-frameworks/kconfig:5
 	kde-frameworks/kconfigwidgets:5
 	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kdelibs4support:5
 	kde-frameworks/ki18n:5
 	kde-frameworks/kio:5
 	kde-frameworks/kitemviews:5
@@ -32,16 +31,11 @@ COMMON_DEPEND="
 	kde-frameworks/kxmlgui:5
 	kde-frameworks/threadweaver:5
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	app-portage/gentoolkit
 	kde-apps/kompare:5
 	kde-plasma/kde-cli-tools:5[kdesu]
 "
-DEPEND="${COMMON_DEPEND}
-	kde-frameworks/extra-cmake-modules:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
 pkg_postinst() {
 	if ! has_version app-admin/logrotate ; then
@@ -49,11 +43,5 @@ pkg_postinst() {
 		elog "portage's summary.log size reasonable to view in the history page."
 	fi
 
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	ecm_pkg_postinst
 }
diff --git a/app-portage/kuroo/kuroo-9999.ebuild b/app-portage/kuroo/kuroo-9999.ebuild
index 6a24d09cce3a..c61ccf8e1e7a 100644
--- a/app-portage/kuroo/kuroo-9999.ebuild
+++ b/app-portage/kuroo/kuroo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,8 +10,8 @@ DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
 HOMEPAGE="https://sourceforge.net/projects/kuroo/"
 
 LICENSE="GPL-2"
-KEYWORDS=""
 SLOT="0"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="
@@ -22,7 +22,6 @@ DEPEND="
 	kde-frameworks/kconfig:5
 	kde-frameworks/kconfigwidgets:5
 	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kdelibs4support:5
 	kde-frameworks/ki18n:5
 	kde-frameworks/kio:5
 	kde-frameworks/kitemviews:5