14 files changed, 11 insertions, 229 deletions
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index 3af8bac2f0ad..b56d664f1fca 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,3 +1 @@
-DIST bc-3.1.5.tar.xz 211632 BLAKE2B f5a38bd87d3c8d674d79141ee00a071e474e7c1ccb2e1fc9944b4496ae8a4613d57cc0b6dfbad5ea35bd59300c23f307364b96cdbffef4b07b10863df413cecd SHA512 34be1c186df5906ab7a966739220a20afd7e3b227a5c7ba32a77256a36e097bbcc39b99ce6d6855de3e6e2296612f8fbe63dc0983ad91d4eb4c1e630dbb587a0
-DIST bc-3.1.6.tar.xz 210976 BLAKE2B 3d3c3102cb97b83e09e3ed61b4bf5862791b4ea8131b5c8dfa6a55bbb42d423b627cd9c5ac8ba6ed6fc7f58f1e92e662541fbd1ea2fdf834292271a16c193564 SHA512 1219a074845b8c66a431ddb78bab643793f5275c26404e92e360e655418d70d1aafa02be2fc4dec25d99a85ae2da1aab7d615de893f85913ca8834448dcade53
 DIST bc-3.2.3.tar.xz 225420 BLAKE2B 6d1ec825a03f77a8024ff69f80eaa09301effc1281663aaf33c530d89c917b9cad41813aca731577fae1eb8dfb1c6e3023e54da0cfd89ea2e5aa413f84c347b3 SHA512 efd040d46f2ed1eff5a2eb336e55fd465176c23c728935ee488a474b2f0c8dddd275805ee3be79f20afc523a183adb3d88a0e7bee095047912cf70741e2c0b32
diff --git a/sci-calculators/bc-gh/bc-gh-3.1.5.ebuild b/sci-calculators/bc-gh/bc-gh-3.1.5.ebuild
deleted file mode 100644
index 31daa94bd5ce..000000000000
--- a/sci-calculators/bc-gh/bc-gh-3.1.5.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 ~arm64 ~x86"
-
-S="${WORKDIR}/bc-${PV}"
-
-src_configure() {
-	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GTl || die
-}
diff --git a/sci-calculators/bc-gh/bc-gh-3.1.6.ebuild b/sci-calculators/bc-gh/bc-gh-3.1.6.ebuild
deleted file mode 100644
index 31daa94bd5ce..000000000000
--- a/sci-calculators/bc-gh/bc-gh-3.1.6.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 ~arm64 ~x86"
-
-S="${WORKDIR}/bc-${PV}"
-
-src_configure() {
-	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GTl || die
-}
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index eb202f0d241f..90df7b5e3564 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -1,4 +1 @@
-DIST datamash-1.4.tar.gz 2013538 BLAKE2B 7be0d146e24c9d5e4e739e4884dda30c52089410b39b77e80e2265f134aaf3fb4db097b2b138497ed117028191a8a1bd0b82d2754f96bb5473d79b7785e1e1af SHA512 1c47d70c9d7fa5ab2fd2a8cb1d40817ca07e8501628997ae370884fd0a4e926c0718f49f54a5f91eb4db847296bc120db3dd19fc12a92bfe8d2e7d6f2ded5aec
-DIST datamash-1.5.tar.gz 2086985 BLAKE2B 3b377d5886ac7de0066c30ffa7a8923230b928514274be10b213d1a0631709b1c940a4da07709d0cb67a6719f5da9b9f045b8a5bb519370b64a677d20547aa17 SHA512 9f7bff0858a7519ef8efc30ef39c3e99f17e81ed847f1edce6ff28e1191d52fbc173baa5d21d6852effbbf2af800604920d92d412f45519700a9b5809da0e8fa
-DIST datamash-1.6.tar.gz 2103174 BLAKE2B 8ef0817df65392bf22d3e748e48292e225a437d16e797301f8e8d67d2d85ee8f4b6f010f6714d02001761b176ad97598f5815636bc92b7dbfdd30b9119e5df0b SHA512 bd4e147e68f9b71d04a2c8150fc3726720aff111a9d1ce873ec0fbcd1fc0f12369e866327180f0561e68a1085bff042673cd97a9ad146edeccca3a1bdc45ac18
 DIST datamash-1.7.tar.gz 2183886 BLAKE2B 56ccb35a985caddd8403d5759c4723ca1309825adf3f34ce70ca16cb1d45378cfe3c9bf2d3f357b497cede403981a1746bccbde1003cdbe48b3d1769b9c68a30 SHA512 29d82d6a1ac25a6ceb901c14fdeacbcb575771f405d844a66df525f820f1515d84989480807e466ddaa0a1ebc5cf698191538391b0c64bddf0d80462f66a5992
