summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2013-07-16 05:28:33 +0000
committerPatrick Lauer <patrick@gentoo.org>2013-07-16 05:28:33 +0000
commit588f2edbc49f3d5064693c67678efe123c048ea8 (patch)
treea95e294c9e2987d06b35b755a84792d64c9957bd /sci-libs/vtk
parentCleanup. (diff)
downloadgentoo-2-588f2edbc49f3d5064693c67678efe123c048ea8.tar.gz
gentoo-2-588f2edbc49f3d5064693c67678efe123c048ea8.tar.bz2
gentoo-2-588f2edbc49f3d5064693c67678efe123c048ea8.zip
Fixing qtgui deps for qt-4.8.5
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sci-libs/vtk')
-rw-r--r--sci-libs/vtk/ChangeLog6
-rw-r--r--sci-libs/vtk/vtk-5.10.0.ebuild4
-rw-r--r--sci-libs/vtk/vtk-5.10.1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index aeff9f1a92fa..ce9e22316350 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.108 2013/06/05 01:21:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.109 2013/07/16 05:28:33 patrick Exp $
+
+ 16 Jul 2013; Patrick Lauer <patrick@gentoo.org> vtk-5.10.0.ebuild,
+ vtk-5.10.1.ebuild:
+ Fixing qtgui deps for qt-4.8.5
05 Jun 2013; Luca Barbato <lu_zero@gentoo.org> vtk-5.10.1.ebuild,
+files/vtk-5.10.1-libav-9.patch:
diff --git a/sci-libs/vtk/vtk-5.10.0.ebuild b/sci-libs/vtk/vtk-5.10.0.ebuild
index ae3772ce55e0..c0c8994728ed 100644
--- a/sci-libs/vtk/vtk-5.10.0.ebuild
+++ b/sci-libs/vtk/vtk-5.10.0.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/sci-libs/vtk/vtk-5.10.0.ebuild,v 1.3 2013/03/02 23:24:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.0.ebuild,v 1.4 2013/07/16 05:28:33 patrick Exp $
EAPI=3
@@ -51,7 +51,7 @@ RDEPEND="
python? ( dev-python/sip )
qt4? (
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 ) )
dev-qt/qtopengl:4
dev-qt/qtsql:4
dev-qt/qtwebkit:4
diff --git a/sci-libs/vtk/vtk-5.10.1.ebuild b/sci-libs/vtk/vtk-5.10.1.ebuild
index ee94421a37ea..6a3980464cb2 100644
--- a/sci-libs/vtk/vtk-5.10.1.ebuild
+++ b/sci-libs/vtk/vtk-5.10.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/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.7 2013/06/05 01:21:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.8 2013/07/16 05:28:33 patrick Exp $
EAPI=3
@@ -51,7 +51,7 @@ RDEPEND="
python? ( dev-python/sip )
qt4? (
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 ) )
dev-qt/qtopengl:4
dev-qt/qtsql:4
dev-qt/qtwebkit:4