Fix protobuf dep #537988

Package-Manager: portage-2.2.20/cvs/Linux x86_64

5 files changed, 15 insertions, 31 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 72d401f6648f..47d95af33158 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.89 2015/04/19 13:15:00 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.90 2015/05/26 02:11:33 patrick Exp $
+
+  26 May 2015; Patrick Lauer <patrick@gentoo.org> paraview-4.1.0-r2.ebuild,
+  paraview-4.2.0-r1.ebuild, paraview-4.3.1.ebuild:
+  Fix protobuf dep #537988
 
 *paraview-4.3.1 (19 Apr 2015)
 
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 9e97f86d9b06..341c7ee240d1 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX paraview-4.0.1-Protobuf.patch 3064 SHA256 1dcd1621c4271c2eabaacb6bc2f7971fcdf206d7cddeff46ab63b6701d769802 SHA512 6f02467435df2deae74f4b72ac7b0ab20ec413333829187a0e5d88d81edbfa01a27f4a3ee6e2d9eed085a8c4f2a4c8f6590cc5d217cb044ef4073a81e69f0122 WHIRLPOOL 62bed030e8b4e536b4b248bab7f2a3e97e0f7eb5ea3112d833804a281145a64cc8004b47761532fe7a4fce61dc722530d1eebde022b7ba9abb82af7e658c129c
 AUX paraview-4.0.1-gcc-4.7.patch 759 SHA256 5f3b7b2cd25fb09004b5820ffb554a5fec21100f8048db257a67708d8abf04e0 SHA512 85164dc2931d960114d23b697022b2e1939513ccb32a0c5af588d980f919a112653b170f076265bea692f6aae0d2efd89ed08597cf13dbfc5c3b8a2292980e02 WHIRLPOOL e4fd9d14ae2065be600f6ed3b00ced9bb1273f5a32fc4eb46d6ccf160d4003abb805a81d06080339c1dba255ac9d702e0c94d8596c6fc1de07d35161b62cc1a9
 AUX paraview-4.0.1-removesqlite.patch 16403 SHA256 e7fee0cd7e0cd08a4de35451add15fceae1775dd8a6898744917e7d9c76006d7 SHA512 d869d00f0060c48c4675ca831855b0d1813b2b96dd5f216db634495096c2f51aa9a82986a8cb6eb8e31030bc85af643d364bf89c50d22568332afdef7a6144a9 WHIRLPOOL bc9f104a9dc726039f368e7b808e828c9a11e7fbcc1509748da2b0565d924305045a1d7f130018437f18f103ad25154695df3dff2b9d3928dc20b866d9145a97
@@ -17,25 +14,8 @@ AUX paraview-4.2.0-vtk-freetype.patch 1159 SHA256 ab95039cf8f39d1dcdf97a3ae62c4a
 DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
 DIST ParaView-v4.2.0-source.tar.gz 50285547 SHA256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512 611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8 WHIRLPOOL 1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7
 DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
