Version bump wrt bug #490758. Fix install phonon backend install path, bug #476026.

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

5 files changed, 231 insertions, 25 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 716e6aa2004b..90ad3da23119 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.52 2013/05/10 17:39:09 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.53 2013/11/11 21:05:16 johu Exp $
+
+*phonon-4.7.0 (11 Nov 2013)
+
+  11 Nov 2013; Johannes Huber <johu@gentoo.org>
+  +files/phonon-4.7.0-plugin-install.patch, +files/phonon-4.7.0-rpath.patch,
+  +phonon-4.7.0.ebuild, phonon-9999.ebuild:
+  Version bump wrt bug #490758. Fix install phonon backend install path, bug
+  #476026.
 
   10 May 2013; Michael Palimaka <kensington@gentoo.org> phonon-9999.ebuild:
   Migrate to EAPI 5. Fix missed package move.
diff --git a/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch b/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch
new file mode 100644
index 000000000000..5f478cac18c1
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
+index 3245e9b..3427c62 100644
+--- a/cmake/FindPhononInternal.cmake
++++ b/cmake/FindPhononInternal.cmake
+@@ -178,7 +178,7 @@ if (PHONON_BUILD_PHONON4QT5)
+ endif (PHONON_BUILD_PHONON4QT5)
+ set(BIN_INSTALL_DIR             "bin"     ) #         CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
+ set(LIB_INSTALL_DIR             "${CMAKE_INSTALL_LIBDIR}" ) #  CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed"
+-set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/kde4"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
++set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/qt4"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt4)")
+ if (PHONON_BUILD_PHONON4QT5)
+     set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/qt5"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)
+ endif(PHONON_BUILD_PHONON4QT5)
diff --git a/media-libs/phonon/files/phonon-4.7.0-rpath.patch b/media-libs/phonon/files/phonon-4.7.0-rpath.patch
new file mode 100644
index 000000000000..b840fbe4dd2c
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.7.0-rpath.patch
@@ -0,0 +1,30 @@
+commit cf441af677beade70036453a6480d77d7e702346
+Author: Rex Dieter <rdieter@math.unl.edu>
+Date:   Tue Nov 5 20:15:03 2013 -0600
+
+    fix rpath handling
+    
+    REVIEW: 113649
+
+diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
+index b48bfaf..3245e9b 100644
+--- a/cmake/FindPhononInternal.cmake
++++ b/cmake/FindPhononInternal.cmake
+@@ -217,10 +217,14 @@ endif(APPLE)
+ # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
+ # install directory. Alex
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
+-list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
++set(_abs_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
++if (NOT IS_ABSOLUTE "${_abs_LIB_INSTALL_DIR}")
++   set(_abs_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
++endif()
++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
++list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemCxxLibDir)
+ if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+-   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++   set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
+ endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+ 
+ 
diff --git a/media-libs/phonon/phonon-4.7.0.ebuild b/media-libs/phonon/phonon-4.7.0.ebuild
new file mode 100644
index 000000000000..8442aee99a11
--- /dev/null
+++ b/media-libs/phonon/phonon-4.7.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.0.ebuild,v 1.1 2013/11/11 21:05:16 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 +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
+
+COMMON_DEPEND="
+	!!dev-qt/qtphonon:4
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/designer:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qttest:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qttest: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}/${P}-plugin-install.patch"
+	"${FILESDIR}/${P}-rpath.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_with pulseaudio GLIB2)
+			$(cmake-utils_use_with pulseaudio PulseAudio)
+		)
+		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-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 84df120db6d5..c2784f7fe0ef 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,60 +1,106 @@
 # Copyright 1999-2013 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.19 2013/05/10 17:39:09 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.20 2013/11/11 21:05:16 johu Exp $
 
 EAPI=5
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	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-2"
-	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+	SCM_ECLASS="git-r3"
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	KEYWORDS=""
 fi
 
-inherit cmake-utils ${SCM_ECLASS}
+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 +gstreamer pulseaudio vlc zeitgeist"
+IUSE="aqua debug +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
 
 COMMON_DEPEND="
 	!!dev-qt/qtphonon:4
-	>=dev-qt/qtcore-4.6.0:4
-	>=dev-qt/qtdbus-4.6.0:4
-	>=dev-qt/qtgui-4.6.0:4
-	>=dev-qt/qttest-4.6.0:4
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/designer:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qttest:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qttest:5
+	)
 	pulseaudio? (
 		dev-libs/glib:2
 		>=media-sound/pulseaudio-0.9.21[glib]
 	)
 	zeitgeist? ( dev-libs/libqzeitgeist )
 "
-# directshow? ( media-sound/phonon-directshow )
-# mmf? ( media-sound/phonon-mmf )
-# mplayer? ( media-sound/phonon-mplayer )
-# waveout? ( media-sound/phonon-waveout )
 PDEPEND="
 	aqua? ( media-libs/phonon-qt7 )
-	gstreamer? ( media-libs/phonon-gstreamer )
-	vlc? ( >=media-libs/phonon-vlc-0.3.2 )
+	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}
-	>=dev-util/automoc-0.9.87
+	qt4? ( >=dev-util/automoc-0.9.87 )
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="|| ( aqua gstreamer vlc )"
+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() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with pulseaudio GLIB2)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-	)
-	cmake-utils_src_configure
+	myconfigure() {
+		local mycmakeargs=(
+			-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+			$(cmake-utils_use_with pulseaudio GLIB2)
+			$(cmake-utils_use_with pulseaudio PulseAudio)
+		)
+		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
 }