gentoo resync : 25.03.2022

4 files changed, 143 insertions, 0 deletions

diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index a39e6b7b9758..f3d9ffd590dc 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,6 +1,10 @@
+AUX 4.0.0-autoskip-network-test.patch 976 BLAKE2B ce6866636be48e553621a18dcda5ca122f204ad074d7472c740ea8db8cb283fe8f6ab63e2bc3862fd2c0725446c7c2969bc2f431bd175d9d2b96f68c401f3e0b SHA512 6f47d66e243dac3162b3e89e5fe893de7d87cc8dce9893534a12e76f1e9b830a18cdf3a9f6a26de89094841d1874843da301ed10f35e0b7e6d9ae4b2bca07f54
+AUX 4.0.0-vapigen.patch 1153 BLAKE2B 1462b72ad3d25d4d5eac255d49217d74ef2cab67c740dc1feaaafa671977eaa92557c623c4f37f8cc4f76ee05018f040dd3604b6eb413bdc46830f77e2aff8c0 SHA512 0aae04a26f68e63b30911d3a76dd0569823ea11e247c14a34f81a15686caf33ea2834368e8b545faa1d0bd5f66e749916722e2cd77feef151c5cebd6d0fec1dd
 AUX 40.0-autoskip-network-test.patch 1038 BLAKE2B c233294ad5a301e8a7b6b96e606124a5440cc93507f291147acc6f8178341b1ce4ce292250d56467364bfadc2d28d49f02e5f3aa8f4cddac7dc621621a57d93c SHA512 fe2ff110863627e61454d1583d155b9f73c7c64814a77736783eaa533e50bbacc61065eb66a84af20f83323f0b66a1a38c70af26a1f7ef5a559865dc885c786d
 AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160a1391dfead3d9bc1117bc3d811ac5cad4706bc85720f330ff5b22d5cd276947ee9bbe0f8911073a0e9a0b35be SHA512 c135d708154060d84023f2e33d16bd5a6a798311b858d0ebd15a9a51a1bf69c33ab93ef02bd8b6b65c5cfaf071af4a7a154630e3fed0767173cdfa576e554d1d
 AUX 40.0-tests-locale.patch 2023 BLAKE2B 97acdc022d38e465bd114dd3411b33752827b77167894386384614a1e0ec19f8abe1a2f52aa785dc768bb3599e20fcf64330dfb220c3519da93b42b38e736c3c SHA512 4e8edc725bccaa30ecf19f428e2e863b2cfabeb209bedd9095b12e149600ec2fce7ac8b385b1e7655d0262c8810a60891272956a829e70b513b16af0c1463435
+DIST libgweather-4.0.0.tar.xz 4722620 BLAKE2B f2500d065fe9607b740c2f6c87378d5fc86c15951b2880f89c3ac22021d085eed601b645dcf1c9864fe1fa47860aa14ed1ab858263a7634c3b7615231d3ee6d1 SHA512 1441b8996a53b277e9453d3fcf32448800c963f40c32542f9055362bc3188dcf2e706466133d53b3f1b6343dc97b15cf5eabe16b950e7c9451cb79eeef87a9c3
 DIST libgweather-40.0.tar.xz 2704404 BLAKE2B 27bc69c350ae91a07307d75b5ea1d03bb251f51bf87d5d54861965b61d7ed825ab708466cbe9d961c4f544b8b17ca6ed37b723c003ce2c1ef020270d6812c61d SHA512 72e295246bf03550039a70bd4bf5b8f06357a6b70e04308c197fba309e406d410a97d128d849d97a29a6a114faa1ef5452e6632870b7ea45223a0c305c228cc1
