commit:     8aedf444c3a5e2b943dcc82699121afe6334ed58
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 04:35:11 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 04:35:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aedf444

app-admin/abrt: treeclean

Closes: https://bugs.gentoo.org/849095
Closes: https://bugs.gentoo.org/849305
Closes: https://bugs.gentoo.org/849092
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-admin/abrt/Manifest                  |   2 -
 app-admin/abrt/abrt-2.15.0.ebuild        | 127 -------------------------------
 app-admin/abrt/abrt-2.15.1.ebuild        | 127 -------------------------------
 app-admin/abrt/files/abrt-2.0.12-r1-conf |  27 -------
 app-admin/abrt/files/abrt-2.0.12-r1-init |  76 ------------------
 app-admin/abrt/metadata.xml              |  11 ---
 profiles/features/prefix/package.mask    |   1 -
 profiles/package.mask                    |   5 --
 8 files changed, 376 deletions(-)

diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
deleted file mode 100644
index ad62600d11c8..000000000000
--- a/app-admin/abrt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST abrt-2.15.0.tar.gz 6122114 BLAKE2B 
ac075a15d4621596bbe3009bf2e4725040139d78077f85bd4daebbe86504f9aa0a12dcedcf3b5b65404bc2851e93e6b1113dcc37923832c826d572ab9810ef94
 SHA512 
2d6c1287c1f01990aeb30f956f465c7a6399a6e53dc667602e263c136f94bc4090b58876acba678b29671c0db89ae8e7dd6994cf8d0d2d9fbc375f54ae6cd935
-DIST abrt-2.15.1.tar.gz 6122174 BLAKE2B 
e3b767929cc2303dcf90a935e0c9ba30641638666925d4707fb0dbed135d8635cd0a58c712f2965969218c64856a5fa3bd20a79410c0e6a5f176a7e82059dda0
 SHA512 
745c513969b78ee7c76c310a8c2fc0bafd1e50375130fa773ad950bf123ee50cfa237da9b331f2c0af2851b35b162cbc908f2e00d59283867ed8ffd72236d0ea

