From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A810A138359 for ; Thu, 1 Oct 2020 08:38:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF66DE08EF; Thu, 1 Oct 2020 08:38:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9FBFE08EF for ; Thu, 1 Oct 2020 08:38:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E323E335DA3 for ; Thu, 1 Oct 2020 08:38:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56116332 for ; Thu, 1 Oct 2020 08:38:35 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1601541513.6f064ca76e278f87f80c33cc3ae31dc4829cbe4d.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-calculators/units/units-2.20.ebuild X-VCS-Directories: sci-calculators/units/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 6f064ca76e278f87f80c33cc3ae31dc4829cbe4d X-VCS-Branch: master Date: Thu, 1 Oct 2020 08:38:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c8d6a02-c52d-47b7-8ca7-25d7a93228f6 X-Archives-Hash: 5c264cb6a7a54996c79d678a168d740e commit: 6f064ca76e278f87f80c33cc3ae31dc4829cbe4d Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 1 08:38:15 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 1 08:38:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f064ca7 sci-calculators/units: Install for multiple python implementations Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/units-2.20.ebuild | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild index 2e744c5f60c..5576c8c4c5c 100644 --- a/sci-calculators/units/units-2.20.ebuild +++ b/sci-calculators/units/units-2.20.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 +inherit python-r1 DESCRIPTION="Unit conversion program" HOMEPAGE="https://www.gnu.org/software/units/units.html" @@ -20,8 +20,8 @@ RDEPEND=" units--cur? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/future[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] ') ) " @@ -37,10 +37,6 @@ DOCS=( ChangeLog NEWS README ) -pkg_setup() { - use units--cur && python-single-r1_pkg_setup -} - src_configure() { econf \ --sharedstatedir="${EROOT}/var/lib" \ @@ -54,15 +50,11 @@ src_compile() { src_install() { default - # we're intentionally delaying this since 'make install' would - # get confused if we shove 'units_cur' there, and there is no real - # need to add more complexity for it if use units--cur; then sed \ -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ -e 's|^#!|&/usr/bin/python|g' \ units_cur_inst > units_cur || die - python_fix_shebang units_cur - python_doscript units_cur + python_foreach_impl python_doscript units_cur fi }