[gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/

[Justin Lecher]

commit:     37e203e784364e5fa60972cac749ceb804cde12e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 16:04:13 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed May 29 16:04:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=37e203e7

sci-chemistry/coot: Move to new python eclasses

Package-Manager: portage-2.2.0_alpha177

---
 sci-chemistry/coot/ChangeLog        |  3 +++
 sci-chemistry/coot/coot-9999.ebuild | 16 +++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 1d89d32..e877cf7 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 May 2013; Justin Lecher <jlec@g.o> coot-9999.ebuild:
+  Move to new python eclasses
+
   29 May 2013; Justin Lecher <jlec@g.o> coot-9999.ebuild, metadata.xml:
   Drop version from clipper
 

diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index 6beaf9e..73032af 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 AUTOTOOLS_AUTORECONF="true"
 
-inherit autotools-utils python subversion toolchain-funcs versionator
+inherit autotools-utils python-single-r1 subversion toolchain-funcs versionator
 
 MY_S2_PV=$(replace_version_separator 2 - ${PV})
 MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1}
@@ -26,6 +26,8 @@ LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+openmp static-libs test"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 SCIDEPS="
@@ -60,7 +62,8 @@ RDEPEND="
 	${SCIDEPS}
 	${XDEPS}
 	${SCHEMEDEPS}
-	dev-python/pygtk:2
+	${PYTHON_DEPS}
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
 	>=dev-libs/gmp-4.2.2-r2
 	>=net-misc/curl-7.19.6
 	net-dns/libidn"
@@ -76,8 +79,7 @@ pkg_setup() {
 	if use openmp; then
 		tc-has-openmp || die "Please use an OPENMP capable compiler"
 	fi
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 PATCHES=(
@@ -126,7 +128,7 @@ src_configure() {
 
 src_compile() {
 	autotools-utils_src_compile
-	python_convert_shebangs $(python_get_version) "${S}"/src/coot_gtk2.py
+	python_fix_shebang "${S}"/src/coot_gtk2.py
 	cp "${S}"/src/coot_gtk2.py python/coot.py || die
 }