gentoo resync : 15.12.2019

4 files changed, 70 insertions, 58 deletions

diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index 35054dde958b..dd433a9bfa98 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-19.04.3.tar.xz 191524 BLAKE2B 8869c9e5c4de20b64ad426db82ce2249821f2bf6ceec958f55b385b16c3c85af7b4e908a37f422e79454ee1ba4f604e1ed9a4ef7ba7ff431dffb32d7443c55e3 SHA512 5a89daee3a4366905bd5c884460b62b9faf75989f8bb9b108f019c4359c5ea6406efcaf896a3504870819467130cd76e31a92cf9d697a5306293b5efd701e4c3
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-EBUILD dolphin-plugins-mercurial-19.04.3.ebuild 1219 BLAKE2B 5fcda1c51b6ff51da071a8f5b6383101a64d4ac2b60927429e9bb1556459134ecceb21d9041f20dc55496fd4727787d35fee0f7f2fc87417ff4e6b0ed2a8a4e6 SHA512 c5ac9a331c8e49fcae878df39401c48586e7359ebfc4b2a132c9a87d8ec0d7bee290dd0f6377f598bc67a09e8e6dca993f122682a528995af8ba801fab29be12
-EBUILD dolphin-plugins-mercurial-19.08.3.ebuild 1396 BLAKE2B 2f54f84a66b094568682289a4c6f3f72ac6b10ae6c5e7d45f20a751e58c1f6b05e7cd22a37cdea7259730f636aaa4d6b4cf4f6061d7ceabb042f647c381e532f SHA512 58c772607240f040aedca8c77d39f114921674264fd4f2c1f160c26d9a4930261a2f4170615b149e34a1fe22bc18fa2cc0d99cdfea315ac2e5341ae292faae4e
+DIST dolphin-plugins-19.12.0.tar.xz 195968 BLAKE2B 10a294ea3950b14b5593f656d067cf8fbfbf680df7dc96e542f6afcd6c29c50d853fc2ab648a0ca151d342a42c3abc5dcc20dd328e2db1dd2aaf97550ae2226a SHA512 2f02cfd4f5b6596e350a77547f76cb484966393947c2c60940e6570c90121085588b2485ae1e46317b86e6d24189356f123f5243f221217942ede587a2d6400f
+EBUILD dolphin-plugins-mercurial-19.08.3.ebuild 1393 BLAKE2B 14ac93d50d135b612ea35e522574b0ee3b0c1e7e922e4110d999e384e41034a73c18b21b8327a7725066aab5e404d885a4c8f064a8418f026533e919945949b0 SHA512 291a93de65c2c6a6acc4c8c9369cde3b71df92fadcd4e2954cc499b89c0232f2f42b8faff458dba0e6344c18cf9a39a732b211d0ed0e2741c31e57a27889bb97
+EBUILD dolphin-plugins-mercurial-19.12.0-r1.ebuild 1578 BLAKE2B a88f166d8064860c61f909dd34bae0759fc7ae495159b3f7df36950aaf45d6e6726c7328c4de0085cc850eb7dfbbe3d120f63ad39013fb7d28c15498ff2ef81e SHA512 a31b2bf6d08dcb6decf7d63a19d67ed9e04080acfb303628d8d9c643128d30b5d0d269f2b69e45a6797eec6090a70c9e65bee7e2bb4504224d489e3e7de16e59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.04.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.04.3.ebuild
deleted file mode 100644
index a675b36183a5..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.04.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="hg"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/mercurial
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	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
-	)
-	kde5_src_configure
-}
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
index 7b2e926413e4..aa9f14c9e97c 100644
--- 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
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Dolphin plugin for Mercurial integration"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild
new file mode 100644
index 000000000000..377f98447cf7
--- /dev/null
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+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
+}