gentoo resync : 14.05.2020

5 files changed, 2 insertions, 231 deletions

diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 4097af021196..4d7c12844f2e 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,11 +1,6 @@
-AUX mate-applets-1.22.0-cpupower.patch 1349 BLAKE2B 745b7c02a17a21d05494c25b4ffbb3451d94dadeda4c12b3ff7c5e889a8c8c311ac033344b6deffeab575ebe7e6b645f7c789f65ac5d5d57d033d05ea13cdc24 SHA512 214bdb8c711a7b1bef0f16bf2c2464578d46fa640ce5dcace6dbd74c08df5cb8276875ac6e7e7d4347125551c236c4813002798a3f478af2baaa94cea10df44a
 AUX mate-applets-1.22.2-gcc-10-fno-common.patch 1533 BLAKE2B 501301f29481c8947d9dc31b25c91dac415334819c06cf663b1a9fb431d89cfccd7e9ef67ca093d323b53e51a2732c57cdb986bb49f259176d256b553095f51c SHA512 3586835f5734e228a1e8b185aed26fd966c6910575046492ef3a92f5296fd1dffca3b14ab1270682734a9db20839521a9057aa872c9c325914c79a60bba452cf
-DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
-DIST mate-applets-1.22.1.tar.xz 7602112 BLAKE2B 22dc076d188cddf9c5160d7ecaddb14ecc41a575abac91b72959054f3fe1c961c80b1aa9171150e7c4ce61ccee0783572726386319312dc97f64d4f9266c1a6d SHA512 d132c8b5e433a557785745032235a5792d04edd7c249269d9a4066fb345b76955bdca71164f7b321f41f566803694d85d9cd7690fbd699daa54788572f0eb986
 DIST mate-applets-1.22.2.tar.xz 7648744 BLAKE2B 85235f12c1436c3caaa6429aabd16822ae34c5c4bd7a575aa9be2c2e9080734b39180e34b22fdf265a64b5ebffb24071d8768b99f55736631403da02882e45fe SHA512 a57ed37d6ddef303e40cbd8f811d1c6be473eeee78a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f
 DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42 SHA512 345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e
-EBUILD mate-applets-1.22.0.ebuild 1957 BLAKE2B 2960725e78c39d2940bdf5bc14f126c34a75695c8678a17e72a1fa3309e088b7a739e7b07a867ef3b043b60d7f814aa0104ba5b3d2aefcd286d52f5e28beaa48 SHA512 2506940c8b170692f4103f66f0adce964a012e2985b4770ee80fef219ad4430c9ed9220a4ca4d8f0dc108f22566a09ebd671d90c7e902574a554eadb8fa0f089
-EBUILD mate-applets-1.22.1.ebuild 1943 BLAKE2B e7d9994d2dc687a9dd35ad9ac647e63042bcc2f764d08717143d42e4f5e93d749f129fd2d45ca742e162975bace094ef2390cb4b2326566f477a50d5c2f52d29 SHA512 d147db39ac2e12fdac98bb4f77e2a7f11cec1c765ec885feb81ccbf214aa4c79d0fbcdb272d5c90a0a9678d30ef4c41d4541c59818f97c96e3cd81846ae0fe1c
-EBUILD mate-applets-1.22.2-r1.ebuild 2128 BLAKE2B d86b7989e86f077b822d04c8b66a86cf7479a1a14b539eff1554db9a7e9855e61f7c75b48927540ba82a6cfb90d1fb5b5d51994494a068c3980e658e0a1f7f24 SHA512 21ea88ddfd24bfe60e4402c83f61c615a96cd61fbd7d43a09e72bcb55a5633291814eed1ab7de5f496259df80b09458984a2448e07ac38afa9b930d7cf38f87e
+EBUILD mate-applets-1.22.2-r1.ebuild 2126 BLAKE2B efb02795026fdab295ae37f9f2e6d48cae2404675a5d0cacebfcf174f354e0a84d900664c1e437766af0dc69a1e07ac51c1004fbbcfb8e12e861c8c3c118ac5f SHA512 1a4cc2631b36de20d34d671462aa88b2146abf9509d54550e8b62db7a8e7ae9cb99bb3b75ec00be2f87fa26181181105d3ceef9bef67458c6f89ed6677c92f17
 EBUILD mate-applets-1.24.0.ebuild 2054 BLAKE2B 2975ebf447220a2ff3a9b319b6775839ba432fd9ee21d047ca112584b78ba6e8f325832a30bbebfe936fccbe2c4975bf8c6570e8bfadd85e817a48d425de9c94 SHA512 a42f77747f8893e5e43d2404d9fafaedcd51c0b88fdb9954cc57cb671044518c2b50ac8cee2fd899e6479376d48916d9dcd1e23bce910941138926c474c0763a
 MISC metadata.xml 476 BLAKE2B 7e9ca9850dc90a6c22f661760b1aa54cc4e87eb53c1f6eb8f4087afa7b92f7a11e924c45b69cea8ad025203e894d24511a6d960d93b4f5341082447bc380fe34 SHA512 2b64230204857eb218fc42fdd18fb4ec9bdd7727d278e0c492630e38c561150cc8c5d45b5168cac619e8104aa9a737db6961045e71bbd005c235df20f72bd5c3
diff --git a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
deleted file mode 100644
index 9c1a80e93758..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -370,6 +370,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"
-
-@@ -98,7 +102,7 @@
-         return CPUFREQ_MONITOR (monitor);
- }
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- extern int cpupower_is_cpu_online (unsigned int cpu);
- #endif
-  
-@@ -115,7 +119,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.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
deleted file mode 100644
index 077a17c344df..000000000000
--- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50: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
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libwnck-3.0:3
-	x11-libs/pango
-	virtual/libintl
-	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
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1
-	dev-libs/libxslt
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}"/${P}-cpupower.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() {
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes 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.1.ebuild b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
deleted file mode 100644
index 38f90f1bdb01..000000000000
--- a/mate-base/mate-applets/mate-applets-1.22.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	>=dev-libs/libxml2-2.5:2
-	>=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
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libwnck-3.0:3
-	x11-libs/pango
-	virtual/libintl
-	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
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1
-	dev-libs/libxslt
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.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() {
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes 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.2-r1.ebuild b/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
index 97fbd7bd56cf..a92aa889f8a7 100644
--- a/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.2-r1.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"