Fixed VTK dep (#553102)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x55265D89

5 files changed, 39 insertions, 12 deletions

diff --git a/sci-visualization/visit/ChangeLog b/sci-visualization/visit/ChangeLog
index adf7f4497d79..3e2d611487d0 100644
--- a/sci-visualization/visit/ChangeLog
+++ b/sci-visualization/visit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/visit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/ChangeLog,v 1.3 2015/03/16 08:29:05 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/ChangeLog,v 1.4 2015/06/25 04:26:41 slis Exp $
+
+  25 Jun 2015;  <slis@gentoo.org> visit-2.7.3.ebuild, visit-2.8.2.ebuild,
+  visit-2.9.0.ebuild:
+  Fixed VTK dep (#553102)
 
 *visit-2.9.0 (16 Mar 2015)
 
diff --git a/sci-visualization/visit/Manifest b/sci-visualization/visit/Manifest
index 3b1158d977c5..c0c1e081619d 100644
--- a/sci-visualization/visit/Manifest
+++ b/sci-visualization/visit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX visit-2.7.3-dont_symlink_visit_dir.patch 743 SHA256 bab48080e92a83b339298ca10c45dc32bb0953476d90e9cc772db92da3d02a6d SHA512 c385a3e6fa6c5856223df8c5aea329ba01dd625980257c3cd7d2784eb9e1aca3640e50d2afb0af0e02553dc6f72bb23bec666f3dc726706690c7bd45c6cc5336 WHIRLPOOL bc7bc88200913a44144e45a64f35a2c07aa20bac17572a888ed0f3c71d833e2fb3f7c313930475d84b1fa08d9e67602b1317a25bb1d01153fa8f0a81b21e0791
 AUX visit-2.7.3-findpython.patch 833 SHA256 eb134490d6519b3f8c1eab3bf3eb45471fcb367df47fe042ddce93b9bedcff50 SHA512 9b73e00e7884fed34e63ea51aa14483212227f05c83412a1638a31a56a0685bf7fdfdf511a1a53c9f1a55289ae8d4a0bac8ff92d3380d9c989502d2cb95e8679 WHIRLPOOL 4a6471dc5996e5db1f90f397c2d2de0f55caf50e526a0855972bae3e2428f0a36df22bf63a30f413095ccafdc40252dae27e10b00c756c4d088ae9642e31b4af
 AUX visit-2.7.3-findsilo.patch 585 SHA256 bd97818df6eaaf5b160c982439f17223c5b0d7c35c830a551a7aeac380c3e29e SHA512 76bec5fd134318724d0d2ad59a345d78652867a9680abaca7504af11ddd818a678338afd10bdf9385295f672d265439a1341c1c71697c7a98aae6406abe4565d WHIRLPOOL ef5200ff51dd3d856c504d4ef54f78f8f507f8239834023de01654451f8fb34d63bede72b5883f0cbcf0e7616f843a62ef29ca7c6be136539adc13f24df0f674
@@ -17,8 +20,19 @@ AUX visit-2.9.0-vtkmpi.patch 3824 SHA256 e224344d8cf577772f0a3defe8547237353cd67
 DIST visit2.7.3.tar.gz 82475238 SHA256 e4ed7b20c4c0fb5aac49181f8ddeae3d2d5a73b1662756ddcaa9d08776a7c39f SHA512 5eea2667482a9b70cf4794446da69595c1145839dfae0afdf961589a09b0f3ad41c44b607f96dbb3e4a3c1ba77161d77a1e0342d6a4e2df8bc73040110c7e8f1 WHIRLPOOL a1157d2424d93037e1ffd8dd10ebc47ae9f3d074a63a811bcadf6db5349dea348432e63d414d4a62a156c9423a1d5fdb240f34b2ec4262e8647def40d999759a
 DIST visit2.8.2.tar.gz 88008002 SHA256 43d652dde540e3a5db34a2105d89432fa1d018b104ed0508dfb18f4287a43eb3 SHA512 1c2c2b6cad49b32b5cbc7f7ffba5c6ffb98ee88dfeae5c51af5e581ad53fb1efb8fc222b796696e607abd4b748855141de072414bdec1b1ad4e7ac01a928db8d WHIRLPOOL dadfd48bf9522fc67547f2d7fc4332f300d06e3f04f1bd23189f4a6d806286b46420e4caecaba616bf9f954ea3e202efcee7e899d10444304f7f79809e8fc6d9
 DIST visit2.9.0.tar.gz 87058013 SHA256 98d7a80d95f4083fffc23a65cff28abd126e2eb0fff43591663818aaa1338fcf SHA512 889a6ff6f0c45064c0705a8a41fd268ad865619e42eb7a3302a520bcb2a3c182a40bc6870ec80c0994fa649f3030f6283b9783fab37b938d4b77fd3c1ab10d15 WHIRLPOOL 8d6e9370fddda7d28c16882a04ac2c196b0c42ffd72436ca601413b7483c72d4b33691a9dc7340d71d536fead3d6692f1491c2bed32ed27ceba0c745b9555380
-EBUILD visit-2.7.3.ebuild 2408 SHA256 00e5756d682d226f7655068ad4e53ada09570bb127949d7997283e463c064669 SHA512 018cc8a92c01ad7ba14be8aeff5f93c7cf5546bd2b8e611e7a111b157291dd3ddb999f528b1e09c9c7660364a06640156b12ee48e9f4150a9532f6cfd25b7b16 WHIRLPOOL 387877ce3f095d893aaa7371f36488ee283dcc3daf31cf75fd48e89684d0d0c091d6be03f059d4c30913704d18e2803b400a66735f5db0e27728492f85a3c4b0
-EBUILD visit-2.8.2.ebuild 2417 SHA256 b3dbfe8b1d113fa5a40c0f6d302e47d152919b7559166ca3e0978cd186fe1c94 SHA512 123441383feb8649d1976a806508def05424c66c61e6ba1a9c0ef6d556bfc06778d0e27d6937b1ea138f8bf193024ee7385a531b2aeaf17c0295a8131339cc2b WHIRLPOOL d63656c45d2324260ac9e15ecc37bb1e2f23b1f7757235e4e474a7d830ef572b32e1dbb2db89fb4eb343aebe789125f8a46d5712276c3e18f0c21381cc212230
-EBUILD visit-2.9.0.ebuild 2546 SHA256 78a1b860f1fefd081f4b2bbb3b250f6d4ea9d7ebf3df1f89e951bd0c75a5bff0 SHA512 a50ca2afa3f60adb36bc4c8837e805af13dac71276f7325c339924c30ca8cc0b9e94c7bb658b49669b767944bf5a9a7198d5e14165581b035d1094b9ddd44c33 WHIRLPOOL 8ecb08a31f5b9df904f9d43a2bb73718d808cde551b35a8c5102003f75d816a6997f99fc8f2f22214c96eaff3189b422e56c9796e2e981259471605827a2beba
-MISC ChangeLog 1228 SHA256 577a2e970124340f5cf30cd8d3d3fbb3ccbf14e315fd84b3f04bfc60527307d3 SHA512 a0545b7be0448a7ade8c789526a7b8b8fc63d091a603d877b24814fc169651b847a607637d9c214fa84d1d241ae24495b7b6ee101b80c764d806e0e55cf3d484 WHIRLPOOL ef00b467b9c2197faafba265e7d604198d03b366a212ac1cac6e86248bc5f88cdc8d7cb8ae0e90da3a1a020dec0eb6ceb86ef7f64056ab6c96152b5d3da7f7eb
+EBUILD visit-2.7.3.ebuild 2407 SHA256 b54d41a1130aa52b2deb9bd35e843c52b5ac6b7e89f3677f5df49a8e78c04d79 SHA512 ef0afbd19abc2386d13c50ca32bc012a41bb973c5b891b116b88e53cab6d985870a8d6ef2d2807738389fc3bb63352199e7435dc5622b2da6c22e0c00975e1a1 WHIRLPOOL e5811b612fc5f44c702ae40faa8ce466464aed470fb82178ae50d294a6105dc3d0105daf6a4ef338e3f0015c7a5d470f7bd2ef8ab6303eb46f9f68462f8c53e0
+EBUILD visit-2.8.2.ebuild 2550 SHA256 855127d5d9f0fbf2b0bbe634ce992adbcda3bc7d5eec3c94608f53535e963dd5 SHA512 8d407e2f1764f1a0318c3cb1a225cb8386272c6633b92aeb73caabc1aa8a95ccb9451f317e11555c7bfbaf5feb563b60cfd09136ea7a0dc5357f748904bfb3d5 WHIRLPOOL 2df559f58ca6c1f49a111d9a94d68790fa3d1758d1e626e11de3e7139a32adda33b361b8416ab4b141df39dcdbf881416abfa5738084362ff1fc742042cbc45c
+EBUILD visit-2.9.0.ebuild 2550 SHA256 cf86cf0e02da398ba9decad09213608a90f0588c419ad5abdc31941d4d81bd9c SHA512 ad8d65ccf94db56ccd41ee1a0759f892893946dab888e07d883d9af8d808d2130ae1e9e933e50dfe68abca9f486d18724d984ff98a5eaccf5ad5538773a0a5f1 WHIRLPOOL 7ee003bbef929d902a395fa1b8e017dd16ae38ed0dcc185a20e06c5226a11df551bcaa6d3827044a9e1e06355cadc4f09ab67e01e342c937882eac86f8a1dd98
+MISC ChangeLog 1351 SHA256 1281e0b4a53b6fe845c619c547c5097949e0f08f3518009478de5b428f062799 SHA512 87257790b944ce16331c14257e03d1021e7351df900d508617fca8f336486ca101c9dc0f41332c2248160a5e502b0e931f025c895fb6457f09a5d09c1ea31ae3 WHIRLPOOL 3557b02f9f79d0d72160ce7f474fd18969564987521756adb6f7fcd7c9a67df2285406ead4beb08c53b6bbe14a4d2f05b7b196eb7f3abe9d0faf52b601593f12
 MISC metadata.xml 651 SHA256 871077793d318b6f1eeeb050f03e0b837e83003d88f8e51c586843cd0b4a0adc SHA512 0dea2d275c25b59ec3040cfe62bd093f44e8fd0011a71ce233d04ea933147662a53493e61d424cfd0cb37be24eb2fddc5bb6b6ab134ae4aa11af0305eb02de0a WHIRLPOOL 68b806cebb5f18af212546d6f309efec5d85a6de74857bb923aa656d9907c4ddf8cf57a46236e2280927caefc399b18465b4402d9d14ab49d90d0cd22d9f4df1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVi4MpAAoJEO1RxJ84ipLkEqoH/1wlSQWfHdAZDXNjH+3s4hTS
+dBWYDUx3fsbjP+V2rcCKqdbn/tTx4wLxqiDxIy2q2uKmzuklMYXT2RpT75VjF17h
+xZoTDVGG0yK46TePiShqsk1vXte97hGIqJsUIcEbttYgL8WVW9M9Jdlm9W2H5ZjJ
+bUic8XplMnzIDY+GyQaG2JN+rpYD9R1x51wOvPKmJAfX1pwexc7rbi3X3cwUQ4EM
+TuDxI1f5HBgOnZM3kAxvbxo//KmBNJuy3VIp5eIHddijLhxnyaltJ+3DpeNo++kW
+9F4Fc3TQ/u+IkYd6Ig4KC8hdRWuZbKtmWZD2LtI3CUulp7XunXCAETx9FLI9FHM=
+=FZTO
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/visit/visit-2.7.3.ebuild b/sci-visualization/visit/visit-2.7.3.ebuild
index 1cb5236a65d5..f5b0fd0bf10d 100644
--- a/sci-visualization/visit/visit-2.7.3.ebuild
+++ b/sci-visualization/visit/visit-2.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.7.3.ebuild,v 1.2 2015/04/02 18:33:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.7.3.ebuild,v 1.3 2015/06/25 04:26:41 slis Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -24,7 +24,7 @@ RDEPEND="
 	hdf5? ( sci-libs/hdf5 )
 	netcdf? ( sci-libs/netcdf )
 	silo? ( sci-libs/silo )
-	>=sci-libs/vtk-6.0.0[imaging,python,rendering,${PYTHON_USEDEP}]
+	>=sci-libs/vtk-6.0.0[imaging,python,rendering,qt4,${PYTHON_USEDEP}]
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-visualization/visit/visit-2.8.2.ebuild b/sci-visualization/visit/visit-2.8.2.ebuild
index a0957f1b69b6..4cf3733ba2b7 100644
--- a/sci-visualization/visit/visit-2.8.2.ebuild
+++ b/sci-visualization/visit/visit-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.8.2.ebuild,v 1.2 2015/04/02 18:33:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.8.2.ebuild,v 1.3 2015/06/25 04:26:41 slis Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -24,7 +24,7 @@ RDEPEND="
 	hdf5? ( sci-libs/hdf5 )
 	netcdf? ( sci-libs/netcdf )
 	silo? ( sci-libs/silo )
-	>=sci-libs/vtk-6.0.0[imaging,mpi?,python,rendering,${PYTHON_USEDEP}]
+	>=sci-libs/vtk-6.0.0[imaging,mpi?,python,rendering,qt4,${PYTHON_USEDEP}]
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
@@ -37,6 +37,15 @@ PATCHES=(
 	"${FILESDIR}/${P}-dont_symlink_visit_dir.patch"
 )
 
+src_prepare() {
+	for p in ${PATCHES[@]} ; do
+		epatch "${p}"
+	done
+	if use mpi ; then
+		epatch "${FILESDIR}/${P}-vtkmpi.patch"
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX=/opt/visit
diff --git a/sci-visualization/visit/visit-2.9.0.ebuild b/sci-visualization/visit/visit-2.9.0.ebuild
index 3774597758d6..45383aaad8a7 100644
--- a/sci-visualization/visit/visit-2.9.0.ebuild
+++ b/sci-visualization/visit/visit-2.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.9.0.ebuild,v 1.1 2015/03/16 08:29:05 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.9.0.ebuild,v 1.2 2015/06/25 04:26:41 slis Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -24,7 +24,7 @@ RDEPEND="
 	hdf5? ( sci-libs/hdf5 )
 	netcdf? ( sci-libs/netcdf )
 	silo? ( sci-libs/silo )
-	>=sci-libs/vtk-6.0.0[imaging,mpi=,python,rendering,${PYTHON_USEDEP}]
+	>=sci-libs/vtk-6.0.0[imaging,mpi=,python,rendering,qt4,${PYTHON_USEDEP}]
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"