Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 138 insertions, 1 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/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
+}