gentoo resync : 25.11.2020

21 files changed, 129 insertions, 69 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 29f61db1ea2f..d44a604b5bc7 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index 2c5987f586b2..1dc0c48e930c 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,7 +1,5 @@
-DIST bc-2.7.2.tar.xz 189020 BLAKE2B 6b4d78deeb6a4724e4a336f51d9489610b9f1069c723a398c30885ebfdf0ba849172bc4b2b5561592b5b004cc5e450da3845bed51751e2d487bcf613ea3606bc SHA512 c2014b16165bf5f8bdadf42bb60ea967a060753c17e13a7c3569d16d218bb3fb644e6a46950e9e7b3aa5a9f6bee4da9b158694909a0ab1fe390b7bb4dc20b303
-DIST bc-3.1.3.tar.xz 210924 BLAKE2B 9a442ad7808231bd5741a70f876dc918ac2747d07ab676f13594e14370f660b9a83a0733c7bcf818d14c2134dfa6da3a87f49b28aff1a1f803525567b3625560 SHA512 fb702e45fb994d4f1be55c2b05c4c4b4c67ae838f4f46864ba944890c1810b871fbafaa323d432f0f600f8182b4370757b75de756ae2795b595776e3fe03ba7b
 DIST bc-3.1.5.tar.xz 211632 BLAKE2B f5a38bd87d3c8d674d79141ee00a071e474e7c1ccb2e1fc9944b4496ae8a4613d57cc0b6dfbad5ea35bd59300c23f307364b96cdbffef4b07b10863df413cecd SHA512 34be1c186df5906ab7a966739220a20afd7e3b227a5c7ba32a77256a36e097bbcc39b99ce6d6855de3e6e2296612f8fbe63dc0983ad91d4eb4c1e630dbb587a0
-EBUILD bc-gh-2.7.2.ebuild 461 BLAKE2B 3c5813399dff6b4efa215a4161a83e24cb129b3636847d8b6e1a002608b2c5e953d7ec2639cf62682b7e26692b37729b4e33f94f58d685d9ba3f2cfe763c5ab2 SHA512 787c32f7feac2077e3d24a69d79131b5801b72df7bdf44c3e58713e1075a1c1e02d3956a6f153c57f13d13bb60c4b12e9e4bb25a2656dd4c13119b561b7086b7
-EBUILD bc-gh-3.1.3.ebuild 469 BLAKE2B 57a00dbc077c768449ea40a0e02a9a5ec54bfe0aac1d0b0d02aa9153559fc52b0b9de63c771a68908f49ccda6d7d37683fa499dc7d59199119ad7917c25f2d70 SHA512 8fdf5ab52e9d391b4622b693aa30296c9838275c54d15de312db40957819ab378acc3a0e0a76b5221d0497c28082a640c70973ddcf55209d1601050975db6d3f
+DIST bc-3.1.6.tar.xz 210976 BLAKE2B 3d3c3102cb97b83e09e3ed61b4bf5862791b4ea8131b5c8dfa6a55bbb42d423b627cd9c5ac8ba6ed6fc7f58f1e92e662541fbd1ea2fdf834292271a16c193564 SHA512 1219a074845b8c66a431ddb78bab643793f5275c26404e92e360e655418d70d1aafa02be2fc4dec25d99a85ae2da1aab7d615de893f85913ca8834448dcade53
 EBUILD bc-gh-3.1.5.ebuild 469 BLAKE2B 57a00dbc077c768449ea40a0e02a9a5ec54bfe0aac1d0b0d02aa9153559fc52b0b9de63c771a68908f49ccda6d7d37683fa499dc7d59199119ad7917c25f2d70 SHA512 8fdf5ab52e9d391b4622b693aa30296c9838275c54d15de312db40957819ab378acc3a0e0a76b5221d0497c28082a640c70973ddcf55209d1601050975db6d3f
