gentoo new year resync : 01.01.2021

10 files changed, 28 insertions, 136 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 290a1d48f241..ccb04762d9f0 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/pcalc/Manifest b/sci-calculators/pcalc/Manifest
index 98c919555438..30ea3464a3be 100644
--- a/sci-calculators/pcalc/Manifest
+++ b/sci-calculators/pcalc/Manifest
@@ -1,5 +1,5 @@
 DIST pcalc-3.tar.xz 66908 BLAKE2B 40473405f564d5dc5fd43f6f7fc4a80d41d7c9b09f8f6915408313aa45ecaa860b27debe0131fa0450b9b62a7ed4157bc433c7866910211551c6b159113cecc3 SHA512 55b6644300a8eb5224df5a0885907c10847df7ab6296d012eb2bb638876687ddbe23d5b76e31ac6ff4c159e44940d5cf6ba747f2a410943fdc25c9d9855fd60e
 DIST pcalc-4.tar.xz 68948 BLAKE2B f7d17e3ebf76aeccd9b7c74fe6ecfa7de94d8450d302e3b094b57f4050e0be2448887ea131496ab00ee140d0a44b0dd8d5b5564feb8fdc47d2fbbe5010af73d9 SHA512 6492ca89c5f60549f9388d8b7edad21c1c912feea0ee1a1271d730a63832c3b562b1a6bc9f69a0bd3118407906646c8d8fbed6c6d9a62db6a6bbde22579c1fd0
-EBUILD pcalc-3-r1.ebuild 565 BLAKE2B d8093a222ddac75ef9a13bc75b8254274ab150c4624ddc8059842cfb9a677af353527fe8366104de0a5211ce67a7c0528d9c893460e207812c5adb7948008398 SHA512 997cff6f970acd0c4ba803a870d8e9b6e898e7ab4a31a06ee387d0be62c10908dd41a4860edfd7740963b154f2e5c465e7efefd9626f334e9d03dd22de4b856b
+EBUILD pcalc-3-r1.ebuild 566 BLAKE2B feb0555eb9d81d6c7abd5aaba563440d44c0558ee472f910228849a60415ca508a87ae71ba0623f83d3337aa184306b776a9a5d833618c3dcec594f0d0502971 SHA512 95c50a2b61b974de0c7c5da0bdc91bf9aae1f61ba681ae897bfa9a7d153bf9a1bfb72d18ef86b51b1c799adb803256f04f6ad6297f9b7f5a350c330f87975078
 EBUILD pcalc-4.ebuild 574 BLAKE2B 48dc569394ad21fa72897e882f458e63702932079dcbf3ba555ae081b30de8756a151f6bb25a2f00566e09e6607af5cbf3c92c48563ec815f88816a96d4c9bbd SHA512 7493319098c26de588cc54e6d9887f4949108f9e57f92e8bece7cbf080fc28265c03dffc766b0005cba756090cab956364b1fddc0a6169c34f13740b6031df15
 MISC metadata.xml 380 BLAKE2B 966f815d92d6c5680629d5bb6bf5b6124aa1bf6a747d914c94e66148a6e7d8b53e9931e56436a99d0ccc5bbbea1cb6e2a0bb3054fa31a4dd6f7fad54f279893f SHA512 45ac8682dd7d9e8c414354090b2733f3c715e9b76db3ab3e1e852282bf460f3a6881626d49c73b7975fbc238485ed38881187dd4c392469108bad1b15022465a
