From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 00D9D1388C1 for ; Thu, 12 Nov 2015 16:24:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 097C721C166; Thu, 12 Nov 2015 16:24:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A65F821C166 for ; Thu, 12 Nov 2015 16:23:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78AEA33E3A9 for ; Thu, 12 Nov 2015 16:23:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 300F11472 for ; Thu, 12 Nov 2015 16:23:55 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1447345429.48fda2d43d2691c28b535a2b4e289276cfaf079f.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol/metadata.xml sci-chemistry/pymol/pymol-9999.ebuild X-VCS-Directories: sci-chemistry/pymol/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 48fda2d43d2691c28b535a2b4e289276cfaf079f X-VCS-Branch: master Date: Thu, 12 Nov 2015 16:23: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-Archives-Salt: e8029408-fb5a-4407-ac78-b31a7b038c40 X-Archives-Hash: 20d1232bfedc52deba33fc532532460b commit: 48fda2d43d2691c28b535a2b4e289276cfaf079f Author: Justin Lecher gentoo org> AuthorDate: Thu Nov 12 16:23:32 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 12 16:23:49 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=48fda2d4 sci-chemistry/pymol: Always use included apbs plugin Correctly block files collisions Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=565600 Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher gentoo.org> sci-chemistry/pymol/metadata.xml | 1 - sci-chemistry/pymol/pymol-9999.ebuild | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml index bca2106..b68426c 100644 --- a/sci-chemistry/pymol/metadata.xml +++ b/sci-chemistry/pymol/metadata.xml @@ -6,7 +6,6 @@ jlec@gentoo.org - Pymol supprt for sci-chemistry/apbs Install Pymodule needed for web app support diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild index 574855c..2abc15d 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -7,7 +7,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="tk" -inherit distutils-r1 fdo-mime flag-o-matic subversion versionator +inherit distutils-r1 eutils fdo-mime flag-o-matic subversion versionator DESCRIPTION="A Python-extensible molecular graphics system" HOMEPAGE="http://www.pymol.org/" @@ -17,7 +17,7 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk/pymol" LICENSE="PSF-2.2" SLOT="0" KEYWORDS="" -IUSE="apbs web" +IUSE="web" DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] @@ -29,11 +29,7 @@ DEPEND=" media-video/mpeg-tools sys-libs/zlib virtual/python-pmw[${PYTHON_USEDEP}] - apbs? ( - sci-chemistry/apbs[${PYTHON_USEDEP}] - sci-chemistry/pdb2pqr[${PYTHON_USEDEP}] - !sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}] - ) + !sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}] web? ( !dev-python/webpy[${PYTHON_USEDEP}] )" RDEPEND="${DEPEND}" @@ -109,6 +105,7 @@ python_install_all() { pkg_postinst() { fdo-mime_desktop_database_update fdo-mime_mime_database_update + optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr } pkg_postrm() {