Fix for USE="python -tool" situation, #311995

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index 3e07b3b682d21e830a7d01a1eea95f91a2736155..0b754f5526314c06accb651c8d41373d538aa875 100644 (file)
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/apbs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.26 2010/03/29 19:00:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.27 2010/03/30 07:02:46 jlec Exp $
+
+  30 Mar 2010; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r2.ebuild,
+  metadata.xml:
+  Fix for USE="python -tool" situation, #311995
 
 *apbs-1.2.1b-r2 (28 Mar 2010)
 

diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 058e763b856906472d7f73d40975635c99ab5e83..45c0a263e7711406986d2b973a299509393e1829 100644 (file)
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -17,14 +17,14 @@ DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143
 EBUILD apbs-1.0.0-r1.ebuild 1995 RMD160 0efbe531fe27749a65a23d17958c411bcd15ad74 SHA1 9ff5761e0d8d01cdb49518cdf5d3372977c0f9ad SHA256 34b2bd026da29cec1224c91d9b4c86bdac3bec95747e167b2127aa329de2f4b2
 EBUILD apbs-1.2.0.ebuild 2514 RMD160 860994d50bc8a5d1657a5f3f6fa0dfef3c1e76e4 SHA1 d917e489ecc0e245e02796097a6aef07617e73ff SHA256 4f4229963c163b60012c091e84cf456a1215680358e3852174f2a972554546bf
 EBUILD apbs-1.2.1b-r1.ebuild 2666 RMD160 147ace2cedc979ae431e0e2e83ace236c320c7a0 SHA1 7889ebff83224c531315123dae972d3e503270bf SHA256 c9b404e8870a7461b38139785f62a05db8227464fc6b6bd918467655ed959b8e
-EBUILD apbs-1.2.1b-r2.ebuild 3333 RMD160 7f429bc43e097adac47c8991d9baa7939f8b18b6 SHA1 0440981bb40ab26db895348f74a9534318480fea SHA256 ce9ad9d236ac80b44f6895e1fb2bc54e3bf86479f620f0a0128d7160e79cf360
+EBUILD apbs-1.2.1b-r2.ebuild 3453 RMD160 5c1fea5796961b8b84c6cd90de2573c793469ca9 SHA1 57cfae6a2e5e5551019c1100c6b29ae6213f0c16 SHA256 f322e5608ff64bfe6fd947d665172fe8224bf9babf41cd5652946c52e6b9867e
 EBUILD apbs-1.2.1b.ebuild 2583 RMD160 03d49d8d7d7a5a7ab71164e40bdde4a0c3e8632e SHA1 7712bc2d3faed84eb914d7466769be38076d11ed SHA256 9fa004e87205630e756762a82e6f6ffa969d77970aab2210b9688a8a295ef2a7
-MISC ChangeLog 4666 RMD160 c83ce4d1179de50d1b22555ce798e781760ff661 SHA1 842a19cc34a81f56a4b93b665e45b18f12781e9c SHA256 b6caf32916d704bce84da20143903dfabc492cd5a11508a81069a57d0d15f4c1
-MISC metadata.xml 409 RMD160 61627921d41b6b81c937da90c975be2f5ec76aee SHA1 d76210f2bb303a7f277cb8c75697cf1f242af3ff SHA256 cd86d7db6f944fe5339d452a49ef9f707c163b323a844c21ab4d2d8fbeceb9f4
+MISC ChangeLog 4801 RMD160 b0eb1f82b1fac9ae72866a6cb9625d4dddbcb9ad SHA1 0299d162b674cff2960f135b0096f7bf81fb69fc SHA256 167ed2932a981509b4896930192684a4f00c3c3c633b257614527d9eaf221bd4
+MISC metadata.xml 547 RMD160 7df9b626591272a0875025ac69614734ebeaa886 SHA1 7fb86e4654460def273914edb38551efbee4facc SHA256 49c4f98a836f53297ed0efc680613a595f149b92a864ed3e7e329f93ea17116f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuw+NMACgkQgAnW8HDreRZAIgCfXh1Dxq8f/7lmyNwUTSa8FgHC
-KdMAnisXtHGRZttLXMYi+akbtKauboyJ
-=d47z
+iEYEARECAAYFAkuxohsACgkQgAnW8HDreRbd3ACgkJ1O60un4AZlGDghX9IPHc9q
+HiMAnizMxMvgpsZi/vqMm1Zqf+ycQ9U2
+=3Uuh
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild b/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild
index c9727e661f380e7e474490a2315f3c03aac1a19a..53d63e6bc302d12c91423d0d6999db5d2ec478ea 100644 (file)
--- a/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild
+++ b/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v 1.1 2010/03/29 19:00:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v 1.2 2010/03/30 07:02:46 jlec Exp $
 
 EAPI="3"
 
@@ -65,9 +65,15 @@ src_configure() {
                fi
        fi || die "Failed to select proper mpi implementation"
 
-       econf $(use_enable python) \
+       # we need the tools target for python
+       if use python && ! use tools; then
+               myconf="${myconf} --enable-tools"
+       fi
+
+       econf \
                --disable-maloc-rebuild \
                $(use_enable openmp) \
+               $(use_enable python) \
                $(use_enable tools) \
                ${myconf}
 }

diff --git a/sci-chemistry/apbs/metadata.xml b/sci-chemistry/apbs/metadata.xml
index c6c79fd71aceb323107bc862d7e4cf054f37f239..b360b031c2e87ef73a6d6ecc6d9e5ce2f79ae96f 100644 (file)
--- a/sci-chemistry/apbs/metadata.xml
+++ b/sci-chemistry/apbs/metadata.xml
@@ -5,6 +5,11 @@
         <email>markusle@gentoo.org</email>
         <name>Markus Dittrich</name>
     </maintainer>
+       <maintainer>
+               <email>jlec@gentoo.org</email>
+               <name>Justin Lecher</name>
+               <description>Ebuild Crasher</description>
+       </maintainer>                   
        <herd>sci-chemistry</herd>
        <use>
                <flag name='arpack'>Include support for arpack libs</flag>