diff --git a/sci-calculators/pcalc/pcalc-3-r1.ebuild b/sci-calculators/pcalc/pcalc-3-r1.ebuild
index a5d85d3d10be..f514c1693805 100644
--- a/sci-calculators/pcalc/pcalc-3-r1.ebuild
+++ b/sci-calculators/pcalc/pcalc-3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-devel/flex"
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index cdad26d582cb..af8a723fc18a 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -2,11 +2,9 @@ AUX qalculate-gtk-0.9.9-entry.patch 481 BLAKE2B 10323362dcdcd4ce27f96f7599c3b930
 AUX qalculate-gtk-2.8.1-entry.patch 387 BLAKE2B c767853416e99e79557f3e43086831e0b6573a68d5edde084ff6f5e93c8456bc42e3238898d1c800e1126d8f6ab3bcc566d4f492c0406ca5a916430cd3526367 SHA512 7f0eca65cbc66737a7a9d9e4cc14f81b86d6ff706eb63694821803ed77a108438edabea10699a21f3776cfafdbba07c72ca5bb672ffbf34afdd84f7c39b6c7b7
 AUX qalculate-gtk-3.2.0-entry.patch 388 BLAKE2B 42c903e1e9abbf42b37b35fa31d1a306c5c8c150dc5536a7227f5bdd9240e1394cb617668d792a8492d173f72c67704bb6fdd9cd114d6fa2ea75fd70f07a02b3 SHA512 7b0d0556561d3e6578792d8b623c0c5add585a54d8bf0a68d9f1877aca54dacefa37f23dc528537ff069f60bdb37d97b537f2ae71c7c447bc3db7825d4737199
 DIST qalculate-gtk-0.9.9.tar.gz 1283947 BLAKE2B 68904e19a4810ef7c83b2508d952195a38690def54816ecfde227a5f1bac847973ff67df62d5c174c00f6f9490a3ad8dce0d418cb2317b0c9c461126d54c5695 SHA512 944fad21d96de4a9d6b01fe259efb72f4872dd555357577fff18dca5bc4022c77d894b5cf8a0b470fbb02331de21210a6f034627346e08dc57be2f7c08e9faef
-DIST qalculate-gtk-2.2.0.tar.gz 2339951 BLAKE2B 87a2a9328314b994a780f2f616b6f43b53848131db3e5940863432360da44f1e50084076b63c2fac01fe339d5845a55133f5d453bf3d6eec432ce8e43a524921 SHA512 a761383021448f2d8542fad2c51a57e9d98a09264a1467e8e4555ab1930151651f0a40cd9869bb88e18b716fdbe4c664ce69ec02b6623698f42f34e708f55dea
 DIST qalculate-gtk-2.8.1.tar.gz 2650577 BLAKE2B 9a28afb846f28730bf29c705ec51abda96ccca1864d973588bfd855ae3dc2027765d0bb9b26d817d4b5cfd9189f02c0b889ac74d66d48ebde4bdda2790eb1234 SHA512 fa5ede37bfed3b5f5b46cdf07e3d83456d8144f9b9eda1ae081267d73c06ea032e1012cb7bd01ff36c87aa1a88fc20794fd9477a8d3ece2950785e7aa0b32acc
-DIST qalculate-gtk-3.2.0.tar.gz 2987908 BLAKE2B 038203fab563bb0b74c2c23fd2f4077f7b4c8dc5ebb40c8246dd55c5ce311e19906f664040ccdff8a993fbc0bf8e2e89745bd99c66cb86874097462ec799e5ad SHA512 c9c00bec9ef9fc9526c1ed1d81df06e2fa5c947962cfd981fc3f4036612336ac2dc8027855d505101e78379840d9499f4dda492b98219f9073d91d9237f37528
+DIST qalculate-gtk-3.15.0.tar.gz 2715732 BLAKE2B 7047befbf3a56e53c06d78dc33a515e4a8e59a665202f7a203b61e8f6b5e03b7d52d4a9a1514a92901249f65586552e14b8fd8a24e2d10a15875168d54467e74 SHA512 c5dfe308b13e04644452cfd3a4ce48f170d2599b6b3fb94a64dd78763f3546e44c0f940881d70a4727898feeb7b99a15104442d462f76382eec10cfbc0ed6393
 EBUILD qalculate-gtk-0.9.9.ebuild 747 BLAKE2B 04175d6536ee0b5ba2bc729676f6f8d1924c61ddbc17897a56527f85efb4b25e2816649d63b568046c6cdfcc90f6b60f64882c7621e637bf23fcdcca6ad85707 SHA512 f77e07a90a217ec22500050043d3d14f254465014eab50a4394630f51c180c1fa438c84ebdc4e2513bd50f66950608822e5236484b1b23ac6d84dbaefd48a746
