8 files changed, 49 insertions, 28 deletions
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 8640d8a93c9a..5aede15d19c1 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 f0976f03d635..f9cc3b8a22f7 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,7 +1,5 @@
-DIST bc-5.1.1.tar.xz 433944 BLAKE2B d46ae9de6358b3acd1afe9f7013286d8678e26a985664d65e78b51077b494d2b1c1271044170d3488ececeaed5e97df15da2734070a2fbf39b33ab9c01543558 SHA512 d8774fb1e654520abdf7d790783d4a3c04fa8f4982fc1cd0d92331e7e4b5889efa022cafb5e1286b6c82a74c9388f47657c7b9d78888b5d8056fa40d3d5e5c69
-DIST bc-5.2.0.tar.xz 435820 BLAKE2B babcd26a69b845fa1f50b0f65dc536bdcd7603102224379387e6dc60aaf94faebc30088d429206100e053cfa34945117b090cd75c7d0dcf377467204572b9358 SHA512 f5fcaef5a963baa344972432e20c9747cba7b08b2dd7beac5c783da250abcde37cf85c23bfb3273432c31b292c9c470c836daf990c69f83bd6c7e565a46859e2
 DIST bc-5.2.1.tar.xz 437096 BLAKE2B 9ec13897b3489c00761c1478de8ad9428e966ecba4f4582e37ede17cb6d97d492c928f7f931c8e412deb6cdb86e2092b17c5c1b0a31527964a522fd2929e8472 SHA512 8f5cfdfc0b2e1866d8fc1477d7bfc2882cf4d2e4844fcf41ded5f8b52b4d8124c073e845d86b355977f815a5a8a2f22fd98495ec4b5dd41737b808a3a4f4bb56
-EBUILD bc-gh-5.1.1.ebuild 497 BLAKE2B e4a9ebdd7889572a28c6d7ff606de35d162f858478b42451552fc55bf1eb57ed717ed06e997f0283e0b7fb8d5294b6440632b7f0581fc27418fe6e3430e94da5 SHA512 fff00599da592750c235a6441bbf9ca5f921c4829268e6e6e40b74e549250fb123a31eabebe39cbee8503a47fc8e9a76fe747b8884c067697e37002e3f5f8777
-EBUILD bc-gh-5.2.0.ebuild 497 BLAKE2B e4a9ebdd7889572a28c6d7ff606de35d162f858478b42451552fc55bf1eb57ed717ed06e997f0283e0b7fb8d5294b6440632b7f0581fc27418fe6e3430e94da5 SHA512 fff00599da592750c235a6441bbf9ca5f921c4829268e6e6e40b74e549250fb123a31eabebe39cbee8503a47fc8e9a76fe747b8884c067697e37002e3f5f8777
+DIST bc-5.3.3.tar.xz 444552 BLAKE2B b5fd2b1d7fc36505209a6aac89f44b784ce52e0d955b48bbb818462aef022f7e85332d5526ab9ca405a44fcf6089a9edbd3dcdb70a5624a25ebe052bfd007f95 SHA512 94f7c35761211b4909f4bc5a2c19e7cd6589f7b6c2fa6eaf0a889d682ffd3f3ba79b3580d9e2aa4bef32b4c7874d047d0fba4e7dace05d63c87f884afbe8020f
 EBUILD bc-gh-5.2.1.ebuild 497 BLAKE2B e4a9ebdd7889572a28c6d7ff606de35d162f858478b42451552fc55bf1eb57ed717ed06e997f0283e0b7fb8d5294b6440632b7f0581fc27418fe6e3430e94da5 SHA512 fff00599da592750c235a6441bbf9ca5f921c4829268e6e6e40b74e549250fb123a31eabebe39cbee8503a47fc8e9a76fe747b8884c067697e37002e3f5f8777
