gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 64 deletions

diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index dc872503e3f4..e307d71fdff1 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,3 @@
-DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-DIST dolphin-plugins-19.12.2.tar.xz 195884 BLAKE2B 5bb575f5c717bb31faceb6f715390a3dc275df5dd526f5edd1cfdf9c2170d235a87dd187e1f14c134806e06c58e0ca946a15dc9cf0fb6f9e9f1e92dd09803941 SHA512 f825b61c0825156d6f0abfefa1ce617135a4bf9521d7feca2a3b677bbcb386d098ceb1c57ca29847e5bfd0e659bf6a2efce3e9a6676e60576f5f58968375ab1a
-EBUILD dolphin-plugins-mercurial-19.08.3.ebuild 1393 BLAKE2B 14ac93d50d135b612ea35e522574b0ee3b0c1e7e922e4110d999e384e41034a73c18b21b8327a7725066aab5e404d885a4c8f064a8418f026533e919945949b0 SHA512 291a93de65c2c6a6acc4c8c9369cde3b71df92fadcd4e2954cc499b89c0232f2f42b8faff458dba0e6344c18cf9a39a732b211d0ed0e2741c31e57a27889bb97
-EBUILD dolphin-plugins-mercurial-19.12.2.ebuild 1578 BLAKE2B 275f999030e35a18e5fd39f5c3d07b585d67ea905bf515bb0389a3f400ff6e8952005446590dbccaa11737f5706c23fab5cb11e4b512566e17f5f972ce180fb9 SHA512 830dcd052badcd75549a9f33c03634df50457c9898cc22867b44c84e703d04c46625cbe9e2e9cbd1fb04203c305c2d501dde31bb966f7556a534b8a1ce4dc543
+DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
+EBUILD dolphin-plugins-mercurial-19.12.3.ebuild 1575 BLAKE2B 5665a98a9f324d90ddabbb190afb38dcd08fd7a48a71b8b11022f82376495f0f95dd23e0b4580f977671fcdebf788e98d481ff5458fb5467ffa996655e3cb689 SHA512 320ef405a7e704295e1d3a1475d74ae1583a195985524ecf99c5a5b2e2562e47aa7131a205fe8a7637484aa1ef7bb54d87ceafd0ea87c6db6c35e0618800c0fe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
deleted file mode 100644
index aa9f14c9e97c..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="dolphin-plugins"
-ECM_HANDBOOK="false"
-MY_PLUGIN_NAME="hg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-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
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.2.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.3.ebuild
index 7cd6e8a4587a..82a165e54076 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.2.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="