+EBUILD libgweather-4.0.0.ebuild 1714 BLAKE2B 0649c0a0cd15e507e2cbbc75d2c29c4dd6f85e4b51cb10998140698e8d21053e2eb1df08260700c93bc8e238d841b1975cafa59bf0c540f2920a84fcbb2adfca SHA512 2c36d5b7a30c24d3049c434f4392d757e3f6e9a6492deadaae0a6702ee5854c9e042351eba7023b9ea689ac573471f6a761e38538f5e7f402ad2c14682dfc9f7
 EBUILD libgweather-40.0.ebuild 2116 BLAKE2B 2faac8e29708c643ff2e7086294871bede550d97bea1429af2cc64a1216c2fc9d9a66534bc36227cc5586a5618336fff3bfb25d43350d3e92c53fe123d7e40b6 SHA512 55a446794a6ffafff387f2254b550a5045a3f94bb740443aa33a37db32f02e094915c8e3204d77fa66e10125797215dc06ea34c59d8f1637de8361f8ac47f4c0
 MISC metadata.xml 350 BLAKE2B cba370b67a1b0ecfa341989e9590fe3c5dfb165349c5a874bc968ed5d3f2e42185f2872034dc8d847f878b68f6bef6d40a19883868945834bbab18edc6fe028f SHA512 3f2b10a36dd71f822b9cf2c799832c8725778c918c4a83e80431443b2c4ae3fc8a5d36071e0b02549fcde4f11aa8f38297fa7394363182abf0ab1a06639f92a2
diff --git a/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch b/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch
new file mode 100644
index 000000000000..3f27906de012
--- /dev/null
+++ b/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch
@@ -0,0 +1,29 @@
+From 87c0d202977c212a6b7fd360ceaa295e422de87d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 30 Aug 2020 10:35:13 +0300
+Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be
+ resolved
+
+---
+ libgweather/tests/metar.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c
+index 7d6c7c04..0b3025a2 100644
+--- a/libgweather/tests/metar.c
++++ b/libgweather/tests/metar.c
+@@ -142,6 +142,11 @@ test_metar_weather_stations (void)
+         g_test_message ("SSL/TLS failure, please check your glib-networking installation");
+         g_test_failed ();
+         return;
++    } else if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
++        g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
++        g_object_unref (session);
++        g_object_unref (msg);
++        return;
+     }
+ #if SOUP_CHECK_VERSION(2, 99, 2)
+     g_assert_no_error (error);
+-- 
+2.34.1
+
diff --git a/dev-libs/libgweather/files/4.0.0-vapigen.patch b/dev-libs/libgweather/files/4.0.0-vapigen.patch
new file mode 100644
index 000000000000..d5c4ca12623e
--- /dev/null
+++ b/dev-libs/libgweather/files/4.0.0-vapigen.patch
@@ -0,0 +1,29 @@
+https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/176
+
+From 98b505675f631c1fabbbcbcee2523f8dde8e7e3d Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 12:19:59 -0700
+Subject: [PATCH] meson: Use dependency() for finding vapigen
+
+This allows the vapigen binary to be chosen by overriding the VAPIGEN
+environment variable.
+---
+ libgweather/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgweather/meson.build b/libgweather/meson.build
+index 08311af4..7148f5ca 100644
+--- a/libgweather/meson.build
++++ b/libgweather/meson.build
+@@ -211,7 +211,7 @@ g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'
+ build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
+
+ enable_vala = get_option('enable_vala')
+-vapigen = find_program('vapigen', required: enable_vala == 'true')
++vapigen = dependency('vapigen', required: enable_vala == 'true')
+ if enable_vala == 'auto' or enable_vala == 'true'
+   build_vapi = vapigen.found() and get_option('introspection')
+   if enable_vala == 'true' and not build_vapi
+--
+2.34.1
+
diff --git a/dev-libs/libgweather/libgweather-4.0.0.ebuild b/dev-libs/libgweather/libgweather-4.0.0.ebuild
new file mode 100644
index 000000000000..daa592786342
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-4.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="4/4-0" # subslot = 4-(libgweather-4 soname suffix)
+
+IUSE="gtk-doc +introspection test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.68.0:2
+	>=net-libs/libsoup-2.44:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	sci-geosciences/geocode-glib
+
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.6
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/4.0.0-autoskip-network-test.patch
+	"${FILESDIR}"/4.0.0-vapigen.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/pygobject[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use vala enable_vala)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use test tests)
+		-Dsoup2=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}