From: Matthias Maier Date: Mon, 19 Jan 2015 18:12:00 +0000 (+0000) Subject: do not set global PYTHONPATH environment variable, bug #499272 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1d27846b4075615a7d18006d290028899f615b2;p=gentoo.git do not set global PYTHONPATH environment variable, bug #499272 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xBD3A97A3 --- diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 4925ed5895b7..d37ac4ca9f16 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,15 @@ # 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.85 2014/12/31 12:36:59 tamiko Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.86 2015/01/19 18:12:00 tamiko Exp $ + +*paraview-4.2.0-r1 (19 Jan 2015) +*paraview-4.1.0-r2 (19 Jan 2015) +*paraview-4.0.1-r2 (19 Jan 2015) + + 19 Jan 2015; Matthias Maier +paraview-4.0.1-r2.ebuild, + +paraview-4.1.0-r2.ebuild, +paraview-4.2.0-r1.ebuild, + -paraview-4.0.1-r1.ebuild, -paraview-4.1.0-r1.ebuild, -paraview-4.2.0.ebuild: + do not set global PYTHONPATH environment variable, bug #499272 31 Dec 2014; Matthias Maier +files/paraview-4.2.0-vtk-freetype.patch, paraview-4.2.0.ebuild: diff --git a/sci-visualization/paraview/paraview-4.0.1-r1.ebuild b/sci-visualization/paraview/paraview-4.0.1-r2.ebuild similarity index 95% rename from sci-visualization/paraview/paraview-4.0.1-r1.ebuild rename to sci-visualization/paraview/paraview-4.0.1-r2.ebuild index cb2e404645f9..de1efbcf10d7 100644 --- a/sci-visualization/paraview/paraview-4.0.1-r1.ebuild +++ b/sci-visualization/paraview/paraview-4.0.1-r2.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/paraview/paraview-4.0.1-r1.ebuild,v 1.4 2014/12/13 08:22:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1-r2.ebuild,v 1.1 2015/01/19 18:12:00 tamiko Exp $ EAPI=5 @@ -264,8 +264,6 @@ src_install() { # set up the environment echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} - echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN} - doenvd "${T}"/40${PN} newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png make_desktop_entry paraview "Paraview" paraview @@ -276,11 +274,17 @@ src_install() { pkg_postinst() { # with Qt4.5 there seem to be issues reading data files # under certain locales. Setting LC_ALL=C should fix these. - echo + elog "" elog "If you experience data corruption during parsing of" elog "data files with paraview please try setting your" elog "locale to LC_ALL=C." elog "If you plan to use paraview component from an existing shell" elog "you should run env-update and . /etc/profile first" - echo + elog "" + elog "paraview no longer exports bundled python modules in PYTHONPATH" + elog "globally due to clashes of bundled packages with system-wide" + elog "site-packages. If you want to use paraview's python modules" + elog "export" + elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages" + elog "as needed." } diff --git a/sci-visualization/paraview/paraview-4.1.0-r1.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild similarity index 95% rename from sci-visualization/paraview/paraview-4.1.0-r1.ebuild rename to sci-visualization/paraview/paraview-4.1.0-r2.ebuild index 5df0f5205424..e7b416773840 100644 --- a/sci-visualization/paraview/paraview-4.1.0-r1.ebuild +++ b/sci-visualization/paraview/paraview-4.1.0-r2.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/paraview/paraview-4.1.0-r1.ebuild,v 1.5 2014/12/21 23:03:05 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.1.0-r2.ebuild,v 1.1 2015/01/19 18:12:00 tamiko Exp $ EAPI=5 @@ -277,8 +277,6 @@ src_install() { # set up the environment echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} - echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN} - doenvd "${T}"/40${PN} newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png make_desktop_entry paraview "Paraview" paraview @@ -289,11 +287,17 @@ src_install() { pkg_postinst() { # with Qt4.5 there seem to be issues reading data files # under certain locales. Setting LC_ALL=C should fix these. - echo + elog "" elog "If you experience data corruption during parsing of" elog "data files with paraview please try setting your" elog "locale to LC_ALL=C." elog "If you plan to use paraview component from an existing shell" elog "you should run env-update and . /etc/profile first" - echo + elog "" + elog "paraview no longer exports bundled python modules in PYTHONPATH" + elog "globally due to clashes of bundled packages with system-wide" + elog "site-packages. If you want to use paraview's python modules" + elog "export" + elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages" + elog "as needed." } diff --git a/sci-visualization/paraview/paraview-4.2.0.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild similarity index 95% rename from sci-visualization/paraview/paraview-4.2.0.ebuild rename to sci-visualization/paraview/paraview-4.2.0-r1.ebuild index b07e6c9d3270..55582a8e3a59 100644 --- a/sci-visualization/paraview/paraview-4.2.0.ebuild +++ b/sci-visualization/paraview/paraview-4.2.0-r1.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/paraview/paraview-4.2.0.ebuild,v 1.2 2014/12/31 12:36:59 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0-r1.ebuild,v 1.1 2015/01/19 18:12:00 tamiko Exp $ EAPI=5 @@ -276,8 +276,6 @@ src_install() { # set up the environment echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} - echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN} - doenvd "${T}"/40${PN} newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png make_desktop_entry paraview "Paraview" paraview @@ -288,11 +286,17 @@ src_install() { pkg_postinst() { # with Qt4.5 there seem to be issues reading data files # under certain locales. Setting LC_ALL=C should fix these. - echo + elog "" elog "If you experience data corruption during parsing of" elog "data files with paraview please try setting your" elog "locale to LC_ALL=C." elog "If you plan to use paraview component from an existing shell" elog "you should run env-update and . /etc/profile first" - echo + elog "" + elog "paraview no longer exports bundled python modules in PYTHONPATH" + elog "globally due to clashes of bundled packages with system-wide" + elog "site-packages. If you want to use paraview's python modules" + elog "export" + elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages" + elog "as needed." }