gentoo resync : 11.07.2019

3 files changed, 2 insertions, 66 deletions

diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 8b9fdd0f10d2..c192e820124e 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,5 +1,3 @@
-DIST mate-sensors-applet-1.22.0.tar.xz 511876 BLAKE2B 6e2008d60a5530ab233da0fe67a38fea2abfba0d745386d82d44e21e59a5d7a08e7f97390f3b8e3df16699c8b69bf1f9c3d4762b45f4652838672c57ec91bf34 SHA512 f756fdff4dd8fe824fbe41956411ca1e6ce251fc1d43276c7244a8a806e91bacc283c412b831935136682971509e23c08538264963af31488bee15ce5644d5cb
 DIST mate-sensors-applet-1.22.1.tar.xz 496776 BLAKE2B 1f3ca3e7b6b48a3bdb4e3b370c65bd34bcbde250d21d2c9214eceadf790d2c1a45f87ccf615387edf9abaad2c3a899a536b78d8afece0574d735d80095c1b595 SHA512 4b6e608c92f03051044863f770b295d1526b19a9668513b566e81adeb28bc8524d8f458d114d2b44acf00f20c2f0a8d86b1ca7254fa165fde3b867c75a6b83e6
-EBUILD mate-sensors-applet-1.22.0-r1.ebuild 1341 BLAKE2B 4c5b0a611bc8bddc25f0c5fc0d91a36109aad973ce1ac7b2c232a023bf918ceb7af7b41c1f65c7027d0e4a515af2bb0cd452402b2baf1bf225571e77f6b5bc56 SHA512 92c2ed89a0b7969bcadda1f65f65cff201e9abc99fe52a42ab25b87c41453154e2d00c41304041907acf08c7af7535a98584f7e2d226587c5b320b6a987dbf54
-EBUILD mate-sensors-applet-1.22.1.ebuild 1343 BLAKE2B a98f8642e50aa7dc991c87112186fb2bb47661f75c5a662efccfc35eb7c4d8ee963c6056e5be59b724066e6e1c2dd10f0008001282f8d1f5d62737cabdeb7fa8 SHA512 711a98f3a37c7e1de8355983c57ba0b73a72176562d12ac93cd295facb2aafc1fd5ad6b303b5d5419a580ce9fa4e90b0d3aa4a6ccea6d90e4621220c20fdff0a
+EBUILD mate-sensors-applet-1.22.1.ebuild 1341 BLAKE2B 4c5b0a611bc8bddc25f0c5fc0d91a36109aad973ce1ac7b2c232a023bf918ceb7af7b41c1f65c7027d0e4a515af2bb0cd452402b2baf1bf225571e77f6b5bc56 SHA512 92c2ed89a0b7969bcadda1f65f65cff201e9abc99fe52a42ab25b87c41453154e2d00c41304041907acf08c7af7535a98584f7e2d226587c5b320b6a987dbf54
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
deleted file mode 100644
index 7df62276db70..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,62 +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 x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/cairo-1.0.4
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	virtual/libintl
-	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
-	) )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:2 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks2"
-	else
-		udisks="--disable-udisks2"
-	fi
-
-	mate_src_configure \
-		--disable-netbsd \
-		--disable-static \
-		--without-aticonfig \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
index 1bbeca988faf..7df62276db70 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="MATE panel applet to display readings from hardware sensors"