Offer choice between qt-phonon and media-sound/phonon. Fixes bug 254987.

(Portage version: 2.2_rc23/cvs/Linux i686)

2 files changed, 56 insertions, 1 deletions

diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog
index bd745b0076b6..e4547fb268ba 100644
--- a/x11-libs/qt-demo/ChangeLog
+++ b/x11-libs/qt-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-demo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.10 2009/01/18 20:06:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.11 2009/02/01 22:43:43 yngwin Exp $
+
+*qt-demo-4.4.2-r1 (01 Feb 2009)
+
+  01 Feb 2009; Ben de Groot <yngwin@gentoo.org> +qt-demo-4.4.2-r1.ebuild:
+  Offer choice between qt-phonon and media-sound/phonon. Fixes bug 254987.
 
   18 Jan 2009; Markus Meier <maekke@gentoo.org> qt-demo-4.4.2.ebuild:
   amd64/x86 stable, bug #248038
diff --git a/x11-libs/qt-demo/qt-demo-4.4.2-r1.ebuild b/x11-libs/qt-demo/qt-demo-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..ab0225aed987
--- /dev/null
+++ b/x11-libs/qt-demo/qt-demo-4.4.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.4.2-r1.ebuild,v 1.1 2009/02/01 22:43:43 yngwin Exp $
+
+EAPI="1"
+inherit qt4-build
+
+DESCRIPTION="Demonstration module of the Qt toolkit"
+HOMEPAGE="http://www.trolltech.com/"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}
+	~x11-libs/qt-core-${PV}:${SLOT}
+	~x11-libs/qt-dbus-${PV}:${SLOT}
+	~x11-libs/qt-gui-${PV}:${SLOT}
+	~x11-libs/qt-opengl-${PV}:${SLOT}
+	~x11-libs/qt-qt3support-${PV}:${SLOT}
+	~x11-libs/qt-script-${PV}:${SLOT}
+	~x11-libs/qt-sql-${PV}:${SLOT}
+	~x11-libs/qt-svg-${PV}:${SLOT}
+	~x11-libs/qt-test-${PV}:${SLOT}
+	~x11-libs/qt-webkit-${PV}:${SLOT}
+	~x11-libs/qt-xmlpatterns-${PV}:${SLOT}
+	|| ( ~x11-libs/qt-phonon-${PV}:${SLOT} media-sound/phonon )"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="demos
+	examples"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	doc/src/images"
+
+src_compile() {
+	# Doesn't find qt-gui and fails linking
+	sed -e '/QT_BUILD_TREE/ s:=:+=:' \
+		-i "${S}"/examples/tools/plugandpaint/plugandpaint.pro \
+		|| die "Fixing plugandpaint example failed."
+
+	qt4-build_src_compile
+}
+
+src_install() {
+	insinto ${QTDOCDIR}/src
+	doins -r "${S}"/doc/src/images || die "Installing images failed."
+
+	qt4-build_src_install
+}