gentoo resync : 25.08.2020

3 files changed, 74 insertions, 1 deletions

diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 7b3eef57e2ba..679992f5dfce 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calculator-3.34.1.tar.xz 965520 BLAKE2B 7dd7af4d2065aee9a8962983ebf723aa06e4b2e3ef98213a89044d70e47057a747a88fdd58185abb272589433f84a6fcd3a3c5fd7dc0281d13f34ccaba690b50 SHA512 43900cebc6b479292a45619f1e4f6afc5264e2dceda5d0049b59f27ebe2a32b5f4b2465a22f33b33b882ab0e737f7048fbe9395b18f9b5d2023da2941b6783f6
-EBUILD gnome-calculator-3.34.1.ebuild 1415 BLAKE2B 7ab760953344be8fbc73f2d5447aa4e04856e9a9bb2c97aeccc4c1f3c276f3adaedd2602210547d771aecb00cca2d21af1931e4d4fdfce9c9f67f12d330133d5 SHA512 04c0c9e04e9f2009b732293648068fc6e0933405aed6006adb3084804657bc0f26dd7f48ff2b8d8d154ca949c064c40a4a9d32d4f32e74ec6434a5692fc951a3
+DIST gnome-calculator-3.36.0.tar.xz 983532 BLAKE2B 5e28a82cb93cb944e69d4d7c7cf1a14cd91375ef864cbd5624d87a66ee79f0aff17f871ba734d35ae372b761ce67c809acb6fdfe66597980f33e06fe86d6157d SHA512 5e8d3b17703260928e9d0594a6e0b06b6a25d71590b4ab6c371e0c21be5e53698011407886f09f6bd67660ecbfa182d725d5e3a1c51fe4ea9125b175bd4d279c
+EBUILD gnome-calculator-3.34.1.ebuild 1443 BLAKE2B 58d185671862d68932e3f20a71699e239deab3b19cb666a57ed30c097f425ca78ed74f17676ab10c1b296054637a69b82ded0f823506aa974bb33200c3df8025 SHA512 2ddcad67d36bc63f69ba82e5311e3254fe2e0fd113c8c396996289cf51efce80add1d782f1e3832ee788593b5782e74932b53c69545020f59812a86110dd5355
+EBUILD gnome-calculator-3.36.0.ebuild 1597 BLAKE2B c28e9bc243ad6226ed5f7a1fa033cbfaf85a8a4991c847190645db9110e94b9f4235d5e5d4ac4289d0d39e8786fb8440927a2ecddc0f49e6b95be26ef1d86a98 SHA512 456977c6299876c3b77c386c2e62c42fa3f33c1b13a0c503046e4c2d0f193ae6e35ed609e87d839352b7e53fd1ea7c564d4e908402a394c9a5883ddd0febf643
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
index 5512971b8c18..eaedf70c3328 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+VALA_MIN_API_VERSION="0.40"
 VALA_MAX_API_VERSION="0.44"
 inherit gnome.org gnome2-utils meson vala xdg
 
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild
new file mode 100644
index 000000000000..a8604b323e2a
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson 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 ~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.19.3:3
+	>=x11-libs/gtksourceview-4.0.2:4
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	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]
+"
+
+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
+}