summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-06-13 23:26:43 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-06-13 23:26:43 +0000
commit4c1c229d12d8021478286af5e521733d30ef67a7 (patch)
treedbef78b64b24fda3f6ae5c9e8eea8109ceb74118 /x11-libs/qt-phonon
parentPatch not used, remove. (diff)
downloadhistorical-4c1c229d12d8021478286af5e521733d30ef67a7.tar.gz
historical-4c1c229d12d8021478286af5e521733d30ef67a7.tar.bz2
historical-4c1c229d12d8021478286af5e521733d30ef67a7.zip
Make all split Qt4 ebuilds block the old monolithic ebuild.
Package-Manager: portage-2.1.5.4
Diffstat (limited to 'x11-libs/qt-phonon')
-rw-r--r--x11-libs/qt-phonon/ChangeLog5
-rw-r--r--x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild4
2 files changed, 7 insertions, 2 deletions
diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index 150024972592..c4c60216a1d1 100644
--- a/x11-libs/qt-phonon/ChangeLog
+++ b/x11-libs/qt-phonon/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-phonon
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.8 2008/05/30 04:18:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.9 2008/06/13 23:22:53 ingmar Exp $
+
+ 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-phonon-4.4.0.ebuild:
+ Make all split Qt4 ebuilds block the old monolithic ebuild.
30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-phonon-4.4.0.ebuild:
Marked ~hppa (bug #223557).
diff --git a/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild b/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild
index 6849a9df092f..a7f80437a182 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild,v 1.3 2008/05/30 04:18:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild,v 1.4 2008/06/13 23:22:53 ingmar Exp $
+EAPI="1"
inherit qt4-build
DESCRIPTION="The Phonon module for the Qt toolkit."
@@ -13,6 +14,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
IUSE="dbus"
DEPEND="~x11-libs/qt-gui-${PV}
+ !<=x11-libs/qt-4.4.0_alpha:${SLOT}
media-libs/gstreamer
media-libs/gst-plugins-base
dbus? ( =x11-libs/qt-dbus-${PV} )"