commit: c0dd21f4fceff481c9a02396ea9db26b9e4ff20a Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Tue Feb 7 09:35:49 2023 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Tue Feb 7 09:36:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0dd21f4
sci-chemistry/pymol: support msgpack-5 Tested, builds fine against =dev-cpp/msgpack-cxx-5.0.0. Closes: https://bugs.gentoo.org/893314 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> ...pymol-2.5.0-r1.ebuild => pymol-2.5.0-r2.ebuild} | 2 +- sci-chemistry/pymol/pymol-2.5.0.ebuild | 99 ---------------------- 2 files changed, 1 insertion(+), 100 deletions(-) diff --git a/sci-chemistry/pymol/pymol-2.5.0-r1.ebuild b/sci-chemistry/pymol/pymol-2.5.0-r2.ebuild similarity index 97% rename from sci-chemistry/pymol/pymol-2.5.0-r1.ebuild rename to sci-chemistry/pymol/pymol-2.5.0-r2.ebuild index 287c6e3776bc..a4653ad70c83 100644 --- a/sci-chemistry/pymol/pymol-2.5.0-r1.ebuild +++ b/sci-chemistry/pymol/pymol-2.5.0-r2.ebuild @@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+netcdf web" DEPEND=" - dev-libs/msgpack[cxx(-)] + || ( dev-cpp/msgpack-cxx dev-libs/msgpack[cxx(-)] ) dev-libs/mmtf-cpp dev-python/pyopengl[${PYTHON_USEDEP}] dev-python/PyQt5[opengl,${PYTHON_USEDEP}] diff --git a/sci-chemistry/pymol/pymol-2.5.0.ebuild b/sci-chemistry/pymol/pymol-2.5.0.ebuild deleted file mode 100644 index febb99f21a88..000000000000 --- a/sci-chemistry/pymol/pymol-2.5.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit desktop flag-o-matic xdg distutils-r1 - -DESCRIPTION="A Python-extensible molecular graphics system" -HOMEPAGE="https://www.pymol.org/"; -SRC_URI=" - https://dev.gentoo.org/~pacho/${PN}/${PN}-1.8.4.0.png.xz - https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz - " -RESTRICT="mirror" -LICENSE="PSF-2.2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+netcdf web" - -DEPEND=" - dev-libs/msgpack[cxx(-)] - dev-libs/mmtf-cpp - dev-python/pyopengl[${PYTHON_USEDEP}] - dev-python/PyQt5[opengl,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pmw[${PYTHON_USEDEP}] - media-libs/freetype:2 - media-libs/glew:0= - media-libs/glm - media-libs/libpng:0= - media-video/mpeg-tools - sys-libs/zlib - netcdf? ( sci-libs/netcdf:0= ) -" -RDEPEND="${DEPEND} - sci-chemistry/chemical-mime-data -" - -S="${WORKDIR}"/${PN}-open-source-${PV} - -python_prepare_all() { - sed \ - -e "s:\"/usr:\"${EPREFIX}/usr:g" \ - -e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \ - -i setup.py || die - - sed \ - -e "s:/opt/local:${EPREFIX}/usr:g" \ - -e '/ext_comp_args/s:\[.*\]:[]:g' \ - -i setup.py || die - sed \ - -e "s:\['msgpackc'\]:\['msgpack'\]:g" \ - -i setup.py || die - - append-cxxflags -std=c++0x - - use !netcdf && mydistutilsargs=( --no-vmd-plugins ) - - distutils-r1_python_prepare_all -} - -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_foreach_impl python_doscript "${T}"/${PN} - - # These environment variables should not go in the wrapper script, or else - # it will be impossible to use the PyMOL libraries from Python. - cat >> "${T}"/20pymol <<- EOF || die - PYMOL_PATH="${EPREFIX}/usr/share/pymol" - PYMOL_DATA="${EPREFIX}/usr/share/pymol/data" - PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts" - EOF - - doenvd "${T}"/20pymol - - newicon "${WORKDIR}"/${PN}-1.8.4.0.png ${PN}.png - make_desktop_entry ${PN} PyMol ${PN} \ - "Graphics;Education;Science;Chemistry;" \ - "MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;" - - if ! use web; then - rm -rf "${D}/$(python_get_sitedir)/web" || die - fi - - rm -f "${ED}"/usr/share/${PN}/LICENSE || die -}
