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

[Jeroen Roovers]

commit:     249e1ca7979ae7fe786e53f9373a2a3086a905e0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 11:35:22 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 11:36:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249e1ca7

sci-calculators/units: Version bump.

Package-Manager: portage-2.2.23

 sci-calculators/units/Manifest                     |  3 +-
 sci-calculators/units/units-2.11f.ebuild           | 61 ----------------------
 .../{units-2.11d.ebuild => units-2.12.ebuild}      |  4 +-
 3 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index ee85a03..f5d9e28 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,4 +1,3 @@
 DIST units-2.11.tar.gz 861772 SHA256 
53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 
83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce
 WHIRLPOOL 
4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500
-DIST units-2.11d.tar.gz 868580 SHA256 
f1ba31658de19fa4ab3ecf791a08c590dc4f6dd5903c771bb9d678ba68ac785b SHA512 
6e0dac8ae8830d0ab914e6e367f9473ac8c860cde9d189d05a8ade047037d21884a66e07733e8decc4d95325dcfb5a7110e4552b4b47c72b746cdc248354c1e5
 WHIRLPOOL 
a54a33f50a0976d180e889485600de5354c94302dbe4b83aaff732efe9d473a07295d447b6d1df9fef766c35cb9571c947c4f12a23f8c21f8665ddb365078914
-DIST units-2.11f.tar.gz 874405 SHA256 
ec01319a468f6f34bc65e312fa706e3a88ac1a34f7ddee24b4b751b810e95ea3 SHA512 
25dc834d60845c835fbf9392d44c80fbc14c92cfa1dfbb0dd40fe3c21404aab4859d98be718a13fcf3a1857b8c1fe58c71691c4ff2bb309185a2f15e19497a17
 WHIRLPOOL 
b718a8dae4111e9f89cc557f2544c069dfde212338146a8ccdca9c3b0ab0c5f6f91b4febfabdac0ff42bd5cc8d0788dca946656368820188557c6f47d63502b0
 DIST units-2.11n.tar.gz 875888 SHA256 
8995af70b64c0ef21f75876e03ea19c637c08586e216142fe1ff2c69c3a08041 SHA512 
aaafa9d1fcfe15262b4cf85cfd696803c4bc5ab8b3b5550493ed6ce36bce122e2ea5c0b8624746925d0783552655e4b4e445f5695ecf546605d3be9a6c822ba9
 WHIRLPOOL 
5b8b6b5a61a082874f5d10b48c0603bf0a8dc748d43c93db52f9c20205e0faad64dff78466f557dc0a1859f182d8bb8fe61e029ea53d9c2efa20d8741808258b
+DIST units-2.12.tar.gz 875884 SHA256 
7868ea5118f1fe8e9f9f7256ecc7f1ee0dd7027ba9f32cc739184af1ed94bbcb SHA512 
90065c03ecc2cb821b8a8c5bd2c6b577ea35aef7c26de83d066b216f5aa9cf071f0fcb57edff24f83b538690a98a57c1a8677a8e06d8a4a8286c84cd02a336ac
 WHIRLPOOL 
179155bc8b97ed2c7f27c5e640bcb7d1d5820dc554f3ea66f411f27af856c79709e4694c4981c8da58a9f3d0c4dd5cca087fbf1c85ef3ed7d4783f61b75f8d05

diff --git a/sci-calculators/units/units-2.11f.ebuild 
b/sci-calculators/units/units-2.11f.ebuild
deleted file mode 100644
index b08c085..0000000
--- a/sci-calculators/units/units-2.11f.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-inherit eutils python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html";
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+units_cur"
-
-DEPEND="
-       >=sys-libs/readline-4.1-r2
-       units_cur? (
-               dev-lang/python-exec:2
-       )
-"
-RDEPEND="
-       ${DEPEND}
-       units_cur? (
-               dev-python/unidecode[${PYTHON_USEDEP}]
-               ${PYTHON_DEPS}
-       )
-"
-
-units_cur_prepare() {
-       local UNITS_PYTHON_MAJOR
-       UNITS_PYTHON_MAJOR=$(
-               UNITS_PYTHON_MAJOR=${EPYTHON/.*}
-               shopt -s extglob
-               echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])}
-       )
-       sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" 
units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON}
-}
-
-src_prepare() {
-       use units_cur && python_foreach_impl units_cur_prepare
-}
-
-src_compile() {
-       emake HAVE_PYTHON=no
-}
-
-units_cur_install() {
-       python_newexe units_cur-${EPYTHON} units_cur
-}
-
-src_install() {
-       emake DESTDIR="${D}" HAVE_PYTHON=no install
-
-       dodoc ChangeLog NEWS README
-
-       use units_cur && python_foreach_impl units_cur_install
-}

diff --git a/sci-calculators/units/units-2.11d.ebuild 
b/sci-calculators/units/units-2.12.ebuild
similarity index 94%
rename from sci-calculators/units/units-2.11d.ebuild
rename to sci-calculators/units/units-2.12.ebuild
index b08c085..fe3f2b0 100644
--- a/sci-calculators/units/units-2.11d.ebuild
+++ b/sci-calculators/units/units-2.12.ebuild
@@ -9,7 +9,7 @@ inherit eutils python-r1
 
 DESCRIPTION="Unit conversion program"
 HOMEPAGE="https://www.gnu.org/software/units/units.html";
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="+units_cur"
 
 DEPEND="
-       >=sys-libs/readline-4.1-r2
+       sys-libs/readline:=
        units_cur? (
                dev-lang/python-exec:2
        )