5 files changed, 99 insertions, 0 deletions
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 67ac5b962094..29f61db1ea2f 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index edbcf54aac68..634a18ad0b61 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,8 +1,12 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
+AUX units-2.20-WIN32.patch 395 BLAKE2B 5f6cee1a4ca07be73979efc6060b0225cf0a52114085dc31d1259d7a09f131d9a3d8ab91d3f2f995b41e9a3eb3299bbb09575e8c2677cee33e2ccad05abbd628 SHA512 b79d1cea6542a8360f9ba8e6a0bdbc69ade2ccd58bcda53851f6368b6c91a98ca6d2f757028bfc141c9ad8773117972d480e99063800394bcd9c5d3ba2ab61dc
+AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
 DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
+DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d
 EBUILD units-2.16-r1.ebuild 1335 BLAKE2B 6fd6f978c8577c2754a2b98566d4b48f13caf2e1af7c23a9854f5c8847f81e6c4d76d4f6d6723144fa575aef0c0395428c8607e85d65ea95654feb37f8ced2c6 SHA512 b5c9b5a411f4bedd431620632dee2650835fc986ecdd2f2fc0b1b6fcbd640621c2dbf7c6d86d52ae27d53ffda7dd3fd6dd05ec130404c19aeb65dce7afd2e8aa
 EBUILD units-2.18.ebuild 1441 BLAKE2B f6bcb25778a136c98c52d8d0e79562aa2b984f25e16ead86a1485e1bdbefd54a907581b73b867b31b6b584aa0488d6e11e1adc683dceb2bee6cd04d6d89df4ee SHA512 7518fd6a8b4964224380513dcfa623d27af1d2d43089e1dd86df50e48272f62366a8164ca9797ca42d1096792bbc2df43f661d466f0260daee4c669fb66264b0
 EBUILD units-2.19-r1.ebuild 1421 BLAKE2B d460307dbd13044a057748767f9b8c89c71336b69b7c9454111681e244f7f2a4600b16b4b20cb6167312759f023aa054d838bd06169660e2f377477ce32f361a SHA512 2bbcf9f78d4868d6f1ff113cb82ea5c0fd4b7108efcaded6b8f0420afc29c31f86381f735953c8827299735c2fd3ef2786b8985a01e758d866cddbfcb07e75f3
+EBUILD units-2.20.ebuild 1243 BLAKE2B cddb872c334127df99f642df0c1bb5dc3d8ca14d5803b5142d10c871134d4952b43aa6dc66950292dba5b5f87625bcd9d6ff8d268949748802a0419f1e317bdf SHA512 f5c7639a38a099338063abc48579bf15f076d271a04dae1268f28d80625573ab588f2d1488d8120fa1be27ec5cb9f470ef79e2ef63fb98c239b0f11a972907d8
 MISC metadata.xml 342 BLAKE2B 5dfe07ae92c9b1741b7c2f49f8f0ba853aebfaa20d156685ed5a8fe9c8f0bb094bc240f197e3fb57f65494d4a41b037d7d4e2631c11d26e4fbada04f2916b749 SHA512 c648f964163e26133e70b40687d317d57067fa3bdff11080a33123b7fbf9e9af3aff1d4890ce4e75283b86ef026896804606283c888cb2dbc0c66a171dca8657
diff --git a/sci-calculators/units/files/units-2.20-WIN32.patch b/sci-calculators/units/files/units-2.20-WIN32.patch
new file mode 100644
index 000000000000..fbe7599831c4
--- /dev/null
+++ b/sci-calculators/units/files/units-2.20-WIN32.patch
@@ -0,0 +1,24 @@
+--- a/units.c
++++ b/units.c
+@@ -4087,7 +4087,9 @@
+ checkcwd (char *file)
+ {
+   FILE *fp;
++#ifdef _WIN32
+   char *p;
++#endif
+ 
+   fp = fopen(file, "r");
+   if (fp){
+@@ -4630,7 +4630,10 @@
+ printversion()
+ {
+   int exists;
+-  char *unitsfile, *localemap;
++  char *unitsfile;
++#ifdef _WIN32
++  char *localemap;
++#endif
+ 
+   if (flags.verbose == 0) {
+     printf("GNU Units version %s\n", VERSION);
diff --git a/sci-calculators/units/files/units-2.20-readerror.patch b/sci-calculators/units/files/units-2.20-readerror.patch
new file mode 100644
index 000000000000..ccb12c681539
--- /dev/null
+++ b/sci-calculators/units/files/units-2.20-readerror.patch
@@ -0,0 +1,11 @@
+--- a/units.c
++++ b/units.c
+@@ -761,7 +761,7 @@
+ }
+ 
+ 
+-#define readerror (goterr=1) && errfile && fprintf
++#define readerror(...) do { goterr=1; if (errfile) fprintf(__VA_ARGS__); } while (0)
+ 
+ #define VAGUE_ERR "%s: error in units file '%s' line %d\n", \
+                        progname, file, linenum
diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild
new file mode 100644
index 000000000000..512e983f4b3a
--- /dev/null
+++ b/sci-calculators/units/units-2.20.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit python-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://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 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units--cur"
+REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/readline:=
+	units--cur? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+	"${FILESDIR}"/${PN}-2.20-WIN32.patch
+	"${FILESDIR}"/${PN}-2.20-readerror.patch
+)
+DOCS=(
+	ChangeLog NEWS README
+)
+
+src_configure() {
+	econf \
+		--sharedstatedir="${EROOT}/var/lib" \
+		ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	default
+
+	if use units--cur; then
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
+		python_foreach_impl python_doscript units_cur
+	fi
+}