gentoo resync : 25.11.2020

3 files changed, 6 insertions, 74 deletions

diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index 7307fa373e6c..48dca3b03983 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,3 @@
-DIST dolphin-plugins-20.04.3.tar.xz 213888 BLAKE2B 8ad8e98a42c5a6d12bd3c03ffcc9f5923d1651bc10a74152f5561ebf59b50aafa24fe29d0ea6a7ce147d4f8732fa72c50664b7a890a6e4fe00c64298c8aa0bd4 SHA512 cab1d81deb8204e2d95ae10dc375d5cdc98958ae3dd0a969ee9ea78326229877cd314d2f37266b2ef1ebcdd876cffade6d7e5ee296028867f9c00592c8cd6eb6
-DIST dolphin-plugins-20.08.1.tar.xz 228072 BLAKE2B f6d0b0945eb1d9872ef20468e7e8df308d240909eda12bda00181f088c0ede3462f5b8560416500c1f199c1587a544cb65b41b5f89b89f2d493e57d077fc5b73 SHA512 e4f0a8899fd26055a80081236e4a9e14ea5d73c011ee0bf6cc934f599d24047adf86b16ff7164edcc59e101f11ad5364d9381f6852a11d6d36571366ff135e7b
-EBUILD dolphin-plugins-mercurial-20.04.3.ebuild 1575 BLAKE2B 140d6772490bc3f58640178e009c4d2d1689fb4667053f4b246841185269df45aed47f656fd17e6357567cfd795e06630ea11a3485f974101d8dd5350eca10db SHA512 71a24aa7753a105a77ca7510dd3fb27cfae47e7a5b3cda03d7a6ccf786428df037e72fdcd51cace826dba78a424c1806ec64b25f58f4173488af85ac290ae95b
-EBUILD dolphin-plugins-mercurial-20.08.1.ebuild 1703 BLAKE2B e409e9e296b67dcdc3c43dd30f61b49a8ae287e06d88bda80ae357b0d5e1fe3923a75125bda877da05b4d1b2e41c91880c61d4f86a49935b0b7b14778e9f2a86 SHA512 c63001f4787ebf325f60ae06b488bf8180f50a599a785d609716f6bb93b06bc99512aa14d92effc1c154ef2ef6d0764fa41a53e202890be437f18469e207ecf1
+DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
+EBUILD dolphin-plugins-mercurial-20.08.3.ebuild 1680 BLAKE2B 39fc4a0568fb04ee24b83fbbf5f83837d66588cc1c5dd6fa229cf4f81aae88fd963fef5da15b394d98cc0eda6dc9f7b080f3539f0cd692932cb21508dbfc8483 SHA512 fef393c698f2b4403d05958c15bd36e7ac5514fd00470ef2d927398b3d12f9e0873fdba3e7f9a154176bfaf7585501e5811164be9cd10ef5e42db92ddf9a269f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.04.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.04.3.ebuild
deleted file mode 100644
index d65d1642ad9d..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.04.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="hg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/mercurial
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.1.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.3.ebuild
index 73960060e861..f6011f824b3b 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.1.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.3.ebuild
@@ -7,16 +7,16 @@ ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="hg"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Mercurial integration"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
+HOMEPAGE="https://apps.kde.org/en/dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="