gentoo resync : 11.07.2019

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index a3d7459e42c3..8a776f161581 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,4 +1,3 @@
 DIST libmateweather-1.22.0.tar.xz 3386920 BLAKE2B 312bd8cd12a1d51216b9509b2badaccb23779f1c7c314ecf02c9789837fa619d6029e97bf06f9fd320ba590936888d51fe178cffbb7dca87eb167ed4fbf3eabb SHA512 43371fc615dda2b9042633a63ac4c1fb0b1ea43b20c783e443b0f57e10ad8fddedbd593f03bd6c942729f0a9c80484266fe1ef900d128fa4b02f80d6a80ae9bd
-EBUILD libmateweather-1.22.0-r1.ebuild 867 BLAKE2B 8af6aa5a0b13b613916f74a6c3d96966e8aa746268676435d800463ebc11ba493cd331ceb3a567419ac18843d020641fcfd2ce96845e1dcdda52e9cc45f8e3aa SHA512 f9b3e38831be3e513325bffac63ab9ef5b553548bfad8d5531ffcd3794a91d8f106451d235ea19cee77d24f0b466afd2e5653e529c8d3eed4dfaa45c496c9e23
-EBUILD libmateweather-1.22.0.ebuild 864 BLAKE2B ddd1d3cffad117cae2e3072f5dfec1476374228df0caa8b8cb3cb8ab3cf9b147ed73c35fd76e40122ba6d6fda6fd805eee5cb823f3e34c17a03f7a7d30db5009 SHA512 97e891e24b6ea067eaf4b03f6ed132d875ca838243ee92f17d283e0fe3a80a80b4abdd10866edfa0b4dd5fc917fe3b200662edf733445c0c1e22159c97787d6f
+EBUILD libmateweather-1.22.0-r1.ebuild 865 BLAKE2B 2d3a0dc7799985e8a7e9c64a8e2624fb2ed168862b0d36f8f367c783b9a927071c24f31c6bb7685697585f5d57d2c50692dbe80419afac224ab44d83e372c71b SHA512 bd94bf6cffcabfafab5226cbbd53d98aecff62b6990536f3ce8b159a3a573ce02a5e3fe4234421c7d4e5755baa90eeb0e46556258483cc4c6030e97c93cddca3
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild
index 2fef43535398..783a9ab05bd1 100644
--- a/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit 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.22.0.ebuild b/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
deleted file mode 100644
index e3a5753eeca6..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 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="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=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
-}