diff --git a/sci-calculators/datamash/datamash-1.4.ebuild b/sci-calculators/datamash/datamash-1.4.ebuild
deleted file mode 100644
index 4e17c0dbba48..000000000000
--- a/sci-calculators/datamash/datamash-1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="command-line program for basic numeric, textual and statistical operations"
-HOMEPAGE="https://www.gnu.org/software/datamash/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls openssl"
-
-CDEPEND="
-	openssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	${CDEPEND}
-	nls? ( virtual/libintl )
-"
-BDEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(usex openssl --with-openssl={yes,no})
-}
diff --git a/sci-calculators/datamash/datamash-1.5.ebuild b/sci-calculators/datamash/datamash-1.5.ebuild
deleted file mode 100644
index db1f765861fa..000000000000
--- a/sci-calculators/datamash/datamash-1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="command-line program for basic numeric, textual and statistical operations"
-HOMEPAGE="https://www.gnu.org/software/datamash/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="linux-crypto nls openssl"
-
-CDEPEND="
-	openssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	${CDEPEND}
-	nls? ( virtual/libintl )
-"
-BDEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with openssl) \
-		$(use_with linux-crypto)
-}
diff --git a/sci-calculators/datamash/datamash-1.6.ebuild b/sci-calculators/datamash/datamash-1.6.ebuild
deleted file mode 100644
index b46eb24c3af7..000000000000
--- a/sci-calculators/datamash/datamash-1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="command-line program for basic numeric, textual and statistical operations"
-HOMEPAGE="https://www.gnu.org/software/datamash/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="linux-crypto nls openssl"
-
-CDEPEND="
-	openssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	${CDEPEND}
-	nls? ( virtual/libintl )
-"
-BDEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with openssl) \
-		$(use_with linux-crypto)
-}
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 985ddb7889ca..9e4d73b80bb6 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST qalculate-gtk-0.9.9.tar.gz 1283947 BLAKE2B 68904e19a4810ef7c83b2508d952195a38690def54816ecfde227a5f1bac847973ff67df62d5c174c00f6f9490a3ad8dce0d418cb2317b0c9c461126d54c5695 SHA512 944fad21d96de4a9d6b01fe259efb72f4872dd555357577fff18dca5bc4022c77d894b5cf8a0b470fbb02331de21210a6f034627346e08dc57be2f7c08e9faef
-DIST qalculate-gtk-2.8.1.tar.gz 2650577 BLAKE2B 9a28afb846f28730bf29c705ec51abda96ccca1864d973588bfd855ae3dc2027765d0bb9b26d817d4b5cfd9189f02c0b889ac74d66d48ebde4bdda2790eb1234 SHA512 fa5ede37bfed3b5f5b46cdf07e3d83456d8144f9b9eda1ae081267d73c06ea032e1012cb7bd01ff36c87aa1a88fc20794fd9477a8d3ece2950785e7aa0b32acc
 DIST qalculate-gtk-3.15.0.tar.gz 2715732 BLAKE2B 7047befbf3a56e53c06d78dc33a515e4a8e59a665202f7a203b61e8f6b5e03b7d52d4a9a1514a92901249f65586552e14b8fd8a24e2d10a15875168d54467e74 SHA512 c5dfe308b13e04644452cfd3a4ce48f170d2599b6b3fb94a64dd78763f3546e44c0f940881d70a4727898feeb7b99a15104442d462f76382eec10cfbc0ed6393
+DIST qalculate-gtk-3.16.0.tar.gz 2338500 BLAKE2B f252f6e19eeb7ae1e35e865111b72dd65837aba246719018e241aebd4f7b1358c342fc5d659b1d9ccf777130e2c443143e578156da5445dba5656c04ed8d18ef SHA512 42e6bd86df451e9a9dc92fd930f675195f7539feb7f2db2a8e04ebee96482d3bcda45530feafb71be00489d81d27027a9758a3e79a1ea912887bf082d034fe74
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.9-entry.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.9-entry.patch
deleted file mode 100644
index 0163e8efcc1a..000000000000
--- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.9-entry.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Update to latest freedesktop spec.
-
---- qalculate-gtk-0.9.9/data/qalculate-gtk.desktop.in
-+++ qalculate-gtk-0.9.9/data/qalculate-gtk.desktop.in
-@@ -1,11 +1,10 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=Qalculate!
- _Comment=Powerful and easy to use calculator
- Exec=qalculate-gtk
--Icon=qalculate.png
-+Icon=qalculate
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GTK;Application;Utility;Calculator;Science;Math;
-+Categories=GTK;Utility;Calculator;Science;Math;
- 
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-2.8.1-entry.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-2.8.1-entry.patch
deleted file mode 100644
index 02819fdd5c57..000000000000
--- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-2.8.1-entry.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/data/qalculate-gtk.desktop.in
-+++ b/data/qalculate-gtk.desktop.in
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=Qalculate!
- _Comment=Powerful and easy to use calculator
- Exec=qalculate-gtk
-@@ -7,5 +6,5 @@
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GTK;Application;Utility;Calculator;Science;Math;
-+Categories=GTK;Utility;Calculator;Science;Math;
- 
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-3.2.0-entry.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-3.2.0-entry.patch
deleted file mode 100644
index d9e1d3a72176..000000000000
--- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-3.2.0-entry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/data/qalculate-gtk.desktop.in b/data/qalculate-gtk.desktop.in
-index fdefbf9..68b32b4 100644
---- a/data/qalculate-gtk.desktop.in
-+++ b/data/qalculate-gtk.desktop.in
-@@ -9,5 +9,5 @@ Terminal=false
- Type=Application
- StartupNotify=true
- StartupWMClass=qalculate-gtk
--Categories=GTK;Application;Utility;Calculator;Science;Math;
-+Categories=GTK;Utility;Calculator;Science;Math;
- 
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
deleted file mode 100644
index 610e170750aa..000000000000
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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-0.9.9:=
-	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.15.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
index 0088a35397ac..1234757d9b28 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild
index 1b7aeeca19db..a6d0a39d19b6 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2
 
@@ -11,25 +11,22 @@ 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=""
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-libs/glib:2
-	>=sci-libs/libqalculate-2.8.1:=
+RDEPEND="
+	dev-libs/glib:2
+	>=sci-libs/libqalculate-3.16.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}-2.8.1-entry.patch"
-)
-
 src_prepare() {
 	# Required by src_test() and `make check`
 	echo data/calendarconversion.ui > po/POTFILES.skip || die