[gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/, media-libs/libqaccessibilityclient/, media-libs/phonon/, ...

[gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/, media-libs/libqaccessibilityclient/, media-libs/phonon/, ...

[Andreas Sturmlechner]

commit:     75256c747707958bcd0a36ea24cde5d1ab9ad348
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 01:18:30 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 01:20:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=75256c74

media-libs: Port to ecm.eclass and kde.org.eclass

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../libqaccessibilityclient-9999.ebuild                 | 14 ++++++++------
 .../phonon-gstreamer/phonon-gstreamer-9999.ebuild       |  2 +-
 media-libs/phonon-vlc/phonon-vlc-9999.ebuild            |  2 +-
 media-libs/phonon/phonon-9999.ebuild                    |  6 +++---
 media-libs/pulseaudio-qt/pulseaudio-qt-9999.ebuild      | 17 +++++++++--------
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild
index 8757e4e38c..c3a01763e3 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild
@@ -4,10 +4,11 @@
 EAPI=7
 
 ECM_KDEINSTALLDIRS="false"
-KDE_TEST="true"
-KDE_EXAMPLES="true"
+ECM_TEST="true"
+ECM_EXAMPLES="true"
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Library for writing accessibility clients such as screen readers"
 HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityclient.git"
@@ -18,12 +19,13 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="LGPL-2.1"
+SLOT="5"
 IUSE=""
 
 DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 263fa0ffce..f1b6538926 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="GStreamer backend for the Phonon multimedia library"
 HOMEPAGE="https://phonon.kde.org/"

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 890afef5f1..9aef61bb41 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="VLC backend for the Phonon multimedia library"
 HOMEPAGE="https://phonon.kde.org/"

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index b8c768c6d7..0ebc2ce066 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop kde5
+inherit desktop ecm kde.org
 
 DESCRIPTION="KDE multimedia abstraction library"
 HOMEPAGE="https://phonon.kde.org/"
@@ -43,11 +43,11 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
 		-DPHONON_BUILD_SETTINGS=$(usex !pulseaudio)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 	use pulseaudio || \
 		make_desktop_entry "${PN}settings" \
 			"Phonon Audio and Video" preferences-desktop-sound

diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-9999.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-9999.ebuild
index f3d859d3f0..72715c3d5f 100644
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-9999.ebuild
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-9999.ebuild
@@ -3,10 +3,11 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_QTHELP="true"
-KDE_TEST="optional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="true"
+ECM_TEST="optional"
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Qt bindings for libpulse"
 HOMEPAGE="https://cgit.kde.org/pulseaudio-qt.git/"
@@ -21,14 +22,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
 	dev-libs/glib:2
 	media-sound/pulseaudio
 "
 DEPEND="${RDEPEND}
 	test? (
-		$(add_qt_dep qtdeclarative)
-		$(add_qt_dep qtquickcontrols2)
+		>=dev-qt/qtdeclarative-${QTMIN}:5
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	)
 "