diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-07-17 08:10:43 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-07-17 08:10:43 +0000 |
| commit | 040240907d4484fe6af42f50835ffcddce3648aa (patch) | |
| tree | 59585d794712485e18d4eb1ebf146aee5dfcbf9d /sci-geosciences | |
| parent | Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 an... (diff) | |
| download | gentoo-2-040240907d4484fe6af42f50835ffcddce3648aa.tar.gz gentoo-2-040240907d4484fe6af42f50835ffcddce3648aa.tar.bz2 gentoo-2-040240907d4484fe6af42f50835ffcddce3648aa.zip | |
Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 and -r2 have it, part of bug #231831.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.2.1.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index b9dd09d8ba7b..c07e0fdffb40 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/grass # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.59 2008/06/25 04:28:50 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.60 2008/07/17 08:10:43 aballier Exp $ + + 17 Jul 2008; Alexis Ballier <aballier@gentoo.org> grass-6.2.1.ebuild: + Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 + and -r2 have it, part of bug #231831. 25 Jun 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.3.0.ebuild: Fixed oversight (bug #229297) and checked for any wxpython use flag issues; diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild index 0bfd518099f5..2581664483a8 100644 --- a/sci-geosciences/grass/grass-6.2.1.ebuild +++ b/sci-geosciences/grass/grass-6.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.12 2008/06/24 07:45:50 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.13 2008/07/17 08:10:43 aballier Exp $ inherit eutils libtool @@ -26,7 +26,9 @@ RDEPEND=">=sys-libs/zlib-1.1.4 sys-apps/man-db ) sci-libs/gdal >=sci-libs/proj-4.4.7 - ffmpeg? ( <=media-video/ffmpeg-0.4.9_p20070616 ) + ffmpeg? ( <media-video/ffmpeg-0.4.9_p20070616-r20 + !=media-video/ffmpeg-0.4.9_p20070616-r1 + !=media-video/ffmpeg-0.4.9_p20070616-r2 ) fftw? ( sci-libs/fftw ) gmath? ( virtual/blas virtual/lapack ) |