gentoo resync : 28.04.2021

3 files changed, 11 insertions, 8 deletions

diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index e3bd4d681c28..d3782ac0d04b 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-calculator-3.36.0.tar.xz 983532 BLAKE2B 5e28a82cb93cb944e69d4d7c7cf1a14cd91375ef864cbd5624d87a66ee79f0aff17f871ba734d35ae372b761ce67c809acb6fdfe66597980f33e06fe86d6157d SHA512 5e8d3b17703260928e9d0594a6e0b06b6a25d71590b4ab6c371e0c21be5e53698011407886f09f6bd67660ecbfa182d725d5e3a1c51fe4ea9125b175bd4d279c
 DIST gnome-calculator-3.38.2.tar.xz 1004684 BLAKE2B c2b6a0ff2e6a91c43a1670945af989b715f0f7369050dac13bec02898ef6780ec4484c6ee9f6e6bb19b8ecc9d7d8c2df0c824ac9c3309783cbc89b96fe1f16b9 SHA512 41e58b34640e795108a552aa0d95b03f0c84c4d5af6eef7fe8350c5f4e031a0fad7cad73034b38b2121f09687815b6b10a6a86fb00c7cbf720ccb06a8eea0403
-EBUILD gnome-calculator-3.36.0.ebuild 1595 BLAKE2B 1f001f68ca0a0035c09d66ce59bc846b2750282cfae7e70f43aebdd865fe757a0358a6eeddc2c671d9b835ad5aafe94b9caa1eab99ef0004a92a21ffa18b457e SHA512 00608448db8af20a0d33678f05446e5a579fee1f924700f847d5653fcc767bc4d1d921f5da69b4e6d6e63f7a0741e989231eaaf968a0bd8fb6969cdb9e76c76a
-EBUILD gnome-calculator-3.38.2.ebuild 1596 BLAKE2B fa95f74af06d0643487eebab507326b894bcd80179222099312cbb32a2f7530fcb1f49ff927ba239adab9d5c4b5e8129bb6e465d195b1eb2781a5754173e9098 SHA512 d76f484cff84f49acb2c1e6f1f40a619f8d204011dfee0d67ff0903194a8baba20c7f0df79ae424896baec9ea4df6389ab953be9bf7ad8d47ef16ad29798f53b
+DIST gnome-calculator-40.0.tar.xz 1022596 BLAKE2B 9522c8698492eeb07fbd86e8baeaee67433a1d43b2c97c4c895ca7ac8958a01c4e05c73598b1c14a2b333bfbc156b824669b20e878fcb681ade99c1ceef5ce72 SHA512 f22e9a9ade2f236142b7ebc3e54ed07834b049087ed8606571730e3bef2ab86317718df622368515266ba9578f660d7cd892cf87cf43bca9441369c838967c5d
+EBUILD gnome-calculator-3.38.2.ebuild 1595 BLAKE2B 508741b5f8eb80e83d16e3d035b61baf96253db07ef3f9dbdf08d4c0035d926be754087c6118cdf7186c9bf6c57f966363a5a388fcb76437faf0c711940d729d SHA512 7d1667034f9041836fcae738b6c197efd02126da6f95bf868da200040eea10ccc36e66a7aed61a49c546ab3578abee95ce9b4a5ff71bada6d0bd522c73943921
+EBUILD gnome-calculator-40.0.ebuild 1690 BLAKE2B 8a4c93d1c5466668b3bb2a8ac40124e15eba2ae5ade32cc1bb2a5282fb717bde09734f7a11fb791bacd6bf07ced3391691155f248d9c7d1a8706bee9a605b1a6 SHA512 bcf726e99cd69ee997aaa32d4059f328a3a93bf18633719bf44b7533303520bc12cb0f0cc4c815cff2b665134adb059a6b581f09f2420b123e41359f30ebb962
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild
index e0fc2f79a531..466d1d3cd563 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.0.ebuild
index 925cda6f56c6..17bd94f4fdf8 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-40.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.40"
 
-inherit gnome.org gnome2-utils meson vala virtualx xdg
+inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
 
 DESCRIPTION="A calculator application for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
@@ -12,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
@@ -23,12 +24,14 @@ RDEPEND="
 	>=dev-libs/libgee-0.20.0:0.8
 	dev-libs/mpc:=
 	dev-libs/mpfr:0=
-	>=x11-libs/gtk+-3.19.3:3
+	>=x11-libs/gtk+-3.24.1:3
+	>=gui-libs/libhandy-1.0.0:1=
 	>=x11-libs/gtksourceview-4.0.2:4
 	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/appstream-glib
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8