gentoo resync : 16.09.2020

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 23b05557b36c..b5636fce9b9a 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,5 +1,4 @@
 AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d61085c3d937862dac48ca26c338fa21f72e0a189349834efe0bf5583fc6a54fc80d8514786d20a4130ca1b91331367d8762ffb3a241f31237 SHA512 97afd9cf53e35370b86b09d2414ca0b784d3b7e571d39873045f47b67f851a22be4181f8160007cc16f3037f8838868a4fd8f4dc4a06cb4ccdb403206f6e94d2
 DIST libmateweather-1.24.0.tar.xz 2233116 BLAKE2B 2b642af39e850d38d16f6a458568e43262007f2a1150db87371fca46f6db3f1b977a6cbad601ed182b8c0fdc9c5015e493ab60bc2c0e3485091e71992951cd72 SHA512 077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300
-EBUILD libmateweather-1.24.0-r1.ebuild 1119 BLAKE2B 58647265c3768c597987806bc3576603398564afb9f6a48c2d9ee991f7a3eaea56182e6a51b4d1cb1c1df6f9383e902670dd1b8c7ff3d8195530943ea7170869 SHA512 7d92ba209a08f429334b3448130ffe7e1105b7b039f6ff8ec5cb9615dbdb8bc4f038e443b43431f82bf9fe87d89ba96e2cabbba1c4cc70888e73c8b6c2229827
-EBUILD libmateweather-1.24.0.ebuild 854 BLAKE2B f51dcaa5f5303761f47efd4025f04f5fdc03091811d70ba84fe9d73c49b3b1e35cbbd65925b4250364e901524f687db8e01df9700ef749cfad1624623ec986e2 SHA512 750a6ea93069def2dd8bd2e1cf6c198cf484cd6a2873c3caf67f6ebedef32c60c62b699114e066b653850f7f86a05a939e30d057d19e5d7c1be80bf287d9c9cb
+EBUILD libmateweather-1.24.0-r1.ebuild 1117 BLAKE2B dea76225a962e0f4629c92c737864dca79811059021eb91948ea4dbbe1a3ccd52e1a98398a087dcafe9cf2fd7364b8eeac85071a4ef6cdbd27f648cdb5d137d9 SHA512 f29017258f1e403cd6ad83a01f9781ec3e97755a2dd6241f5ebcf16e1bfe80494d326afa807e66a6a8c9dd472bb8d0c2e52e45ae7e89a3112228d20bb0deefbb
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
index c487fea2d969..5ab0dbf7fd5a 100644
--- a/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit eapi7-ver mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE library to access weather information from online services"
diff --git a/dev-libs/libmateweather/libmateweather-1.24.0.ebuild b/dev-libs/libmateweather/libmateweather-1.24.0.ebuild
deleted file mode 100644
index bc645287670f..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.24.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.54:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--disable-icon-update
-}