summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kapusta <ayoy@gentoo.org>2009-10-06 17:58:11 +0000
committerDominik Kapusta <ayoy@gentoo.org>2009-10-06 17:58:11 +0000
commit0fcdb707979d7a41f96083c1cac519636e1cc653 (patch)
treeb41078b50a603091ebbf7f732cb238d3380450bd
parentVersion bump KDE 4.3.2 (diff)
downloadgentoo-2-0fcdb707979d7a41f96083c1cac519636e1cc653.tar.gz
gentoo-2-0fcdb707979d7a41f96083c1cac519636e1cc653.tar.bz2
gentoo-2-0fcdb707979d7a41f96083c1cac519636e1cc653.zip
Removed alternative dependency on Qt metapackage
(Portage version: 2.2_rc43/cvs/Linux x86_64)
-rw-r--r--x11-libs/qscintilla/ChangeLog6
-rw-r--r--x11-libs/qscintilla/qscintilla-2.1-r1.ebuild9
-rw-r--r--x11-libs/qscintilla/qscintilla-2.2.ebuild8
-rw-r--r--x11-libs/qscintilla/qscintilla-2.3.ebuild8
4 files changed, 14 insertions, 17 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index fef85a89e4c9..7c86fc432c8e 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qscintilla
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.29 2009/09/27 18:28:38 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.30 2009/10/06 17:58:11 ayoy Exp $
+
+ 06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> qscintilla-2.1-r1.ebuild,
+ qscintilla-2.2.ebuild, qscintilla-2.3.ebuild:
+ Removed alternative dependency on Qt metapackage
27 Sep 2009; nixnut <nixnut@gentoo.org> qscintilla-2.4.ebuild:
ppc stable #284707
diff --git a/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild
index 43ce7184942e..7e7325c70455 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
+# Copyright 1999-2009 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.8 2008/07/27 01:22:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild,v 1.9 2009/10/06 17:58:11 ayoy Exp $
EAPI=1
inherit eutils toolchain-funcs multilib
@@ -19,10 +19,7 @@ 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-gui:4
- =x11-libs/qt-4.3*:4 )
- )
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )
!qt4? ( x11-libs/qt:3 )"
# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
# need dev-python/PyQt, bug 199543
diff --git a/x11-libs/qscintilla/qscintilla-2.2.ebuild b/x11-libs/qscintilla/qscintilla-2.2.ebuild
index 1defb48ab8d1..7b6b4dc42a3a 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
+# Copyright 1999-2009 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.2 2008/07/27 01:22:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.2.ebuild,v 1.3 2009/10/06 17:58:11 ayoy Exp $
EAPI=1
inherit eutils toolchain-funcs multilib
@@ -18,9 +18,7 @@ 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-gui:4
- =x11-libs/qt-4.3*:4 )
- )
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )
!qt4? ( x11-libs/qt:3 )"
# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
# need dev-python/PyQt, bug 199543
diff --git a/x11-libs/qscintilla/qscintilla-2.3.ebuild b/x11-libs/qscintilla/qscintilla-2.3.ebuild
index a2558ab075ed..d68b9f01ac3d 100644
--- a/x11-libs/qscintilla/qscintilla-2.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.ebuild,v 1.2 2008/10/11 22:59:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.ebuild,v 1.3 2009/10/06 17:58:11 ayoy Exp $
EAPI=1
inherit eutils toolchain-funcs multilib
@@ -18,9 +18,7 @@ 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-gui:4
- =x11-libs/qt-4.3*:4 )
- )
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )
!qt4? ( x11-libs/qt:3 )"
DEPEND="${RDEPEND}"
# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings