3 files changed, 57 insertions, 44 deletions
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index e906ffe3036d..f16afda12e5b 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,4 +1,5 @@
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
 EBUILD phonon-gstreamer-4.9.0-r1.ebuild 1978 BLAKE2B ab48d3cd7486242e6eaedf43434f32d6f857a5ac3f6bf80b63bb41f28acf6b9dc52d900a0e6de6667f88dffd2aa174c59586f4d5837358b42c71267c8e88315d SHA512 062854f40de54080251b0490a359b9579941b8f3fd6300ecb505c500e1f373d8ec818fa477d18306463144211e5e1c80b49c896713b50fab201ace9f53aadf30
-EBUILD phonon-gstreamer-9999.ebuild 1919 BLAKE2B d9e4a14d1d5330cecf30ed787d365f8ae28fdf494ec88444b8308b8cbd480ebd758f85d739922c67df1895023b8d56abb2fb33f5028ec93ea4afcf7dc4842be6 SHA512 62d607045962eccef32bc84dc0d4f3dc43fdada4b94ef653e8c3dba8df821649cca852b329e011df55b5d0af139c5ff29d434ff5d347df0d1356da000b0b0d0d
+EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1056 BLAKE2B aa1afd5ade889a59c5ec4218fe9cba15f50d863483e5b379077c5a832e35a9c57eecf9eddb307e04ccc5bf6882ef72f845749b54407fa57cdfb79bb230882e71 SHA512 17a27ab64a08f7be157a59106e3f8871b631533164d517130c37448fa6d2d26eb2ceb2056cd31c35cc4af15bbe821d0c2792e89ffe86a3d832aa4b10862d9efc
+EBUILD phonon-gstreamer-9999.ebuild 1056 BLAKE2B aa1afd5ade889a59c5ec4218fe9cba15f50d863483e5b379077c5a832e35a9c57eecf9eddb307e04ccc5bf6882ef72f845749b54407fa57cdfb79bb230882e71 SHA512 17a27ab64a08f7be157a59106e3f8871b631533164d517130c37448fa6d2d26eb2ceb2056cd31c35cc4af15bbe821d0c2792e89ffe86a3d832aa4b10862d9efc
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
new file mode 100644
index 000000000000..cd3c7c7b418c
--- /dev/null
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="phonon-backend-gstreamer"
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	inherit git-r3
+fi
+
+inherit cmake-utils
+
+DESCRIPTION="Phonon GStreamer backend"
+HOMEPAGE="https://phonon.kde.org/"
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="alsa debug +network"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/phonon-4.10.0
+	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+	virtual/opengl
+	network? ( media-plugins/gst-plugins-soup:1.0 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index b0e89138a56c..cd3c7c7b418c 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,20 +8,20 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
 fi
 
-inherit cmake-utils multibuild
+inherit cmake-utils
 
 DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://phonon.kde.org/"
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="alsa debug +network qt4"
+IUSE="alsa debug +network"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -33,52 +33,16 @@ RDEPEND="
 	dev-qt/qtx11extras:5
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-libs/phonon-4.9.0[qt4?,qt5(+)]
+	>=media-libs/phonon-4.10.0
 	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
 	virtual/opengl
 	network? ( media-plugins/gst-plugins-soup:1.0 )
-	qt4? (
-		>=dev-qt/qtcore-4.8.7-r2:4[glib]
-		>=dev-qt/qtgui-4.8.7:4[glib]
-		>=dev-qt/qtopengl-4.8.7:4
-		!<dev-qt/qtwebkit-4.10.4:4[gstreamer]
-	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-pkg_setup() {
-	if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
-		ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618"
-	fi
-
-	MULTIBUILD_VARIANTS=( $(usev qt4) qt5 )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
-		fi
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+	cmake-utils_src_configure
 }