diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-06-13 23:26:43 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-06-13 23:26:43 +0000 |
| commit | 4c1c229d12d8021478286af5e521733d30ef67a7 (patch) | |
| tree | dbef78b64b24fda3f6ae5c9e8eea8109ceb74118 /x11-libs/qt-demo | |
| parent | Patch not used, remove. (diff) | |
| download | historical-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-demo')
| -rw-r--r-- | x11-libs/qt-demo/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-demo/qt-demo-4.4.0.ebuild | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index 43bcf097be87..7b5ec4e63363 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-demo # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.2 2008/05/25 14:56:10 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.3 2008/06/13 23:21:15 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-demo-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 25 May 2008; Markus Rothe <corsair@gentoo.org> qt-demo-4.4.0.ebuild: Added ~ppc/~ppc64 diff --git a/x11-libs/qt-demo/qt-demo-4.4.0.ebuild b/x11-libs/qt-demo/qt-demo-4.4.0.ebuild index 45bcc8100f30..71111599e55d 100644 --- a/x11-libs/qt-demo/qt-demo-4.4.0.ebuild +++ b/x11-libs/qt-demo/qt-demo-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.0.ebuild,v 1.2 2008/05/25 14:56:10 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.4.0.ebuild,v 1.3 2008/06/13 23:21:15 ingmar Exp $ EAPI="1" inherit qt4-build @@ -27,6 +27,7 @@ DEPEND=" ~x11-libs/qt-test-${PV}:${SLOT} ~x11-libs/qt-webkit-${PV}:${SLOT} ~x11-libs/qt-xmlpatterns-${PV}:${SLOT} + !<=x11-libs/qt-4.4.0_alpha:${SLOT} " RDEPEND="${DEPEND}" |