Add workaround for qmake misbehaviour, bug 388675

(Portage version: 2.1.10.31/cvs/Linux x86_64)

4 files changed, 149 insertions, 1 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 8561d1ef1fd3..eb19b0bc8c5d 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.21 2011/10/28 15:16:55 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.22 2011/10/30 23:22:41 dilfridge Exp $
+
+*phonon-4.5.1-r1 (30 Oct 2011)
+*phonon-4.5.0-r2 (30 Oct 2011)
+
+  30 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +phonon-4.5.0-r2.ebuild, +phonon-4.5.1-r1.ebuild,
+  +files/phonon-4.5.1-qmakeworkaround.patch:
+  Add workaround for qmake misbehaviour, bug 388675
 
   28 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   phonon-4.5.1.ebuild:
diff --git a/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch b/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch
new file mode 100644
index 000000000000..a656889880ac
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch
@@ -0,0 +1,16 @@
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/cmake und phonon-4.5.1/cmake.
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/demos und phonon-4.5.1/demos.
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/designer und phonon-4.5.1/designer.
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/includes und phonon-4.5.1/includes.
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/phonon und phonon-4.5.1/phonon.
+diff -u phonon-4.5.1.orig/qt_phonon.pri phonon-4.5.1/qt_phonon.pri
+--- phonon-4.5.1.orig/qt_phonon.pri	2011-10-21 21:03:49.000000000 +0200
++++ phonon-4.5.1/qt_phonon.pri	2011-10-31 00:16:58.081648105 +0100
+@@ -3,6 +3,5 @@
+ # the next build of Qt. So pretend we're not there in this case.
+ # This file is loaded by qt_config.prf, before .qmake.cache has been loaded.
+ # Consequently, we have to do some stunts to get values out of the cache.
+-if(!exists($$_QMAKE_CACHE_)| \
+-   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
++if(!exists($$_QMAKE_CACHE_)|!contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
+     QT_CONFIG += phonon
diff --git a/media-libs/phonon/phonon-4.5.0-r2.ebuild b/media-libs/phonon/phonon-4.5.0-r2.ebuild
new file mode 100644
index 000000000000..f8107bb6b4f6
--- /dev/null
+++ b/media-libs/phonon/phonon-4.5.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.0-r2.ebuild,v 1.1 2011/10/30 23:22:41 dilfridge Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
+SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+IUSE="aqua debug +gstreamer pulseaudio vlc xine"
+
+COMMON_DEPEND="
+	>=x11-libs/qt-core-4.6.0:4
+	>=x11-libs/qt-dbus-4.6.0:4
+	>=x11-libs/qt-gui-4.6.0:4
+	>=x11-libs/qt-test-4.6.0:4
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+	!x11-libs/qt-phonon:4
+"
+# 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 )
+	xine? ( >=media-libs/phonon-xine-0.4.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-base/phonon-xine
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/automoc-0.9.87
+	dev-util/pkgconfig
+"
+
+REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-pow.patch"
+	"${FILESDIR}/${PN}-4.5.1-qmakeworkaround.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with pulseaudio GLIB2)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon/phonon-4.5.1-r1.ebuild b/media-libs/phonon/phonon-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..ec02b5cbdccc
--- /dev/null
+++ b/media-libs/phonon/phonon-4.5.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.1-r1.ebuild,v 1.1 2011/10/30 23:22:41 dilfridge Exp $
+
+EAPI=4
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+else
+	SCM_ECLASS="git-2"
+	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${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 xine"
+
+COMMON_DEPEND="
+	!x11-libs/qt-phonon:4
+	>=x11-libs/qt-core-4.6.0:4
+	>=x11-libs/qt-dbus-4.6.0:4
+	>=x11-libs/qt-gui-4.6.0:4
+	>=x11-libs/qt-test-4.6.0:4
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+"
+# 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 )
+	xine? ( >=media-libs/phonon-xine-0.4.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-base/phonon-xine
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/automoc-0.9.87
+	dev-util/pkgconfig
+"
+
+REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
+
+PATCHES=( "${FILESDIR}/${P}-qmakeworkaround.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with pulseaudio GLIB2)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+	)
+	cmake-utils_src_configure
+}