gentoo resync : 31.05.2021

6 files changed, 50 insertions, 9 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 5ec63b50f168..1ff41201884d 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/pcalc/Manifest b/sci-calculators/pcalc/Manifest
index 49ec9dd6ec27..56912bc2f42a 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 567 BLAKE2B bffe0740f9c9c0b56d60f32247cf43574d6385bcdc905fdf4e015be0b8014ddd75217347bb701b18668517ba4e71a9538a8e698de015ae2eceec8c3e6645c9a5 SHA512 401fc19c238e642aeab0e1e33f3edc42bbb408047e05ca58d908f7357ff352e4d7f9906d661c15c959dc8a74c47bc733a22b537b358ecedea47ddb123abc5d75
-EBUILD pcalc-4.ebuild 574 BLAKE2B 48dc569394ad21fa72897e882f458e63702932079dcbf3ba555ae081b30de8756a151f6bb25a2f00566e09e6607af5cbf3c92c48563ec815f88816a96d4c9bbd SHA512 7493319098c26de588cc54e6d9887f4949108f9e57f92e8bece7cbf080fc28265c03dffc766b0005cba756090cab956364b1fddc0a6169c34f13740b6031df15
+EBUILD pcalc-4.ebuild 550 BLAKE2B 1f6e50a5820ad450c75a4a2dbd797e46a68eab391bfbd4235cb18b04882d43152f1916756d1c87ed02c70bf518c13b71908635c8525a66b49c5c5b2c8cbea192 SHA512 bed700d26e06bfa1ba04ff7d00431ab058fd6449bdc396337479f7dda5dfa3fa4d598947945e7f230e167f2bc10147df72c013a4c02949855d9884796122bf5f
 MISC metadata.xml 380 BLAKE2B 966f815d92d6c5680629d5bb6bf5b6124aa1bf6a747d914c94e66148a6e7d8b53e9931e56436a99d0ccc5bbbea1cb6e2a0bb3054fa31a4dd6f7fad54f279893f SHA512 45ac8682dd7d9e8c414354090b2733f3c715e9b76db3ab3e1e852282bf460f3a6881626d49c73b7975fbc238485ed38881187dd4c392469108bad1b15022465a
diff --git a/sci-calculators/pcalc/pcalc-4.ebuild b/sci-calculators/pcalc/pcalc-4.ebuild
index 6f7040033fed..d97cf2067b4f 100644
--- a/sci-calculators/pcalc/pcalc-4.ebuild
+++ b/sci-calculators/pcalc/pcalc-4.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 toolchain-funcs
 
@@ -11,11 +11,9 @@ 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"
-IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
-DEPEND="sys-devel/flex"
-RDEPEND=""
+BDEPEND="sys-devel/flex"
 
 src_prepare() {
 	default
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index e48a1630e066..8f39fd895945 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,5 +1,7 @@
 DIST qalculate-gtk-3.17.0.tar.gz 2414740 BLAKE2B e24cd509566ab2daa106b5d233f8d851409b933e82b4057cd2c9b3c6b3526a30f878f2512243711e77718dd12cd4208a5c60bbded7eae50a8841a49c75814bb7 SHA512 ea4413d1574f9875810d82c80590de46c3c424b6466508faab30c6b2505ddd306fb206f316ec99e28a7e5311f2842e011206b9caca4aed36245d1f16f25f5de5
 DIST qalculate-gtk-3.18.0.tar.gz 2418606 BLAKE2B 19c37474cacacd9e4c3ebdc58441a9c032cb86382e5545760018731b197765cae19d2f5687aeeb3ab09b2c137ec3f383f442a0b7910109fb0b664019837bb905 SHA512 d90c7188b28853489363663199be500e83dc908af6956d31d7f50c0797db262282475b7cc56bf177ebbacc3a0aaec5499c10c7270bd44a848589f16ea190b03e
+DIST qalculate-gtk-3.19.0.tar.gz 2508273 BLAKE2B db2f479c9fbbc11ece391e324858aad4404bdca03e14f69e7e2ed8966850fa5f699dd82d9ef613054d5113f5137b983e6520c2dc1c8e5a83ce253ea140d7c522 SHA512 3587ca55673bf71476423be6ec99fd8245c19c725866103862cd622e39e136cfaa94cd86744ede7a700a6e7886b7e8b84d646b25a1a22c73242a0ba9719149d6
 EBUILD qalculate-gtk-3.17.0.ebuild 841 BLAKE2B 0240be3d37f43cf047c74d89c35c72394f6b564f490ca095a80b047d849e718ecb3025704804467fb3199d97591a004bac7dc34915a553987e9f7f4bc07a032d SHA512 748ea72a4e2b62d288131b20ff231cc57a88ed33fc623f68807973f617f670e8532f27582bf148fddc059aff92c06ea4560edddb8120b8ceb12d3fd78999f54e
-EBUILD qalculate-gtk-3.18.0.ebuild 845 BLAKE2B 8a97e80b693d8647c40232cb8598992d82e6165dda58c08e1f5fad2e627452ef16c79d23acd11b173276f7b4fc4d1df9573287f6b0c6601b27fc7ca809166039 SHA512 380424b53451d287748a1ee53dfbb4a986445fbfbf3bb35363e6941e16c9391e61153d551daa9a6c69180c680fa75f26f09d82a625b886eded0d64410d55e7d9
+EBUILD qalculate-gtk-3.18.0.ebuild 865 BLAKE2B 42649f8a09ec79bee7127a50e4dcf11a8a3496ebd537143343140c8434dba4258b62bead1256ab71ab24ef471106fb5d0fae5004227feaeae2bf36d2ed775c5e SHA512 9a6abe04019dc6cc4abb82a44d273d775ddc523348884520adfebedccc3efdee320369ca55d872259f8deb05b45e4b1c210250b290b1bec60b508463d6e8e27d
+EBUILD qalculate-gtk-3.19.0.ebuild 869 BLAKE2B 6575ed5ac052420925875d372f0190da4fa492a6e1e40dac718c3a726d945931f9337903404552cf914cc5ecc4a80278f5c4507cffb8007909859be4be4f7ebc SHA512 f4aaa20f497999773472aef52e55aa4a3a7723b68b378a41597308b9cccd75212cfc4a6f5a27e619cf385be06719732d936ec8d803fca43dde2b8118cc60ab54
 MISC metadata.xml 606 BLAKE2B 15fdc1a94dbacd325187cafc04040e85b12e9497c36483f5eaacf56b6418858555b459e7a25b6b3d2155c748150d646b8d0f9af7abdc6ea26a6e6dcc4ac6f483 SHA512 39b2ecbdf4152007252597d839f3369660c1430798a022a8165993d1b8cc18fb7a82948640aeddd010c9fbf75648cd79f4356b204ced1d9ae43d18005845c2fb
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.18.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.18.0.ebuild
index 5b7532db6dac..095917fa8e5a 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.18.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.18.0.ebuild
@@ -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
@@ -23,6 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rarian
+	dev-util/gdbus-codegen
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild
new file mode 100644
index 000000000000..886fd621ca60
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=sci-libs/libqalculate-3.18.0:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/rarian
+	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
+
+	gnome2_src_prepare
+}