Version bump.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 16 insertions, 95 deletions

diff --git a/sci-calculators/units/ChangeLog b/sci-calculators/units/ChangeLog
index e531ee7d7054..961ebb71d452 100644
--- a/sci-calculators/units/ChangeLog
+++ b/sci-calculators/units/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-calculators/units
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/ChangeLog,v 1.58 2013/07/09 11:27:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/ChangeLog,v 1.59 2013/07/12 11:48:14 jer Exp $
+
+*units-2.02 (12 Jul 2013)
+
+  12 Jul 2013; Jeroen Roovers <jer@gentoo.org> +units-2.02.ebuild,
+  -files/units-2.01_cur, -units-2.01-r4.ebuild:
+  Version bump.
 
 *units-2.01-r4 (09 Jul 2013)
 
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index b923f73f13f1..e71eac8f3d8a 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA256
 
 AUX units-2.01-install.patch 2008 SHA256 7487ec8d4d887cae48e6696361a5777b461eec48f1f2d2100b15fc593a578ab1 SHA512 73dfabad8fdbf24798e51f5104c0a68b28b30c53b162c28facd36cc53f5d68afa269decc04d4055475b17b4e5d932f449d174b41aab9546b5e6f2e32e0410203 WHIRLPOOL a3da2bc69feeb54360284e3d1158d68a2e0c29f784348b0e47c953d676c1398e1dd3d221b9800b4a4c5c32d98320bd2606df66e5fd7698385fb9a7e742e263d2
-AUX units-2.01_cur 2540 SHA256 d182a735db441d6d3d6f9de313d15702f52b70dbd71755502159265de8aa3af6 SHA512 d66ffc8e15006cecc444c6dba827d90e0e8bce64b5e48ff27e44261a9ddd7cae45b5de3f95e5255ffac1c1cba57ed57c98117373dcb8401e0443957c011ce51b WHIRLPOOL c1818755b77bd39fc89a7bb69b798513c035dafb5f886f4b35a3782d3ea7a12b57d7ea12cab568471755adf3d1ac5dcd4bd3bcceabbf3b3ca10dcf0a0cc0b4a8
 DIST units-2.01.tar.gz 709368 SHA256 138b12c70bffa0e484fdfe579927412b1ac573e8351c17d8938592f9ba9a88f2 SHA512 ddaa9d8ad84aea963e84379f6d5d6298ec0431c56ba2c805a5fbc3695504279a7ba81609e33bb9d52771ee3ca739570b925d30aa1637dacb5a90d8c8c483fd37 WHIRLPOOL 1c97a5ca7b2e351773eae5850a30680817a5788f8324bd37d2d8632e8a3fcf2a9da7dd59ee0d415bc8617c1e89fcc2a82ac4a51e27f76a1ac8b77321ea035e17
-EBUILD units-2.01-r4.ebuild 796 SHA256 c078c0927cfa735c139690545d7f0fadd756263ac4843ff92ade24ad5dbb3e9c SHA512 6978ddd5fcd3b093ca68b44788b85b03542b71042932eb48bf9da5f9f5b63b3bca5b48f4d4155f6ca3b060204f61e43562fe669388ac073905a4da6435e8f0d4 WHIRLPOOL 8a6d6807cdfe8504c17ffcb870c088ebe0ec2eef884677e6fb42ea3f05ab34925399f24b82652d8cad07e09e97d7d18664c4dfe76a82c6252276539d44e3688e
+DIST units-2.02.tar.gz 768135 SHA256 2b34fa70c9319956135b990afc1ac99d411ba5b291b5d29e4a89fdf052944e9a SHA512 83cb6d2ac00304a5e14fd7c5137f70993bc2ea2f67852e4e64e2a718402c118ee3eaeb2bd251a1dca612fb6a995cd86b4c3eb353754540a14bd4d51cf1f5b0ed WHIRLPOOL d7253e97575cb6e85a6be5b30fe8be88fa1625e2d289f5e7c7f65a1b6baa96aa29978b0a212724977d81d67c664ced2dee5dd7b6e2c376550684ff7a1c9ca6e3
 EBUILD units-2.01.ebuild 824 SHA256 a8313ec940a23cb7c071c2a64b7ec6d3f5fb5e1f06dda6e5626dcb914d87c664 SHA512 d12a93bc2233da45de60cc4cf2d68c1423e20d15751aaa18057c721979450c14694ca9b172b57840ddb9437143941c544017ae1452b64909054e47f9dd4d158b WHIRLPOOL e624f4c8b45a51d436bb49a93030cbb8c3d541726f5e7a4650248ad160956d1bdad103172c7725a67b13fc839c54509717eeba9591f010ce683a67cfe4dcd6ca