-MISC metadata.xml 951 BLAKE2B 11e98c240f9e07a167ba084fff4dd4c9b3d6c5862269f53dbbd5cee3b16a9ee325a56ee45208936aed59efe963fe05ca4dfc9f3bdce2466a34080f48650a7968 SHA512 7195f4e4794b924c7381ea717b04f56d97013fa603c08c858646c1a80cd9bfc1bacad1790ab6350efd374619fabf27058e79280110870445525a76de2312d3c3
+EBUILD bc-gh-3.1.6.ebuild 469 BLAKE2B 57a00dbc077c768449ea40a0e02a9a5ec54bfe0aac1d0b0d02aa9153559fc52b0b9de63c771a68908f49ccda6d7d37683fa499dc7d59199119ad7917c25f2d70 SHA512 8fdf5ab52e9d391b4622b693aa30296c9838275c54d15de312db40957819ab378acc3a0e0a76b5221d0497c28082a640c70973ddcf55209d1601050975db6d3f
+MISC metadata.xml 946 BLAKE2B 44154ae17a2dde049403cfb5924f9580ee1350396181b8865bd3fceeb454b8a9fe5e69973f339005adcfaf5e72a72d7892b65dc04aaa572bc362f6bee293ff05 SHA512 bf98969315752cf2c17aa2487790df7b09f61419f67965350619382a1128b108ddd9a2728c5db322d2886f38757929d44c0e7ce781fde768212cf72ad58e01b0
diff --git a/sci-calculators/bc-gh/bc-gh-2.7.2.ebuild b/sci-calculators/bc-gh/bc-gh-2.7.2.ebuild
deleted file mode 100644
index 66e56800fe67..000000000000
--- a/sci-calculators/bc-gh/bc-gh-2.7.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementation of POSIX bc with GNU extensions"
-HOMEPAGE="https://github.com/gavinhoward/bc"
-SRC_URI="https://github.com/gavinhoward/bc/releases/download/${PV}/bc-${PV}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/bc-${PV}"
-
-src_configure() {
-	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GT || die
-}
diff --git a/sci-calculators/bc-gh/bc-gh-3.1.3.ebuild b/sci-calculators/bc-gh/bc-gh-3.1.6.ebuild
index 31daa94bd5ce..31daa94bd5ce 100644
--- a/sci-calculators/bc-gh/bc-gh-3.1.3.ebuild
+++ b/sci-calculators/bc-gh/bc-gh-3.1.6.ebuild
diff --git a/sci-calculators/bc-gh/metadata.xml b/sci-calculators/bc-gh/metadata.xml
index 1f88059f1ecf..0b15b497384b 100644
--- a/sci-calculators/bc-gh/metadata.xml
+++ b/sci-calculators/bc-gh/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Gavin D. Howard</name>
-		<email>yzena.tech@gmail.com</email>
+		<email>gavin@yzena.com</email>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index c984c0ae2e0e..c6293338aa67 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -6,4 +6,4 @@ EBUILD datamash-1.4.ebuild 601 BLAKE2B d02c99ccbaf8b2887d503170eca0dcf21b6b3537e
 EBUILD datamash-1.5.ebuild 623 BLAKE2B 64ea8062e2dc182d76b562944c86688ac61aeeef3ec3263275576caff3081566e49aa5a10b9cfa559d9401c02f31f62ee1fe5f84ed17e9b0997253981fc463c2 SHA512 a764f5b8c260631573d4f1aad99bed300affe1d614d086f054b599a10a129a2d80807042b9e4dbe80556b42e264d411ca5e7a808353d7b1ef321fa7b37f3e473
 EBUILD datamash-1.6.ebuild 623 BLAKE2B f11b4e90ca448292a766e79fbd8718af25ca6514481534cd72a619bca9db71cc57be26869b61943baf0d06a22dd3f314e4406ff7aa10ed6b4b105dce76bec063 SHA512 5ebf03cf5b4fd99c2d4d2950dd4a5956ac7c443b95063dacc5d359807f96678cc363dc2e990873af12c2a70da5d27af64771f6d6f98a6ee9fa4d38678297f9e9
 EBUILD datamash-1.7.ebuild 623 BLAKE2B f11b4e90ca448292a766e79fbd8718af25ca6514481534cd72a619bca9db71cc57be26869b61943baf0d06a22dd3f314e4406ff7aa10ed6b4b105dce76bec063 SHA512 5ebf03cf5b4fd99c2d4d2950dd4a5956ac7c443b95063dacc5d359807f96678cc363dc2e990873af12c2a70da5d27af64771f6d6f98a6ee9fa4d38678297f9e9
