Gentoo Archives: gentoo-commits

From: Adam Feldman <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/
Date: Fri, 08 May 2020 04:45:12
Message-Id: 1588913059.53818829a0af53a5ec1975e9fdd6cd8fd746471e.np-hardass@gentoo
1 commit: 53818829a0af53a5ec1975e9fdd6cd8fd746471e
2 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 8 04:14:18 2020 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Fri May 8 04:44:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53818829
7
8 mate-base/mate-applets: Drop old
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
12
13 mate-base/mate-applets/Manifest | 2 -
14 .../files/mate-applets-1.22.0-cpupower.patch | 53 -------------
15 mate-base/mate-applets/mate-applets-1.22.0.ebuild | 86 ----------------------
16 mate-base/mate-applets/mate-applets-1.22.1.ebuild | 85 ---------------------
17 4 files changed, 226 deletions(-)
18
19 diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
20 index d953a28a8e2..9bfa42e070b 100644
21 --- a/mate-base/mate-applets/Manifest
22 +++ b/mate-base/mate-applets/Manifest
23 @@ -1,4 +1,2 @@
24 -DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
25 -DIST mate-applets-1.22.1.tar.xz 7602112 BLAKE2B 22dc076d188cddf9c5160d7ecaddb14ecc41a575abac91b72959054f3fe1c961c80b1aa9171150e7c4ce61ccee0783572726386319312dc97f64d4f9266c1a6d SHA512 d132c8b5e433a557785745032235a5792d04edd7c249269d9a4066fb345b76955bdca71164f7b321f41f566803694d85d9cd7690fbd699daa54788572f0eb986
26 DIST mate-applets-1.22.2.tar.xz 7648744 BLAKE2B 85235f12c1436c3caaa6429aabd16822ae34c5c4bd7a575aa9be2c2e9080734b39180e34b22fdf265a64b5ebffb24071d8768b99f55736631403da02882e45fe SHA512 a57ed37d6ddef303e40cbd8f811d1c6be473eeee78a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f
27 DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42 SHA512 345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e
28
29 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
30 deleted file mode 100644
31 index 9c1a80e9375..00000000000
32 --- a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
33 +++ /dev/null
34 @@ -1,53 +0,0 @@
35 -diff --git a/configure.ac b/configure.ac
36 -index b49d127..6b87389 100644
37 ---- a/configure.ac
38 -+++ b/configure.ac
39 -@@ -370,6 +370,8 @@ fi
40 - AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
41 - AC_SUBST(LIBCPUFREQ_LIBS)
42 -
43 -+AC_CHECK_HEADERS([cpupower.h])
44 -+
45 - build_cpufreq_applet=no
46 -
47 - if test x$disable_cpufreq = xno; then
48 -diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
49 -index 4fa9d4c..ba52fde 100644
50 ---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
51 -+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
52 -@@ -19,12 +19,16 @@
53 - * Authors : Carlos García Campos <carlosgc@×××××.org>
54 - */
55 -
56 -+#include <config.h>
57 -+
58 - #include <glib.h>
59 - #include <glib/gi18n.h>
60 -
61 - #include <stdlib.h>
62 --#include <linux/version.h>
63 - #include <cpufreq.h>
64 -+#ifdef HAVE_CPUPOWER_H
65 -+#include <cpupower.h>
66 -+#endif
67 - #include "cpufreq-monitor-libcpufreq.h"
68 - #include "cpufreq-utils.h"
69 -
70 -@@ -98,7 +102,7 @@
71 - return CPUFREQ_MONITOR (monitor);
72 - }
73 -
74 --#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0)
75 -+#ifndef HAVE_CPUPOWER_H
76 - extern int cpupower_is_cpu_online (unsigned int cpu);
77 - #endif
78 -
79 -@@ -115,7 +119,7 @@
80 - /* Check whether it failed because
81 - * cpu is not online.
82 - */
83 --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
84 -+#ifndef HAVE_CPUPOWER_H
85 - if (!cpufreq_cpu_exists (cpu)) {
86 - #else
87 - if (cpupower_is_cpu_online (cpu)) {
88
89 diff --git a/mate-base/mate-applets/mate-applets-1.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
90 deleted file mode 100644
91 index 077a17c344d..00000000000
92 --- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
93 +++ /dev/null
94 @@ -1,86 +0,0 @@
95 -# Copyright 1999-2020 Gentoo Authors
96 -# Distributed under the terms of the GNU General Public License v2
97 -
98 -EAPI=6
99 -
100 -inherit mate
101 -
102 -if [[ ${PV} != 9999 ]]; then
103 - KEYWORDS="amd64 ~arm ~arm64 x86"
104 -fi
105 -
106 -DESCRIPTION="Applets for the MATE Desktop and Panel"
107 -LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
108 -SLOT="0"
109 -
110 -IUSE="X ipv6 policykit +upower"
111 -
112 -COMMON_DEPEND="dev-libs/atk
113 - >=dev-libs/dbus-glib-0.74
114 - >=dev-libs/glib-2.50:2
115 - >=dev-libs/libmateweather-1.17.0
116 - >=dev-libs/libxml2-2.5:2
117 - dev-python/pygobject:3
118 - >=gnome-base/libgtop-2.12.0:2=
119 - >=gnome-extra/gucharmap-3.0:2.90
120 - >=mate-base/mate-panel-1.17.0
121 - >=net-wireless/wireless-tools-28_pre9:0
122 - >=sys-apps/dbus-1.1.2
123 - sys-power/cpupower
124 - x11-libs/gdk-pixbuf:2
125 - >=x11-libs/gtk+-3.22:3
126 - x11-libs/gtksourceview:3.0
127 - >=x11-libs/libnotify-0.7
128 - x11-libs/libX11
129 - >=x11-libs/libwnck-3.0:3
130 - x11-libs/pango
131 - virtual/libintl
132 - policykit? ( >=sys-auth/polkit-0.97:0 )
133 - upower? ( >=sys-power/upower-0.9.23 )
134 - !!net-analyzer/mate-netspeed"
135 -
136 -RDEPEND="${COMMON_DEPEND}
137 - >=mate-base/mate-settings-daemon-1.6"
138 -
139 -DEPEND="${COMMON_DEPEND}
140 - app-text/docbook-xml-dtd:4.3
141 - app-text/rarian
142 - >=app-text/scrollkeeper-dtd-1:1.0
143 - app-text/yelp-tools
144 - >=dev-util/intltool-0.50.1
145 - dev-libs/libxslt
146 - sys-devel/gettext:*
147 - virtual/pkgconfig:*"
148 -
149 -PATCHES=( "${FILESDIR}"/${P}-cpupower.patch )
150 -
151 -src_configure() {
152 - mate_src_configure \
153 - --libexecdir=/usr/libexec/mate-applets \
154 - --with-cpufreq-lib=cpupower \
155 - $(use_with X x) \
156 - $(use_with upower) \
157 - $(use_enable ipv6) \
158 - $(use_enable policykit polkit)
159 -}
160 -
161 -src_test() {
162 - unset DBUS_SESSION_BUS_ADDRESS
163 - emake check
164 -}
165 -
166 -src_install() {
167 - mate_src_install
168 -
169 - local APPLETS="accessx-status battstat charpick command cpufreq drivemount
170 - geyes mateweather multiload netspeed stickynotes
171 - timerapplet trashapplet"
172 -
173 - for applet in ${APPLETS}; do
174 - docinto ${applet}
175 -
176 - for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
177 - [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
178 - done
179 - done
180 -}
181
182 diff --git a/mate-base/mate-applets/mate-applets-1.22.1.ebuild b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
183 deleted file mode 100644
184 index 38f90f1bdb0..00000000000
185 --- a/mate-base/mate-applets/mate-applets-1.22.1.ebuild
186 +++ /dev/null
187 @@ -1,85 +0,0 @@
188 -# Copyright 1999-2020 Gentoo Authors
189 -# Distributed under the terms of the GNU General Public License v2
190 -
191 -EAPI=6
192 -
193 -inherit mate
194 -
195 -if [[ ${PV} != 9999 ]]; then
196 - KEYWORDS="~amd64 ~arm ~arm64 ~x86"
197 -fi
198 -
199 -DESCRIPTION="Applets for the MATE Desktop and Panel"
200 -LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
201 -SLOT="0"
202 -
203 -IUSE="X ipv6 policykit +upower"
204 -
205 -COMMON_DEPEND="dev-libs/atk
206 - >=dev-libs/dbus-glib-0.74
207 - >=dev-libs/glib-2.50:2
208 - >=dev-libs/libmateweather-1.17.0
209 - >=dev-libs/libxml2-2.5:2
210 - >=gnome-base/libgtop-2.12.0:2=
211 - >=gnome-extra/gucharmap-3.0:2.90
212 - >=mate-base/mate-panel-1.17.0
213 - >=net-wireless/wireless-tools-28_pre9:0
214 - >=sys-apps/dbus-1.1.2
215 - sys-power/cpupower
216 - x11-libs/gdk-pixbuf:2
217 - >=x11-libs/gtk+-3.22:3
218 - x11-libs/gtksourceview:3.0
219 - >=x11-libs/libnotify-0.7
220 - x11-libs/libX11
221 - >=x11-libs/libwnck-3.0:3
222 - x11-libs/pango
223 - virtual/libintl
224 - policykit? ( >=sys-auth/polkit-0.97:0 )
225 - upower? ( >=sys-power/upower-0.9.23 )
226 - !!net-analyzer/mate-netspeed"
227 -
228 -RDEPEND="${COMMON_DEPEND}
229 - >=mate-base/mate-settings-daemon-1.6"
230 -
231 -DEPEND="${COMMON_DEPEND}
232 - app-text/docbook-xml-dtd:4.3
233 - app-text/rarian
234 - >=app-text/scrollkeeper-dtd-1:1.0
235 - app-text/yelp-tools
236 - >=dev-util/intltool-0.50.1
237 - dev-libs/libxslt
238 - sys-devel/gettext:*
239 - virtual/pkgconfig:*"
240 -
241 -PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch )
242 -
243 -src_configure() {
244 - mate_src_configure \
245 - --libexecdir=/usr/libexec/mate-applets \
246 - --with-cpufreq-lib=cpupower \
247 - $(use_with X x) \
248 - $(use_with upower) \
249 - $(use_enable ipv6) \
250 - $(use_enable policykit polkit)
251 -}
252 -
253 -src_test() {
254 - unset DBUS_SESSION_BUS_ADDRESS
255 - emake check
256 -}
257 -
258 -src_install() {
259 - mate_src_install
260 -
261 - local APPLETS="accessx-status battstat charpick command cpufreq drivemount
262 - geyes mateweather multiload netspeed stickynotes
263 - timerapplet trashapplet"
264 -
265 - for applet in ${APPLETS}; do
266 - docinto ${applet}
267 -
268 - for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
269 - [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
270 - done
271 - done
272 -}