-EBUILD qalculate-gtk-2.2.0.ebuild 754 BLAKE2B a7b2fef7909b3d5a72a43938d0c235eaca8a1c635b3a6c05b613c60d1d00f0eab3a62a3a8146a083fd50eae999bdf6f585477effea023686985291c53812612b SHA512 d4361e3e16d2ac608295aa8844bd6e9b76c37aba2a88a9a8541705e2190f100ffba95ef103993e4f36a41e39198244cb5379779ba63c9a7fdc6afc55777173eb
 EBUILD qalculate-gtk-2.8.1.ebuild 873 BLAKE2B e7404c64aa6c0085780e58c2b117aa70992561322434158f9d9662a72bac797d0351aa9b50961377b5f28e41ca2648220af7cd51855842c93977caf3b7440ec7 SHA512 5b184da0445241ba308e5210e416139148f81f078d03656db2f61ab208095be77d8fdf5ffc6eb7b70adc956b261778e1cbb6951e1eee53efec86c0f8d5d6e9bb
-EBUILD qalculate-gtk-3.2.0-r1.ebuild 883 BLAKE2B f6dec6c83d27b0035e91f153397ac85fe280e0047f537996d62b2ca15b00925a8e58a0e72c53e40ffcf8a79c59c4dcd39e567bd64c6198ea191a74a049e5a6cf SHA512 26e4e4fee5cfc0e1e7383544cbe17d99a37f95935ebe9627c2e4be000b5788cc50949edf6cd5ce7521630aa2712b0f424448b330dd9675a80283d65d896ce5cf
+EBUILD qalculate-gtk-3.15.0.ebuild 836 BLAKE2B 38a28f4a11ba0dd8a62bc3499cd79c494159cae342d2cd16c12a919d26ff09ea4cd0ef91c2e66c0a9d9ba8c1c1a1f1159aa47854d96f1248977995d11b1ce998 SHA512 cc780bf4ef039ab08f029ab602f818c982c4df0656819a865660ffc72a810577244b5b86d88a7e25a2250534f73ccfef548a789a3f95e4c12d9d76303b1570c1
 MISC metadata.xml 606 BLAKE2B 0d52327ba35512f67f66d9c98323e941e177b2d7f9479e1ed94aea588427b8979624fe5e62f33e8f7b2071ec79f10b1546fbc83437572d0f5ea9da387f9e6b10 SHA512 596bbb4219292b494c2b1c367190ccdd09045fe4c00d1a935ef6180cc1bfedd1d0b233ce98855cb4162766a6bf4c1fe5be3e7e2d582d321c94848c9a4921eaca
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-2.2.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-2.2.0.ebuild
deleted file mode 100644
index 7a244310dcfc..000000000000
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-2.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Modern multi-purpose calculator"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="gnome"
-
-RDEPEND=">=sci-libs/libqalculate-2.2.0:=
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.9-entry.patch"
-)
-
-src_prepare() {
-	# Required by src_test() and `make check`
-	echo data/periodictable.ui > po/POTFILES.skip || die
-
-	gnome2_src_prepare
-}
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
index 6afd4c58b74b..0088a35397ac 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2
 
