Fix for python 2.7 wrt #348151

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 7a20663f6a6d2e5769f07effb2f3e391512d7cb1..5660272ec090151e3331b2fe420270ae86e0c1a8 100644 (file)
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.58 2011/07/27 17:11:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.59 2011/07/27 17:38:47 xarthisius Exp $
+
+  27 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> paraview-3.6.2.ebuild:
+  Fix for python 2.7 wrt #348151
 
   27 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> paraview-3.6.2.ebuild:
   Fix dependency on qt-assistant wrt bug 335831

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index a1945d1cdc6e397b08af131ac5ee4731fae3a4f8..9349f31f5b3bdab7a6d4811c6adfb1058d9db8bc 100644 (file)
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -15,15 +15,15 @@ AUX paraview-3.6.2-qt.patch 7324 RMD160 e5038a2642eee257008181ee3bcba0b1fb95dc62
 DIST paraview-3.6.2-openfoam-gpl-r173.patch.bz2 3402 RMD160 2ceb036486b2757eeeed8eae36593be2a70a3a36 SHA1 ea2ac1f92b529973164469c5fc3fdbc0407f8ccd SHA256 3e8751f7747a0067b8532d399a4dc253c71ce50d39fc3b17d38e16060196fc99
 DIST paraview-3.6.2-openfoam-r173.patch.bz2 54275 RMD160 930785f07883a2fc952569a2908600d911627b24 SHA1 ca255ec222e9f8884f4e090df8e860946246b249 SHA256 87c62931de1484dd71fe2f1b36eafdb85eb27127cb42825819a67730118ae6ce
 DIST paraview-3.6.2.tar.gz 28323172 RMD160 0f14419100d6d7fd7cc0ca3d385da41397a96da8 SHA1 5a2fad2bd2eaa39dbcbd3f592edfaedb780f63ff SHA256 062f581a6f3fda5cead647fb32b0fab6d9bb3be38aace5e4080dab38a9eaea04
-EBUILD paraview-3.6.2.ebuild 9547 RMD160 c368b3470eb7b9b2af7ed9c1767a08701db56f34 SHA1 e751802ab494e1c8a414496e8e6cc5846fc1ea52 SHA256 560a182cbd5f1b5f8e808e92c8b8ed36b14d86e02717e88f57ecb0b2bc1e300e
-MISC ChangeLog 12106 RMD160 31a1a1a9917242c6613d1cab7f4654bae7b7cb2e SHA1 6a245525a656546053428f023efbdc81678bcb34 SHA256 daf977b1c9ec1cf14fdf735f22c0489eb10399debb6ff68aa7d514d98ade262b
+EBUILD paraview-3.6.2.ebuild 9664 RMD160 f54cf53af0c5528b48d82e55be46ba2006dc8678 SHA1 8e0fe062fd9334e07456525e5a520e6ea60247d8 SHA256 d529f7e526fc0a636ca14c7eecc7b012dc9c86e08b11c48f1fa30f508b66c826
+MISC ChangeLog 12217 RMD160 2b8a2cea1b0abbe3874c50838d06e61048c19053 SHA1 921a6b50f986f853927c1d89537939445c759e71 SHA256 71ee6ff8658b1f3cd10d3537f8c596bcce599eb6321fbfa9138ca0162e5cefa9
 MISC metadata.xml 568 RMD160 d44613fcc6b3dc955197867f9e93fcfc9620a7aa SHA1 5818b0ac73fdb158a6d0cf010df85663a1219132 SHA256 2e7d9258b0f11c618647bea07ebb91f84c8cac7ee830640d80c2a5fe03959b66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4wRroACgkQIiMqcbOVdxS/3AQAjfFAPiqCGnyHvsK5zWvLMkd4
-QRWnW8Zyc7vfg8J3y9vuVR0ew6R1sevl1mDBWMP50ikWhWF1nsag1KDtM7ZXnHAL
-E8iGgCYRPTlU/tgQdnzcBgFXhkp2s5OeZltRqbs4OgruJ80kmjFFM7ekYvz54Hun
-tjffYF8rGDl7Pk/coOE=
-=Ufnt
+iJwEAQECAAYFAk4wTTEACgkQIiMqcbOVdxTijQQAj+OpMYuNBdZQZH9+tQfZKdua
+jVT8LEnCI3UJPtf70RKQZFejRrSMvbPv0yWbZqrUm4sFzsn8ScqUG0BATJAjlbhC
+7AN5bSna42R7DtpTOYBDlOfxzjwb77XBKiJxUBN+5U/xQxNYMJ4qgk2HNz+OR4v9
++YkIvtNHJjz8/uFJY8w=
+=NNrf
 -----END PGP SIGNATURE-----

diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
index fe27c0040617905ac45d29e56fd1f13b2a694184..6de9fa45cd62004d2417353b235bc51f3fc53bc1 100644 (file)
--- a/sci-visualization/paraview/paraview-3.6.2.ebuild
+++ b/sci-visualization/paraview/paraview-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.15 2011/07/27 17:11:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.16 2011/07/27 17:38:47 xarthisius Exp $
 
 EAPI="3"
 
@@ -88,6 +88,10 @@ src_prepare() {
        sed -e "s:\${PV_INSTALL_BIN_DIR}/plugins:/usr/${PVLIBDIR}/plugins:" \
                -i CMake/ParaViewPlugins.cmake \
                || die "Failed to fix plugin install directories"
+
+       # bug 348151
+       sed -e 's/CURRENT_VERSION 2.6/CURRENT_VERSION 2.7 2.6/' \
+               -i VTK/CMake/FindPythonLibs.cmake || die
 }
 
 src_configure() {