gentoo resync : 15.01.2020

2 files changed, 39 insertions, 32 deletions

diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 1f1fb0436b55..5c63a8cf8788 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -6,5 +6,5 @@ AUX kmplayer-0.12.0b-qt-5.11b3.patch 943 BLAKE2B db0b5bbf4e36859693645cde5aa67b9
 AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb49a97550da77641c4cb306eded8849df76eac0dcc441c2febf5523eb07abd1a494eee2335e02bd9d1bceacc87ccdf826 SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9
 AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
 DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
-EBUILD kmplayer-0.12.0b-r2.ebuild 2408 BLAKE2B 9101fb98b727227884a223f8e7386b8f166c531a589e2535b7663a4f62280c73114caea7b8a28cbb70e4d909bdf5582804b18afbe1613be0d3000ecb30edff91 SHA512 0c13ed1b2417d115d5360276f54a776599fb3d2585ff2429b3ac09e12a673b71ab11be9917d2cb93e9631090577df6a9abb5f90dde424931647a544a65473bfe
+EBUILD kmplayer-0.12.0b-r3.ebuild 2668 BLAKE2B 6a935c265b743b4416786017c3919eef83ef0c208d2b1def3e194f4c0cd868eb009ef351c31d6180761cebf593c2f1c63ac3a77bea1b8cb8a3bc9df7823f9b02 SHA512 ad3e22e89bdbdb9e70cbf9008a75cad8331592487c7d6be5d92c1cde0f8db6842bad4a5a9959769ce7fdb14266ba77299982e25b1e2ce2c67c9c3dd3b63af6ff
 MISC metadata.xml 475 BLAKE2B 3c086dc3f1ddb849cf673de7aa73a3d68bc7f24537af193dca8e4f65fe28147f85b05bb8c88d591df95fb1f001ae2fe8b5f414eaf10cc314363c91185b4eb0da SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r2.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r3.ebuild
index ddd10e09aab3..12c25a86a3bd 100644
--- a/media-video/kmplayer/kmplayer-0.12.0b-r2.ebuild
+++ b/media-video/kmplayer/kmplayer-0.12.0b-r3.ebuild
@@ -1,47 +1,54 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="true"
-inherit kde5
+ECM_HANDBOOK="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2"
+HOMEPAGE="https://kmplayer.kde.org
+https://kde.org/applications/multimedia/org.kde.kmplayer"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-KEYWORDS="amd64 x86"
+SLOT="5"
 IUSE="cairo npp"
 
 BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kmediaplayer)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kmediaplayer-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	x11-libs/libxcb
-	cairo? ( x11-libs/cairo[xcb] )
+	cairo? ( x11-libs/cairo[X,xcb(+)] )
 	npp? (
 		dev-libs/dbus-glib
 		dev-libs/glib:2
@@ -66,7 +73,7 @@ PATCHES=(
 src_prepare() {
 	# Prerequisite for ${P}-desktop.patch:
 	mv src/kmplayer.desktop src/org.kde.kmplayer.desktop || die
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if use npp; then
 		sed -i src/kmplayer_part.desktop \
@@ -82,17 +89,17 @@ src_configure() {
 		-DKMPLAYER_BUILT_WITH_NPP=$(usex npp)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 
 	if use npp; then
 		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" \
 			--group "application/x-shockwave-flash" --key player npp
 		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" \
 			--group "application/x-shockwave-flash" \
-			--key plugin /usr/$(get_libdir)/nsbrowser/plugins/libflashplayer.so
+			--key plugin /usr/lib/nsbrowser/plugins/libflashplayer.so
 	fi
 }