diff --git a/app-admin/abrt/abrt-2.15.0.ebuild 
b/app-admin/abrt/abrt-2.15.0.ebuild
deleted file mode 100644
index 6a77875e2603..000000000000
--- a/app-admin/abrt/abrt-2.15.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools python-single-r1 tmpfiles xdg
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project 
https://github.com/abrt/abrt";
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="selinux test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="${PYTHON_DEPS}
-       >=dev-libs/glib-2.56:2
-       >=dev-libs/libreport-2.13.0:=[gtk,python]
-       dev-libs/libxml2:2
-       >=gnome-base/gsettings-desktop-schemas-3.15.1
-       net-libs/libsoup:2.4
-       sys-apps/dbus
-       sys-apps/systemd:0=
-       sys-auth/polkit
-       sys-libs/libcap
-       sys-fs/inotify-tools
-       x11-libs/gtk+:3
-       x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
-       acct-user/abrt
-       acct-group/abrt
-       app-arch/cpio
-       app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-       dev-libs/elfutils
-       dev-libs/json-c:0=
-       sys-apps/util-linux
-       >=sys-devel/gdb-7
-       $(python_gen_cond_dep '
-                       dev-libs/satyr[${PYTHON_USEDEP}]
-                       dev-python/argcomplete[${PYTHON_USEDEP}]
-                       dev-python/argh[${PYTHON_USEDEP}]
-                       dev-python/humanize[${PYTHON_USEDEP}]
-       ')
-"
-BDEPEND="
-       $(python_gen_cond_dep 'dev-python/python-systemd[${PYTHON_USEDEP}]')
-       test? (
-               $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-       )
-       app-text/asciidoc
-       app-text/xmlto
-       >=dev-util/intltool-0.35.0
-       virtual/pkgconfig
-       >=sys-devel/gettext-0.17
-"
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       python_fix_shebang .
-       default
-
-       # Install under proper directory
-       sed -i -e 's:dbusabrtdocdir = 
${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = 
${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
-
-       # Ensure this works for systems with and without /usr merge
-       sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service 
|| die
-
-       # Fix hardcoded "pytest-3"
-       sed -i -e "s:pytest-3:pytest:" \
-               configure.ac src/python-problem/tests/Makefile.am src/cli/test 
|| die
-
-       # pyhook test is sensitive to the format of python's error messages, and
-       # fails with certain python versions
-       sed -e '/pyhook.at/ d' \
-               -i tests/Makefile.* tests/testsuite.at || die "sed remove 
pyhook tests failed"
-       ./gen-version || die # Needed to be run before autoreconf
-       eautoreconf
-}
-
-src_configure() {
-       myeconfargs=(
-               --libdir="${EPREFIX}/usr/$(get_libdir)"
-               --localstatedir="${EPREFIX}/var"
-               --without-bodhi
-               # package breaks due to not finding libreport-web with bodhi 
plugin enabled
-               --without-rpm
-               $(usex selinux "" "--without-selinux")
-               --with-python3
-               --without-pythondoc
-               # package breaks due to no sphinx-build-3
-               $(use_with test pythontests)
-       )
-
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-       python_optimize
-
-       # /var/spool/abrt is created by dev-libs/libreport
-       diropts -m 700 -o abrt -g abrt
-       keepdir /var/spool/abrt-upload
-
-       find "${D}" -name '*.la' -delete || die
-
-       newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-       newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-
-       # Drop empy dirs, handled by tmpfiles
-       rm -r "${ED}"/var/run/ || die
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-       tmpfiles_process abrt.conf
-}

diff --git a/app-admin/abrt/abrt-2.15.1.ebuild 
b/app-admin/abrt/abrt-2.15.1.ebuild
deleted file mode 100644
index 6a77875e2603..000000000000
--- a/app-admin/abrt/abrt-2.15.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools python-single-r1 tmpfiles xdg
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project 
https://github.com/abrt/abrt";
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="selinux test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="${PYTHON_DEPS}
-       >=dev-libs/glib-2.56:2
-       >=dev-libs/libreport-2.13.0:=[gtk,python]
-       dev-libs/libxml2:2
-       >=gnome-base/gsettings-desktop-schemas-3.15.1
-       net-libs/libsoup:2.4
-       sys-apps/dbus
-       sys-apps/systemd:0=
-       sys-auth/polkit
-       sys-libs/libcap
-       sys-fs/inotify-tools
-       x11-libs/gtk+:3
-       x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
-       acct-user/abrt
-       acct-group/abrt
-       app-arch/cpio
-       app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-       dev-libs/elfutils
-       dev-libs/json-c:0=
-       sys-apps/util-linux
-       >=sys-devel/gdb-7
-       $(python_gen_cond_dep '
-                       dev-libs/satyr[${PYTHON_USEDEP}]
-                       dev-python/argcomplete[${PYTHON_USEDEP}]
-                       dev-python/argh[${PYTHON_USEDEP}]
-                       dev-python/humanize[${PYTHON_USEDEP}]
-       ')
-"
-BDEPEND="
-       $(python_gen_cond_dep 'dev-python/python-systemd[${PYTHON_USEDEP}]')
-       test? (
-               $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-       )
-       app-text/asciidoc
-       app-text/xmlto
-       >=dev-util/intltool-0.35.0
-       virtual/pkgconfig
-       >=sys-devel/gettext-0.17
-"
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       python_fix_shebang .
-       default
-
-       # Install under proper directory
-       sed -i -e 's:dbusabrtdocdir = 
${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = 
${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
-
-       # Ensure this works for systems with and without /usr merge
-       sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service 
|| die
-
-       # Fix hardcoded "pytest-3"
-       sed -i -e "s:pytest-3:pytest:" \
-               configure.ac src/python-problem/tests/Makefile.am src/cli/test 
|| die
-
-       # pyhook test is sensitive to the format of python's error messages, and
-       # fails with certain python versions
-       sed -e '/pyhook.at/ d' \
-               -i tests/Makefile.* tests/testsuite.at || die "sed remove 
pyhook tests failed"
-       ./gen-version || die # Needed to be run before autoreconf
-       eautoreconf
-}
-
-src_configure() {
-       myeconfargs=(
-               --libdir="${EPREFIX}/usr/$(get_libdir)"
-               --localstatedir="${EPREFIX}/var"
-               --without-bodhi
-               # package breaks due to not finding libreport-web with bodhi 
plugin enabled
-               --without-rpm
-               $(usex selinux "" "--without-selinux")
-               --with-python3
-               --without-pythondoc
-               # package breaks due to no sphinx-build-3
-               $(use_with test pythontests)
-       )
-
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-       python_optimize
-
-       # /var/spool/abrt is created by dev-libs/libreport
-       diropts -m 700 -o abrt -g abrt
-       keepdir /var/spool/abrt-upload
-
-       find "${D}" -name '*.la' -delete || die
-
-       newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-       newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-
-       # Drop empy dirs, handled by tmpfiles
-       rm -r "${ED}"/var/run/ || die
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-       tmpfiles_process abrt.conf
-}

diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-conf 
b/app-admin/abrt/files/abrt-2.0.12-r1-conf
deleted file mode 100644
index 073eb0daf82e..000000000000
--- a/app-admin/abrt/files/abrt-2.0.12-r1-conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# abrtd command-line options
-# Default: ""
-ABRTD_OPTS=""
-
-# Run abrt-harvest-vmcore to make new kdump dumps available for abrtd
-START_VMCORE="yes"
-
-# Install abrt-ccpp hook to watch for segfaults
-START_CCPP="yes"
-
-# Call abrt-dump-oops to log kernel oops
-START_OOPS="yes"
-# log file to watch for kernel oops
-# Default: "/var/log/messages"
-OOPS_WATCH_LOG="/var/log/messages"
-# abrt-dump-oops command-line options
-# Default: "-xD"
-OOPS_DUMP_OPTS="-xD"
-
-# Call abrt-dump-xorg to log X crashes
-START_XORG="yes"
-# log file to watch for X crashes
-# Default: "/var/log/Xorg.0.log"
-XORG_WATCH_LOG="/var/log/Xorg.0.log"
-# abrt-dump-xorg command-line options
-# Default: "-xD"
-XORG_DUMP_OPTS="-xD"

diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-init 
b/app-admin/abrt/files/abrt-2.0.12-r1-init
deleted file mode 100644
index 3fb32b7c3e43..000000000000
--- a/app-admin/abrt/files/abrt-2.0.12-r1-init
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Automated crash detection service"
-
-depend() {
-       need dbus logger
-}
-
-start() {
-       ebegin "Starting abrtd"
-       start-stop-daemon --start --quiet --pidfile /var/run/abrt/abrtd.pid \
-               --exec /usr/sbin/abrtd -- ${ABRTD_OPTS}
-       eend $?
-
-       if [ "${START_VMCORE}" = "yes" ]; then
-               ebegin "Running abrt-harvest-vmcore"
-               /usr/sbin/abrt-harvest-vmcore
-               eend $?
-       fi
-
-       if [ "${START_CCPP}" = "yes" ]; then
-               ebegin "Installing abrt-ccpp hook"
-               /usr/sbin/abrt-install-ccpp-hook install
-               eend $?
-       fi
-
-       if [ "${START_OOPS}" = "yes" ]; then
-               ebegin "Starting abrt-dump-oops"
-               start-stop-daemon --start --quiet \
-                       --pidfile /var/run/abrt/abrt-dump-oops.pid \
-                       --make-pidfile --background \
-                       --exec /usr/bin/abrt-watch-log -- \
-                       -F "`/usr/bin/abrt-dump-oops -m`" ${OOPS_WATCH_LOG} -- \
-                       /usr/bin/abrt-dump-oops ${OOPS_DUMP_OPTS}
-               eend $?
-       fi
-
-       if [ "${START_XORG}" = "yes" ]; then
-               ebegin "Starting abrt-dump-xorg"
-               start-stop-daemon --start --quiet \
-                       --pidfile /var/run/abrt/abrt-dump-xorg.pid \
-                       --make-pidfile --background \
-                       --exec /usr/bin/abrt-watch-log -- \
-                       -F "`/usr/bin/abrt-dump-xorg -m`" ${XORG_WATCH_LOG} -- \
-                       /usr/bin/abrt-dump-xorg ${XORG_DUMP_OPTS}
-               eend $?
-       fi
-}
-
-stop() {
-       if [ "${START_XORG}" = "yes" ]; then
-               ebegin "Stopping abrt-dump-xorg"
-               start-stop-daemon --stop --quiet \
-                       --pidfile /var/run/abrt/abrt-dump-xorg.pid
-               eend $?
-       fi
-
-       if [ "${START_OOPS}" = "yes" ]; then
-               ebegin "Stopping abrt-dump-oops"
-               start-stop-daemon --stop --quiet \
-                       --pidfile /var/run/abrt/abrt-dump-oops.pid
-               eend $?
-       fi
-
-       if [ "${START_CCPP}" = "yes" ]; then
-               ebegin "Uninstalling abrt-ccpp hook"
-               /usr/sbin/abrt-install-ccpp-hook uninstall
-               eend $?
-       fi
-
-       ebegin "Stopping abrtd"
-       start-stop-daemon --stop --quiet --pidfile /var/run/abrt/abrtd.pid
-       eend $?
-}

diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
deleted file mode 100644
index fec035a2a9fa..000000000000
--- a/app-admin/abrt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <maintainer type="person">
-               <email>pa...@gentoo.org</email>
-               <name>Pacho Ramos</name>
-       </maintainer>
-       <upstream>
-               <remote-id type="github">abrt/abrt</remote-id>
-       </upstream>
-</pkgmetadata>

diff --git a/profiles/features/prefix/package.mask 
b/profiles/features/prefix/package.mask
index 8f1fbaf63cd4..32df49a3a6c4 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -5,7 +5,6 @@
 # systemd is set to invade pid 1, which is not possible for Prefix.
 # The following are its reverse dependencies.
 sys-apps/systemd
-app-admin/abrt
 app-admin/systemdgenie
 dev-python/python-systemd
 games-util/gamemode

diff --git a/profiles/package.mask b/profiles/package.mask
index 0a8edfa45a92..6ea1aaf60aa8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -398,11 +398,6 @@ sys-cluster/slurm
 # Removal on 2022-10-18.  Bug #871522.
 dev-python/pyproject2setuppy
 
-# Pacho Ramos <pa...@gentoo.org> (2022-09-18)
-# ABRT environment keeps breaking more and more on non-Fedora systems.
-# Removal: 2022-10-18.  Bugs #849305, #849092, #849095, #713858.
-app-admin/abrt
-
 # Mike Gilbert <flop...@gentoo.org> (2022-09-12)
 # repoman is no longer maintained and has been removed from the portage
 # git repository. Please use dev-util/pkgcheck and dev-util/pkgdev instead.

Reply via email to