gentoo resync : 10.09.2021

3 files changed, 13 insertions, 147 deletions

diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index cb6a8c3e0023..60a3ab460bfb 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,7 +1,5 @@
 AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f7182d4bf9e7bebf1f80f6178acbce4ffddff7ab292c773685148621d53528b96c3099d96dcd0f26b1280 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
-DIST abrt-2.14.2.tar.gz 6113632 BLAKE2B 904ec2ca4c3aa70b62573ca2730742689f4446c1e5f04bfb6dc4267a4a9a6d44ef8c2b6e82c1e0aba04876b400c3a965a879da65bbff7ec729846f1b5c28cdf9 SHA512 82ba10cb151b4585024e3dfc626f46a7d967797e0375158cd76355c4f6a66c59578cc7b41bc5d5aaa3e694b3653b8658650df458676225660cfe95ec318c6886
-DIST abrt-2.14.5.tar.gz 6056105 BLAKE2B 22e797a431237bd3d4ef6f2467842c5f08e2ef3ca51e7857e3c55e45ed93a9499843fe40b081c70affb5def8f2cfe78d61e865c51c969fb2c9936225bdfe4996 SHA512 a8672735c6d3263ddff006e6e186d9b71e6d9375a8c909c2a85bbbf736a6687b6fe4aa74640a07664f14fd886895a86babf41218a8c2365d6fccd347630ccc9e
-EBUILD abrt-2.14.2.ebuild 3123 BLAKE2B bc1b6fd277f756dd59fcd34a045f0768c5ac418636e576ce2b1b43ef73a2e994c857635e9cbd311382868930c94032ffdef0b0dc716371e2e7e2f4a59604fa3c SHA512 b9585478516532464b1c966ce04e60d1a32b9148960b03a15e0107248bfa00a56e3d3bc350973c11c0c659a0da485563f6dece86aed1af4f33fb39195411247e
-EBUILD abrt-2.14.5.ebuild 3123 BLAKE2B bc1b6fd277f756dd59fcd34a045f0768c5ac418636e576ce2b1b43ef73a2e994c857635e9cbd311382868930c94032ffdef0b0dc716371e2e7e2f4a59604fa3c SHA512 b9585478516532464b1c966ce04e60d1a32b9148960b03a15e0107248bfa00a56e3d3bc350973c11c0c659a0da485563f6dece86aed1af4f33fb39195411247e
+DIST abrt-2.14.6.tar.gz 6057661 BLAKE2B 2ef74203181c89818f283a801c4a1a0f22a01c92ca2415d245dc180ee721b3e29cb75c95e45d738f88b6bbf339fe8bef4e499ab6fecad33399dc8a5af8f98d4c SHA512 eb1ba2f624d51eeccd203bb23060493347f5a9142fad7d0570d46134071d870a9c66b4fbfb8210e7d6f87c0c039f31eb486d18a36b10fba318e2180aa09df9fe
+EBUILD abrt-2.14.6.ebuild 3196 BLAKE2B 32d8f82d2f5cc01200de4ec824fa9964be155e3efdac820b6b5c0161738f6ae71f94632954a4e8f53a6968e6d83c061d3792733cc44151b5eefbbe5a918a9fa9 SHA512 086dc81758a3a80a02440c3962f3f44fa48e86e41ebc49e4255a27459727017f0bf912b63b6b2a3762073c85b8332319b310f36b4a6da8e7a35ce06cb6f813a8
 MISC metadata.xml 317 BLAKE2B 2c9d95904b60edd29cc9b42cb603b03e5b7b7243849dee3766c9810dfd94a8ea0c5215677acdabd5205cdff65e58557f9ef08db1ca9da7b6551b660386e46789 SHA512 eb0425972ad2086e847c4162c8a0aa6725ff77ad58ff6719f025e51d483369c4caf1134e8ff8ff77bbb2b1ca6821f3e1ba7fa3e929db0167d39acb6ab55f18f6
diff --git a/app-admin/abrt/abrt-2.14.5.ebuild b/app-admin/abrt/abrt-2.14.5.ebuild
deleted file mode 100644
index 6756dd1e66a6..000000000000
--- a/app-admin/abrt/abrt-2.14.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools python-single-r1 xdg-utils
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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
-"
-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="
-	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
-
-	keepdir /var/run/abrt
-	# /var/spool/abrt is created by dev-libs/libreport
-
-	diropts -m 700 -o abrt -g abrt
-	keepdir /var/spool/abrt-upload
-
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-admin/abrt/abrt-2.14.2.ebuild b/app-admin/abrt/abrt-2.14.6.ebuild
index 6756dd1e66a6..4218d5a78a57 100644
--- a/app-admin/abrt/abrt-2.14.2.ebuild
+++ b/app-admin/abrt/abrt-2.14.6.ebuild
@@ -4,10 +4,10 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 
-inherit autotools python-single-r1 xdg-utils
+inherit autotools python-single-r1 tmpfiles xdg
 
 DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+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"
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="selinux test"
-RESTRICT="!test? ( 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/libreport-2.13.0:=[gtk,python]
 	dev-libs/libxml2:2
 	>=gnome-base/gsettings-desktop-schemas-3.15.1
 	net-libs/libsoup:2.4
@@ -48,6 +49,7 @@ RDEPEND="${DEPEND}
 	')
 "
 BDEPEND="
+	$(python_gen_cond_dep 'dev-python/python-systemd[${PYTHON_USEDEP}]')
 	test? (
 		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)
@@ -105,25 +107,20 @@ src_install() {
 	default
 	python_optimize
 
-	keepdir /var/run/abrt
 	# /var/spool/abrt is created by dev-libs/libreport
-
 	diropts -m 700 -o abrt -g abrt
 	keepdir /var/spool/abrt-upload
 
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
 	find "${D}" -name '*.la' -delete || die
 
 	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
 	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
 
-pkg_postinst() {
-	xdg_icon_cache_update
+	# Drop empy dirs, handled by tmpfiles
+	rm -r "${ED}"/var/run/ || die
 }
 
-pkg_postrm() {
-	xdg_icon_cache_update
+pkg_postinst() {
+	xdg_pkg_postinst
+	tmpfiles_process abrt.conf
 }