-EBUILD paraview-4.1.0-r2.ebuild 10580 SHA256 93edbbf6f7ebdd3f5f0937d1e62c52fc8f1e6873d9b761f250600088bcb977ad SHA512 f9c7f906288bce2178e9ee13b12f53844f0ed5a10180e52496a24131077313020fbad6b239d9991f6e85fc2bd21e6adaf97107b880a2d632f0d4e400964a9e71 WHIRLPOOL 3bdd7f4f4eb21ced34c765df48a22dff2756e8e75a85d3eb270d950c17f3f1452e69f4255c02854a47829afa6e319a9515662aceac6ac3fde188f89276e25a72
-EBUILD paraview-4.2.0-r1.ebuild 10522 SHA256 f7f5ff4218b87a0900f4788df5aa6232957d2819016af9ef3d5e312036aa4bc7 SHA512 3221bba500d2c5f3678e572b3e65f60d31c29c5c1b6aab972e2a32e3d61879b0a69ecd79c6106579ac590e89ef2077db444e2be42a95fef4e0a2612b8a9df765 WHIRLPOOL 164938d442e918ee62f01e35ca813b7c1cdd286b5fabb037e964c98d7467799c3bdf851a322b3553fe96b231995100d39896835e42a97bfefadbd641e09f26f5
-EBUILD paraview-4.3.1.ebuild 10508 SHA256 51cb5149099cc1baa54cc1bb2d02a6b3062dc111c816a674f5088fb761ad7aa3 SHA512 d30a8aff4eda35e70681df245c86d7a39242c087f7874288e7425b5cfd230e975d5a1b434147c7fd074c846b053241978dcc2eece44a1fafbe4804def925e39f WHIRLPOOL f5a73bc60fe1b6533af4e78a159aef8b7a210bc8313a012c74693535a9a8e5328d65aacff8d8a8cc1d5152254684ede5786dc3a360bf5e75bf8afa700eeaa34c
-MISC ChangeLog 18886 SHA256 fc6fc095a5692f5499b47d0dfc6206f589ddcec0e80deeea2047795becca51d6 SHA512 5413e13d978851fc890037e4564b2e5ae9c7eb64ba24fb7ac0fb0a797102c2c0dced9e2cde4faea660dc0c2e3296b9bc2bf771ea063847b324846ff466b19f1c WHIRLPOOL a67f282d7afb1b1138bed628b59c0be44deed6db4b48a7ce6380da683d2ec1658de0b15d10cc668fb7a5ab6ece69cef55eb24b49920e44ca77d3c5ebc3406f1b
+EBUILD paraview-4.1.0-r2.ebuild 10586 SHA256 f20dc235e78c100c035f9510a6a883d3f35d3127f648e5c1f84a411569c1d2d3 SHA512 6d74f72dc4310e7c244db0aa60e9658e592bdab152481d81e669dfa0f7f03faa627e59e8c51e01e4d5da615a07a1c32529b2e33cd7cf4c7068afa38c2b7cf0fe WHIRLPOOL 48e4d79b3531120b173790fb04b387aeafa9cdb75a360031bfb39386138e7b11fb7e3a481761fdad0aa3b2b496aafc516c342a9682733b0a46f5f917f3ae9310
+EBUILD paraview-4.2.0-r1.ebuild 10528 SHA256 804ac4611be5a70e1aa561777f08dcf0a991230e361925f7b0b7233e868a4f7f SHA512 68ab86040aaeb4de85aa00626da9c8b98b0c5223459b3a3cc86ead862892478e4b7bf0f07cdc6bfa6ce5b05d41546d66c376124988427199f9a2f45730c57f89 WHIRLPOOL 977d9aebb2cdf5dcab8fa29f85528c9899d397768a713e7cd9558ee7ae9b149e2250221a778a1be108c2e662a863c9a8159265c96d3a4bd451000324fd677690
+EBUILD paraview-4.3.1.ebuild 10514 SHA256 5390d9fd07a53e0068c8cbb9da59eb5363203853986a3d77bc8d42d25911e13c SHA512 b76d8155a10b10f35c5da182dd01fb827090a13b25644d5179690517e87a7d9da2de267e13e667eb0d5e96b5c63eb05c8eba7c3458e75b183d90bdf67cefdf3f WHIRLPOOL 353edf0f9e0edc26db4a9d1645f9e4001e6b83b3d4fa342db05824b27534eed738a915824dafc6d9c7c915f0b0822fa912f03243769e6dbad9d460ebd74802af
+MISC ChangeLog 19042 SHA256 1e2fe3a96e96ad81b607e717a70b77a8622d0d311b80751c74256789519e91d8 SHA512 37cc7a1ea90f479d32f1d703e8ab03a9fb6a6ed1a42d5906237de084283b8dc4a54ec7a8629e416beddbccf2b87d44f4be063f8936397847c9fd002c55408e97 WHIRLPOOL 1b58a32c46e9f631829c126e39cfe8a20f4ecd87aee03c792e38111592839060b2ca585c4aa22e17816bb99049ed9c80e9f86d516d8bfb9eb0d3cb3e3e9de6da
 MISC metadata.xml 734 SHA256 477700ff289c96e62b0ca05a06bfcb9059fddaf6e880b159099349e072a958ce SHA512 3298974ce60364b56453482b950aa12759cae192a8ea1943e24dabb944ad17b7925e1e8e1c05ce781daf8fc409bca29190339c26bf542df5c328824cccd3e142 WHIRLPOOL c252c5d89e223d5f13beaa065317d75befd22e3f06c804abbfbbf6b40e0f06e7cd724951f56fe6662b60db3bbc1b587aea4d422ecec2f97251f1d8fc34da1703
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iQIcBAEBCAAGBQJVM6pMAAoJELhOzYlK7nn/BkEQAL36P3aasMffCZAV58LzOg/a
-lQOc+E8iXIdNlK5Ww6M7ktpGWIcbPd4w1ZTMDj0kDy+eh7rvODUqJEGtYb4jA4V5
-YOP87wJ/HNgI2X0a+6clHjukWvPiQslVg7kbXFB4Q8FA0qorkUFyHidYqHQBdYRe
-8vbqwHw720ARJ2zPMrp6NUX6gDxwmdt3XtAUUdFOOGVBMkanjBScw7pEMi8gLxBs
-XaN/r1uvKR6+Oha5Ynt4FGnAuYw6V6gWHGSANiAB+liJuTvMv8xrJuVE8iumaQVp
-yQx3avLiBwKD7l1iKqm6UfW6F6vxovXouy2chE6tsXL0OhXH4NZz7y5G3P4KwWsQ
-/PyN4tXPIv4uf1qC0tfAX1OQxgwTM561CrWvL7VhamGNbvpYIOyQH4IwsPK70hU4
-+sJAUFzpk+8IUWFl+v9VY1pInzdsMDDwzKvONICXvSCmuD/2yJmU+djz5aNLuS3D
-D/7dJtCijp/AhhhyESPvo2SCPRCSFryHRBpMYav2bygfHAtHQtd5MaiSTbXfAhwV
-TiBj7F/uGIB3M9l6/fn2Ey314/IKLfX7GPvEMQZ4nYX/G0JwCGciEDCwg6ItXSr5
-L4phP7FG5QgvjQFii6U3BlSoI1d4V7/0r5+Yj++wYmytzixqR8t+kAX1Bovgsa1n
-oaskpiFPGBpKY270fek3
-=HrqK
------END PGP SIGNATURE-----
diff --git a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
index ecf52a91d90a..5156e6d17307 100644
--- a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
+++ b/sci-visualization/paraview/paraview-4.1.0-r2.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/paraview/paraview-4.1.0-r2.ebuild,v 1.4 2015/04/19 13:15:00 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.1.0-r2.ebuild,v 1.5 2015/05/26 02:11:33 patrick Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-libs/expat
 	dev-libs/jsoncpp
 	dev-libs/libxml2:2
