Gentoo Archives: gentoo-commits

From: Andrey Utkin <andrey_utkin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/acpid/files/systemd/, sys-power/acpid/files/, sys-power/acpid/
Date: Mon, 08 Apr 2019 18:22:22
Message-Id: 1554747706.a43958bf2f7cbeeafed85e4f6c5b9d89af3f841d.andrey_utkin@gentoo
1 commit: a43958bf2f7cbeeafed85e4f6c5b9d89af3f841d
2 Author: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 8 18:10:38 2019 +0000
4 Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 8 18:21:46 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43958bf
7
8 sys-power/acpid: drop old versions
9
10 Also files/ dropped as current versions live in "extras" distfile.
11
12 Package-Manager: Portage-2.3.62, Repoman-2.3.12
13 Signed-off-by: Andrey Utkin <andrey_utkin <AT> gentoo.org>
14
15 sys-power/acpid/Manifest | 2 -
16 sys-power/acpid/acpid-2.0.29-r1.ebuild | 72 ----------------------
17 sys-power/acpid/acpid-2.0.29.ebuild | 68 --------------------
18 sys-power/acpid/acpid-2.0.30.ebuild | 70 ---------------------
19 sys-power/acpid/files/acpid-1.0.4-default | 19 ------
20 sys-power/acpid/files/acpid-1.0.6-default.sh | 59 ------------------
21 sys-power/acpid/files/acpid-2.0.16-conf.d | 6 --
22 .../acpid-2.0.25-add_mate-power-manager.patch | 13 ----
23 sys-power/acpid/files/acpid-2.0.25-kde4.patch | 13 ----
24 sys-power/acpid/files/acpid-2.0.26-init.d | 19 ------
25 sys-power/acpid/files/systemd/acpid.service | 10 ---
26 sys-power/acpid/files/systemd/acpid.socket | 8 ---
27 12 files changed, 359 deletions(-)
28
29 diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
30 index 451121dc1cc..2722fbf7310 100644
31 --- a/sys-power/acpid/Manifest
32 +++ b/sys-power/acpid/Manifest
33 @@ -1,4 +1,2 @@
34 -DIST acpid-2.0.29.tar.xz 155568 BLAKE2B 9a2c9f2f8ba035bf7452b633c20a73796ca05d4849d567f076a08a8216f2e07ca7a0b25e995054697e70bacacad07872e153c6c47f8204294964b276bca49f62 SHA512 5f480cb4456b6b843adb239519a8d05f83c3c668525457e55d7fae2ba7725356ec7a1faa16bbd54086f0eab2e8ca20952180c00b2b65a27eda534c3f28e8ed17
35 -DIST acpid-2.0.30.tar.xz 155528 BLAKE2B cbf387dc6342e0f4256360e99c02f8ebf4c322cd1c1dbd4ff0fcf703a323b90cfb0eb256233917dbdb81cd9a5f9bd075c581de9daee3d3a311208553084a093e SHA512 6901e93cc626817b782e43976caf4b7f89e8c4275eb7e9d31aeeb967b5d5bbb6a2b4dcf71e72ba666e10343cdbdbe8528feee955af5ba14de8ec88ef61b29f96
36 DIST acpid-2.0.31.tar.xz 155620 BLAKE2B 11338d72156dfd90f680367e23e373f8c4ee5e553ad4a8a9c9688163e9a97ee99a9b866940320ee5af5a9e9fe956dd3e675d0b879ea984c2cca56162c0d163fd SHA512 05eb96cdae698731b14caa89aa01239a0f16ce732f897d295447753aab7c8d49227c9b9ce901c6fd3bfdb117688e6ed80ec61aea0f64d75c9c0afe2aea2aa91a
37 DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
38
39 diff --git a/sys-power/acpid/acpid-2.0.29-r1.ebuild b/sys-power/acpid/acpid-2.0.29-r1.ebuild
40 deleted file mode 100644
41 index 23eb1895e8d..00000000000
42 --- a/sys-power/acpid/acpid-2.0.29-r1.ebuild
43 +++ /dev/null
44 @@ -1,72 +0,0 @@
45 -# Copyright 1999-2018 Gentoo Foundation
46 -# Distributed under the terms of the GNU General Public License v2
47 -
48 -EAPI=6
49 -inherit linux-info systemd
50 -
51 -DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
52 -HOMEPAGE="https://sourceforge.net/projects/acpid2"
53 -EXTRAS_VER="2.0.29-r1"
54 -EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
55 -SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
56 - https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
57 - "
58 -
59 -LICENSE="GPL-2"
60 -SLOT="0"
61 -KEYWORDS="amd64 arm64 ia64 x86"
62 -IUSE="selinux"
63 -
64 -RDEPEND="selinux? ( sec-policy/selinux-apm )"
65 -DEPEND=">=sys-kernel/linux-headers-3"
66 -
67 -pkg_pretend() {
68 - local CONFIG_CHECK="~INPUT_EVDEV"
69 - local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
70 - [[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
71 -}
72 -
73 -pkg_setup() { :; }
74 -
75 -PATCHES=(
76 - "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.25-kde4.patch" #515088
77 - "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.29-r1-extend-pms-list.patch" #538590, 628698
78 -)
79 -
80 -src_install() {
81 - emake DESTDIR="${D}" install
82 -
83 - newdoc kacpimon/README README.kacpimon
84 - dodoc -r samples
85 - rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
86 -
87 - exeinto /etc/acpi
88 - newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
89 - exeinto /etc/acpi/actions
90 - newexe samples/powerbtn/powerbtn.sh powerbtn.sh
91 - insinto /etc/acpi/events
92 - newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
93 -
94 - newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
95 - newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
96 -
97 - systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
98 -}
99 -
100 -pkg_postinst() {
101 - if [[ -z ${REPLACING_VERSIONS} ]]; then
102 - elog
103 - elog "You may wish to read the Gentoo Linux Power Management Guide,"
104 - elog "which can be found online at:"
105 - elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
106 - elog
107 - fi
108 -
109 - # files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
110 - mkdir -p "${ROOT%/}"/run
111 -
112 - if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
113 - echo
114 - ewarn "You should reboot the system now to get /run mounted with tmpfs!"
115 - fi
116 -}
117
118 diff --git a/sys-power/acpid/acpid-2.0.29.ebuild b/sys-power/acpid/acpid-2.0.29.ebuild
119 deleted file mode 100644
120 index f9699804c53..00000000000
121 --- a/sys-power/acpid/acpid-2.0.29.ebuild
122 +++ /dev/null
123 @@ -1,68 +0,0 @@
124 -# Copyright 1999-2018 Gentoo Foundation
125 -# Distributed under the terms of the GNU General Public License v2
126 -
127 -EAPI=6
128 -inherit linux-info systemd
129 -
130 -DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
131 -HOMEPAGE="https://sourceforge.net/projects/acpid2"
132 -SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
133 -
134 -LICENSE="GPL-2"
135 -SLOT="0"
136 -KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
137 -IUSE="selinux"
138 -
139 -RDEPEND="selinux? ( sec-policy/selinux-apm )"
140 -DEPEND=">=sys-kernel/linux-headers-3"
141 -
142 -pkg_pretend() {
143 - local CONFIG_CHECK="~INPUT_EVDEV"
144 - local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
145 - [[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
146 -}
147 -
148 -pkg_setup() { :; }
149 -
150 -PATCHES=(
151 - "${FILESDIR}"/${PN}-2.0.25-kde4.patch #515088
152 - "${FILESDIR}"/${PN}-2.0.25-add_mate-power-manager.patch #538590
153 -)
154 -
155 -src_install() {
156 - emake DESTDIR="${D}" install
157 -
158 - newdoc kacpimon/README README.kacpimon
159 - dodoc -r samples
160 - rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
161 -
162 - exeinto /etc/acpi
163 - newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
164 - exeinto /etc/acpi/actions
165 - newexe samples/powerbtn/powerbtn.sh powerbtn.sh
166 - insinto /etc/acpi/events
167 - newins "${FILESDIR}"/${PN}-1.0.4-default default
168 -
169 - newinitd "${FILESDIR}"/${PN}-2.0.26-init.d ${PN}
170 - newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
171 -
172 - systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
173 -}
174 -
175 -pkg_postinst() {
176 - if [[ -z ${REPLACING_VERSIONS} ]]; then
177 - elog
178 - elog "You may wish to read the Gentoo Linux Power Management Guide,"
179 - elog "which can be found online at:"
180 - elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
181 - elog
182 - fi
183 -
184 - # files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
185 - mkdir -p "${ROOT%/}"/run
186 -
187 - if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
188 - echo
189 - ewarn "You should reboot the system now to get /run mounted with tmpfs!"
190 - fi
191 -}
192
193 diff --git a/sys-power/acpid/acpid-2.0.30.ebuild b/sys-power/acpid/acpid-2.0.30.ebuild
194 deleted file mode 100644
195 index 52a2ac1739c..00000000000
196 --- a/sys-power/acpid/acpid-2.0.30.ebuild
197 +++ /dev/null
198 @@ -1,70 +0,0 @@
199 -# Copyright 1999-2018 Gentoo Authors
200 -# Distributed under the terms of the GNU General Public License v2
201 -
202 -EAPI=6
203 -inherit linux-info systemd
204 -
205 -DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
206 -HOMEPAGE="https://sourceforge.net/projects/acpid2"
207 -EXTRAS_VER="2.0.29-r1"
208 -EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
209 -SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
210 - https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
211 - "
212 -
213 -LICENSE="GPL-2"
214 -SLOT="0"
215 -KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
216 -IUSE="selinux"
217 -
218 -RDEPEND="selinux? ( sec-policy/selinux-apm )"
219 -DEPEND=">=sys-kernel/linux-headers-3"
220 -
221 -pkg_pretend() {
222 - local CONFIG_CHECK="~INPUT_EVDEV"
223 - local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
224 - [[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
225 -}
226 -
227 -pkg_setup() { :; }
228 -
229 -PATCHES=(
230 -)
231 -
232 -src_install() {
233 - emake DESTDIR="${D}" install
234 -
235 - newdoc kacpimon/README README.kacpimon
236 - dodoc -r samples
237 - rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
238 -
239 - exeinto /etc/acpi
240 - newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
241 - exeinto /etc/acpi/actions
242 - newexe samples/powerbtn/powerbtn.sh powerbtn.sh
243 - insinto /etc/acpi/events
244 - newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
245 -
246 - newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
247 - newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
248 -
249 - systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
250 -}
251 -
252 -pkg_postinst() {
253 - if [[ -z ${REPLACING_VERSIONS} ]]; then
254 - elog
255 - elog "You may wish to read the Gentoo Linux Power Management Guide,"
256 - elog "which can be found online at:"
257 - elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
258 - elog
259 - fi
260 -
261 - # files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
262 - mkdir -p "${ROOT%/}"/run
263 -
264 - if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
265 - echo
266 - ewarn "You should reboot the system now to get /run mounted with tmpfs!"
267 - fi
268 -}
269
270 diff --git a/sys-power/acpid/files/acpid-1.0.4-default b/sys-power/acpid/files/acpid-1.0.4-default
271 deleted file mode 100644
272 index a07c1827f4e..00000000000
273 --- a/sys-power/acpid/files/acpid-1.0.4-default
274 +++ /dev/null
275 @@ -1,19 +0,0 @@
276 -# /etc/acpi/events/default
277 -# This is the ACPID default configuration, it takes all
278 -# events and passes them to /etc/acpi/default.sh for further
279 -# processing.
280 -
281 -# event keeps a regular expression matching the event. To get
282 -# power events only, just use something like "event=button[ /]power.*"
283 -# to catch it.
284 -# action keeps the command to be executed after an event occurs
285 -# In case of the power event above, your entry may look this way:
286 -#event=button[ /]power.*
287 -#action=/sbin/init 0
288 -
289 -# Optionally you can specify the placeholder %e. It will pass
290 -# through the whole kernel event message to the program you've
291 -# specified.
292 -
293 -event=.*
294 -action=/etc/acpi/default.sh %e
295
296 diff --git a/sys-power/acpid/files/acpid-1.0.6-default.sh b/sys-power/acpid/files/acpid-1.0.6-default.sh
297 deleted file mode 100644
298 index 8be6f3e1a9f..00000000000
299 --- a/sys-power/acpid/files/acpid-1.0.6-default.sh
300 +++ /dev/null
301 @@ -1,59 +0,0 @@
302 -#!/bin/sh
303 -# /etc/acpi/default.sh
304 -# Default acpi script that takes an entry for all actions
305 -
306 -set $*
307 -
308 -group=${1%%/*}
309 -action=${1#*/}
310 -device=$2
311 -id=$3
312 -value=$4
313 -
314 -log_unhandled() {
315 - logger "ACPI event unhandled: $*"
316 -}
317 -
318 -case "$group" in
319 - button)
320 - case "$action" in
321 - power)
322 - /etc/acpi/actions/powerbtn.sh
323 - ;;
324 -
325 - # if your laptop doesnt turn on/off the display via hardware
326 - # switch and instead just generates an acpi event, you can force
327 - # X to turn off the display via dpms. note you will have to run
328 - # 'xhost +local:0' so root can access the X DISPLAY.
329 - #lid)
330 - # xset dpms force off
331 - # ;;
332 -
333 - *) log_unhandled $* ;;
334 - esac
335 - ;;
336 -
337 - ac_adapter)
338 - case "$value" in
339 - # Add code here to handle when the system is unplugged
340 - # (maybe change cpu scaling to powersave mode). For
341 - # multicore systems, make sure you set powersave mode
342 - # for each core!
343 - #*0)
344 - # cpufreq-set -g powersave
345 - # ;;
346 -
347 - # Add code here to handle when the system is plugged in
348 - # (maybe change cpu scaling to performance mode). For
349 - # multicore systems, make sure you set performance mode
350 - # for each core!
351 - #*1)
352 - # cpufreq-set -g performance
353 - # ;;
354 -
355 - *) log_unhandled $* ;;
356 - esac
357 - ;;
358 -
359 - *) log_unhandled $* ;;
360 -esac
361
362 diff --git a/sys-power/acpid/files/acpid-2.0.16-conf.d b/sys-power/acpid/files/acpid-2.0.16-conf.d
363 deleted file mode 100644
364 index 9aadb4cd814..00000000000
365 --- a/sys-power/acpid/files/acpid-2.0.16-conf.d
366 +++ /dev/null
367 @@ -1,6 +0,0 @@
368 -# /etc/conf.d/acpid: config file for /etc/init.d/acpid
369 -
370 -# Options to pass to the acpid daemon.
371 -# See the acpid(8) man page for more info.
372 -
373 -ACPID_ARGS=""
374
375 diff --git a/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch b/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch
376 deleted file mode 100644
377 index 7061744ed57..00000000000
378 --- a/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch
379 +++ /dev/null
380 @@ -1,13 +0,0 @@
381 -https://bugs.gentoo.org/538590
382 -
383 ---- acpid-2.0.25/samples/powerbtn/powerbtn.sh
384 -+++ acpid-2.0.25/samples/powerbtn/powerbtn.sh
385 -@@ -51,7 +51,7 @@
386 - getXconsole
387 -
388 - # A list of power management system process names.
389 --PMS="gnome-power-manager kpowersave xfce4-power-manager"
390 -+PMS="gnome-power-manager kpowersave xfce4-power-manager mate-power-manager"
391 - PMS="$PMS guidance-power-manager.py dalston-power-applet"
392 -
393 - # If one of those is running or any of several others,
394
395 diff --git a/sys-power/acpid/files/acpid-2.0.25-kde4.patch b/sys-power/acpid/files/acpid-2.0.25-kde4.patch
396 deleted file mode 100644
397 index 1a91bb94524..00000000000
398 --- a/sys-power/acpid/files/acpid-2.0.25-kde4.patch
399 +++ /dev/null
400 @@ -1,13 +0,0 @@
401 -https://bugs.gentoo.org/515088
402 -
403 ---- acpid-2.0.25/samples/powerbtn/powerbtn.sh
404 -+++ acpid-2.0.25/samples/powerbtn/powerbtn.sh
405 -@@ -57,7 +57,7 @@
406 - # If one of those is running or any of several others,
407 - if pidof x $PMS > /dev/null ||
408 - ( test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon) ||
409 -- ( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pidof kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pidof kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
410 -+ ( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pgrep -n kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pgrep -n kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
411 - # Get out as the power manager that is running will take care of things.
412 - exit
413 - fi
414
415 diff --git a/sys-power/acpid/files/acpid-2.0.26-init.d b/sys-power/acpid/files/acpid-2.0.26-init.d
416 deleted file mode 100644
417 index f8076d43b0a..00000000000
418 --- a/sys-power/acpid/files/acpid-2.0.26-init.d
419 +++ /dev/null
420 @@ -1,19 +0,0 @@
421 -#!/sbin/openrc-run
422 -# Copyright 1999-2016 Gentoo Foundation
423 -# Distributed under the terms of the GNU General Public License v2
424 -
425 -extra_started_commands="reload"
426 -command="/usr/sbin/acpid"
427 -command_args="${ACPID_ARGS}"
428 -description="Daemon for Advanced Configuration and Power Interface"
429 -
430 -depend() {
431 - need localmount
432 - use logger
433 -}
434 -
435 -reload() {
436 - ebegin "Reloading acpid configuration"
437 - start-stop-daemon --exec $command --signal HUP
438 - eend $?
439 -}
440
441 diff --git a/sys-power/acpid/files/systemd/acpid.service b/sys-power/acpid/files/systemd/acpid.service
442 deleted file mode 100644
443 index e4ddacdbead..00000000000
444 --- a/sys-power/acpid/files/systemd/acpid.service
445 +++ /dev/null
446 @@ -1,10 +0,0 @@
447 -[Unit]
448 -Description=ACPI event daemon
449 -Requires=acpid.socket
450 -
451 -[Service]
452 -ExecStart=/usr/sbin/acpid -f
453 -
454 -[Install]
455 -WantedBy=multi-user.target
456 -Also=acpid.socket
457
458 diff --git a/sys-power/acpid/files/systemd/acpid.socket b/sys-power/acpid/files/systemd/acpid.socket
459 deleted file mode 100644
460 index 1b23f8735d4..00000000000
461 --- a/sys-power/acpid/files/systemd/acpid.socket
462 +++ /dev/null
463 @@ -1,8 +0,0 @@
464 -[Unit]
465 -Description=ACPID Listen Socket
466 -
467 -[Socket]
468 -ListenStream=/var/run/acpid.socket
469 -
470 -[Install]
471 -WantedBy=sockets.target