@@ -12,24 +12,21 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-RDEPEND="dev-libs/glib:2
-	>=sci-libs/libqalculate-3.2.0:=
+RDEPEND="
+	dev-libs/glib:2
+	>=sci-libs/libqalculate-3.8.0:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/pango"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rarian
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.0-entry.patch"
-)
-
 src_prepare() {
 	# Required by src_test() and `make check`
 	echo data/calendarconversion.ui > po/POTFILES.skip || die
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 35e77db85e08..788e2c65c5b1 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,12 +1,10 @@
 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 1330 BLAKE2B b074a88ff51d671c04e44320697fbf2884bfc401e9c676ac30eabbf101fbae971efe5138beca249e4761b814357f694440d26619059cd7fa0984a9655fb624f9 SHA512 c411be263fd2de4d0083cc46af7223dc0ad93967df3f5ce8e9d7b69bd06d5333baeb7737800f99669e215503020f423c19fc8a83d27da28d08c18a050babbcd6
-EBUILD units-2.18.ebuild 1438 BLAKE2B a49ae6dba4513c3826b6db73e43f5a4ba812d444f63f5cff0732b727cd04dc0cebfb0198f44c8a9c232385f1bb9662ba6e2e3c6913a6c15129b5e5e3af3e61ec SHA512 01d9c76ea3efb975941220aeb11cdb797968690b3c1808744ef0f276e8870bdfdd99be5756aa427242de91cd9990516c41c615b76818cc53f905e1273f8b1737
-EBUILD units-2.19-r1.ebuild 1418 BLAKE2B 97e4e8270c89c8d4b05cdbee68203a8032d6c7a60426d815b8863da333f17dc85597a7045e78a95cdd00204669757dc0b0851f1bf2e7e853f9965f3cd99536ea SHA512 06db229ce26135c7d2f7d81f77ae9b5421153f7769b94e35020dc1720c71e77a9ab0152764aaf9ce80090ee4df13ec4e4cef1ef07b30d7810cf8eb2e81462547
+DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
+EBUILD units-2.19-r1.ebuild 1419 BLAKE2B efbb701fcfc0def5e41f6ad4f31e1f074fa7b01f297ecd19833601f27b3507aaa2241bcc9af032ae8e9dc95bc8de89e8c6c2ab69f3e5639b8c0d98453e6af96e SHA512 c31a7d1314d708528df556b19e1d18752ad1bb5d7a9c607e96559cf7dbd746bf16c110a3573740212c17c7c7296c8dd94dac2f0822074fa6fbd3e5a8bde05892
 EBUILD units-2.20.ebuild 1241 BLAKE2B 89aad89db4fe4804fbb8b009cf3dcc668f6f4fc58a80ecb734259bbddebfa89923e18f9ed4c3a9c0af5b53c8ac2f19757c51574d886c0e30cafed5d48e48e4f5 SHA512 a4acfcf9e14b4b8127af772f2ffbbd80e7cab00bd10af2f05e3f722b8cc0d364e439ed620a669cd333c038b3f157dad6b90848f3bda3e466b81c9cbd398609fd
+EBUILD units-2.21.ebuild 1202 BLAKE2B 8163a804f37dcf59f1fec0b9731ff7a1349e28d2f4b95b0bba3eeae1d5a3f2ef1b8436cf7a6eed5efcc26b5c35f3993ba96611e2446e253d42454bf4386a3399 SHA512 f842cc52b1dd7525a225d1716abad976cec91d1f2bc418ac7d0007fa93a781d4ef71d640ecb556218963b48d2e8948352e27537321bc9c20c7a76ef7e7c48406
 MISC metadata.xml 269 BLAKE2B 212fd839faa71081ff89c999bc77e37b69c5c618f9e1527ed9402ad14af7072432fcd3eaa3ced4dd20a45929c054095d652ab6c18a1642be436b345436ed48a7 SHA512 bcb2f5dd279dd126273909fdaf0c3ee89f0eb050938317ba26e75532a742e7eb496669bea134494071ec30b3475a3ffc70b47035de404e8c1f7bc1034012e917
diff --git a/sci-calculators/units/units-2.16-r1.ebuild b/sci-calculators/units/units-2.16-r1.ebuild
deleted file mode 100644
index 6bea3362ca40..000000000000
--- a/sci-calculators/units/units-2.16-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit eutils python-single-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_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-pkg_setup() {
-	use units-cur && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
-
-	# we're intentionally delaying this since 'make install' would
-	# get confused if we shove 'units_cur' there, and there is no real
-	# need to add more complexity for it
-	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_fix_shebang units_cur
-		python_doscript units_cur
-	fi
-}
diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild
index b68b04a87f90..755e4b2d6df4 100644
--- a/sci-calculators/units/units-2.19-r1.ebuild
+++ b/sci-calculators/units/units-2.19-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+units-cur"
 REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.21.ebuild
index 8f8ba8b7c387..f62e7185316e 100644
--- a/sci-calculators/units/units-2.18.ebuild
+++ b/sci-calculators/units/units-2.21.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit eutils python-single-r1
+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"
@@ -11,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+units-cur"
 REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -20,21 +21,19 @@ RDEPEND="
 	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+	"${FILESDIR}"/${PN}-2.20-readerror.patch
 )
 
-pkg_setup() {
-	use units-cur && python-single-r1_pkg_setup
-}
+DOCS=( ChangeLog NEWS README )
 
 src_configure() {
 	econf \
@@ -47,19 +46,13 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
+	default
 
-	# we're intentionally delaying this since 'make install' would
-	# get confused if we shove 'units_cur' there, and there is no real
-	# need to add more complexity for it
 	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_fix_shebang units_cur
-		python_doscript units_cur
+		python_foreach_impl python_doscript units_cur
 	fi
 }