gentoo resync : 22.12.2021

3 files changed, 78 insertions, 1 deletions

diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 58193fcd7493..a25b9d43cb29 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calculator-40.1.tar.xz 1023164 BLAKE2B 977fc227adaa50efa271776035a11ca79166a703c9c8d618c13af477056622a9faa42c3a8876257a117486399e91fceec7a19b930293883078846a645db912fe SHA512 f46acc802ef130ec59e4376a02032ab683e6d166d691d7c5f626e2a978f017f171c0e8ad50991d1828cb325b1bd53f63ef256b9b24860842224fa3dd7e27f4da
-EBUILD gnome-calculator-40.1.ebuild 1695 BLAKE2B 4651ddd557d0734e9a686a1a97dda467528759d0b84a5d710af5e8adaf635d147079a407b45e568ed1a9782737a1dd5817ee6175174c120b9edb5645de8e1e2d SHA512 c8cab7eb96c9ff2ca8f7a08941c8cf92d0635d84c1bf4c5642b02deb43d43df77aa700ab9145cdbb22dd490cd9cc05ad89769516a5a0750d551ad027d20e598d
+DIST gnome-calculator-41.1.tar.xz 1046092 BLAKE2B 2c9a8757adcb9858f826f303ebcec44b869e3be95f49d2722e57765f187d725f82dda6b1cac1302640d686fdccebbf5c8565c5bbd064d1d647bc5d23434d55ba SHA512 fc0d5c0744c52cd68f076afa29e3028f4998fe04e2e253d267b0350514ebae72172e90a345db69bc13d4ead2c7679416529d7192a34cfd970c7b2773870b9604
+EBUILD gnome-calculator-40.1.ebuild 1722 BLAKE2B 885739e6bcee098222db8154ccf7ac20ca0f43ca1885fe3b1a61f98fa66184cb704f437859ef59960124296cd853f6e5f1f9f68ed9dc4652ec124403fa2cf310 SHA512 b54c2c17f73e221dc60b31adc9aaa60cd1ad4e311bfe4ba6ec4c2887e857eed3f78f122fc39dd33df70cb353cbe551b8fe91394121636af0dcbd92a79dfedcf2
+EBUILD gnome-calculator-41.1.ebuild 1724 BLAKE2B c7de0274e014a1f17d4085717b1bfcd40723d707512a8611347e489888028c0dbcff9e86211feb610ca1e2d22f8a8041c23e35651afc66a8315be64cabd69741 SHA512 b0fda6bffbd15a99d505bcb3120a0e9890c3d6e5b646310066f9bfde05e8cf0e8cd49b58440ef8a7b85509a8522cf18d71af0f55901d2b168c3c518e08e73c17
 MISC metadata.xml 436 BLAKE2B 32bdac72c16828ca6ef52e23f380603787e6f08829abe8576cc7475cc48fa3e2612d39891e7ece1a1cce1eb4b7e45ca53af8e058de5d68cbc1a9ea4e2c62f133 SHA512 04f0795da8fbdcd87eb4a77a70934bec3c7be51876248782b90fb94c0831ae2ba30e619bcbd078196fcca6164225752a84361964e91f2b74a10a22e75d3fd902
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
index d5f2f822d161..b195c51ffa50 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
@@ -39,6 +39,7 @@ BDEPEND="
 	$(vala_depend)
 	net-libs/libsoup:2.4[vala]
 	x11-libs/gtksourceview:4[vala]
+	gui-libs/libhandy:1[vala]
 "
 
 src_prepare() {
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild
new file mode 100644
index 000000000000..037952ba22f8
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild
@@ -0,0 +1,74 @@
+# 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 python-any-r1 vala virtualx xdg
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libgee-0.20.0:0.8
+	dev-libs/mpc:=
+	dev-libs/mpfr:0=
+	>=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
+	virtual/pkgconfig
+	$(vala_depend)
+	net-libs/libsoup:2.4[vala]
+	x11-libs/gtksourceview:4[vala]
+	gui-libs/libhandy:1[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+	# Automagic dep on valadoc - don't bother for now
+	sed -e '/subdir.*doc/d' -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-ui=false
+		#-Dvala-version # doesn't do anything in 3.34
+		$(meson_use !introspection disable-introspection)
+		$(meson_use test ui-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}