-MISC ChangeLog 8737 SHA256 d02dd0aa3be41eff0f051109ce4a7532dcb41f4e5febc8e2d00ca8dd25a9d33d SHA512 997a5e52c0387962ee924ea5c8d340a6482e70165bc9c79ee969e644f63317d52677b579ed62db43a7a5fa2f418f87768b9b265a2953a45212d905d0c861ffb9 WHIRLPOOL 509545dbb84438be0e51e0a621db6ff7535cb132677faa4639c7fe93d5d85b90544a3f6ec6a1e61508fb0f51017527881ae905bd5f86f3eb7e2efe0bd9a39030
+EBUILD units-2.02.ebuild 770 SHA256 2a903cee40937b49fa3cae2a809adcec21a6dcf45392f03334b079cb7cc3f4d8 SHA512 3bad479b1e329d4813b315038202ea3a946da6b44f8e114d83d8bc5caadbcfc582cff260a8f6388e9b0b46baffc355b5235ecbd2bcc3a235f5fd2b101b9656d7 WHIRLPOOL 13b5278c453e22ca00186039ca266230f642219607bc8e19e3cf68a05d9b2056efb44e79cf258ffcbc5a437b5fc519fa8b1ffd61d74a85847c644a0093b8e559
+MISC ChangeLog 8896 SHA256 17f1ec360bff99cd0c621063b180dfbf9002e4b9487c1b2041651b466fc8bdbc SHA512 9ea6e822e7b2b20f20d58c70f0ed45ca96c833dc4ceff9ecaf893e3397abe13cf582f83e7a5ea620aba6a5065d3ab8039329702b1aaa45163cbf86c6f9f7191e WHIRLPOOL f8027b6e42e0f8a42f1e999eddfc2a3c375427d058534ba60c7025edcfbf98ad90d1f64a77a24b8ec612d7413a140126c5a3c304e4012a29d2149c5b9626800a
 MISC metadata.xml 224 SHA256 d7ffc52704d4bc0180f6f1c448ea4bdd0e3ff3a562384dc944af4a00debc9620 SHA512 6487ad35c6f3d2e4876714919e7bb01fd65f57e7753cbfc318130727dded4fcf8632a06ab9b7a3016fc1ab127434d1d20de2dd0ef2cc63ad162023f2dbf64b1e WHIRLPOOL 879ad2c41f2e1297b677803b2b0478ed2affc91059b198524795e1a128cf8ab6b9fbe78b53bdd3421041f27b419bce387a267e389111125cd55b05e260abc998
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHb844ACgkQVWmRsqeSphNrfgCeL4kqYxql5eWXYvm1c5kr6JmT
-cNoAn3SChio8S2zNyN3JCGbmekwb3UcV
-=CW4C
+iEYEAREIAAYFAlHf7QAACgkQVWmRsqeSphOAiwCfWR7xGB8Qf2NXq1cFuRH2G8pg
+WcEAn0Rynme4vKBOXSudqxcVpbX68GWj
+=zHcU
 -----END PGP SIGNATURE-----
diff --git a/sci-calculators/units/files/units-2.01_cur b/sci-calculators/units/files/units-2.01_cur
deleted file mode 100755
index dceb6ff5ac37..000000000000
--- a/sci-calculators/units/files/units-2.01_cur
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/python2
-
-import datetime
-import sys
-import urllib
-import xml.etree.ElementTree as ET
-
-outfile = 'currency.units'
-outstr = ''
-
-if len(sys.argv)==2:
-  outfile = sys.argv[1]
-elif len(sys.argv)>2:
-  sys.stderr.write('Usage: {0} [filename]\n\n'.format(sys.argv[0]))
-  sys.stderr.write('Update currency information for \'units\' into the specified\n')
-  sys.stderr.write('filename or the default location, \'{0}\'.\n'.format(outfile))
-  sys.exit(1)
-
-try:
-  currencies = ET.parse(urllib.urlopen('http://rss.timegenie.com/forex.xml')).findall('data')
-except IOError, exc:
-  sys.stderr.write('Error connecting to currency server. {0}\n'.format(exc))
-  sys.exit(1)
-
-# print codes here
-
-outstr += '# ISO Currency Codes\n\n'
-
-maxlen = 0
-
-for currency in currencies:
-  code = currency.find('code').text
-  description = currency.find('description').text.lower().replace(' ','')
-  currency.find('description').text = description
-  outstr += code + ' '*20 + description + '\n'
-  if len(currency.find('description').text) > maxlen:
-    maxlen = len(currency.find('description').text)
-  if currency.find('code').text == 'USD':
-    usdval = currency.find('rate').text[2:]
-    currencies.remove(currency)
-
-# print rates here
-
-now = datetime.datetime.now()
-outstr += '\n# Currency exchange rates from Time Genie (www.timegenie.com)\n'
-outstr += '\n!message Currency exchange rates from ' + now.strftime('%Y-%m-%d') + '\n\n'
-
-for currency in currencies:
-  if currency.find('code').text == 'EUR':
-    euro = currency.find('rate').text
-    currency.find('rate').text = usdval + ' US$'
-
-  else:
-    currency.find('rate').text += ' euro'
-  outstr += currency.find('description').text.ljust(maxlen+2) + '1|' + currency.find('rate').text + '\n'
-
-# precious metals prices
-
-# Another source for this data might be 
-# http://www.xmlcharts.com/cache/precious-metals.xml
-
-outstr += '\n# Precious metals prices from http://services.packetizer.com/spotprices/\n\n'
-
-try:
-  spotprices = ET.parse(urllib.urlopen('http://services.packetizer.com/spotprices/?f=xml'))
-except IOError, exc:
-  sys.stderr.write('Error connecting to spotprices server. {0}\n'.format(exc))
-  sys.exit(1)
-
-metals = ['gold','platinum','silver']
-
-for metal in metals:
-  outstr += '{0}    {1} US$/troyounce\n'.format((metal+'price').ljust(15), spotprices.find(metal).text)
-
-try:
-  if outfile == '-':
-    outfile = sys.stdout
-  else:
-    outfile = open(outfile,'w')
-except IOError, exc:
-  sys.stderr.write('Unable to write to output file. {0}\n'.format(exc))
-  sys.exit(1)
-
-outfile.write(outstr)
diff --git a/sci-calculators/units/units-2.01-r4.ebuild b/sci-calculators/units/units-2.02.ebuild
index af37224d7b05..7fc6abc3c335 100644
--- a/sci-calculators/units/units-2.01-r4.ebuild
+++ b/sci-calculators/units/units-2.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.01-r4.ebuild,v 1.1 2013/07/09 11:27:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.02.ebuild,v 1.1 2013/07/12 11:48:14 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Unit conversion program"
 HOMEPAGE="http://www.gnu.org/software/units/units.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
@@ -29,7 +29,6 @@ RDEPEND="
 DOCS=( ChangeLog NEWS README )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch
-	cp "${FILESDIR}"/${P}_cur ${PN}_cur
+	epatch "${FILESDIR}"/${PN}-2.01-install.patch
 	eautoreconf
 }