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 EB329138200 for ; Wed, 29 May 2013 16:05:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70537E0A10; Wed, 29 May 2013 16:05:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7C97E0A10 for ; Wed, 29 May 2013 16:05:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F397733E121 for ; Wed, 29 May 2013 16:05:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 919EAE545F for ; Wed, 29 May 2013 16:05:09 +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: <1369843453.37e203e784364e5fa60972cac749ceb804cde12e.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/coot/ChangeLog sci-chemistry/coot/coot-9999.ebuild X-VCS-Directories: sci-chemistry/coot/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 37e203e784364e5fa60972cac749ceb804cde12e X-VCS-Branch: master Date: Wed, 29 May 2013 16:05:09 +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: f1fee06c-6665-4442-bd34-1d1e658965bc X-Archives-Hash: 47bd21c69255a3b6683c900f2e584be8 commit: 37e203e784364e5fa60972cac749ceb804cde12e Author: Justin Lecher gentoo org> AuthorDate: Wed May 29 16:04:13 2013 +0000 Commit: Justin Lecher gentoo 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 coot-9999.ebuild: + Move to new python eclasses + 29 May 2013; Justin Lecher 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 }