gentoo resync : 28.04.2019

4 files changed, 2 insertions, 142 deletions

diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 68bcd28f5912..600554b6b10e 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,7 +1,4 @@
-AUX mate-applets-1.16.0-cpupower-4.7.patch 1142 BLAKE2B 1222947dd918825d3905aa4c7e95e7c13115ac1aec0d0881b3fcca2f68947ed23a6decebbb0ec94010308ea943696c5d05ceda90803fe14c1bf7b151880e544a SHA512 7845655d2215e91286b19891cb8e6f018b8b11bebcb876d97b5c0a0232063cd030ef14754871f14e09f3e82d714f33d844d41f09f1168a088ac4d83cde527789
 AUX mate-applets-1.22.0-cpupower.patch 1349 BLAKE2B 745b7c02a17a21d05494c25b4ffbb3451d94dadeda4c12b3ff7c5e889a8c8c311ac033344b6deffeab575ebe7e6b645f7c789f65ac5d5d57d033d05ea13cdc24 SHA512 214bdb8c711a7b1bef0f16bf2c2464578d46fa640ce5dcace6dbd74c08df5cb8276875ac6e7e7d4347125551c236c4813002798a3f478af2baaa94cea10df44a
-DIST mate-applets-1.18.2.tar.xz 7163260 BLAKE2B 58d057d1eded3ef26f33e133f86459a75df2903906f27df555640aaf51ca381e8f57b0b4fe6ed7b2d679e08d2a595fc85a6b0d9c4ad51d3ac01552e2875e00bb SHA512 6644a7dfde1dbf65c38cd3a0f52f862e096030f0b9f324f1fbfc34b6167c04b51071f01c322c3c8382e74843332c877b1340fe2129417d6cf9207c32ef2f70be
 DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
-EBUILD mate-applets-1.18.2.ebuild 2121 BLAKE2B 1ba438665d25d5fdf1cc90efb5a9bacf56069e7029fab8c07fd905868d35aa44b38c7def22ff2e9b6509b5ceabee68ef20a04fb31954ade6199525b5a5b95ab4 SHA512 d43072a084396b0a315d42c3c8069918967a5d78831d817be71ee4c512827fb9a4126fe147c7aaa4db8527a4a61a297f6130ff1cd12a9365ef82f04eecb06a2b
-EBUILD mate-applets-1.22.0.ebuild 1936 BLAKE2B e5f35b5e65ae1bbf0b31f1b1bd3809082c753a0d70350d03568716e0d3258df5c780272e4f2f95bb6579721dc12c65d8d3d02521ff4c4c8bc457d2a1b1bb2d25 SHA512 1c31c6d5561b46a5feb4e148e0943f1371d6b32ce0b439082661f4a4f061e5102a9c9b9674fb7d7a24eac4aba92ded19b4cb7c5dd0cbdd15181bd18e0974cb10
+EBUILD mate-applets-1.22.0.ebuild 1934 BLAKE2B 3799e17486bdf4129733260dc487d4726fe57c567f9b2dc7316b1c5e5838410311d172fa0a3d643728e167dd74d81c02d8deebd704d9cc6516acc3a86504a1a3 SHA512 4f1eb5ab368e46ea0d5f0ec3bf395b5cd19f7c42a0a4b80e1e0a7a41d116957757bb48d7cca305df10c413c4b2023e4328c4f52cfa4e75f31445fb5a62cec099
 MISC metadata.xml 341 BLAKE2B 5013e079fa6d6c8dca84a8798ce1e360942b8284816842662f0a783895575cc4df2e992d67862928d436b188f87fb29e21b5299b455a838849dac4ecf2588ef1 SHA512 20bc118f3d597db418636c77744f83f398c25ce2dc783bc61f81fda1c0520b3ca9b18ee5f4bed149fecc70436bc3d2a79ac311559e7d1ee085322eac5963e7c9
diff --git a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
deleted file mode 100644
index 3f4f4fa519f1..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -411,6 +411,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
- 
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
- 
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 4fa9d4c..ba52fde 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,12 +19,16 @@
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-  */
- 
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
--#include <linux/version.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
- 
-@@ -111,7 +115,7 @@
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- 		if (!cpufreq_cpu_exists (cpu)) {
- #else
- 		if (cpupower_is_cpu_online (cpu)) {
diff --git a/mate-base/mate-applets/mate-applets-1.18.2.ebuild b/mate-base/mate-applets/mate-applets-1.18.2.ebuild
deleted file mode 100644
index fff5a4222fc3..000000000000
--- a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.17.0
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.12.0:2=
-	>=gnome-extra/gucharmap-3.0:2.90
-	>=mate-base/mate-panel-1.17.0
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	>=x11-libs/libwnck-3.0:3
-	x11-libs/pango:0
-	virtual/libintl:0
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? (
-			>=sys-power/upower-0.9.23
-		)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
index 1a1b62dec8c9..79f7b2082756 100644
--- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Applets for the MATE Desktop and Panel"