diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-01-14 11:08:41 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-01-14 11:08:41 +0000 |
| commit | 37266c9ac513c085c1fdef46460c05e61f57ca05 (patch) | |
| tree | 7326397fe66d542cda9a97e7c9d56e479c692743 /sci-libs/vtk | |
| parent | Version bump: add support for tiff and webp. Drop old (diff) | |
| download | gentoo-2-37266c9ac513c085c1fdef46460c05e61f57ca05.tar.gz gentoo-2-37266c9ac513c085c1fdef46460c05e61f57ca05.tar.bz2 gentoo-2-37266c9ac513c085c1fdef46460c05e61f57ca05.zip | |
sci-libs/vtk: nvidia-settings ist provided by both packages
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sci-libs/vtk')
| -rw-r--r-- | sci-libs/vtk/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-6.0.0.ebuild | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index 060d6ef346f3..6b640820d5a7 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/vtk # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.113 2014/01/12 09:15:22 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.114 2014/01/14 11:08:41 jlec Exp $ + + 14 Jan 2014; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild: + nvidia-settings ist provided by both packages 12 Jan 2014; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild: Fix gl2ps version in deps,#497224 diff --git a/sci-libs/vtk/vtk-6.0.0.ebuild b/sci-libs/vtk/vtk-6.0.0.ebuild index 555020dd59c6..8556676c4a86 100644 --- a/sci-libs/vtk/vtk-6.0.0.ebuild +++ b/sci-libs/vtk/vtk-6.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.2 2014/01/12 09:15:22 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.3 2014/01/14 11:08:41 jlec Exp $ EAPI=5 @@ -79,7 +79,12 @@ RDEPEND=" ) tcl? ( dev-lang/tcl ) tk? ( dev-lang/tk ) - video_cards_nvidia? ( media-video/nvidia-settings ) + video_cards_nvidia? ( + || ( + media-video/nvidia-settings + x11-drivers/nvidia-drivers[tools] + ) + ) R? ( dev-lang/R )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) |