diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-04-09 18:47:56 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-04-09 18:47:56 +0000 |
| commit | cb1832bb154745a265767a8747694ff08bcb4f81 (patch) | |
| tree | da0868acbfa2b121ebcdc7285e0e0c418be243b0 /x11-libs/qscintilla | |
| parent | Make dependencies compatible with split Qt:4. (diff) | |
| download | gentoo-2-cb1832bb154745a265767a8747694ff08bcb4f81.tar.gz gentoo-2-cb1832bb154745a265767a8747694ff08bcb4f81.tar.bz2 gentoo-2-cb1832bb154745a265767a8747694ff08bcb4f81.zip | |
Make dependencies compatible with split Qt:4.
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'x11-libs/qscintilla')
| -rw-r--r-- | x11-libs/qscintilla/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qscintilla/qscintilla-2.1-r1.ebuild | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog index e9f719e5b966..c781074b879c 100644 --- a/x11-libs/qscintilla/ChangeLog +++ b/x11-libs/qscintilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qscintilla # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.6 2008/03/22 19:54:09 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.7 2008/04/09 18:47:56 ingmar Exp $ + + 09 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> + qscintilla-2.1-r1.ebuild: + Make dependencies compatible with split Qt:4. 22 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> qscintilla-2.1-r1.ebuild: diff --git a/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild index a95fc14f89ce..59e042808989 100644 --- a/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild @@ -1,9 +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/qscintilla/qscintilla-2.1-r1.ebuild,v 1.5 2008/03/22 19:54:09 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild,v 1.6 2008/04/09 18:47:56 ingmar Exp $ EAPI=1 - inherit eutils toolchain-funcs multilib SCINTILLA_VER="1.73" @@ -20,8 +19,11 @@ LICENSE="GPL-2" KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd" IUSE="qt4 +python doc examples debug" -RDEPEND="qt4? ( =x11-libs/qt-4* ) - !qt4? ( =x11-libs/qt-3* )" +RDEPEND=" + qt4? ( || ( x11-libs/qt-gui:4 + x11-libs/qt:4 ) + ) + !qt4? ( x11-libs/qt:3 )" # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings # need dev-python/PyQt, bug 199543 PDEPEND="python? ( dev-python/qscintilla-python )" |