From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB6A3138351 for ; Wed, 4 Mar 2020 18:02:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05CB6E098A; Wed, 4 Mar 2020 18:02:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1CF3E098A for ; Wed, 4 Mar 2020 18:02:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7C3734F25A for ; Wed, 4 Mar 2020 18:02:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6B06161 for ; Wed, 4 Mar 2020 18:02:55 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1583344910.de879cad418f2e55fb037c9a063dde7c3ae3dec3.alexxy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pymol/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/pymol/pymol-2.3.0-r2.ebuild sci-chemistry/pymol/pymol-2.3.0-r3.ebuild X-VCS-Directories: sci-chemistry/pymol/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: de879cad418f2e55fb037c9a063dde7c3ae3dec3 X-VCS-Branch: master Date: Wed, 4 Mar 2020 18:02:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3a214aca-edd8-4a56-ac4d-3b00707a5eda X-Archives-Hash: 69d49e4deff996edda831b6dfdfcd835 commit: de879cad418f2e55fb037c9a063dde7c3ae3dec3 Author: Alexey Shvetsov gentoo org> AuthorDate: Wed Mar 4 18:01:25 2020 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Wed Mar 4 18:01:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de879cad sci-chemistry/pymol: pymol works with py3 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Alexey Shvetsov gentoo.org> sci-chemistry/pymol/pymol-2.3.0-r2.ebuild | 1 - .../pymol/{pymol-2.3.0-r2.ebuild => pymol-2.3.0-r3.ebuild} | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild index 36cc913f7b0..5eadc9a8512 100644 --- a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild +++ b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild @@ -29,7 +29,6 @@ DEPEND=" dev-python/pmw:py2[${PYTHON_USEDEP}] dev-python/pyopengl[${PYTHON_USEDEP}] dev-python/PyQt5[opengl,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] media-libs/freetype:2 media-libs/glew:0= media-libs/glm diff --git a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild similarity index 92% copy from sci-chemistry/pymol/pymol-2.3.0-r2.ebuild copy to sci-chemistry/pymol/pymol-2.3.0-r3.ebuild index 36cc913f7b0..675c8b36880 100644 --- a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild +++ b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 desktop eutils flag-o-matic xdg-utils @@ -22,11 +22,6 @@ IUSE="web" DEPEND=" dev-libs/msgpack[cxx] dev-libs/mmtf-cpp - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) - dev-python/pmw:py2[${PYTHON_USEDEP}] dev-python/pyopengl[${PYTHON_USEDEP}] dev-python/PyQt5[opengl,${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] @@ -36,8 +31,7 @@ DEPEND=" media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib - !sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}] - web? ( !dev-python/webpy[${PYTHON_USEDEP}] )" +" RDEPEND="${DEPEND} sci-chemistry/chemical-mime-data "