diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2008-07-27 01:22:04 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2008-07-27 01:22:04 +0000 |
| commit | f4d93830bca392878a1017e93615b11be6cf38c1 (patch) | |
| tree | cadc16f5f3e752e5b9bcd782eeec59236ca3f63b /x11-libs | |
| parent | Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11. (diff) | |
| download | gentoo-2-f4d93830bca392878a1017e93615b11be6cf38c1.tar.gz gentoo-2-f4d93830bca392878a1017e93615b11be6cf38c1.tar.bz2 gentoo-2-f4d93830bca392878a1017e93615b11be6cf38c1.zip | |
Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qscintilla/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qscintilla/qscintilla-2.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/qscintilla/qscintilla-2.2.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog index 9771b0424442..2244a958e63a 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.12 2008/07/08 12:41:57 griffon26 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.13 2008/07/27 01:22:04 carlo Exp $ + + 27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qscintilla-2.1-r1.ebuild, + qscintilla-2.2.ebuild: + Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11. 08 Jul 2008; Maurice van der Pot <griffon26@gentoo.org> files/qscintilla-2.2-qt.patch, files/qscintilla-2.2-qt4.patch: diff --git a/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild index 38788407bece..43ce7184942e 100644 --- a/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.1-r1.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/qscintilla/qscintilla-2.1-r1.ebuild,v 1.7 2008/05/12 15:12:03 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild,v 1.8 2008/07/27 01:22:04 carlo Exp $ EAPI=1 inherit eutils toolchain-funcs multilib @@ -21,7 +21,7 @@ IUSE="qt4 +python doc examples debug" RDEPEND=" qt4? ( || ( x11-libs/qt-gui:4 - x11-libs/qt:4 ) + =x11-libs/qt-4.3*:4 ) ) !qt4? ( x11-libs/qt:3 )" # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings diff --git a/x11-libs/qscintilla/qscintilla-2.2.ebuild b/x11-libs/qscintilla/qscintilla-2.2.ebuild index 1434152f8868..1defb48ab8d1 100644 --- a/x11-libs/qscintilla/qscintilla-2.2.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.2.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/qscintilla/qscintilla-2.2.ebuild,v 1.1 2008/05/24 22:38:50 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.2.ebuild,v 1.2 2008/07/27 01:22:04 carlo Exp $ EAPI=1 inherit eutils toolchain-funcs multilib @@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="qt4 +python doc examples debug" RDEPEND="qt4? ( || ( x11-libs/qt-gui:4 - x11-libs/qt:4 ) + =x11-libs/qt-4.3*:4 ) ) !qt4? ( x11-libs/qt:3 )" # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings |