diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-11-13 10:14:43 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-11-13 10:14:43 +0000 |
| commit | dc5bf93dc740b8bdbcff4dfdbd7f3330b73ab2a8 (patch) | |
| tree | 4402fdcef777afdd8a8038ccbc5b001c6aa17c1c /media-libs/vigra | |
| parent | Keyworded for Prefix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86... (diff) | |
| download | gentoo-2-dc5bf93dc740b8bdbcff4dfdbd7f3330b73ab2a8.tar.gz gentoo-2-dc5bf93dc740b8bdbcff4dfdbd7f3330b73ab2a8.tar.bz2 gentoo-2-dc5bf93dc740b8bdbcff4dfdbd7f3330b73ab2a8.zip | |
Fix python.eclass depend usage
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/vigra')
| -rw-r--r-- | media-libs/vigra/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/vigra/vigra-1.7.1-r1.ebuild | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog index 7511e1fb0c89..8aeb63bdbe7a 100644 --- a/media-libs/vigra/ChangeLog +++ b/media-libs/vigra/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/vigra # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.45 2011/11/13 10:12:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.46 2011/11/13 10:14:43 ssuominen Exp $ + + 13 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> vigra-1.7.1-r1.ebuild: + Fix python.eclass depend usage 13 Nov 2011; Justin Lecher <jlec@gentoo.org> vigra-1.7.1-r1.ebuild: Keyworded for Prefix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris diff --git a/media-libs/vigra/vigra-1.7.1-r1.ebuild b/media-libs/vigra/vigra-1.7.1-r1.ebuild index 70d08786685f..0206e2a60c77 100644 --- a/media-libs/vigra/vigra-1.7.1-r1.ebuild +++ b/media-libs/vigra/vigra-1.7.1-r1.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1-r1.ebuild,v 1.6 2011/11/13 10:12:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1-r1.ebuild,v 1.7 2011/11/13 10:14:43 ssuominen Exp $ EAPI=4 -PYTHON_DEPEND="2" -PYTHON_USE_WITH="threads,xml" +PYTHON_DEPEND="python? 2:2.6" +PYTHON_USE_WITH_OPT="python" +PYTHON_USE_WITH="threads xml" MY_P=${P}-src @@ -25,11 +26,8 @@ RDEPEND=" fftw? ( >=sci-libs/fftw-3 ) hdf5? ( sci-libs/hdf5 ) jpeg? ( virtual/jpeg ) - png? ( media-libs/libpng ) - python? ( - || ( dev-lang/python:2.6 dev-lang/python:2.7 ) - ) - tiff? ( media-libs/tiff ) + png? ( media-libs/libpng:0 ) + tiff? ( media-libs/tiff:0 ) " DEPEND="${RDEPEND} doc? ( |