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 14FED1391DB for ; Tue, 18 Mar 2014 19:28:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26AE8E0944; Tue, 18 Mar 2014 19:28:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89A3EE0944 for ; Tue, 18 Mar 2014 19:28:47 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E4A333FC7E for ; Tue, 18 Mar 2014 19:28:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 6869C18875 for ; Tue, 18 Mar 2014 19:28:44 +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: <1395016420.b99794fb384ae6826a5a46c1dc2cc755798f923f.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-astronomy/astrometry/ X-VCS-Repository: proj/sci X-VCS-Files: sci-astronomy/astrometry/ChangeLog sci-astronomy/astrometry/astrometry-0.43.ebuild X-VCS-Directories: sci-astronomy/astrometry/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b99794fb384ae6826a5a46c1dc2cc755798f923f X-VCS-Branch: master Date: Tue, 18 Mar 2014 19:28:44 +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: 41a27b2d-8d72-4a0c-bb9f-4fc0cb23e25b X-Archives-Hash: d42bcbbe1485cd71ebd5ae1701b313b7 commit: b99794fb384ae6826a5a46c1dc2cc755798f923f Author: Joseph Jon Booker neoturbine net> AuthorDate: Mon Mar 17 00:33:40 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Mar 17 00:33:40 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b99794fb Use python-single-r1 and fix typo for USE=extra Package-Manager: portage-2.2.8-r1 --- sci-astronomy/astrometry/ChangeLog | 5 ++++- sci-astronomy/astrometry/astrometry-0.43.ebuild | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sci-astronomy/astrometry/ChangeLog b/sci-astronomy/astrometry/ChangeLog index afb42de..dfd71da 100644 --- a/sci-astronomy/astrometry/ChangeLog +++ b/sci-astronomy/astrometry/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-astronomy/astrometry -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Mar 2014; Joseph Jon Booker astrometry-0.43.ebuild: + Use python-single-r1 and fix typo for USE=extra + 14 Jun 2013; Sébastien Fabbro metadata.xml: sci-astronomy/astrometry: Added extra use flag to plot diff --git a/sci-astronomy/astrometry/astrometry-0.43.ebuild b/sci-astronomy/astrometry/astrometry-0.43.ebuild index 7ba8005..4db5cfb 100644 --- a/sci-astronomy/astrometry/astrometry-0.43.ebuild +++ b/sci-astronomy/astrometry/astrometry-0.43.ebuild @@ -4,7 +4,8 @@ EAPI=5 -inherit eutils toolchain-funcs +PYTHON_COMPAT=( python2_6 python2_7 ) +inherit eutils toolchain-funcs python-single-r1 MYP=${PN}.net-${PV} @@ -19,12 +20,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples extra python" RDEPEND=" - dev-python/numpy + dev-python/numpy[${PYTHON_USEDEP}] sci-astronomy/wcslib sci-libs/cfitsio sci-libs/gsl sys-libs/zlib - virtual/pyfits + virtual/pyfits[${PYTHON_USEDEP}] extra? ( media-libs/libpng media-libs/netpbm @@ -41,6 +42,13 @@ src_prepare() { "${FILESDIR}"/0.43-as-needed.patch \ "${FILESDIR}"/0.43-respect-user-flags.patch \ "${FILESDIR}"/0.43-system-libs.patch + + python_fix_shebang "${S}" + sed "s|python setup-util.py|${EPYTHON} setup-util.py|" "${S}"/util/Makefile -i + sed "s|python setup.py|${EPYTHON} setup.py|" "${S}"/{libkd,sdss,blind}/Makefile -i + sed "s|python -c|${EPYTHON} -c|" "${S}"/blind/Makefile -i + sed "s|python <