-MISC metadata.xml 396 BLAKE2B 0d89182c943e98ca9975608a49368af7250f0a02ad0111c38b22e29487dd04d1e8cd4a31db564e7dd4a81a920a34559b48ccdfd08f7b659fb12363705536b2c4 SHA512 f95651480cc76dff603952f66377e0f41cec06ea141a94e8597466e362d09f99d83b15b2f40dbc7df78cd1400c6bda9a2cac50be66504ebe6af89b24de0ac30f
+MISC metadata.xml 352 BLAKE2B 89fafe68f3a51e7e67bf3b88a559ac7c13e28843b42b4bc8209c87f4c0a9631160057f768415e9a08eb6b0f773dc5cfb45a3a9c89335d3d0de57651f7bf54b79 SHA512 237328da5b1bfc7a9965d6183bb5af4ae170c99c70fa21c03e9d5ac920e8c70dfb83ca075b019544488a8a37b30e7f7d08b55e405b2411c714dd048cdefa688e
diff --git a/sci-calculators/datamash/metadata.xml b/sci-calculators/datamash/metadata.xml
index e792eaf68c54..546a299ef9e5 100644
--- a/sci-calculators/datamash/metadata.xml
+++ b/sci-calculators/datamash/metadata.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name='linux-crypto'>Use Linux kernel cryptographic API</flag>
-<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> for hash routines instead of internal gnulib</flag>
+<flag name="linux-crypto">Use Linux kernel cryptographic API</flag>
+<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hash routines instead of internal gnulib</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index 48ef66e36c0e..ea34c85ca473 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,3 +1,5 @@
+AUX galculator-2.1.4-fno-common.patch 2030 BLAKE2B 288c04e137cb93da6a7b49e074998621d1f40153ba6b2dfa4cb94f1f6244920a66913d866e5939f84c8a1469576ba3c5138604badcac495d6411a186b0d1e155 SHA512 9cdddad238c0b4c4ee57934cdcd742ee24efb6df80452462f447d0deed6039a6238e48d25933a8c69fe031e1fb5a57d464b7f0913010a3feda275b1ebde85378
 DIST galculator-2.1.4.tar.bz2 472989 BLAKE2B 2fa40aa0d04880e46aad89c79ebb221a13fca815af3540c159205690a65dae6c5ec9e52e48c110ecadc4a18b86d5bd5d363f9d77c162717c8bfd2a60b71d0896 SHA512 ca5f373649d9bf26184e94ba6a501610efbb13e92a8723cda78b83aa495519e82e5b4fcd17f00f615eb702ed186598aecc70ae63a8238c32384b7f608cba4cfa
+EBUILD galculator-2.1.4-r1.ebuild 741 BLAKE2B 549abc4c4b4d5b88035dffad18963a7736029dd232722a6b804e9b9377819e3c5169ee292bae5bbc8f09726b6895fbc0b82e1a2440bdea2ddb534c7b6978c94f SHA512 2d67628a5bee70d0f8eb4ad9985672efa263c75598fd7ff74e7cf530a2217568415b8c3baaecd9998dbe0ad637118f9c0df8603d6a5a2f7d9602a57bff9fb37e
 EBUILD galculator-2.1.4.ebuild 624 BLAKE2B dcc01eb2f31ef7e8e2d1d1ba879bd9a2ed62cdf30d02aba755ad89322ac0a6b6caf22e07e71d6259cfcb958baedccb4b2fa8bd1370dff1249ef85981a45f2bcc SHA512 d7dd39dbfd73edbe497d5e3e4dfc335d329d5ca8007211d1be175fb3da93e91d39f2285add768a820d53b09100ef9fc50aa46f23eb3569e5b4fcb9998bc86fc6
 MISC metadata.xml 394 BLAKE2B 4fa1374c3ac91ea4c4212455d7ff63a35705444c3df485c6f327d6b5ebae90afcc345030c69e7a256759277f18253a20c3b7ff11036e0cd8ababa918212d9ce5 SHA512 fc850474030836be72c5a81983052b0af11312a3b3ef815b6b5eaf7a95a1b7bdbf5b1f25b5e0b2c32786b6fc5958993ff859bd2c9c818dc7df68dbecb4b61800
