[gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs: ChangeLog apbs-1.2.1b-r2.ebuild

[gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs: ChangeLog apbs-1.2.1b-r2.ebuild

[Justin Lecher (jlec)]

jlec        10/04/25 09:24:24

  Modified:             ChangeLog apbs-1.2.1b-r2.ebuild
  Log:
  Python ABI fixes, #316165
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.28                 sci-chemistry/apbs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	30 Mar 2010 07:02:46 -0000	1.27
+++ ChangeLog	25 Apr 2010 09:24:23 -0000	1.28
@@ -1,6 +1,9 @@
 # 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.27 2010/03/30 07:02:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.28 2010/04/25 09:24:23 jlec Exp $
+
+  25 Apr 2010; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r2.ebuild:
+  Python ABI fixes, #316165
 
   30 Mar 2010; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r2.ebuild,
   metadata.xml:



1.3                  sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild?r1=1.2&r2=1.3

Index: apbs-1.2.1b-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apbs-1.2.1b-r2.ebuild	30 Mar 2010 07:02:46 -0000	1.2
+++ apbs-1.2.1b-r2.ebuild	25 Apr 2010 09:24:23 -0000	1.3
@@ -1,10 +1,10 @@
 # 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.2 2010/03/30 07:02:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v 1.3 2010/04/25 09:24:23 jlec Exp $
 
 EAPI="3"
 
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="python? 2"
 FORTRAN="g77 gfortran ifc"
 
 inherit autotools eutils flag-o-matic fortran python versionator
@@ -24,7 +24,6 @@
 DEPEND="
 	dev-libs/maloc[mpi=]
 	blas? ( virtual/blas )
-	python? ( dev-lang/python )
 	sys-libs/readline
 	arpack? ( sci-libs/arpack )
 	mpi? ( virtual/mpi )"
@@ -32,6 +31,10 @@
 
 S="${WORKDIR}"/"${MY_P}-source"
 
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-openmp.patch
 	epatch "${FILESDIR}"/${P}-install-fix.patch
@@ -126,9 +129,9 @@
 }
 
 pkg_postinst() {
-	python_mod_optimize /usr/$(python_get_sitedir)/${PN}
+	python_mod_optimize ${EPREFIX}/usr/$(python_get_sitedir)/${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(python_get_sitedir)/${PN}
+	python_mod_cleanup ${EPREFIX}/usr/$(python_get_sitedir)/${PN}
 }