gentoo resync : 25.08.2020

2 files changed, 32 insertions, 30 deletions

diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index b4f812718347..029b39de0fea 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,9 +1,9 @@
 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.12.0.tar.gz 6799338 BLAKE2B 57a9b3fac4a4a5f55630be0573b26d4ae2d921d4f09d6566339a77f314c413c1a9e242f882fe20befabf30a58e7df21395edcf1b0d560bfeadf8e854bff6a705 SHA512 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded
 DIST abrt-2.14.0.tar.gz 6102393 BLAKE2B 6bba45604406c1f2f84d778475acc6b5db3747f292fcb74a881703491b2d92adda3cc88d6ed741087c1ed2f88a68cdc4858f3640b506a6be650ea4d1d1f2bfd3 SHA512 26cf04ef6f52da445e825d5f1074186c4c77d1b093174bb6f7b0a8fa6175e265fcaf56fa4a977851a2352f9fd004425bc397e35a91f6f8e78f37564cd492c571
 DIST abrt-2.14.1.tar.gz 6113024 BLAKE2B ddceda689fa51b04a0c201fe560c31ba5c8233c1f75c878b391b0b61cff241e6c2ce5b1829faa6e5f286c3c5efe96941c823234affe94b59fdd2aa3d7cd33cc3 SHA512 24126a54778b7e612c8b950321686bdee7ce15a16e79c8d967f8126c89f7da7060270fc0929cfabfc35100d069b0a626c3380833a3f62614cea6b00a44238ec3
-EBUILD abrt-2.12.0-r2.ebuild 3156 BLAKE2B d8c356d44d0e384c7bab4b74e3c1aa3646b521157e3e68a20b391367f6c9323bd93cc7e2f69c9cfc87268cd51e1ca19c35c714f73eeb116df02b6f096dfb5d16 SHA512 da60bf5c5c78617311738965f06bb4842c31493e245c064de95ff433479c01c68e8c16ed74965458ca21f58017b98e399ef103b45f0520def678c219abee862d
+DIST abrt-2.14.2.tar.gz 6113632 BLAKE2B 904ec2ca4c3aa70b62573ca2730742689f4446c1e5f04bfb6dc4267a4a9a6d44ef8c2b6e82c1e0aba04876b400c3a965a879da65bbff7ec729846f1b5c28cdf9 SHA512 82ba10cb151b4585024e3dfc626f46a7d967797e0375158cd76355c4f6a66c59578cc7b41bc5d5aaa3e694b3653b8658650df458676225660cfe95ec318c6886
 EBUILD abrt-2.14.0.ebuild 3158 BLAKE2B 61454e86d94458b541971bd1b249864ad141cd0ac30a19929c65d49c30336441ad2c1d17170d54302d73bce65bd7f0785e5564865608158c5ffb852e05036bf4 SHA512 0917826e044cadd00bb4b87271e4a76c59fa07629186a49475d941785c90b0f9c0c111dc96c4efaf68442a545d1494484c9fab3397a6088f5b6803660ce2f57e
 EBUILD abrt-2.14.1.ebuild 3160 BLAKE2B e4091dd74e7cad18a4ec51bb5d220b746afa11e200649d3e088e2c67bceaf94466228e5979979e6d59cc8bf6cb7c389c7eb15f0500ed5d3c9872e91061529f32 SHA512 ec18ee6df3ec45164caf460bb6159473e54398fcbcb719f3acb93b3986b18333aece2efdf96b97cbb040e3adacdf9215935ac452431c7d24a1940dc41f69c021
+EBUILD abrt-2.14.2.ebuild 3161 BLAKE2B 4106e0fd301e1c8007faef3570cdbe024b2f6e14d6e1dd1e0919c8c0739ec7c48daad5c6163fe88d68eb97074c12bdb70b7628a321fef40662c66b5bd0186275 SHA512 4001b1d60b6559a36947264cc008e9417b9d6bb6cbf353b73d9fc7ca7127c6b6b5260565ebb5c3ffcf021082210169d0ff716151f03843092e3f706f2e1973b9
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.12.0-r2.ebuild b/app-admin/abrt/abrt-2.14.2.ebuild
index 097383a5b464..1071f21d2393 100644
--- a/app-admin/abrt/abrt-2.12.0-r2.ebuild
+++ b/app-admin/abrt/abrt-2.14.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools gnome2-utils python-single-r1 systemd user
+inherit autotools python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Automatic bug detection and reporting tool"
 HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
@@ -12,57 +12,58 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="debug selinux"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.56:2
-	>=dev-libs/libreport-2.10.0[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
 	sys-apps/dbus
 	sys-apps/systemd:0=
 	sys-auth/polkit
+	sys-libs/libcap
 	sys-fs/inotify-tools
 	x11-libs/gtk+:3
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+	acct-user/abrt
+	acct-group/abrt
 	app-arch/cpio
-	app-arch/rpm
+	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-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		dev-python/argh[${PYTHON_MULTI_USEDEP}]
-		dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
+			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+			dev-python/argh[${PYTHON_MULTI_USEDEP}]
+			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
 	')
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+	)
 	app-text/asciidoc
 	app-text/xmlto
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.17
-	$(python_gen_cond_dep '
-		dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
-	')
 "
 
-RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
-
 pkg_setup() {
 	python-single-r1_pkg_setup
-
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
 }
 
 src_prepare() {
+	python_fix_shebang .
 	default
 
 	# Install under proper directory
@@ -71,6 +72,10 @@ src_prepare() {
 	# 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' \
@@ -87,13 +92,10 @@ src_configure() {
 		# package breaks due to not finding libreport-web with bodhi plugin enabled
 		--without-rpm
 		$(usex selinux "" "--without-selinux")
-		--without-python2
-		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
 		--with-python3
 		--without-pythondoc
 		# package breaks due to no sphinx-build-3
-		--without-pythontests
-		# kill tests for now until they can be explored.
+		$(use_with test pythontests)
 	)
 
 	econf "${myeconfargs[@]}"
@@ -101,7 +103,7 @@ src_configure() {
 
 src_install() {
 	default
-	python_optimize #661706
+	python_optimize
 
 	keepdir /var/run/abrt
 	# /var/spool/abrt is created by dev-libs/libreport
@@ -119,9 +121,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }