Version bump.

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

5 files changed, 146 insertions, 6 deletions

diff --git a/sci-calculators/units/ChangeLog b/sci-calculators/units/ChangeLog
index b2abffe0c730..47f1cf8f2d16 100644
--- a/sci-calculators/units/ChangeLog
+++ b/sci-calculators/units/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-calculators/units
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/ChangeLog,v 1.67 2014/02/04 08:37:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/ChangeLog,v 1.68 2014/03/27 20:01:15 jer Exp $
+
+*units-2.10 (27 Mar 2014)
+
+  27 Mar 2014; Jeroen Roovers <jer@gentoo.org> +units-2.10.ebuild,
+  +files/units-2.10-install.patch, metadata.xml:
+  Version bump.
 
 *units-2.02-r1 (04 Feb 2014)
 
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 333113e43fa1..0a118aad21bb 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -3,15 +3,18 @@ Hash: SHA256
 
 AUX units-2.01-install.patch 2008 SHA256 7487ec8d4d887cae48e6696361a5777b461eec48f1f2d2100b15fc593a578ab1 SHA512 73dfabad8fdbf24798e51f5104c0a68b28b30c53b162c28facd36cc53f5d68afa269decc04d4055475b17b4e5d932f449d174b41aab9546b5e6f2e32e0410203 WHIRLPOOL a3da2bc69feeb54360284e3d1158d68a2e0c29f784348b0e47c953d676c1398e1dd3d221b9800b4a4c5c32d98320bd2606df66e5fd7698385fb9a7e742e263d2
 AUX units-2.02-UTF8.patch 619 SHA256 c5f26a6813710abc86532631d29ababaddfedff7d143b51a1748bb3b20fbf4b2 SHA512 91fd9c325058648799af3e55207fa37287986e3233cbac341fed1de9b001182b724b0c69e97e4d331f864150ec6ac44a28ff153b1146c2c1a60db49744231d78 WHIRLPOOL a50d04e9ae4bb9e90aaca3bfc7cf9bbdca9f31ec01c78f3365dbe3f64b58b8cbbe16a5248a168f546c02aa913ab28062a2d6417378d31b528f5b76837d297953
+AUX units-2.10-install.patch 2116 SHA256 ce43492073482580c9d4eadfeb16dd74de1f46b1808052d3dfb2d6aaf979161e SHA512 cb6d2846581c1f57220a5c41f874ae49d3999402e337b888478ed6b0c1591bee1ff2e4c6556cf5bea3565fb10c497c63bf6f2b3807e3a6dad7f9ae07b52b453d WHIRLPOOL 304557ec34c1d7be0239651b76907f5d0ca02fa393253b9b7e83e281b858b699494519ee746c02b28ae0a685d6572881456e105767e75008a237bee3991e44e6
 DIST units-2.02.tar.gz 768135 SHA256 2b34fa70c9319956135b990afc1ac99d411ba5b291b5d29e4a89fdf052944e9a SHA512 83cb6d2ac00304a5e14fd7c5137f70993bc2ea2f67852e4e64e2a718402c118ee3eaeb2bd251a1dca612fb6a995cd86b4c3eb353754540a14bd4d51cf1f5b0ed WHIRLPOOL d7253e97575cb6e85a6be5b30fe8be88fa1625e2d289f5e7c7f65a1b6baa96aa29978b0a212724977d81d67c664ced2dee5dd7b6e2c376550684ff7a1c9ca6e3
