commit: 5e4cabe39a1ad71a44b89b696142bab6226291a4 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Wed Jul 19 08:26:10 2023 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Wed Jul 19 08:28:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e4cabe3
sci-chemistry/pymol: Fix distutils-r1 usage Thanks-to: Sam James Closes: https://bugs.gentoo.org/851588 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> sci-chemistry/pymol/pymol-2.5.0-r3.ebuild | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sci-chemistry/pymol/pymol-2.5.0-r3.ebuild b/sci-chemistry/pymol/pymol-2.5.0-r3.ebuild index 92415ecd58a6..ae7eda57d7a6 100644 --- a/sci-chemistry/pymol/pymol-2.5.0-r3.ebuild +++ b/sci-chemistry/pymol/pymol-2.5.0-r3.ebuild @@ -5,6 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_EXT=1 inherit desktop flag-o-matic xdg distutils-r1 @@ -56,24 +57,25 @@ python_prepare_all() { append-cxxflags -std=c++0x - use !netcdf && mydistutilsargs=( --no-vmd-plugins ) - distutils-r1_python_prepare_all } +python_configure_all() { + use !netcdf && DISTUTILS_ARGS=( --no-vmd-plugins ) +} + python_install() { distutils-r1_python_install \ --pymol-path="${EPREFIX}/usr/share/pymol" -} - -python_install_all() { - distutils-r1_python_install_all sed \ -e '1i#!/usr/bin/env python' \ "${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die + python_doscript "${T}"/${PN} +} - python_foreach_impl python_doscript "${T}"/${PN} +python_install_all() { + distutils-r1_python_install_all # These environment variables should not go in the wrapper script, or else # it will be impossible to use the PyMOL libraries from Python.
