summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-01-25 22:57:53 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-01-25 22:57:53 +0000
commitee9fbedb202245a5f916be2bad3a02019b691447 (patch)
tree91b80ba56b9c4b64cab468b1040c3a29279553af /sci-visualization
parentamd64 stable, bug #498930 (diff)
downloadhistorical-ee9fbedb202245a5f916be2bad3a02019b691447.tar.gz
historical-ee9fbedb202245a5f916be2bad3a02019b691447.tar.bz2
historical-ee9fbedb202245a5f916be2bad3a02019b691447.zip
fix sci-libs/netcdf dep wrt #498076
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/paraview/ChangeLog5
-rw-r--r--sci-visualization/paraview/Manifest18
-rw-r--r--sci-visualization/paraview/paraview-4.0.1-r1.ebuild7
3 files changed, 17 insertions, 13 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 5ff08c8b4314..6f2f4fbd3265 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-visualization/paraview
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.77 2014/01/25 21:57:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.78 2014/01/25 22:57:48 hasufell Exp $
+
+ 25 Jan 2014; Julian Ospald <hasufell@gentoo.org> paraview-4.0.1-r1.ebuild:
+ fix sci-libs/netcdf dep wrt #498076
*paraview-4.1.0-r1 (25 Jan 2014)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 8ff31b77f258..f858de5e9169 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -9,19 +9,19 @@ AUX paraview-4.0.1-vtknetcd.patch 2775 SHA256 b972d38d99c43db18c92b5423d06f542ea
AUX paraview-4.0.1-xdmf-cstring.patch 360 SHA256 4505a480b3775d20cde98f724a20c8b0dbf4f3baf6068013bf69b0e54c1f8473 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472 WHIRLPOOL e0d0c1603ba4ca66fc05dd5049215f2c988f3452763772df35c7fd6a8cb6fa779fd4efbccd20a01f19778f7c0b1db78e0af12716137976ae7bf54923a6bc0642
DIST ParaView-v4.0.1-source.tgz 47827831 SHA256 1e04fcc085ee0305a163d9b6a66904fbb21e6a3fac69b275395c5ffc106e48e2 SHA512 be27b4c10f4881bcd85bfd81b0671f74358022809837620a0baf59f3c3090a5eb3afc1f78a561a3fcf9d4154875fb393c062c1b428579bc254ac7c1ff7214505 WHIRLPOOL ddac32f4be7d46b43f8f66f51ec7877442fd502fcc19b9864e284762b2cc0f3162f16766ca5c566b7f8201745ed6535cf95651f152a4d4476c2682a6432835c0
DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
-EBUILD paraview-4.0.1-r1.ebuild 9738 SHA256 46cd17db188cb0e5ff026eae0abb826578d318518ff313bd32c5e8f684c9224f SHA512 1387b5b3f2454ac8c280a1fdbcb29f723beb132f23164115f338796e2e98d76cbef22d40d1478a81ffa83a6e4c9bdf9bbdc0df2ac45f04203ea023f7c7363106 WHIRLPOOL 246b135fecb8a03ac0d10b300c54d683a474801f581283c3a2e1e47fb2f9464092a89d14e22acb85b65e70fffcced723bda39bfea46494df0713aecacffe2702
+EBUILD paraview-4.0.1-r1.ebuild 9809 SHA256 4ac35117cb1252649cebe774a355c74d6e806753f0cff42e75368a84b757ae1c SHA512 f5ba7492a1183e7512c018df515839e27b2c7eeee553981466e444e806f23253e13486bc22b4de6ff41b12cee93cb63414487537f7f84cddd4a94b0c2738722e WHIRLPOOL 727f3a3c2c07d08037a074af7e6d64860cc859cf92d2c69d9f6f6a0b70fbac285c9847f84f0ebdabf34b572a929e57ff4703e3b9a9cb4c60e9d5604c0dc06309
EBUILD paraview-4.0.1.ebuild 9708 SHA256 0a7e40553c65b8add71a7f10a80e41ac85604f707019344f1a7badfd5cd1cb49 SHA512 6340f72bf951d05f025999831b8919c9652d94c979e00e131999a225a2c1fb9543df5ad18f95983b131eef727a5fbd9abf423907a4fa1834955871e10d9e5d38 WHIRLPOOL 710cb415fa3a09ac3366b343233a09552bd71f3b674d4028bafcad65359b065f4c9d3d92fd3ef72c17c0a404609f96973de5491512d2a1b9793719d0d4b4ec9d
EBUILD paraview-4.1.0-r1.ebuild 10236 SHA256 666450679d19a0cc974e341d8afe7f8af0e330930ba9c41891113130c622a913 SHA512 45330a1404bd441f849d25156ccdc880b38a892500ed1cb6727d013aa4db97dc21abdc927c2761696712116007b8a8e35e9d1e5775e96d12bc15afd59661bb39 WHIRLPOOL ea26ec47034b3b5faa82c801bc7f2309729aee4917cfd6ab96e704d796bb6afdee1f81edf4b2c30a41921c642d9c6542982e5862dbda633207a401b3974d1980
-MISC ChangeLog 16291 SHA256 8ff54c86b2ca61d6aceede5d167b8ad0ccd7dfcec2e57738cd201465f4010761 SHA512 daf8a4654d22f5c568b56c18962ae2667a7695ae258f061de22b5db9b43fce0571f452871691939f6954e7131645be32f3ea47dc6ff1d7014a79d9630f075db5 WHIRLPOOL 72a2cbf74057d66071c0e685e49c199119c1be0cb499906d40d0b0072e8a8061943ee5c44a4f18aa8fbbbf210d14310c3892e51f7dc1f0f5dd070065692d9d2c
+MISC ChangeLog 16407 SHA256 569266e868f540e09b0bf13c96720f624ce0ec2279c02e1515ab10b19f3335d2 SHA512 7913d670feb64e6a400e549beaba1e1b0d93bde1cd1d4414dbc593a6b93086e4a62e052eae241c8bdb5ad0f742d8002a863b130d59c5985ee56091e02d7eb550 WHIRLPOOL 2818ee1fb68c862195610521c1e5b02baefa259f56151d8a318b084ec8c3f3608f477bd627dcc21ff282206d96eb584ab97db5f27b88bae8f59fa48bdeef5753
MISC metadata.xml 735 SHA256 648a5e42e36e2e9134525d349b71c6addf1986934fb8510a60e304143eeecc9e SHA512 377cfa79808b2e75eadf5563fef1a0474f67eb6da4f5a6c47ed4f1f188af22979fe06be2b67bdf0b427cf77595ea9f507dd4c570137d38438dc74ef70d431156 WHIRLPOOL 573a07256245eabec115fb910b990a06386e582f37adebba4e135299cced7102cd8524fb655c162e1702fb0f5fe2008f7d463d855965d797ea4b136340ed506e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJS5DM+AAoJEFpvPKfnPDWzRRgH/0xX2lZD2uOgD9uUiFoWM6OV
-JuWRz9+RmyogXiC/i+5IkRihVNxSp57/uwwTldEZ6RhSLaS0lvW5UiWsK+eUORbE
-NpDzs21bSHEN7jk40cHR9LnSEzaQV8MWPATR1bmr2E4A8qONsIm+z3Qz9wT4sS2p
-DcROuq8LPX+t3cQgZAKu2MqlIfnEOLNpz5Vme5EpbZ5vpYkpWO6w4Y9Rd81T+nz2
-/AA0Fh3r+cFa3axf5U3wIWAby53TUbLWqFv9o4ay4D5YpTEyj8ldt/UYY9j7uALN
-yQmVABqMiJXmqHArbdLT8rvEsOevQM2l2jl3ah7CbWK5QHcivqgYPa3yO5WJEFA=
-=I9Yk
+iQEcBAEBCAAGBQJS5EFxAAoJEFpvPKfnPDWzgO0H/RQZyRs88Vo4hfizxsT+UAw+
+Kj1h78E4uFLzdlJSh49bV5TXMowZbbKKRA29IkiN1PF90oMNaPj7iLd4Tf5r6ch+
+XyP0RJJ8WVXlpwiwzLCaJlZDSRJz59TrAeczMFuPx+WnbhOi5xygrFNbopL1Ne0u
+uQc45cebXipZKrP8YEER90WrAX1mUTLBCAMUwzXP3l/tCR6ZslnD4sGK5vda78+y
+ufuRVk0fJkn0Ewfrd4dwAg/QnzWeLLLyewnpeN85dIjDR1PHWryMuuXdXahxTaXF
+efOzIGktnUsOnY7VdIj6YT1M8mGmg9u0xXu9T7jJ1PU0zwCJ6+ScT5zKVB4TJXI=
+=OYcZ
-----END PGP SIGNATURE-----
diff --git a/sci-visualization/paraview/paraview-4.0.1-r1.ebuild b/sci-visualization/paraview/paraview-4.0.1-r1.ebuild
index b3a81a85778d..94dcbe4986fa 100644
--- a/sci-visualization/paraview/paraview-4.0.1-r1.ebuild
+++ b/sci-visualization/paraview/paraview-4.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1-r1.ebuild,v 1.2 2013/08/03 09:45:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1-r1.ebuild,v 1.3 2014/01/25 22:57:48 hasufell Exp $
EAPI=5
@@ -33,7 +33,8 @@ RDEPEND="
media-libs/libtheora
media-libs/tiff
sci-libs/hdf5[mpi=]
- ~sci-libs/netcdf-4.1.3[cxx,hdf5]
+ || ( ( >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 )
+ ~sci-libs/netcdf-4.1.3[cxx,hdf5] )
sys-libs/zlib
virtual/jpeg
virtual/opengl