+EBUILD bc-gh-5.3.3.ebuild 497 BLAKE2B c1647a217b72b8de743428a4fd22ae84b24c17ec2335eb8a54e87daa736a89063b3f8732f8f25ee6333563f21f9a9c249f94a6624f640a80e636baa74c21a7c1 SHA512 2f59b10d1358879b75149cf1661c68629d9523c45e54195d87dab1fea16584842c78763975487da9f54b8b71f2f69205d835795ed81cdbcabf8942abe438c887
 MISC metadata.xml 972 BLAKE2B 3246d762ce2c9c182efd7aaf1595cde2fddf6d81c59f88f9105443585b4b15fc9fcc583b5b767c3022b96fe8639ca679fa0ea76beb36e0bacd4fc0103e3a103c SHA512 a5400b2c288574c75c9598be449ddfdc878e047261388512cdc95b9077ec9e605471438c253551fde37c8b78918716e3523893aeba091db6d389b92184215f13
diff --git a/sci-calculators/bc-gh/bc-gh-5.2.0.ebuild b/sci-calculators/bc-gh/bc-gh-5.2.0.ebuild
deleted file mode 100644
index 47aaece3ed37..000000000000
--- a/sci-calculators/bc-gh/bc-gh-5.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 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://git.yzena.com/gavin/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 -sbc.banner -sdc.tty_mode || die
-}
diff --git a/sci-calculators/bc-gh/bc-gh-5.1.1.ebuild b/sci-calculators/bc-gh/bc-gh-5.3.3.ebuild
index 47aaece3ed37..24dbaeb6c44c 100644
--- a/sci-calculators/bc-gh/bc-gh-5.1.1.ebuild
+++ b/sci-calculators/bc-gh/bc-gh-5.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Implementation of POSIX bc with GNU extensions"
 HOMEPAGE="https://git.yzena.com/gavin/bc"
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 4594b2435474..0bd9ca6ae027 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,5 +1,7 @@
 DIST qalculate-gtk-3.22.0.tar.gz 2555367 BLAKE2B dcaa3495f75f4c24d0482b13978f19785cf192d231b46f031f0c69c4b9c8b5f49c328a14319e4ad0b1930be799fb5ff5805dab6696a21685eaaabb0b9dcccf47 SHA512 029e0a5db69d04a1bfb796915ded3b4533f3036d99833035ae7e8b214f0b2086f6ecb1c08f463561642bdbbd0fd729250a9bc892bbac5ee0a72a9073d7555a04
 DIST qalculate-gtk-4.1.1.tar.gz 2811609 BLAKE2B ffc5769050368a7883d82ea65251e77057f77dd59f365ff04c85bd8fc6d74e5958d982fb82b3d0519ed6439810ece41102eb4b0647990b126fa2f14cebee0ed3 SHA512 d7a6ce496dc6747300b1fff8b8e2ff74ba7530b4b83539d31ec99a0862e8147d250750cef585063a35a8f6aaadf12e99c51bdff4cb6a4ff83683f4fcf4ceae12
+DIST qalculate-gtk-4.2.0.tar.gz 2817864 BLAKE2B 4d40045ef4aafad292717b289bba3ddbc4d7ca7cfa5f44a479840ad5ccf8b8104e7e25093bdd32bbf5e0ccd73a8bed486c14de1c278a523db5a27922d4658c0b SHA512 ca0c864174f862a2f78e8743c3d7556da53d1d890773c5c8907d1d210f2101419cd083cfd9351e98c4b5fc64c602d5bc53fccecc8df1aa0451ee8418fbdfaa32
 EBUILD qalculate-gtk-3.22.0.ebuild 905 BLAKE2B 94596dcc5b2f64262faaabefd8356bed5759018e83fb9815e02ceda317e87db5e290d139099f79fe26f585774151ef1b4d7038365ce326fd752c379e56234e8b SHA512 70ab0d05a311807a4ac74eef1c55a27d65ea917787345b6d65490abdedb5d1e4c9cd2b19688be21860259795d8214dffa890a46469d511e03ecce77ec9c67ca8
 EBUILD qalculate-gtk-4.1.1-r1.ebuild 875 BLAKE2B 73ce98060eb9fd48010fbc572b68b6dffee5ff9c69441f2bfa663a46e3baa2c6b0b071ae0db1adba24c879630d1bc5be462f4477f1de6d0d142d8daf75187fee SHA512 244f2ed840a75b83e0a10a747c3ee638ddaa6aa431e49d8cf32ae6b8ace14d6c65b0133711d9a89d3d94af7e5395a1533fde257da375a01245469f043e4abe1c
