Make vlc the new default backend. Remove old.

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

4 files changed, 9 insertions, 113 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index cd7bf1cdc5bb..f989f03ca6d5 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.57 2014/06/21 15:36:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.58 2014/08/10 21:42:11 johu Exp $
+
+  10 Aug 2014; Johannes Huber <johu@gentoo.org> -phonon-4.7.1-r1.ebuild,
+  phonon-4.7.2.ebuild, phonon-9999.ebuild:
+  Make vlc the new default backend. Remove old.
 
 *phonon-4.7.2 (21 Jun 2014)
 
diff --git a/media-libs/phonon/phonon-4.7.1-r1.ebuild b/media-libs/phonon/phonon-4.7.1-r1.ebuild
deleted file mode 100644
index f526bb1df6db..000000000000
--- a/media-libs/phonon/phonon-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.1-r1.ebuild,v 1.1 2014/05/27 11:21:03 johu Exp $
-
-EAPI=5
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-else
-	SCM_ECLASS="git-r3"
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	KEYWORDS=""
-fi
-
-inherit cmake-utils multibuild ${SCM_ECLASS}
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
-
-COMMON_DEPEND="
-	!!dev-qt/qtphonon:4
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		designer? ( dev-qt/designer:4 )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-	zeitgeist? ( dev-libs/libqzeitgeist )
-"
-PDEPEND="
-	aqua? ( media-libs/phonon-qt7 )
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?] )
-	vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?] )
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	qt4? ( >=dev-util/automoc-0.9.87 )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( aqua gstreamer vlc )
-	|| ( qt4 qt5 )
-	zeitgeist? ( qt4 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
-
-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=(
-			-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-			$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
-			$(cmake-utils_use_with pulseaudio GLIB2)
-			$(cmake-utils_use_with pulseaudio PulseAudio)
-			$(cmake-utils_use_with zeitgeist QZeitgeist)
-		)
-		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/phonon-4.7.2.ebuild b/media-libs/phonon/phonon-4.7.2.ebuild
index dd1f8f6f6788..149f12ce827d 100644
--- a/media-libs/phonon/phonon-4.7.2.ebuild
+++ b/media-libs/phonon/phonon-4.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.2.ebuild,v 1.1 2014/06/21 15:36:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.2.ebuild,v 1.2 2014/08/10 21:42:11 johu Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
+IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
 
 REQUIRED_USE="
 	|| ( aqua gstreamer vlc )
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 2e1a1d3c1e5e..d6bc009e1314 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.23 2014/06/21 15:36:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.24 2014/08/10 21:42:11 johu Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
+IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
 
 REQUIRED_USE="
 	|| ( aqua gstreamer vlc )