commit: 5b22ce234c2c0b7b508398fbd0ee1dc12a718a90
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 17:49:07 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 22:49:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=5b22ce23
mate-base/mate-applets: Drop old, sync with Gentoo
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
mate-base/mate-applets/Manifest | 9 +-
.../files/mate-applets-1.10.4-cpupower-4.7.patch | 46 ---------
.../files/mate-applets-1.14.1-cpupower-4.7.patch | 44 ---------
...s-1.14.1-revert-upstream-cpupower-4.7-fix.patch | 37 -------
....7.patch => mate-applets-1.22.0-cpupower.patch} | 13 ++-
.../mate-applets/mate-applets-1.12.1-r4.ebuild | 101 -------------------
.../mate-applets/mate-applets-1.12.1-r5.ebuild | 102 --------------------
.../mate-applets/mate-applets-1.14.1-r1.ebuild | 107 ---------------------
.../mate-applets/mate-applets-1.14.1-r2.ebuild | 106 --------------------
.../mate-applets/mate-applets-1.16.0-r1.ebuild | 105 --------------------
mate-base/mate-applets/mate-applets-1.16.0.ebuild | 106 --------------------
...1.18.1-r1.ebuild => mate-applets-1.22.0.ebuild} | 50 ++++------
...ts-1.18.2.ebuild => mate-applets-1.22.1.ebuild} | 49 ++++------
...ts-1.18.2.ebuild => mate-applets-1.22.2.ebuild} | 66 ++++++-------
...ts-1.18.2.ebuild => mate-applets-1.24.0.ebuild} | 70 +++++++-------
mate-base/mate-applets/mate-applets-9999.ebuild | 65 ++++++-------
mate-base/mate-applets/metadata.xml | 4 +-
17 files changed, 149 insertions(+), 931 deletions(-)
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 27a94c1..d953a28 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,5 +1,4 @@
-DIST mate-applets-1.12.1.tar.xz 6816716 BLAKE2B
3268a6a4dd1ee1a238a9573315f9450dea4636b40a98f27857dff3cfd9379e5adefa9f2f7f0522837d3bc4fa1c54055d4e65b47165f42cc44400775ed8890b14
SHA512
c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234
-DIST mate-applets-1.14.1.tar.xz 7151156 BLAKE2B
9b3540ea04c4473f8d9ee081a87d399ebfe74d77d96b96f4c5bf11d954dd53a1e764981eefe593d75480aadf3028626917fd21cdd1b45a5b8f14e4381fcd48ae
SHA512
f7657a4dbeed5ff161dae33bd915bf868c95626d661b3d7e4eea9b86776f75449c4060c647d9a040ccf8a01556979b62a9b21c988b33e0cd8d5d90fd663a331d
-DIST mate-applets-1.16.0.tar.xz 7150340 BLAKE2B
0b5554b3e5f250dbc38ec3ecff795dca3d503045fda7f31ea8cb190c8c30a35b5576b990d5005f11b44035b26d6df2ce91e36edd369e983d893bfa2db5e4c00c
SHA512
606fd39b95083e7cff2ce95e75b4acb0ec1f3d66621a15fa726891c6d6319f7757b92c8c26efd3ee05da9da3dc315b16a3a9089fd4bb8d420816d4728f8545af
-DIST mate-applets-1.18.1.tar.xz 7158716 BLAKE2B
9f3698a61cfdcabbe5734d4f1f2c57a4ee11e4072e5bb87fe8f44e0dc6bdf7bb99e7c455ca221c573f0cef5557d4e89a53b7679915f635aa6ab6d257ca478bd6
SHA512
3186af69f3b8b54a7f31d3c00a39ed439717200181a1e64d97b28eaf2e75b19ac79fdda44c40401687e9cece06feb1e29f52948cd73afadeb0099f64e672c036
-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
+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
diff --git
a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
deleted file mode 100644
index 070b417..0000000
--- a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c867af3..4ff5311 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -416,6 +416,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 40c44ba..120693c 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,11 +19,16 @@
- * Authors : Carlos Garc�a Campos <carlo...@gnome.org>
- */
-
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
-
- #include <stdlib.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
-
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -111,7 +114,11 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- /* Check whether it failed because
- * cpu is not online.
- */
-+#ifndef HAVE_CPUPOWER_H
- if (!cpufreq_cpu_exists (cpu)) {
-+#else
-+ if (cpupower_is_cpu_online (cpu)) {
-+#endif
- g_object_set (G_OBJECT (monitor), "online", FALSE,
NULL);
- return TRUE;
- }
diff --git
a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
deleted file mode 100644
index 203f158..0000000
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-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 <carlo...@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"
-@@ -112,7 +116,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/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
deleted file mode 100644
index 85c2b24..0000000
---
a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e82b68edbfa8d6e209b9ad7b3e6392a928da776e Mon Sep 17 00:00:00 2001
-From: mudler <mud...@sabayon.org>
-Date: Tue, 13 Sep 2016 23:33:58 +0200
-Subject: [PATCH] fix 1.14.1 on kernel-headers >=4.7
-
----
- cpufreq/src/cpufreq-monitor-libcpufreq.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c
b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 228a890..587e316 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -23,7 +23,7 @@
- #include <glib/gi18n.h>
-
- #include <stdlib.h>
--#include <linux/version.h>
-+
- #include <cpufreq.h>
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -111,11 +111,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- /* Check whether it failed because
- * cpu is not online.
- */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- if (!cpufreq_cpu_exists (cpu)) {
--#else
-- if (cpupower_is_cpu_online (cpu)) {
--#endif
- g_object_set (G_OBJECT (monitor), "online", FALSE,
NULL);
- return TRUE;
- }
---
-2.9.2
-
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.22.0-cpupower.patch
similarity index 81%
rename from mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
rename to mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
index 3f4f4fa..9c1a80e 100644
--- a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
+++ b/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
@@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac
index b49d127..6b87389 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -411,6 +411,8 @@ fi
+@@ -370,6 +370,8 @@ fi
AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
AC_SUBST(LIBCPUFREQ_LIBS)
@@ -32,8 +32,17 @@ index 4fa9d4c..ba52fde 100644
+#endif
#include "cpufreq-monitor-libcpufreq.h"
#include "cpufreq-utils.h"
+
+@@ -98,7 +102,7 @@
+ return CPUFREQ_MONITOR (monitor);
+ }
-@@ -111,7 +115,7 @@
+-#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.
*/
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
b/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
deleted file mode 100644
index a7a6743..0000000
--- a/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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 x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-RDEPEND="${PYTHON_DEPS}
- app-text/rarian:0
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.74:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libmateweather-1.6.1[gtk3(-)=]
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.11.92:2=
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- >=mate-base/mate-panel-1.7[gtk3(-)=]
- >=mate-base/mate-settings-daemon-1.6
- >=sys-apps/dbus-1.1.2:0
- <sys-power/cpupower-4.7
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=gnome-extra/gucharmap-2.32.1:0
- >=x11-libs/gtk+-2.24:2
- x11-libs/gtksourceview:2.0
- >=x11-libs/libwnck-2.30:1
- )
- gtk3? (
- >=gnome-extra/gucharmap-3.0:2.90
- >=x11-libs/gtk+-3.0:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libwnck-3.0:3
- )
- policykit? ( >=sys-auth/polkit-0.92:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-0.9.23
- )
- )"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.3
- >=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:*"
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(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 null_applet
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.12.1-r5.ebuild
b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
deleted file mode 100644
index 3853add..0000000
--- a/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- app-text/rarian:0
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.74:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libmateweather-1.6.1[gtk3(-)=]
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.11.92:2=
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- >=mate-base/mate-panel-1.7[gtk3(-)=]
- >=mate-base/mate-settings-daemon-1.6
- >=sys-apps/dbus-1.1.2:0
- sys-power/cpupower
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=gnome-extra/gucharmap-2.32.1:0
- >=x11-libs/gtk+-2.24:2
- x11-libs/gtksourceview:2.0
- >=x11-libs/libwnck-2.30:1
- )
- gtk3? (
- >=gnome-extra/gucharmap-3.0:2.90
- >=x11-libs/gtk+-3.0:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libwnck-3.0:3
- )
- policykit? ( >=sys-auth/polkit-0.92:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-0.9.23
- )
- )"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.3
- >=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.10.4-cpupower-4.7.patch" )
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(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 null_applet
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.14.1-r1.ebuild
b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
deleted file mode 100644
index a813ac7..0000000
--- a/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-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.6.1[gtk3(-)=]
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.11.92:2=
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- >=mate-base/mate-panel-1.7[gtk3(-)=]
- >=net-wireless/wireless-tools-28_pre9:0
- >=sys-apps/dbus-1.1.2:0
- <sys-power/cpupower-4.7
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=gnome-extra/gucharmap-2.32.1:0
- >=x11-libs/gtk+-2.24:2
- x11-libs/gtksourceview:2.0
- >=x11-libs/libwnck-2.30:1
- )
- gtk3? (
- >=gnome-extra/gucharmap-3.0:2.90
- >=x11-libs/gtk+-3.0:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libwnck-3.0:3
- )
- policykit? ( >=sys-auth/polkit-0.92:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-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.14.1-revert-upstream-cpupower-4.7-fix.patch" )
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(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.14.1-r2.ebuild
b/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
deleted file mode 100644
index 900d903..0000000
--- a/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 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.6.1[gtk3(-)=]
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.11.92:2=
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- >=mate-base/mate-panel-1.7[gtk3(-)=]
- >=net-wireless/wireless-tools-28_pre9:0
- >=sys-apps/dbus-1.1.2:0
- sys-power/cpupower
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=gnome-extra/gucharmap-2.32.1:0
- >=x11-libs/gtk+-2.24:2
- x11-libs/gtksourceview:2.0
- >=x11-libs/libwnck-2.30:1
- )
- gtk3? (
- >=gnome-extra/gucharmap-3.0:2.90
- >=x11-libs/gtk+-3.0:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libwnck-3.0:3
- )
- policykit? ( >=sys-auth/polkit-0.92:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-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.14.1-cpupower-4.7.patch" )
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(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.16.0-r1.ebuild
b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
deleted file mode 100644
index d9c8b7e..0000000
--- a/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 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.6.1[gtk3(-)=]
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.11.92:2=
- >=mate-base/mate-panel-1.7[gtk3(-)=]
- >=net-wireless/wireless-tools-28_pre9:0
- >=sys-apps/dbus-1.1.2:0
- sys-power/cpupower
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=gnome-extra/gucharmap-2.32.1:0
- >=x11-libs/gtk+-2.24:2
- x11-libs/gtksourceview:2.0
- >=x11-libs/libwnck-2.30:1
- )
- gtk3? (
- >=gnome-extra/gucharmap-3.0:2.90
- >=x11-libs/gtk+-3.0:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libwnck-3.0:3
- )
- policykit? ( >=sys-auth/polkit-0.97:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-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 \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(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.16.0.ebuild
b/mate-base/mate-applets/mate-applets-1.16.0.ebuild
deleted file mode 100644
index d54b6ac..0000000
--- a/mate-base/mate-applets/mate-applets-1.16.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-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.6.1[gtk3(-)=]
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.11.92:2=
- >=mate-base/mate-panel-1.7[gtk3(-)=]
- >=net-wireless/wireless-tools-28_pre9:0
- >=sys-apps/dbus-1.1.2:0
- <sys-power/cpupower-4.7
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=gnome-extra/gucharmap-2.32.1:0
- >=x11-libs/gtk+-2.24:2
- x11-libs/gtksourceview:2.0
- >=x11-libs/libwnck-2.30:1
- )
- gtk3? (
- >=gnome-extra/gucharmap-3.0:2.90
- >=x11-libs/gtk+-3.0:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libwnck-3.0:3
- )
- policykit? ( >=sys-auth/polkit-0.97:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-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.14.1-revert-upstream-cpupower-4.7-fix.patch" )
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(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.18.1-r1.ebuild
b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
similarity index 64%
rename from mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
rename to mate-base/mate-applets/mate-applets-1.22.0.ebuild
index 4db7d9b..077a17c 100644
--- a/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
@@ -1,27 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
+inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ 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
+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
@@ -29,23 +25,18 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=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-apps/dbus-1.1.2
sys-power/cpupower
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
+ >=x11-libs/gtk+-3.22:3
x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
+ >=x11-libs/libnotify-0.7
+ x11-libs/libX11
>=x11-libs/libwnck-3.0:3
- x11-libs/pango:0
- virtual/libintl:0
+ x11-libs/pango
+ virtual/libintl
policykit? ( >=sys-auth/polkit-0.97:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-0.9.23
- )
- )
+ upower? ( >=sys-power/upower-0.9.23 )
!!net-analyzer/mate-netspeed"
RDEPEND="${COMMON_DEPEND}
@@ -53,15 +44,15 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
- app-text/rarian:0
+ app-text/rarian
>=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- >=dev-util/intltool-0.50.1:*
- dev-libs/libxslt:0
+ app-text/yelp-tools
+ >=dev-util/intltool-0.50.1
+ dev-libs/libxslt
sys-devel/gettext:*
virtual/pkgconfig:*"
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
+PATCHES=( "${FILESDIR}"/${P}-cpupower.patch )
src_configure() {
mate_src_configure \
@@ -79,11 +70,10 @@ src_test() {
}
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
+ geyes mateweather multiload netspeed stickynotes
timerapplet trashapplet"
for applet in ${APPLETS}; do
diff --git a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
similarity index 64%
copy from mate-base/mate-applets/mate-applets-1.18.2.ebuild
copy to mate-base/mate-applets/mate-applets-1.22.1.ebuild
index f0e4d03..38f90f1 100644
--- a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
@@ -1,51 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
+inherit mate
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"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ 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
+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:0
+ >=sys-apps/dbus-1.1.2
sys-power/cpupower
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
+ >=x11-libs/gtk+-3.22:3
x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
+ >=x11-libs/libnotify-0.7
+ x11-libs/libX11
>=x11-libs/libwnck-3.0:3
- x11-libs/pango:0
- virtual/libintl:0
+ x11-libs/pango
+ virtual/libintl
policykit? ( >=sys-auth/polkit-0.97:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-0.9.23
- )
- )
+ upower? ( >=sys-power/upower-0.9.23 )
!!net-analyzer/mate-netspeed"
RDEPEND="${COMMON_DEPEND}
@@ -53,15 +43,15 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
- app-text/rarian:0
+ app-text/rarian
>=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- >=dev-util/intltool-0.50.1:*
- dev-libs/libxslt:0
+ app-text/yelp-tools
+ >=dev-util/intltool-0.50.1
+ dev-libs/libxslt
sys-devel/gettext:*
virtual/pkgconfig:*"
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch )
src_configure() {
mate_src_configure \
@@ -79,11 +69,10 @@ src_test() {
}
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
+ geyes mateweather multiload netspeed stickynotes
timerapplet trashapplet"
for applet in ${APPLETS}; do
diff --git a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
b/mate-base/mate-applets/mate-applets-1.22.2.ebuild
similarity index 57%
copy from mate-base/mate-applets/mate-applets-1.18.2.ebuild
copy to mate-base/mate-applets/mate-applets-1.22.2.ebuild
index f0e4d03..edec396 100644
--- a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.2.ebuild
@@ -1,51 +1,45 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
+inherit mate
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"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
SLOT="0"
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="X +cpupower ipv6 policykit +upower"
+
+REQUIRED_USE="policykit? ( cpupower )"
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.74:0
- >=dev-libs/glib-2.36:2
+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:0
- sys-power/cpupower
+ >=sys-apps/dbus-1.1.2
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
+ >=x11-libs/gtk+-3.22:3
x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
+ >=x11-libs/libnotify-0.7
+ x11-libs/libX11
>=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
- >=sys-power/upower-pm-utils-0.9.23
- )
+ x11-libs/pango
+ virtual/libintl
+ cpupower? (
+ sys-power/cpupower
+ policykit? ( >=sys-auth/polkit-0.97:0 )
)
+ upower? ( >=sys-power/upower-0.9.23 )
!!net-analyzer/mate-netspeed"
RDEPEND="${COMMON_DEPEND}
@@ -53,24 +47,27 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
- app-text/rarian:0
+ app-text/rarian
>=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- >=dev-util/intltool-0.50.1:*
- dev-libs/libxslt:0
+ app-text/yelp-tools
+ >=dev-util/intltool-0.50.1
+ dev-libs/libxslt
sys-devel/gettext:*
virtual/pkgconfig:*"
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
-
src_configure() {
+
+ # configure.ac logic is a little hinky
+ # and ignores --enable flags for cpufreq
+ use cpupower || myconf="--disable-cpufreq"
+
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)
+ $(use_enable policykit polkit) \
+ "${myconf[@]}"
}
src_test() {
@@ -79,11 +76,10 @@ src_test() {
}
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
+ geyes mateweather multiload netspeed stickynotes
timerapplet trashapplet"
for applet in ${APPLETS}; do
diff --git a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
b/mate-base/mate-applets/mate-applets-1.24.0.ebuild
similarity index 54%
rename from mate-base/mate-applets/mate-applets-1.18.2.ebuild
rename to mate-base/mate-applets/mate-applets-1.24.0.ebuild
index f0e4d03..7831931 100644
--- a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.24.0.ebuild
@@ -1,76 +1,73 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
+inherit mate
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"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
SLOT="0"
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="X +cpupower ipv6 policykit +upower"
+
+REQUIRED_USE="policykit? ( cpupower )"
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.74:0
- >=dev-libs/glib-2.36:2
+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:0
- sys-power/cpupower
+ >=sys-apps/dbus-1.10.0
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
+ >=x11-libs/gtk+-3.22:3
x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
+ >=x11-libs/libnotify-0.7
+ x11-libs/libX11
>=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
- >=sys-power/upower-pm-utils-0.9.23
- )
+ x11-libs/pango
+ cpupower? (
+ sys-power/cpupower
+ 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"
+ >=mate-base/mate-settings-daemon-1.6
+ virtual/libintl
+"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
- app-text/rarian:0
+ app-text/rarian
>=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:*
+ app-text/yelp-tools
+ dev-libs/libxslt
+ >=sys-devel/gettext-0.19.8:*
virtual/pkgconfig:*"
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
-
src_configure() {
+
+ # configure.ac logic is a little hinky
+ # and ignores --enable flags for cpufreq
+ use cpupower || myconf="--disable-cpufreq"
+
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)
+ $(use_enable policykit polkit) \
+ "${myconf[@]}"
}
src_test() {
@@ -79,11 +76,10 @@ src_test() {
}
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
+ geyes mateweather multiload netspeed stickynotes
timerapplet trashapplet"
for applet in ${APPLETS}; do
diff --git a/mate-base/mate-applets/mate-applets-9999.ebuild
b/mate-base/mate-applets/mate-applets-9999.ebuild
index 4db7d9b..1dfb6f6 100644
--- a/mate-base/mate-applets/mate-applets-9999.ebuild
+++ b/mate-base/mate-applets/mate-applets-9999.ebuild
@@ -1,74 +1,66 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
+inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
SLOT="0"
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="X +cpupower ipv6 policykit +upower"
+
+REQUIRED_USE="policykit? ( cpupower )"
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.74:0
- >=dev-libs/glib-2.36:2
+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:0
- sys-power/cpupower
+ >=sys-apps/dbus-1.10.0
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
+ >=x11-libs/gtk+-3.22:3
x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
+ >=x11-libs/libnotify-0.7
+ x11-libs/libX11
>=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
- >=sys-power/upower-pm-utils-0.9.23
- )
+ x11-libs/pango
+ cpupower? (
+ sys-power/cpupower
+ 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"
+ >=mate-base/mate-settings-daemon-1.6
+ virtual/libintl
+"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
- app-text/rarian:0
+ app-text/rarian
>=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:*
+ app-text/yelp-tools
+ dev-libs/libxslt
+ >=sys-devel/gettext-0.19.8:*
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 cpupower cpufreq) \
$(use_enable ipv6) \
$(use_enable policykit polkit)
}
@@ -79,11 +71,10 @@ src_test() {
}
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
+ geyes mateweather multiload netspeed stickynotes
timerapplet trashapplet"
for applet in ${APPLETS}; do
diff --git a/mate-base/mate-applets/metadata.xml
b/mate-base/mate-applets/metadata.xml
index 80be462..0d83665 100644
--- a/mate-base/mate-applets/metadata.xml
+++ b/mate-base/mate-applets/metadata.xml
@@ -6,7 +6,9 @@
<name>Gentoo MATE Desktop</name>
</maintainer>
<use>
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+ <flag name="cpupower">
+ Enable support for cpu frequency manipulation using
<pkg>sys-power/cpupower</pkg>
+ </flag>
</use>
<upstream>
<remote-id type="github">mate-desktop/mate-applets</remote-id>