+DIST units-2.10.tar.gz 861463 SHA256 8ca2f35bf82aef59aecceb8efebe91d29a3331ae889aafe32f3a7aacca5c4439 SHA512 18d305a4ac81d7e9257ebae0aff23c494906df24f66138731a8cf450427453a08a2bd8562950eccb0d08212f9f608ed87eb0308e2b33bce31319202495e3b9fb WHIRLPOOL ab89469297e76383e5b0537526220fec53f745c8595c5e5f25d1ebc6dbbb3e4742db516a9d47daf8d8dd6b4494121448958990d3c84cc3fedd2d7cc7676efeb7
 EBUILD units-2.02-r1.ebuild 817 SHA256 6166b29cdf679763de51d6fc175560ee49124d796a9e73ec309e0992d4aafaa7 SHA512 2a922e427410278b1d75a536fa3bc2b4d064d08953872827fae85558288214d73cbbb8a699d04a90d3c337c15195b2fd46deb226ae66f7867f81b8a979b3db15 WHIRLPOOL a74978ee29679cd036cadbc324aa176c23aeecc4bccd42cc1e006a0eb1004f3dac2be0ac731343abd1a5b758c9ed6e0c2c3aa8bbc50678b7e17582efe2f21a25
 EBUILD units-2.02.ebuild 764 SHA256 a9984269297145797b0fad51581763b4b1b56d6721828dbfc1d57cb2505e874c SHA512 48a0c874637d54b873934b0bf488d3e6dd28a788bc3ab25d750f9a5d76d5343ce86c2510f8f0e912aef03660e455844108d8b11296c0d3a2e82c0d4c26faf667 WHIRLPOOL 74825569fa4f5e3083c10023830e6a5f026a464f26496e8b9d04023366d64c3d4fff3bae3c86aeeddbb2efd6ef16a29048e868b628eceb7b86490069f04a59f5
-MISC ChangeLog 9743 SHA256 1aa6fc5426ca12b33a966a1282aa682f641916a80c5905e0fb96dea282922f9e SHA512 9df43a102723835581d7c10c687e2448ae6a4e8f281b4a0e96ab76bc359470a234b6a91a837f7b756a8b33d07b211669852f1584d193305ec2929465173ea2f0 WHIRLPOOL 1bb761ca3a3d49444462976d24bd6652590857de170608472bb2e42c0ee006df571ff2de18258d9586df64eaedbc76559dbd134c9284305976e7c53f99f1b9e2
-MISC metadata.xml 224 SHA256 d7ffc52704d4bc0180f6f1c448ea4bdd0e3ff3a562384dc944af4a00debc9620 SHA512 6487ad35c6f3d2e4876714919e7bb01fd65f57e7753cbfc318130727dded4fcf8632a06ab9b7a3016fc1ab127434d1d20de2dd0ef2cc63ad162023f2dbf64b1e WHIRLPOOL 879ad2c41f2e1297b677803b2b0478ed2affc91059b198524795e1a128cf8ab6b9fbe78b53bdd3421041f27b419bce387a267e389111125cd55b05e260abc998
+EBUILD units-2.10.ebuild 1397 SHA256 aa42403ae74be0eef5035f30795857080067407bb98ccf478a0aa11e30bdb32d SHA512 7af0f2ffc6b977037a65ec44cf6577a6985995589b122c8bb9a16a160de645d70bd5d2ca3adb0251bd71e8d8e108afb7a5c573988d2434be0b17d7049d089f80 WHIRLPOOL c7748290a34c58f219fc0022c3ef8daa7d8c81409c1bedb5e74f2b43f651c5350c590ec8f6b0fe738aa1f86c860d551b97d39249db2e500e818cd60e96df1240
+MISC ChangeLog 9903 SHA256 59b934039d4d90476b6ceb4390154f3192f1554fe04a69db0da406a1a02e53bb SHA512 610ad5f4d8439c6058d4853329e9f88f1e35ab55a9d1446119606963c7cbf71d7bb4cfaa58ad58c795cb0406fbd6dc47055b41af784be011aea94add041c8a9c WHIRLPOOL b72469eff89760d904407bf671f155d4941e3d958279cccf15627a26556154c17817b3765c323a74c6cad6c96f8f2202a5ddae71ccf77c14f00075a71c887184
+MISC metadata.xml 327 SHA256 e2995117e4beb2ef6f9f0521abd6328705aa57f4f62b6923bdfe6a82dbcb53b9 SHA512 694cebc7ceaf4f1f5030d4b0ebedddb06be15ef148e74e0b323273d1a1932e984c223b775fd6c0e30f93c54ef4719eecf9878b5b7469f7dd5910384e31f551c2 WHIRLPOOL 2af2d2c1b72436d2d1d82a8c91187c01f1d7f62413c805945de7c6dd2e08700959bed8a2b6b5d639b7212c22abc8e8ee97c67931ba12712ab4985c48d8f9c4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLwpsYACgkQVWmRsqeSphO3SACdEaJKq23dZwaIvOcsu/xOwNOr
-ag8AnRFM85QFQ/tCufRzZ3JkrOJ/KEHL
-=UIN0
+iEYEAREIAAYFAlM0g40ACgkQVWmRsqeSphP2awCfTNsUp8Tdrhqp+YnryuGutCvS
+twAAn3GIpatOwZ8OilppkkcHhZTHC3C8
+=o4p8
 -----END PGP SIGNATURE-----