-	dev-libs/protobuf
+	<dev-libs/protobuf-2.6
 	media-libs/freetype
 	media-libs/libpng:0
 	media-libs/libtheora
diff --git a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
index 7a702b14ce9e..5f2925944b02 100644
--- a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
+++ b/sci-visualization/paraview/paraview-4.2.0-r1.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/paraview/paraview-4.2.0-r1.ebuild,v 1.4 2015/04/19 13:15:00 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0-r1.ebuild,v 1.5 2015/05/26 02:11:33 patrick Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-libs/expat
 	dev-libs/jsoncpp
 	dev-libs/libxml2:2
-	dev-libs/protobuf
+	<dev-libs/protobuf-2.6
 	media-libs/freetype
 	media-libs/libpng:0
 	media-libs/libtheora
diff --git a/sci-visualization/paraview/paraview-4.3.1.ebuild b/sci-visualization/paraview/paraview-4.3.1.ebuild
index 7c484c0526be..5efc70d31771 100644
--- a/sci-visualization/paraview/paraview-4.3.1.ebuild
+++ b/sci-visualization/paraview/paraview-4.3.1.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/paraview/paraview-4.3.1.ebuild,v 1.1 2015/04/19 13:15:00 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.3.1.ebuild,v 1.2 2015/05/26 02:11:33 patrick Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-libs/expat
 	>=dev-libs/jsoncpp-0.10.1
 	dev-libs/libxml2:2
-	dev-libs/protobuf
+	<dev-libs/protobuf-2.6
 	media-libs/freetype
 	media-libs/libpng:0
 	media-libs/libtheora