Version bump wrt bug #490758.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 149 insertions, 18 deletions

diff --git a/media-libs/phonon-gstreamer/ChangeLog b/media-libs/phonon-gstreamer/ChangeLog
index a9cdc5403385..0e2083fd516e 100644
--- a/media-libs/phonon-gstreamer/ChangeLog
+++ b/media-libs/phonon-gstreamer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon-gstreamer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.44 2013/04/11 11:13:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.45 2013/11/11 21:07:10 johu Exp $
+
+*phonon-gstreamer-4.7.0 (11 Nov 2013)
+
+  11 Nov 2013; Johannes Huber <johu@gentoo.org> +phonon-gstreamer-4.7.0.ebuild,
+  phonon-gstreamer-9999.ebuild:
+  Version bump wrt bug #490758.
 
   11 Apr 2013; Michael Palimaka <kensington@gentoo.org>
   -files/phonon-gstreamer-4.6.2-desktop.patch,
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.7.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.7.0.ebuild
new file mode 100644
index 000000000000..c6c8c08902a6
--- /dev/null
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.7.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.7.0.ebuild,v 1.1 2013/11/11 21:07:10 johu Exp $
+
+EAPI=5
+
+[[ ${PV} == *9999 ]] && git_eclass="git-r3"
+EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+
+MY_PN="phonon-backend-gstreamer"
+MY_P=${MY_PN}-${PV}
+
+inherit cmake-utils multibuild ${git_eclass}
+
+DESCRIPTION="Phonon GStreamer backend"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+fi
+SLOT="0"
+IUSE="alsa debug +network +qt4 qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+	media-libs/gstreamer:0.10
+	media-plugins/gst-plugins-meta:0.10[alsa?,ogg,vorbis]
+	>=media-libs/phonon-4.7.0[qt4?,qt5?]
+	qt4? (
+		dev-qt/qtcore:4[glib]
+		dev-qt/qtgui:4[glib]
+		dev-qt/qtopengl:4
+	)
+	qt5? (
+		dev-qt/qtcore:5[glib]
+		dev-qt/qtgui:5[glib]
+		dev-qt/qtopengl:5
+	)
+	virtual/opengl
+	network? ( media-plugins/gst-plugins-soup:0.10 )
+"
+DEPEND="${RDEPEND}
+	qt4? ( >=dev-util/automoc-0.9.87 )
+	virtual/pkgconfig
+"
+
+[[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
+}
+
+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_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 2fea6f1dac18..4a4ba603a450 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild,v 1.15 2013/03/10 10:12:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild,v 1.16 2013/11/11 21:07:10 johu Exp $
 
-EAPI=4
+EAPI=5
 
-[[ ${PV} == *9999 ]] && git_eclass="git-2"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+[[ ${PV} == *9999 ]] && git_eclass="git-r3"
+EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 
 MY_PN="phonon-backend-gstreamer"
 MY_P=${MY_PN}-${PV}
 
-inherit cmake-utils multilib ${git_eclass}
+inherit cmake-utils multibuild ${git_eclass}
 
 DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
@@ -23,29 +23,66 @@ else
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 fi
 SLOT="0"
-IUSE="alsa debug +network"
+IUSE="alsa debug +network +qt4 qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
 	media-libs/gstreamer:0.10
 	media-plugins/gst-plugins-meta:0.10[alsa?,ogg,vorbis]
-	>=media-libs/phonon-4.6.0
-	>=dev-qt/qtcore-4.6.0:4[glib]
-	>=dev-qt/qtgui-4.6.0:4[glib]
-	>=dev-qt/qtopengl-4.6.0:4
+	>=media-libs/phonon-4.7.0[qt4?,qt5?]
+	qt4? (
+		dev-qt/qtcore:4[glib]
+		dev-qt/qtgui:4[glib]
+		dev-qt/qtopengl:4
+	)
+	qt5? (
+		dev-qt/qtcore:5[glib]
+		dev-qt/qtgui:5[glib]
+		dev-qt/qtopengl:5
+	)
 	virtual/opengl
 	network? ( media-plugins/gst-plugins-soup:0.10 )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/automoc-0.9.87
+	qt4? ( >=dev-util/automoc-0.9.87 )
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${MY_P}"
+[[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
+}
 
 src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-		-DPhonon_DIR=/usr/$(get_libdir)/cmake/phonon/
-	)
-	cmake-utils_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_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
 }