gentoo resync : 31.05.2021

3 files changed, 2 insertions, 80 deletions

diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 076186f5ecf1..0732a8b9ecd8 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -4,8 +4,6 @@ AUX 3.36.2-autoskip-network-test.patch 1034 BLAKE2B a675ec70e9f8a0bcba89743c1ae1
 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-3.36.2.tar.xz 2707976 BLAKE2B 0051e1fe9dccef44ff6fe46bdf8e6b23c9a772ed000daf3a0349e064819d0f17f3f7d902f9c860f0d186a67fc6c5a27b31a8b20b4fec7e738221a58830216ca5 SHA512 58012931382d87b10ace79f6e2337a9244a0877a8bc241bad5da6368f6d8eaa815f88bee25cfd49b12baa4b2399a407b905f1cf0afb98f649fda6b0dc9f61f01
 DIST libgweather-40.0.tar.xz 2704404 BLAKE2B 27bc69c350ae91a07307d75b5ea1d03bb251f51bf87d5d54861965b61d7ed825ab708466cbe9d961c4f544b8b17ca6ed37b723c003ce2c1ef020270d6812c61d SHA512 72e295246bf03550039a70bd4bf5b8f06357a6b70e04308c197fba309e406d410a97d128d849d97a29a6a114faa1ef5452e6632870b7ea45223a0c305c228cc1
-EBUILD libgweather-3.36.2.ebuild 1968 BLAKE2B 4603276671a2870718979c6bf27fe522c61b9ac8d3cb4225c4a85ac73ea038be0389e89d0d71f4de6422b3122f6b2bb2f37aa6a4eebe9e6f8d18401adaa20b1a SHA512 9867a812b3c891b43ba32d44d2a47e132bccd17ae703ebaa73d91fa404e327d75969312025ffc1c1b1f8e791308e528035b5ea0dbc488c247ed2c6ab3e1c4e10
-EBUILD libgweather-40.0.ebuild 2111 BLAKE2B 74dd0ed2a40d1876abf51a98e9a18a433d078884f55fab046941b22a0fcd678fb198ae1c357885af704f3815940227aab4c23ed4fb3ab3776838e37617325f23 SHA512 92b59bcbf89993b72ba2ad6a594c8c25b319f5ef897375af17a2b7c04b2d58c742bfee385f2e6e094cc34c24cae062dd319d8d9c03dae7a51b2bbbceca841604
+EBUILD libgweather-40.0.ebuild 2108 BLAKE2B e66db83d3aea59b114eacfa0e1843711d47d192297052048aafc7bec05e322121a8794610d34040eceece1944177fdcb23d040dbaf510d153ddd159d7f925a35 SHA512 b8ebf8db02aaef7cb5656793cf9308bbf99b82a1386c7c7297247444b5da75d09d08423a7b5df333e55abf00b0a5db75c81b2dbc32695f303b560a45d0bb2c8d
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.36.2.ebuild b/dev-libs/libgweather/libgweather-3.36.2.ebuild
deleted file mode 100644
index ac0aaee8a251..000000000000
--- a/dev-libs/libgweather/libgweather-3.36.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND="vapigen"
-
-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="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(vala_depend)
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
-	"${FILESDIR}"/3.36.1-tests-locale.patch # Don't fail tests when a locale is not present, https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/58
-	"${FILESDIR}"/3.36.2-autoskip-network-test.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		$(meson_use vala enable_vala)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/libgweather/libgweather-40.0.ebuild b/dev-libs/libgweather/libgweather-40.0.ebuild
index 25aefdc8fd5d..b7249ad649f9 100644
--- a/dev-libs/libgweather/libgweather-40.0.ebuild
+++ b/dev-libs/libgweather/libgweather-40.0.ebuild
@@ -16,7 +16,7 @@ SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2