+EBUILD qalculate-gtk-4.2.0.ebuild 875 BLAKE2B 73ce98060eb9fd48010fbc572b68b6dffee5ff9c69441f2bfa663a46e3baa2c6b0b071ae0db1adba24c879630d1bc5be462f4477f1de6d0d142d8daf75187fee SHA512 244f2ed840a75b83e0a10a747c3ee638ddaa6aa431e49d8cf32ae6b8ace14d6c65b0133711d9a89d3d94af7e5395a1533fde257da375a01245469f043e4abe1c
 MISC metadata.xml 607 BLAKE2B 7572be504616d69914849d6bdd53a9768fa649606f7f64f3a5ce136f0971ed57b410bf90796091f95f94c73dfdfe8748f31e30a656765de82e68e3d40abc48c3 SHA512 fba3a4df947551ec5421975ec33830e2c3c30b26030abf13a3ba1d524cb64f92adbf77015683142457ea715883a39198f3fb83a932629b887d077ab9b34d77d4
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-4.2.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-4.2.0.ebuild
new file mode 100644
index 000000000000..47ce82e13fba
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-4.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: bump with sci-libs/libqalculate!
+
+inherit xdg
+
+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 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/glib:2
+	>=sci-libs/libqalculate-${PV}:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Required by src_test() and `make check`
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/calendarconversion.ui
+		data/periodictable.ui
+	EOF
+
+	default
+}
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index e358fa56083c..3b6e025d0164 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,5 +1,5 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
 AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d
 DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
-EBUILD units-2.21.ebuild 1196 BLAKE2B b10d3326f7e25664ab11ed85d56e5d4b74a8b930e15ec463f78a77089e057acb167fc5e89412ffcb6c3804d02b5441eb2e805a57de3f3cb149bf752465701449 SHA512 c081bc4ce4e1dce3bf3f83f6c8e313474df9c65032e02f86827d122472ed3608f6e26147b4107258199a0134dba92bb6478d90cfb459bedac727c24127d89fa3
+EBUILD units-2.21.ebuild 1196 BLAKE2B 82474e1b2b54891cf7e4021ec1137b1e7721c6b0d5809530aff9cde1c18f114f8a30aa9ade3e01759f8a913e8190a2ab38ec1bebdd1b26a4582ec608dcf5fbe2 SHA512 1c2dd9233318b8058f24a3b7152e801afad1a54c09cf0a3693ebf04850cebe9c7ab69f5e8bce0abafc9821c895594b3465b705de3ac271f825e62eaaa7b3f80a
 MISC metadata.xml 270 BLAKE2B 7dee9687f98896d38a4c70f35424d66e1b4e5065cf948953d772a4a4e54de2f44cafc2d99b4ca62f0d0a025f868c9cd010a7da76e090d36d0a8083c45642bcc1 SHA512 6c8ad4908b0adbe2854527906adc067f0fece43a36cdb4149e50d4d4ebacfa29b5005db482442e63235e6aaca222862413cd5bfcdcd7425ec978fc24abad5c00
diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild
index 27e2401c7804..0c1c7e86fb23 100644
--- a/sci-calculators/units/units-2.21.ebuild
+++ b/sci-calculators/units/units-2.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1
 
 DESCRIPTION="Unit conversion program"