diff --git a/sci-calculators/units/files/units-2.10-install.patch b/sci-calculators/units/files/units-2.10-install.patch
new file mode 100644
index 000000000000..5767adf8e9d4
--- /dev/null
+++ b/sci-calculators/units/files/units-2.10-install.patch
@@ -0,0 +1,68 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,6 +28,7 @@
+ 
+ AC_C_CONST
+ AC_PROG_INSTALL
++AC_PROG_MKDIR_P
+ 
+ dnl Checks for libraries.
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -36,6 +36,7 @@
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ TEXI2PDF = texi2pdf
++MKDIR_P = @MKDIR_P@
+ LDFLAGS = @LDFLAGS@
+ LIBS= @LIBS@
+ VPATH = @srcdir@
+@@ -87,7 +88,7 @@
+ 
+ units_cur: units_cur2 units_cur3
+ 	@if test $(HAVE_PYTHON) = no; then \
+-	  make units_cur_dummy; \
++	  $(MAKE) units_cur_dummy; \
+ 	else \
+ 	  version=`$(PYTHON) --version 2>&1`; \
+ 	  if echo $$version | grep 'Python 2' >/dev/null; then \
+@@ -120,7 +121,7 @@
+              units_cur > units_cur_inst
+ 
+ install-support: definitions.units currency.units units_cur_inst
+-	$(srcdir)/mkinstalldirs $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) 
++	$(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) 
+ 	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
+ 	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units
+ 	$(INSTALL_DATA) $(srcdir)/locale_map.txt $(DESTDIR)@UDAT@locale_map.txt
+@@ -129,17 +130,17 @@
+ 
+ 
+ install: units@EXEEXT@ install-doc install-support
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) 
++	$(MKDIR_P) $(DESTDIR)$(bindir) 
+ 	$(INSTALL_PROGRAM) units@EXEEXT@ $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'`
+ 
+ install-strip: units@EXEEXT@ install-doc install-support
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(MKDIR_P) $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -s units@EXEEXT@ $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'`
+ 
+ install-doc: install-man install-info
+ 
+ install-man: units.1
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_DATA) units.1 $(DESTDIR)$(mandir)/man1/`echo units|sed '$(transform)'`.1
+ 
+ units.man: units.texinfo texi2man
+@@ -152,7 +153,7 @@
+ 
+ $(DESTDIR)$(infodir)/units.info: units.info
+ 	$(POST_INSTALL)
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
++	$(MKDIR_P) $(DESTDIR)$(infodir)
+ # There may be a newer info file in . than in srcdir.
+ 	-if test -f units.info; then d=.; \
+ 	    else d=$(srcdir); fi; \
diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
index ef0483f9ff68..d9728cf1d724 100644
--- a/sci-calculators/units/metadata.xml
+++ b/sci-calculators/units/metadata.xml
@@ -5,4 +5,7 @@
 <email>jer@gentoo.org</email>
 <name>Jeroen Roovers</name>
 </maintainer>
+<use>
+<flag name='units_cur'>Install the units_cur python script that updates currencies</flag>
+</use>
 </pkgmetadata>
diff --git a/sci-calculators/units/units-2.10.ebuild b/sci-calculators/units/units-2.10.ebuild
new file mode 100644
index 000000000000..84cf480e8b0a
--- /dev/null
+++ b/sci-calculators/units/units-2.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.10.ebuild,v 1.1 2014/03/27 20:01:15 jer Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE="xml"
+inherit autotools eutils python-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="http://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units_cur"
+
+DEPEND="
+	>=sys-libs/readline-4.1-r2
+	units_cur? (
+		dev-lang/python-exec:2
+		dev-python/unidecode[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+
+DOCS=( ChangeLog NEWS README )
+
+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() {
+	epatch "${FILESDIR}"/${P}-install.patch
+	eautoreconf
+	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
+
+	use units_cur && python_foreach_impl units_cur_install
+}