[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/

[Jeroen Roovers]

commit:     cba707ea3f9ccb11c68eb14f1e43b1bc3a3798ea
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 13:15:18 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 13:15:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba707ea

sci-calculators/units: Version bump.

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 sci-calculators/units/Manifest                     |  1 +
 sci-calculators/units/units-2.14-r1.ebuild         |  1 +
 .../{units-2.14-r1.ebuild => units-2.15.ebuild}    | 24 ++++++++++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index f8eb7ff1385..92f6ef4bd8c 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1 +1,2 @@
 DIST units-2.14.tar.gz 1177024 SHA256 9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 WHIRLPOOL ae4c0297387e9d3e42ae556a5f528f9c6f1b6a75f5f90580c5b9729ccdea011962d0e891c13ed583a97167bb62d5d074ab3b695ffdd23304f72a62098ce87821
+DIST units-2.15.tar.gz 1178099 SHA256 25d6334fafc801e15b3b0388e207e1efc5d4ae88af6dc7b17d3913de6441f47c SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f WHIRLPOOL ce17241a949c32a602f1a90683a82af973d51bb2ffdea35d9e7d2f23857271aa05519ee4c22eff9c4df9db590115dfd097b1637c4ce58762eebc8afd5e493c95

diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild
index 45559228bae..2269d863f54 100644
--- a/sci-calculators/units/units-2.14-r1.ebuild
+++ b/sci-calculators/units/units-2.14-r1.ebuild
@@ -45,6 +45,7 @@ src_install() {
 		python_is_python3 && pyver=3 || pyver=2
 		sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			"units_cur${pyver}" > units_cur || die
+		python_fix_shebang
 		python_doscript units_cur
 	fi
 }

diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.15.ebuild
similarity index 73%
copy from sci-calculators/units/units-2.14-r1.ebuild
copy to sci-calculators/units/units-2.15.ebuild
index 45559228bae..4d87f5164ed 100644
--- a/sci-calculators/units/units-2.14-r1.ebuild
+++ b/sci-calculators/units/units-2.15.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="xml"
 inherit eutils python-single-r1
 
 DESCRIPTION="Unit conversion program"
@@ -12,17 +11,20 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+units_cur"
 REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
 	units_cur? (
-		dev-python/unidecode[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
-	)"
-DEPEND=${RDEPEND}
+		dev-python/future[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
 
 pkg_setup() {
 	use units_cur && python-single-r1_pkg_setup
@@ -32,6 +34,10 @@ src_configure() {
 	econf ac_cv_path_PYTHON=no
 }
 
+src_compile() {
+	emake ${PN}
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
@@ -41,10 +47,10 @@ src_install() {
 	# 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
-		local pyver
-		python_is_python3 && pyver=3 || pyver=2
-		sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			"units_cur${pyver}" > units_cur || die
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
 		python_doscript units_cur
 	fi
 }