1 |
commit: 8aedf444c3a5e2b943dcc82699121afe6334ed58 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 1 04:35:11 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 1 04:35:11 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aedf444 |
7 |
|
8 |
app-admin/abrt: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/849095 |
11 |
Closes: https://bugs.gentoo.org/849305 |
12 |
Closes: https://bugs.gentoo.org/849092 |
13 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
14 |
|
15 |
app-admin/abrt/Manifest | 2 - |
16 |
app-admin/abrt/abrt-2.15.0.ebuild | 127 ------------------------------- |
17 |
app-admin/abrt/abrt-2.15.1.ebuild | 127 ------------------------------- |
18 |
app-admin/abrt/files/abrt-2.0.12-r1-conf | 27 ------- |
19 |
app-admin/abrt/files/abrt-2.0.12-r1-init | 76 ------------------ |
20 |
app-admin/abrt/metadata.xml | 11 --- |
21 |
profiles/features/prefix/package.mask | 1 - |
22 |
profiles/package.mask | 5 -- |
23 |
8 files changed, 376 deletions(-) |
24 |
|
25 |
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest |
26 |
deleted file mode 100644 |
27 |
index ad62600d11c8..000000000000 |
28 |
--- a/app-admin/abrt/Manifest |
29 |
+++ /dev/null |
30 |
@@ -1,2 +0,0 @@ |
31 |
-DIST abrt-2.15.0.tar.gz 6122114 BLAKE2B ac075a15d4621596bbe3009bf2e4725040139d78077f85bd4daebbe86504f9aa0a12dcedcf3b5b65404bc2851e93e6b1113dcc37923832c826d572ab9810ef94 SHA512 2d6c1287c1f01990aeb30f956f465c7a6399a6e53dc667602e263c136f94bc4090b58876acba678b29671c0db89ae8e7dd6994cf8d0d2d9fbc375f54ae6cd935 |
32 |
-DIST abrt-2.15.1.tar.gz 6122174 BLAKE2B e3b767929cc2303dcf90a935e0c9ba30641638666925d4707fb0dbed135d8635cd0a58c712f2965969218c64856a5fa3bd20a79410c0e6a5f176a7e82059dda0 SHA512 745c513969b78ee7c76c310a8c2fc0bafd1e50375130fa773ad950bf123ee50cfa237da9b331f2c0af2851b35b162cbc908f2e00d59283867ed8ffd72236d0ea |
33 |
|
34 |
diff --git a/app-admin/abrt/abrt-2.15.0.ebuild b/app-admin/abrt/abrt-2.15.0.ebuild |
35 |
deleted file mode 100644 |
36 |
index 6a77875e2603..000000000000 |
37 |
--- a/app-admin/abrt/abrt-2.15.0.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,127 +0,0 @@ |
40 |
-# Copyright 1999-2022 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=8 |
44 |
-PYTHON_COMPAT=( python3_{8..10} ) |
45 |
- |
46 |
-inherit autotools python-single-r1 tmpfiles xdg |
47 |
- |
48 |
-DESCRIPTION="Automatic bug detection and reporting tool" |
49 |
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project https://github.com/abrt/abrt" |
50 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="~amd64 ~x86" |
55 |
- |
56 |
-IUSE="selinux test" |
57 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
58 |
- |
59 |
-RESTRICT="!test? ( test )" |
60 |
- |
61 |
-DEPEND="${PYTHON_DEPS} |
62 |
- >=dev-libs/glib-2.56:2 |
63 |
- >=dev-libs/libreport-2.13.0:=[gtk,python] |
64 |
- dev-libs/libxml2:2 |
65 |
- >=gnome-base/gsettings-desktop-schemas-3.15.1 |
66 |
- net-libs/libsoup:2.4 |
67 |
- sys-apps/dbus |
68 |
- sys-apps/systemd:0= |
69 |
- sys-auth/polkit |
70 |
- sys-libs/libcap |
71 |
- sys-fs/inotify-tools |
72 |
- x11-libs/gtk+:3 |
73 |
- x11-libs/libnotify |
74 |
-" |
75 |
-RDEPEND="${DEPEND} |
76 |
- acct-user/abrt |
77 |
- acct-group/abrt |
78 |
- app-arch/cpio |
79 |
- app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}] |
80 |
- dev-libs/elfutils |
81 |
- dev-libs/json-c:0= |
82 |
- sys-apps/util-linux |
83 |
- >=sys-devel/gdb-7 |
84 |
- $(python_gen_cond_dep ' |
85 |
- dev-libs/satyr[${PYTHON_USEDEP}] |
86 |
- dev-python/argcomplete[${PYTHON_USEDEP}] |
87 |
- dev-python/argh[${PYTHON_USEDEP}] |
88 |
- dev-python/humanize[${PYTHON_USEDEP}] |
89 |
- ') |
90 |
-" |
91 |
-BDEPEND=" |
92 |
- $(python_gen_cond_dep 'dev-python/python-systemd[${PYTHON_USEDEP}]') |
93 |
- test? ( |
94 |
- $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') |
95 |
- ) |
96 |
- app-text/asciidoc |
97 |
- app-text/xmlto |
98 |
- >=dev-util/intltool-0.35.0 |
99 |
- virtual/pkgconfig |
100 |
- >=sys-devel/gettext-0.17 |
101 |
-" |
102 |
- |
103 |
-pkg_setup() { |
104 |
- python-single-r1_pkg_setup |
105 |
-} |
106 |
- |
107 |
-src_prepare() { |
108 |
- python_fix_shebang . |
109 |
- default |
110 |
- |
111 |
- # Install under proper directory |
112 |
- sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die |
113 |
- |
114 |
- # Ensure this works for systems with and without /usr merge |
115 |
- sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die |
116 |
- |
117 |
- # Fix hardcoded "pytest-3" |
118 |
- sed -i -e "s:pytest-3:pytest:" \ |
119 |
- configure.ac src/python-problem/tests/Makefile.am src/cli/test || die |
120 |
- |
121 |
- # pyhook test is sensitive to the format of python's error messages, and |
122 |
- # fails with certain python versions |
123 |
- sed -e '/pyhook.at/ d' \ |
124 |
- -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed" |
125 |
- ./gen-version || die # Needed to be run before autoreconf |
126 |
- eautoreconf |
127 |
-} |
128 |
- |
129 |
-src_configure() { |
130 |
- myeconfargs=( |
131 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" |
132 |
- --localstatedir="${EPREFIX}/var" |
133 |
- --without-bodhi |
134 |
- # package breaks due to not finding libreport-web with bodhi plugin enabled |
135 |
- --without-rpm |
136 |
- $(usex selinux "" "--without-selinux") |
137 |
- --with-python3 |
138 |
- --without-pythondoc |
139 |
- # package breaks due to no sphinx-build-3 |
140 |
- $(use_with test pythontests) |
141 |
- ) |
142 |
- |
143 |
- econf "${myeconfargs[@]}" |
144 |
-} |
145 |
- |
146 |
-src_install() { |
147 |
- default |
148 |
- python_optimize |
149 |
- |
150 |
- # /var/spool/abrt is created by dev-libs/libreport |
151 |
- diropts -m 700 -o abrt -g abrt |
152 |
- keepdir /var/spool/abrt-upload |
153 |
- |
154 |
- find "${D}" -name '*.la' -delete || die |
155 |
- |
156 |
- newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt |
157 |
- newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt |
158 |
- |
159 |
- # Drop empy dirs, handled by tmpfiles |
160 |
- rm -r "${ED}"/var/run/ || die |
161 |
-} |
162 |
- |
163 |
-pkg_postinst() { |
164 |
- xdg_pkg_postinst |
165 |
- tmpfiles_process abrt.conf |
166 |
-} |
167 |
|
168 |
diff --git a/app-admin/abrt/abrt-2.15.1.ebuild b/app-admin/abrt/abrt-2.15.1.ebuild |
169 |
deleted file mode 100644 |
170 |
index 6a77875e2603..000000000000 |
171 |
--- a/app-admin/abrt/abrt-2.15.1.ebuild |
172 |
+++ /dev/null |
173 |
@@ -1,127 +0,0 @@ |
174 |
-# Copyright 1999-2022 Gentoo Authors |
175 |
-# Distributed under the terms of the GNU General Public License v2 |
176 |
- |
177 |
-EAPI=8 |
178 |
-PYTHON_COMPAT=( python3_{8..10} ) |
179 |
- |
180 |
-inherit autotools python-single-r1 tmpfiles xdg |
181 |
- |
182 |
-DESCRIPTION="Automatic bug detection and reporting tool" |
183 |
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project https://github.com/abrt/abrt" |
184 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
185 |
- |
186 |
-LICENSE="GPL-2" |
187 |
-SLOT="0" |
188 |
-KEYWORDS="~amd64 ~x86" |
189 |
- |
190 |
-IUSE="selinux test" |
191 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
192 |
- |
193 |
-RESTRICT="!test? ( test )" |
194 |
- |
195 |
-DEPEND="${PYTHON_DEPS} |
196 |
- >=dev-libs/glib-2.56:2 |
197 |
- >=dev-libs/libreport-2.13.0:=[gtk,python] |
198 |
- dev-libs/libxml2:2 |
199 |
- >=gnome-base/gsettings-desktop-schemas-3.15.1 |
200 |
- net-libs/libsoup:2.4 |
201 |
- sys-apps/dbus |
202 |
- sys-apps/systemd:0= |
203 |
- sys-auth/polkit |
204 |
- sys-libs/libcap |
205 |
- sys-fs/inotify-tools |
206 |
- x11-libs/gtk+:3 |
207 |
- x11-libs/libnotify |
208 |
-" |
209 |
-RDEPEND="${DEPEND} |
210 |
- acct-user/abrt |
211 |
- acct-group/abrt |
212 |
- app-arch/cpio |
213 |
- app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}] |
214 |
- dev-libs/elfutils |
215 |
- dev-libs/json-c:0= |
216 |
- sys-apps/util-linux |
217 |
- >=sys-devel/gdb-7 |
218 |
- $(python_gen_cond_dep ' |
219 |
- dev-libs/satyr[${PYTHON_USEDEP}] |
220 |
- dev-python/argcomplete[${PYTHON_USEDEP}] |
221 |
- dev-python/argh[${PYTHON_USEDEP}] |
222 |
- dev-python/humanize[${PYTHON_USEDEP}] |
223 |
- ') |
224 |
-" |
225 |
-BDEPEND=" |
226 |
- $(python_gen_cond_dep 'dev-python/python-systemd[${PYTHON_USEDEP}]') |
227 |
- test? ( |
228 |
- $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') |
229 |
- ) |
230 |
- app-text/asciidoc |
231 |
- app-text/xmlto |
232 |
- >=dev-util/intltool-0.35.0 |
233 |
- virtual/pkgconfig |
234 |
- >=sys-devel/gettext-0.17 |
235 |
-" |
236 |
- |
237 |
-pkg_setup() { |
238 |
- python-single-r1_pkg_setup |
239 |
-} |
240 |
- |
241 |
-src_prepare() { |
242 |
- python_fix_shebang . |
243 |
- default |
244 |
- |
245 |
- # Install under proper directory |
246 |
- sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die |
247 |
- |
248 |
- # Ensure this works for systems with and without /usr merge |
249 |
- sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die |
250 |
- |
251 |
- # Fix hardcoded "pytest-3" |
252 |
- sed -i -e "s:pytest-3:pytest:" \ |
253 |
- configure.ac src/python-problem/tests/Makefile.am src/cli/test || die |
254 |
- |
255 |
- # pyhook test is sensitive to the format of python's error messages, and |
256 |
- # fails with certain python versions |
257 |
- sed -e '/pyhook.at/ d' \ |
258 |
- -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed" |
259 |
- ./gen-version || die # Needed to be run before autoreconf |
260 |
- eautoreconf |
261 |
-} |
262 |
- |
263 |
-src_configure() { |
264 |
- myeconfargs=( |
265 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" |
266 |
- --localstatedir="${EPREFIX}/var" |
267 |
- --without-bodhi |
268 |
- # package breaks due to not finding libreport-web with bodhi plugin enabled |
269 |
- --without-rpm |
270 |
- $(usex selinux "" "--without-selinux") |
271 |
- --with-python3 |
272 |
- --without-pythondoc |
273 |
- # package breaks due to no sphinx-build-3 |
274 |
- $(use_with test pythontests) |
275 |
- ) |
276 |
- |
277 |
- econf "${myeconfargs[@]}" |
278 |
-} |
279 |
- |
280 |
-src_install() { |
281 |
- default |
282 |
- python_optimize |
283 |
- |
284 |
- # /var/spool/abrt is created by dev-libs/libreport |
285 |
- diropts -m 700 -o abrt -g abrt |
286 |
- keepdir /var/spool/abrt-upload |
287 |
- |
288 |
- find "${D}" -name '*.la' -delete || die |
289 |
- |
290 |
- newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt |
291 |
- newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt |
292 |
- |
293 |
- # Drop empy dirs, handled by tmpfiles |
294 |
- rm -r "${ED}"/var/run/ || die |
295 |
-} |
296 |
- |
297 |
-pkg_postinst() { |
298 |
- xdg_pkg_postinst |
299 |
- tmpfiles_process abrt.conf |
300 |
-} |
301 |
|
302 |
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-conf b/app-admin/abrt/files/abrt-2.0.12-r1-conf |
303 |
deleted file mode 100644 |
304 |
index 073eb0daf82e..000000000000 |
305 |
--- a/app-admin/abrt/files/abrt-2.0.12-r1-conf |
306 |
+++ /dev/null |
307 |
@@ -1,27 +0,0 @@ |
308 |
-# abrtd command-line options |
309 |
-# Default: "" |
310 |
-ABRTD_OPTS="" |
311 |
- |
312 |
-# Run abrt-harvest-vmcore to make new kdump dumps available for abrtd |
313 |
-START_VMCORE="yes" |
314 |
- |
315 |
-# Install abrt-ccpp hook to watch for segfaults |
316 |
-START_CCPP="yes" |
317 |
- |
318 |
-# Call abrt-dump-oops to log kernel oops |
319 |
-START_OOPS="yes" |
320 |
-# log file to watch for kernel oops |
321 |
-# Default: "/var/log/messages" |
322 |
-OOPS_WATCH_LOG="/var/log/messages" |
323 |
-# abrt-dump-oops command-line options |
324 |
-# Default: "-xD" |
325 |
-OOPS_DUMP_OPTS="-xD" |
326 |
- |
327 |
-# Call abrt-dump-xorg to log X crashes |
328 |
-START_XORG="yes" |
329 |
-# log file to watch for X crashes |
330 |
-# Default: "/var/log/Xorg.0.log" |
331 |
-XORG_WATCH_LOG="/var/log/Xorg.0.log" |
332 |
-# abrt-dump-xorg command-line options |
333 |
-# Default: "-xD" |
334 |
-XORG_DUMP_OPTS="-xD" |
335 |
|
336 |
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-init b/app-admin/abrt/files/abrt-2.0.12-r1-init |
337 |
deleted file mode 100644 |
338 |
index 3fb32b7c3e43..000000000000 |
339 |
--- a/app-admin/abrt/files/abrt-2.0.12-r1-init |
340 |
+++ /dev/null |
341 |
@@ -1,76 +0,0 @@ |
342 |
-#!/sbin/openrc-run |
343 |
-# Copyright 1999-2017 Gentoo Foundation |
344 |
-# Distributed under the terms of the GNU General Public License v2 |
345 |
- |
346 |
-description="Automated crash detection service" |
347 |
- |
348 |
-depend() { |
349 |
- need dbus logger |
350 |
-} |
351 |
- |
352 |
-start() { |
353 |
- ebegin "Starting abrtd" |
354 |
- start-stop-daemon --start --quiet --pidfile /var/run/abrt/abrtd.pid \ |
355 |
- --exec /usr/sbin/abrtd -- ${ABRTD_OPTS} |
356 |
- eend $? |
357 |
- |
358 |
- if [ "${START_VMCORE}" = "yes" ]; then |
359 |
- ebegin "Running abrt-harvest-vmcore" |
360 |
- /usr/sbin/abrt-harvest-vmcore |
361 |
- eend $? |
362 |
- fi |
363 |
- |
364 |
- if [ "${START_CCPP}" = "yes" ]; then |
365 |
- ebegin "Installing abrt-ccpp hook" |
366 |
- /usr/sbin/abrt-install-ccpp-hook install |
367 |
- eend $? |
368 |
- fi |
369 |
- |
370 |
- if [ "${START_OOPS}" = "yes" ]; then |
371 |
- ebegin "Starting abrt-dump-oops" |
372 |
- start-stop-daemon --start --quiet \ |
373 |
- --pidfile /var/run/abrt/abrt-dump-oops.pid \ |
374 |
- --make-pidfile --background \ |
375 |
- --exec /usr/bin/abrt-watch-log -- \ |
376 |
- -F "`/usr/bin/abrt-dump-oops -m`" ${OOPS_WATCH_LOG} -- \ |
377 |
- /usr/bin/abrt-dump-oops ${OOPS_DUMP_OPTS} |
378 |
- eend $? |
379 |
- fi |
380 |
- |
381 |
- if [ "${START_XORG}" = "yes" ]; then |
382 |
- ebegin "Starting abrt-dump-xorg" |
383 |
- start-stop-daemon --start --quiet \ |
384 |
- --pidfile /var/run/abrt/abrt-dump-xorg.pid \ |
385 |
- --make-pidfile --background \ |
386 |
- --exec /usr/bin/abrt-watch-log -- \ |
387 |
- -F "`/usr/bin/abrt-dump-xorg -m`" ${XORG_WATCH_LOG} -- \ |
388 |
- /usr/bin/abrt-dump-xorg ${XORG_DUMP_OPTS} |
389 |
- eend $? |
390 |
- fi |
391 |
-} |
392 |
- |
393 |
-stop() { |
394 |
- if [ "${START_XORG}" = "yes" ]; then |
395 |
- ebegin "Stopping abrt-dump-xorg" |
396 |
- start-stop-daemon --stop --quiet \ |
397 |
- --pidfile /var/run/abrt/abrt-dump-xorg.pid |
398 |
- eend $? |
399 |
- fi |
400 |
- |
401 |
- if [ "${START_OOPS}" = "yes" ]; then |
402 |
- ebegin "Stopping abrt-dump-oops" |
403 |
- start-stop-daemon --stop --quiet \ |
404 |
- --pidfile /var/run/abrt/abrt-dump-oops.pid |
405 |
- eend $? |
406 |
- fi |
407 |
- |
408 |
- if [ "${START_CCPP}" = "yes" ]; then |
409 |
- ebegin "Uninstalling abrt-ccpp hook" |
410 |
- /usr/sbin/abrt-install-ccpp-hook uninstall |
411 |
- eend $? |
412 |
- fi |
413 |
- |
414 |
- ebegin "Stopping abrtd" |
415 |
- start-stop-daemon --stop --quiet --pidfile /var/run/abrt/abrtd.pid |
416 |
- eend $? |
417 |
-} |
418 |
|
419 |
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml |
420 |
deleted file mode 100644 |
421 |
index fec035a2a9fa..000000000000 |
422 |
--- a/app-admin/abrt/metadata.xml |
423 |
+++ /dev/null |
424 |
@@ -1,11 +0,0 @@ |
425 |
-<?xml version="1.0" encoding="UTF-8"?> |
426 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
427 |
-<pkgmetadata> |
428 |
- <maintainer type="person"> |
429 |
- <email>pacho@g.o</email> |
430 |
- <name>Pacho Ramos</name> |
431 |
- </maintainer> |
432 |
- <upstream> |
433 |
- <remote-id type="github">abrt/abrt</remote-id> |
434 |
- </upstream> |
435 |
-</pkgmetadata> |
436 |
|
437 |
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask |
438 |
index 8f1fbaf63cd4..32df49a3a6c4 100644 |
439 |
--- a/profiles/features/prefix/package.mask |
440 |
+++ b/profiles/features/prefix/package.mask |
441 |
@@ -5,7 +5,6 @@ |
442 |
# systemd is set to invade pid 1, which is not possible for Prefix. |
443 |
# The following are its reverse dependencies. |
444 |
sys-apps/systemd |
445 |
-app-admin/abrt |
446 |
app-admin/systemdgenie |
447 |
dev-python/python-systemd |
448 |
games-util/gamemode |
449 |
|
450 |
diff --git a/profiles/package.mask b/profiles/package.mask |
451 |
index 0a8edfa45a92..6ea1aaf60aa8 100644 |
452 |
--- a/profiles/package.mask |
453 |
+++ b/profiles/package.mask |
454 |
@@ -398,11 +398,6 @@ sys-cluster/slurm |
455 |
# Removal on 2022-10-18. Bug #871522. |
456 |
dev-python/pyproject2setuppy |
457 |
|
458 |
-# Pacho Ramos <pacho@g.o> (2022-09-18) |
459 |
-# ABRT environment keeps breaking more and more on non-Fedora systems. |
460 |
-# Removal: 2022-10-18. Bugs #849305, #849092, #849095, #713858. |
461 |
-app-admin/abrt |
462 |
- |
463 |
# Mike Gilbert <floppym@g.o> (2022-09-12) |
464 |
# repoman is no longer maintained and has been removed from the portage |
465 |
# git repository. Please use dev-util/pkgcheck and dev-util/pkgdev instead. |