diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-07-12 09:16:37 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-07-12 09:16:37 +0000 |
| commit | dc56868a168bc2fa23ec3f5aa25715aa492c70aa (patch) | |
| tree | 3a82b8bf36976e3adbe775abd89f46057aa63128 /x11-libs | |
| parent | Fix building against xorg-server-1.14, bug #461534. (diff) | |
| download | gentoo-2-dc56868a168bc2fa23ec3f5aa25715aa492c70aa.tar.gz gentoo-2-dc56868a168bc2fa23ec3f5aa25715aa492c70aa.tar.bz2 gentoo-2-dc56868a168bc2fa23ec3f5aa25715aa492c70aa.zip | |
Adapting deps for upcoming qt-4.8.5
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qscintilla/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qscintilla/qscintilla-2.6.2.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/qscintilla/qscintilla-2.7.1.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/qscintilla/qscintilla-2.7.2.ebuild | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog index 6e05d4236418..793978fac74a 100644 --- a/x11-libs/qscintilla/ChangeLog +++ b/x11-libs/qscintilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qscintilla # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.86 2013/06/24 10:09:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.87 2013/07/12 09:16:37 patrick Exp $ + + 12 Jul 2013; Patrick Lauer <patrick@gentoo.org> qscintilla-2.6.2.ebuild, + qscintilla-2.7.1.ebuild, qscintilla-2.7.2.ebuild: + Adapting deps for upcoming qt-4.8.5 *qscintilla-2.7.2 (24 Jun 2013) diff --git a/x11-libs/qscintilla/qscintilla-2.6.2.ebuild b/x11-libs/qscintilla/qscintilla-2.6.2.ebuild index 8e365fe2a662..917713b3de95 100644 --- a/x11-libs/qscintilla/qscintilla-2.6.2.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.6.2.ebuild,v 1.7 2013/03/02 23:45:25 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.6.2.ebuild,v 1.8 2013/07/12 09:16:37 patrick Exp $ EAPI=4 @@ -19,7 +19,7 @@ IUSE="doc python" DEPEND=" dev-qt/qtcore:4 - dev-qt/qtgui:4 + || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) ) " RDEPEND="${DEPEND}" PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )" diff --git a/x11-libs/qscintilla/qscintilla-2.7.1.ebuild b/x11-libs/qscintilla/qscintilla-2.7.1.ebuild index 2e415171b450..cf25bf5065ec 100644 --- a/x11-libs/qscintilla/qscintilla-2.7.1.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.1.ebuild,v 1.2 2013/03/11 09:18:16 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.1.ebuild,v 1.3 2013/07/12 09:16:37 patrick Exp $ EAPI=5 @@ -19,7 +19,7 @@ IUSE="doc python" DEPEND=" dev-qt/qtcore:4 - dev-qt/qtgui:4 + || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) ) " RDEPEND="${DEPEND}" PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )" diff --git a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild b/x11-libs/qscintilla/qscintilla-2.7.2.ebuild index e905adc5549c..355d2f8244f8 100644 --- a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.2.ebuild,v 1.1 2013/06/24 10:09:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.2.ebuild,v 1.2 2013/07/12 09:16:37 patrick Exp $ EAPI=5 @@ -19,7 +19,7 @@ IUSE="doc python" DEPEND=" dev-qt/qtcore:4 - dev-qt/qtgui:4 + || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) ) " RDEPEND="${DEPEND}" PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )" |