summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-07-17 08:10:43 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-07-17 08:10:43 +0000
commit2e34f31cdd16fc35baeb268683f15dab2fe88622 (patch)
tree32363bc4507da14b0a8718a0423cdfd7a6e97224 /sci-geosciences
parentFix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 an... (diff)
downloadhistorical-2e34f31cdd16fc35baeb268683f15dab2fe88622.tar.gz
historical-2e34f31cdd16fc35baeb268683f15dab2fe88622.tar.bz2
historical-2e34f31cdd16fc35baeb268683f15dab2fe88622.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.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/grass/ChangeLog6
-rw-r--r--sci-geosciences/grass/Manifest14
-rw-r--r--sci-geosciences/grass/grass-6.2.1.ebuild6
3 files changed, 21 insertions, 5 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/Manifest b/sci-geosciences/grass/Manifest
index 2efbf6d0e0b1..f9f92b4ce665 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8
AUX 99grass-6.2 68 RMD160 08c932be282925ca1316664ba7ef9654a0543488 SHA1 ba73dcd993687fc0bfa95d97ff1ce30fb05bfa45 SHA256 bf7b1df4b9d9f71ffdd36cf924cb374032fd49ba0277a5cc7a4f77658cdc76e4
AUX grass-6.2.0-html-nonviz.patch 1721 RMD160 ad57109c03792e8376ccbe2ed8ff459b850cdf20 SHA1 20122b510bc7e52dfbaac04fd8587281d99a08e6 SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c
@@ -17,8 +20,15 @@ DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2
EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 SHA1 72b35ffc88f218afb14055e94eb8573713d67bb9 SHA256 d93cbad8dea7f99c74979abfc5a86292dffa76e8e3477c5cbc8a7cdf7cf33d21
EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b SHA1 79ef31f94dcb9bf8d7a3a89563867b291509173b SHA256 8ce6c6abd8359c2d736d491998d2d93720c89834a7e5f935c954b26af31781be
EBUILD grass-6.2.0-r1.ebuild 5419 RMD160 7a9792d9d38a52d78b3bab5ff4211d8bb210eee1 SHA1 e986e71631714428b3fd612dd1d5e70d5a0d9099 SHA256 5f78e8e6d19c4799b164d042c2ece9b526cfbd3f5625634cf712b91a0865e7d1
-EBUILD grass-6.2.1.ebuild 6420 RMD160 0fbcae5f446155b505e930ac4758a2add499612e SHA1 b18c248cac64dfbce9989dbb96f0213b89c54bd8 SHA256 9c83ac4e7547017357eb1847bc84bc5fcd4878c58a1d53093c3c3ace3de8806c
+EBUILD grass-6.2.1.ebuild 6508 RMD160 fe1e5d6c1c4b1ef45ef81e2d76ff4e56ba3829d6 SHA1 f71c2b34e887dc9f7817187ca95a748fb88ccb64 SHA256 8cb13c424f871a385722e093e487a6d284a8f11d8e1df8eb6a64aec3b1af9d29
EBUILD grass-6.2.3.ebuild 7038 RMD160 eebcb453c8a431301cdf38c5d66d6c6a7404aec4 SHA1 013334b4273588de4f5a48bee14de9ca402ce49e SHA256 355fc4e430fd528ae22a13323d476e76733ead35b353ed398f1b67de99cbde7b
EBUILD grass-6.3.0.ebuild 8486 RMD160 2cd60d2d60a7e7247b4de7d1d38cf6950154fbed SHA1 9a56aefead51d37fa26b5d0061cebef94e6a35c4 SHA256 9ee4e5f59b94481d491c9bba9810c621810e425617c8fcf3e85f7d988e9751db
-MISC ChangeLog 12434 RMD160 fa17f3fe167f17567383b3033d80ee88256a4ec7 SHA1 317a8835e721e30c7dba518526e3f1c67959ee1e SHA256 f4404a562f08eb4dce3eb1924053a0317f6d9eb5dc79adb3a821485797c6efc3
+MISC ChangeLog 12625 RMD160 9407c745367b228d3b71c0d2b91914be1b85d0bd SHA1 f23de8113d7dbbd7fe3632b42ea32dd7a605f3e5 SHA256 dd9ef433d1bd78ad3d446076a9c1191610fd78cfad69acdad481b912382c3243
MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh+/owACgkQvFcC4BYPU0ol5QCdGIy6F+OZCRiA1lrVql10YKTH
+Sp0An3cQ6kOC4ZU3Q2tktkysSXgjcWoh
+=RTOf
+-----END PGP SIGNATURE-----
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 )