5 files changed, 6 insertions, 147 deletions
diff --git a/sci-calculators/units/ChangeLog b/sci-calculators/units/ChangeLog
index b7cd6a04d4d3..a092015725f7 100644
--- a/sci-calculators/units/ChangeLog
+++ b/sci-calculators/units/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-calculators/units
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/ChangeLog,v 1.84 2015/05/28 15:14:19 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/ChangeLog,v 1.85 2015/05/28 16:35:20 jer Exp $
+
+  28 May 2015; Jeroen Roovers <jer@gentoo.org> -units-2.02.ebuild,
+  -units-2.02-r1.ebuild, -files/units-2.01-install.patch,
+  -files/units-2.02-UTF8.patch:
+  Old.
 
   28 May 2015; Jack Morgan <jmorgan@gentoo.org> units-2.11.ebuild:
   sparc stable wrt bug #509790
diff --git a/sci-calculators/units/files/units-2.01-install.patch b/sci-calculators/units/files/units-2.01-install.patch
deleted file mode 100644
index c48cdbefbabc..000000000000
--- a/sci-calculators/units/files/units-2.01-install.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,6 +24,7 @@
- 
- AC_C_CONST
- AC_PROG_INSTALL
-+AC_PROG_MKDIR_P
- 
- dnl Checks for libraries.
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -31,6 +31,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+MKDIR_P = @MKDIR_P@
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- TEXI2PDF = texi2pdf
-@@ -84,24 +85,24 @@
- 	sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" 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 $(DESTDIR)@UDAT@locale.map
- 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
- 
- 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
-@@ -114,7 +115,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/files/units-2.02-UTF8.patch b/sci-calculators/units/files/units-2.02-UTF8.patch
deleted file mode 100644
index 51d73d804e87..000000000000
--- a/sci-calculators/units/files/units-2.02-UTF8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/units_cur	2013-07-10 01:02:17.000000000 +0200
-+++ b/units_cur	2014-02-04 09:13:07.613075137 +0100
-@@ -6,6 +6,7 @@
- # Modified to use xml format output from timegenie instead of text file
- 
- import datetime
-+import codecs
- import sys
- import urllib
- import xml.etree.ElementTree as ET
-@@ -31,7 +32,7 @@
- # print codes here
- 
- codes = [x.find('code').text for x in currencies]
--names = [x.find('description').text for x in currencies]
-+names = [x.find('description').text.encode('utf-8') for x in currencies]
- values = [x.find('rate').text for x in currencies]
- 
- names = [x.lower().replace(' ','') for x in names]
diff --git a/sci-calculators/units/units-2.02-r1.ebuild b/sci-calculators/units/units-2.02-r1.ebuild
deleted file mode 100644
index 6a51434053ad..000000000000
--- a/sci-calculators/units/units-2.02-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.02-r1.ebuild,v 1.1 2014/02/04 08:37:25 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-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="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	>=sys-libs/readline-4.1-r2
-"
-RDEPEND="
-	|| (
-		dev-lang/python:2.5[xml]
-		dev-lang/python:2.6[xml]
-		dev-lang/python:2.7[xml]
-	)
-	${DEPEND}
-"
-
-DOCS=( ChangeLog NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.01-install.patch
-	epatch "${FILESDIR}"/${PN}-2.02-UTF8.patch
-	eautoreconf
-}
diff --git a/sci-calculators/units/units-2.02.ebuild b/sci-calculators/units/units-2.02.ebuild
deleted file mode 100644
index 69505c9bd9b9..000000000000
--- a/sci-calculators/units/units-2.02.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.02.ebuild,v 1.7 2013/09/06 18:34:58 ago Exp $
-
-EAPI=5
-inherit autotools eutils
-
-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="alpha amd64 ~arm hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	>=sys-libs/readline-4.1-r2
-"
-RDEPEND="
-	|| (
-		dev-lang/python:2.5[xml]
-		dev-lang/python:2.6[xml]
-		dev-lang/python:2.7[xml]
-	)
-	${DEPEND}
-"
-
-DOCS=( ChangeLog NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.01-install.patch
-	eautoreconf
-}