diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-03-16 22:28:30 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-03-16 22:28:30 +0000 |
| commit | dc0bf8fde94f6d73060b652139db9d92d8330c68 (patch) | |
| tree | 5504c08914c0dc1c161ed265a1e9fa3e65451f64 /x11-libs/qt | |
| parent | Remove calls to motif-config, fixes bug 211844. (diff) | |
| download | gentoo-2-dc0bf8fde94f6d73060b652139db9d92d8330c68.tar.gz gentoo-2-dc0bf8fde94f6d73060b652139db9d92d8330c68.tar.bz2 gentoo-2-dc0bf8fde94f6d73060b652139db9d92d8330c68.zip | |
The qt meta ebuild needs to block previous versions of qt:4 too.
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.4.0_beta1.ebuild | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index e20a04535dbc..28f9528ccce6 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.524 2008/03/11 16:51:15 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.525 2008/03/16 22:28:30 zlin Exp $ + + 16 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org> qt-4.4.0_beta1.ebuild: + The qt meta ebuild needs to block previous versions of qt:4 too. 11 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-4.3.2-r1.ebuild, qt-4.3.4.ebuild: diff --git a/x11-libs/qt/qt-4.4.0_beta1.ebuild b/x11-libs/qt/qt-4.4.0_beta1.ebuild index 21873ebf2ed7..ea455b5b0142 100644 --- a/x11-libs/qt/qt-4.4.0_beta1.ebuild +++ b/x11-libs/qt/qt-4.4.0_beta1.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/qt-4.4.0_beta1.ebuild,v 1.3 2008/03/09 21:45:56 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.4.0_beta1.ebuild,v 1.4 2008/03/16 22:28:30 zlin Exp $ +EAPI="1" DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." HOMEPAGE="http://www.trolltech.com/" @@ -11,8 +12,9 @@ KEYWORDS="~amd64 ~x86" IUSE="opengl qt3support" -DEPEND="" -RDEPEND="~x11-libs/qt-gui-${PV} +DEPEND="!=x11-libs/qt-4.4.3*:4" +RDEPEND="${DEPEND} + ~x11-libs/qt-gui-${PV} ~x11-libs/qt-svg-${PV} ~x11-libs/qt-test-${PV} ~x11-libs/qt-sql-${PV} |