diff --git a/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch b/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch
new file mode 100644
index 000000000000..32fa609d19c9
--- /dev/null
+++ b/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch
@@ -0,0 +1,27 @@
+From 501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6 Mon Sep 17 00:00:00 2001
+From: Kentaro Hayashi <kenhys@gmail.com>
+Date: Sat, 1 Aug 2020 22:25:37 +0900
+Subject: [PATCH] Fix multiple definition of `prefs` compile error with GCC-10
+
+This commit fixes the following error:
+
+  libtool: link: gcc -pthread -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -O2 -fdebug-prefix-map=/workspace/galculator-2.1.4=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o galculator galculator-main.o galculator-math_functions.o galculator-display.o galculator-general_functions.o galculator-calc_basic.o galculator-config_file.o galculator-callbacks.o galculator-ui.o galculator-flex_parser.o -Wl,--export-dynamic  -Wl,--as-needed -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm -lquadmath -pthread
+/usr/bin/ld: galculator-config_file.o:./src/config_file.c:42: multiple definition of `prefs'; galculator-main.o:./src/main.c:52: first defined here
+  collect2: error: ld returned 1 exit status
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index 10d0868..d22fea0 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -49,7 +49,7 @@
+ 
+ #define MASK_NUMLOCK GDK_MOD2_MASK
+ 
+-s_preferences		prefs;
++extern s_preferences		prefs;
+ s_current_status 	current_status = {0, 0, 0, 0, FALSE, FALSE, TRUE};
+ s_array				memory;
+ s_constant 			*constant;
diff --git a/sci-calculators/galculator/galculator-2.1.4-r1.ebuild b/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..6a7c796d3cfa
--- /dev/null
+++ b/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="GTK+ based algebraic and RPN calculator"
+HOMEPAGE="http://galculator.mnim.org/"
+SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_prepare() {
+	default
+
+	# bug 566290
+	echo "src/flex_parser.c" >> po/POTFILES.skip || die
+}
+
+src_install() {
+	default
+	dodoc doc/shortcuts
+}
diff --git a/sci-calculators/keurocalc/Manifest b/sci-calculators/keurocalc/Manifest
index cc9426d14e21..41df3cc254c4 100644
--- a/sci-calculators/keurocalc/Manifest
+++ b/sci-calculators/keurocalc/Manifest
@@ -1,3 +1,3 @@
 DIST keurocalc-1.3.0.tar.xz 331764 BLAKE2B 56106c70a478abb9ebbdbe99f96b34300e51b4fbeab147915c1dec6a28fccdda7a8e72caa1684113bc57693fbdef82d68edd0225ad85307fc7468f062f33f7ec SHA512 5e9029e1c1f7550555cfa38e7327cab749240b6e6e6e142fdee60f6608de889bfa6a9f25b12e879fd6770ac7c22f1f9f7f6021b85f7df380404d37d128e40710
-EBUILD keurocalc-1.3.0.ebuild 903 BLAKE2B 92f056debcd3096e27993e3b4f86c471bbc49079026af87105a731eb4c08d774def24a394c94ebada6e98a60e1ba1f0e8affcb665ecb60fd65998b1bc978862f SHA512 38c5dbd788f96ccc07417907cfc0edb3c6c22348eb22a96224f131209d74d49e28e49b5bae097181e7202b6d73151a685f9d07513f8e16ff8a4893a425873d83
+EBUILD keurocalc-1.3.0.ebuild 883 BLAKE2B 453be65d4ef245776150415dca8c105edeab3ce8330f5423c4f5a9503aefe1bf57ce9eae70be57a341c019ef3ad71442b7c3369802908b05384bf0d0b444da44 SHA512 b9af3ae7e200f509e1ca6f93eb3de1cb28cf173fbb4d3774221bec865da06cc9e70f03bb88fc92641e53a6911479e624f6187f497c8725aea8cd8a43b3b2f1aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sci-calculators/keurocalc/keurocalc-1.3.0.ebuild b/sci-calculators/keurocalc/keurocalc-1.3.0.ebuild
index 717b7c999b63..18540e7e65ab 100644
--- a/sci-calculators/keurocalc/keurocalc-1.3.0.ebuild
+++ b/sci-calculators/keurocalc/keurocalc-1.3.0.ebuild
@@ -9,8 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Universal currency converter and calculator"
-HOMEPAGE="https://kde.org/applications/office/org.kde.keurocalc
-https://userbase.kde.org/KEuroCalc"
+HOMEPAGE="https://apps.kde.org/en/keurocalc https://userbase.kde.org/KEuroCalc"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 634a18ad0b61..35e77db85e08 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -5,8 +5,8 @@ DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf
 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
+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
+EBUILD units-2.20.ebuild 1241 BLAKE2B 89aad89db4fe4804fbb8b009cf3dcc668f6f4fc58a80ecb734259bbddebfa89923e18f9ed4c3a9c0af5b53c8ac2f19757c51574d886c0e30cafed5d48e48e4f5 SHA512 a4acfcf9e14b4b8127af772f2ffbbd80e7cab00bd10af2f05e3f722b8cc0d364e439ed620a669cd333c038b3f157dad6b90848f3bda3e466b81c9cbd398609fd
+MISC metadata.xml 269 BLAKE2B 212fd839faa71081ff89c999bc77e37b69c5c618f9e1527ed9402ad14af7072432fcd3eaa3ced4dd20a45929c054095d652ab6c18a1642be436b345436ed48a7 SHA512 bcb2f5dd279dd126273909fdaf0c3ee89f0eb050938317ba26e75532a742e7eb496669bea134494071ec30b3475a3ffc70b47035de404e8c1f7bc1034012e917
diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
index f0a40a93849f..fc2b9059d665 100644
--- a/sci-calculators/units/metadata.xml
+++ b/sci-calculators/units/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name="units--cur">Install the units_cur python script that updates currencies</flag>
+<flag name="units-cur">Install the units_cur python script that updates currencies</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-calculators/units/units-2.16-r1.ebuild b/sci-calculators/units/units-2.16-r1.ebuild
index b6e116cc86eb..6bea3362ca40 100644
--- a/sci-calculators/units/units-2.16-r1.ebuild
+++ b/sci-calculators/units/units-2.16-r1.ebuild
@@ -12,12 +12,12 @@ 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} )"
+IUSE="+units-cur"
+REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
-	units--cur? (
+	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_MULTI_USEDEP}]
@@ -30,7 +30,7 @@ DEPEND="
 "
 
 pkg_setup() {
-	use units--cur && python-single-r1_pkg_setup
+	use units-cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
@@ -49,7 +49,7 @@ src_install() {
 	# 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
+	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \
diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild
index 119605f9309f..8f8ba8b7c387 100644
--- a/sci-calculators/units/units-2.18.ebuild
+++ b/sci-calculators/units/units-2.18.ebuild
@@ -12,12 +12,12 @@ 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} )"
+IUSE="+units-cur"
+REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
-	units--cur? (
+	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_MULTI_USEDEP}]
@@ -33,12 +33,12 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use units--cur && python-single-r1_pkg_setup
+	use units-cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	econf \
-		--sharedstatedir="${EROOT}/var/lib" \
+		--sharedstatedir="${EPREFIX}"/var/lib \
 		ac_cv_path_PYTHON=no
 }
 
@@ -54,7 +54,7 @@ src_install() {
 	# 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
+	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \
diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild
index b6062ea69bb3..b68b04a87f90 100644
--- a/sci-calculators/units/units-2.19-r1.ebuild
+++ b/sci-calculators/units/units-2.19-r1.ebuild
@@ -12,12 +12,12 @@ 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} )"
+IUSE="+units-cur"
+REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
-	units--cur? (
+	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_MULTI_USEDEP}]
@@ -36,12 +36,12 @@ DOCS=(
 )
 
 pkg_setup() {
-	use units--cur && python-single-r1_pkg_setup
+	use units-cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	econf \
-		--sharedstatedir="${EROOT}/var/lib" \
+		--sharedstatedir="${EPREFIX}"/var/lib \
 		ac_cv_path_PYTHON=no
 }
 
@@ -55,7 +55,7 @@ src_install() {
 	# 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
+	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \
diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild
index 512e983f4b3a..40e4195d89a7 100644
--- a/sci-calculators/units/units-2.20.ebuild
+++ b/sci-calculators/units/units-2.20.ebuild
@@ -12,12 +12,12 @@ 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} )"
+IUSE="+units-cur"
+REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
-	units--cur? (
+	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_USEDEP}]
@@ -39,7 +39,7 @@ DOCS=(
 
 src_configure() {
 	econf \
-		--sharedstatedir="${EROOT}/var/lib" \
+		--sharedstatedir="${EPREFIX}"/var/lib \
 		ac_cv_path_PYTHON=no
 }
 
@@ -50,7 +50,7 @@ src_compile() {
 src_install() {
 	default
 
-	if use units--cur; then
+	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \
diff --git a/sci-calculators/wcalc/Manifest b/sci-calculators/wcalc/Manifest
index f0caf2540be2..eeb56c6fac8d 100644
--- a/sci-calculators/wcalc/Manifest
+++ b/sci-calculators/wcalc/Manifest
@@ -1,3 +1,4 @@
+AUX wcalc-2.5-AR.patch 247 BLAKE2B 915558fce783f7046e2942bdef285f1a3f5537faa4d215477c7a6d4dcac5dc11c059cb24d88eb252b8f1f8649ce5d394af29ade3f569b427addb7797cc201d03 SHA512 789610d5fd7ec215f76f082a337312a8c5cee8a76613a2c682c996040325f5e459a7a596c5937fc4f1a43c57bef8161b5ee39052493e7705f58ac7900ab9591d
 DIST wcalc-2.5.tar.bz2 413637 BLAKE2B 6093d73249548c90ba544b7445846bf6021cfc567fd6a7a269412b48ce8e4208ec19193dce878a5799f78f84e64fad59622cccae303d433ed58aa7d0ee0ffce1 SHA512 3eedcf8c93bd33ca0a4bb35867e3157adbde2999d9fc1826ad55281fd927546614f6b1a28900b4cae87a0d15888cd62a04fa2adca316d7cf309af7a2fefea704
-EBUILD wcalc-2.5.ebuild 664 BLAKE2B acb0518b802c57f6f79bce1745deb856598d5ca1f1b2decde4fe07c27f2627d2c1935ad22eed70d9e70ab9829226d5f15f3a195a41ac82c5ea25be890b2e57cc SHA512 b4e2789bfb3129787984622063eef6e2be2b6344c6921e1db67cb3e3caf6bb913fb06e781d8d9ed9c6812003aa4c410322decfc473c8bc5fa38edc2cbfdafa21
+EBUILD wcalc-2.5.ebuild 754 BLAKE2B a5ea854df307a356a464ae77f35a101ce06d8cfb9aed7b7ff9c1ff2112234d78d8f99b1c35077938ea17d1e08dc78a820d2723908ceaafdfe74d0b4ee42772bd SHA512 b48ccaf7f92afc3523eedaeb4fc6d2950e0af3cbc91c1666acf7ec31267583bbc50805729188680e834816e5185bbdae8b92623d16a0365961715253cccd85e0
 MISC metadata.xml 811 BLAKE2B 475cf04b8b607604bbe4b1c3faeefe045005970009c329541ebc41f32b105184f1453be5b50876b879ec5fd66094242532c3b36e798bf06696edebc2b7080fd7 SHA512 67a5d46038e2bb6418b747edbf688d3f541ead53451083af317ab12795377509ad1ae449b10ef8ebee7c979ba5ffc3ec651e6ca9743eca0568cf039610b0f67e
diff --git a/sci-calculators/wcalc/files/wcalc-2.5-AR.patch b/sci-calculators/wcalc/files/wcalc-2.5-AR.patch
new file mode 100644
index 000000000000..03291019d29e
--- /dev/null
+++ b/sci-calculators/wcalc/files/wcalc-2.5-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,6 +46,7 @@ AC_PROG_CC
+ AC_PROG_CC_C99
+ AC_PROG_RANLIB
+ AC_PROG_YACC
++AM_PROG_AR
+ AM_PROG_LEX
+ AS_IF([test "x$LEX" == x],
+ 	  [AC_MSG_ERROR([A Lex/Flex program is required in order to compile wcalc.])],
diff --git a/sci-calculators/wcalc/wcalc-2.5.ebuild b/sci-calculators/wcalc/wcalc-2.5.ebuild
index 9b9a8d8b67a6..f7a5e03f83ee 100644
--- a/sci-calculators/wcalc/wcalc-2.5.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils
+inherit autotools desktop
 
 DESCRIPTION="A flexible command-line scientific calculator"
 HOMEPAGE="http://w-calc.sourceforge.net/"
@@ -20,6 +20,13 @@ RDEPEND="
 	readline? ( sys-libs/readline:0= )"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-AR.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_with readline)
 }