[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pymol/

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     d6a556d0bb073db14a6091c0d705ea08f76ee5bb
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  8 10:02:20 2018 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Nov  8 10:05:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a556d0

sci-chemistry/pymol: Version bump

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

 sci-chemistry/pymol/Manifest                       |   3 +-
 sci-chemistry/pymol/pymol-1.8.6.0.ebuild           | 109 ---------------------
 .../{pymol-2.1.0.ebuild => pymol-2.2.0.ebuild}     |  10 +-
 3 files changed, 6 insertions(+), 116 deletions(-)

diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 64fe4abc321..d308fc6a065 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,4 +1,3 @@
 DIST pymol-1.8.4.0.png.xz 19528 BLAKE2B f3d23d4cedca3d8bb96b20646a548da4be570697e3346a11b01c5c3599b536ba4697be08472dfa8a4f6533167defc1a37a1de332931a73857319cb28fd42cd2b SHA512 40bb0d3f226476f6e047b5361956aad955232a97641474765eaa5204f0539aee3810e0266213618a45364f9f31f6eb18380b17e0c79f64065f7b62a9016caa7c
+DIST pymol-2.2.0.tar.gz 10514753 BLAKE2B 54bf7c639ec1af0c318438f6dcbe5878aded5cc360dee3a5f1dee4b6eea588f4242865ae8adf1e044628ad5f71aa8f6d58d0cc71baf7c1f20eed3045ed3a1cb1 SHA512 56776586276208d42cc4bd4c3cb7d6b9a08e7239186b8f398c75cb57f85e05ebf51aaa8cdec5672e56beeda26f1cd9d14c6de7fba1a741f9c8ec22c1292b9c63
 DIST pymol-v1.8.4.0.tar.bz2 8717344 BLAKE2B a4cfb95eb40a3cd3da5b8cfd4acac7255997f9a3e49ef7e7e1d4c13f36e4aace462a054c326bbaadbc99f22286be878a6d5c518149760b5c939ce9362d4b8cc3 SHA512 73a810adfc31adaf0f3fa25512084882c87b0782c8af716ac0203a5b5b7f0b9fedfbce3d129bffef7b52044e92b0542e683966b2acf961c4dac17fbba72dd7fe
-DIST pymol-v1.8.6.0.tar.bz2 8717164 BLAKE2B ddcabb81e15b2409ee551900ed09daaf681c7ef0e196eecea36773c131586f6379cd41c50bfa9df8f396ddb1a5da761e8b3409e9656a8f6ac7a87818f4375895 SHA512 bd08e6890382af1503d6af16b27b43af09b372a1229cc9d8e2de311873918b5e7b06e8a2365ce73a5f52cb31ac795f5d91b2ae6ef62890d9c2bf0ea25f856658
-DIST pymol-v2.1.0.tar.bz2 8779083 BLAKE2B 819846a9963ddf3953f53e29a8396ed104dbdafc55fe39ad91363366c7647af3ad833704aff3d4c11f39829545500e00bb18916b6963de4b986423adf700845c SHA512 67175c0668a13826febcb73f7c62a43cfa03a7f86bb80113d52fb337e7d29008684c03163fc06338c4d68edd9246ffcf63aec1ee3110ae91c8a71ef24ab7b605

diff --git a/sci-chemistry/pymol/pymol-1.8.6.0.ebuild b/sci-chemistry/pymol/pymol-1.8.6.0.ebuild
deleted file mode 100644
index 8fd0a78a12a..00000000000
--- a/sci-chemistry/pymol/pymol-1.8.6.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 eutils fdo-mime flag-o-matic versionator
-
-DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz
-	mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2
-	"
-# git archive -v --prefix=${P}/ master -o ${P}.tar.xz
-RESTRICT="mirror"
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="web"
-
-DEPEND="
-	dev-libs/msgpack[cxx]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-video/mpeg-tools
-	sys-libs/zlib
-	virtual/python-pmw[${PYTHON_USEDEP}]
-	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-python_prepare_all() {
-	sed \
-		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
-		-e "/import/s:argparse:argparseX:g" \
-		-i setup.py || die
-
-	sed \
-		-e "s:/opt/local:${EPREFIX}/usr:g" \
-		-e '/ext_comp_args/s:\[.*\]:[]:g' \
-		-i setup.py || die
-
-	append-cxxflags -std=c++0x
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install --pymol-path="${EPREFIX}/usr/share/pymol"
-
-	sed \
-		-e '1d' \
-		-e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \
-		-e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \
-		-e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \
-		-i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die
-}
-
-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
-		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
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}

diff --git a/sci-chemistry/pymol/pymol-2.1.0.ebuild b/sci-chemistry/pymol/pymol-2.2.0.ebuild
similarity index 92%
rename from sci-chemistry/pymol/pymol-2.1.0.ebuild
rename to sci-chemistry/pymol/pymol-2.2.0.ebuild
index f29f29694f2..5c2dc1f498f 100644
--- a/sci-chemistry/pymol/pymol-2.1.0.ebuild
+++ b/sci-chemistry/pymol/pymol-2.2.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk"
 
-inherit distutils-r1 eutils xdg-utils flag-o-matic versionator
+inherit distutils-r1 eutils xdg-utils flag-o-matic
 
 DESCRIPTION="A Python-extensible molecular graphics system"
 HOMEPAGE="http://www.pymol.org/"
 SRC_URI="
 	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz
-	mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1)/${PN}-v${PV}.tar.bz2
+	https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	"
 # git archive -v --prefix=${P}/ master -o ${P}.tar.xz
 RESTRICT="mirror"
@@ -36,7 +36,7 @@ DEPEND="
 	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${PN}
+S="${WORKDIR}"/${PN}-open-source-${PV}
 
 python_prepare_all() {
 	sed \