public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
Date: Thu, 12 Nov 2015 16:23:55 +0000 (UTC)	[thread overview]
Message-ID: <1447345429.48fda2d43d2691c28b535a2b4e289276cfaf079f.jlec@gentoo> (raw)

commit:     48fda2d43d2691c28b535a2b4e289276cfaf079f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 16:23:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec <AT> 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 @@
     <email>jlec@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="apbs">Pymol supprt for sci-chemistry/apbs</flag>
     <flag name="web">Install Pymodule needed for web app support</flag>
   </use>
 </pkgmetadata>

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() {


             reply	other threads:[~2015-11-12 16:24 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-12 16:23 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-22 11:59 [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/ Aisha Tammy
2015-08-27 15:01 Justin Lecher
2015-03-16  7:16 Justin Lecher
2015-03-14  8:21 Justin Lecher
2014-10-27 17:20 Justin Lecher
2014-10-21  6:47 Justin Lecher
2014-10-17  7:50 Justin Lecher
2014-05-01 12:23 Justin Lecher
2014-02-15 11:07 Justin Lecher
2014-01-18  7:39 Justin Lecher
2014-01-18  7:39 Justin Lecher
2014-01-18  7:38 Justin Lecher
2014-01-18  7:38 Justin Lecher
2013-07-24  9:17 Justin Lecher
2013-06-26 14:55 Justin Lecher
2013-06-26  7:39 ` Justin Lecher
2013-06-26 14:55 Justin Lecher
2013-06-26 14:45 ` Justin Lecher
2013-06-26 14:53 Justin Lecher
2013-06-26 14:53 Justin Lecher
2013-03-26 15:34 Justin Lecher
2013-03-03 17:52 Justin Lecher
2013-02-19 19:35 Justin Lecher
2013-02-19 19:35 Justin Lecher
2013-01-29 15:20 Justin Lecher
2012-10-24  6:36 Justin Lecher
2012-08-13 20:22 Justin Lecher
2012-03-29 10:44 Justin Lecher
2012-03-29 10:44 Justin Lecher
2012-03-04  8:41 Justin Lecher
2011-06-24 17:09 Justin Lecher
2011-04-04 11:18 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447345429.48fda2d43d2691c28b535a2b4e289276cfaf079f.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox