4 files changed, 2 insertions, 233 deletions
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 343be31cf5b3..f41850225777 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -6,9 +6,6 @@ AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b9001
 AUX abrt-2.0.6-format-security.patch 911 BLAKE2B e502ea10a65de1b0ebff3f7d954d42af365a8384be817ff0b891153877d2714f63b9edb8565df503b455824a03f94bc62ef596aa670516d212239922d23e0b62 SHA512 8e9f8bb37698834b998d1d4a9452e17f5484a2fa9fbc400b80f2154fb4f7ad35dcbc65112afa3fef2f1b2ccf78a01f745e436e61323c40d76f17da11a6229b71
 DIST abrt-2.0.12.tar.gz 1090121 BLAKE2B 272f486bd166a33fea3e340763b3443b5643a650fe16ad326e249309c355f214c67937456dd2d8f3e7cdac65cb85bd8030e6b89671f427085a05dca64b8f874d SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a
 DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
-DIST abrt-2.10.9.tar.gz 6830234 BLAKE2B ec96b915103c8b8157eb64c98791d283225091d0f2aa7b78520bfae1bee22f43703715fabc43828c750aa7e84eea4a886878d411670b7b4ad31ca49b96d387f3 SHA512 1ff7e2edf29085fb03c569b67e8bf2bc83aaf4dd77730e5fc96184453224f83dd0632eaf85a7ad03351fdfaea3d4ed50e8a89eb28d82151f95bd34eb1850f93c
 EBUILD abrt-2.0.12-r2.ebuild 2643 BLAKE2B 2799f38b03a18400cdaa0d471a64aada8204cd837198b107f1217740d00c50bab937f98a46354811fe573d99d5e84b61730a60d39ea45cf5d1c1d31f57ce4de1 SHA512 f9fcd1f028b14744c7f9e930ee684bd6e010bd453d7d4b44b689cca103e7a5770a1b5a6a041193826a29229ab6acde442b8f91cc1714384a3312e0560beb4809
-EBUILD abrt-2.10.10-r1.ebuild 2702 BLAKE2B e337dc8fb42cdbf634ddea35674e8c841a4fca1b9bcf4c65b8e3fcd4553eb791d25ca4313dbda08834aec59c712f84845833d6025939ea8ba1bcce4f5d852c0b SHA512 10af342514fc3cb62942a3ea0b8580cdd1e05a91ec55548bf046a960ed4a38d95f0e362c89dd7f32bf39b080e7d5208dd021645e439130633708a1417b48f1b5
-EBUILD abrt-2.10.10.ebuild 2698 BLAKE2B c4020d0aceff14802ff9dee884cc8e15abfe8751f9167a3e99a983c3347e3091a5008259f4e2de46473532f614c633be30ab11b1b51664bf9759665cb4effcb1 SHA512 870aeb8a60428bdd21b311ee9114a3b4f5605ef7c3095d97c54bd280153555d1c8c3e2ea6175dad62d79a71f707ba9a7a91d939393067c5b678ff4fc4f5b769e
-EBUILD abrt-2.10.9.ebuild 2687 BLAKE2B 2554c809fdb24139c97f968fac129f0b408025033e8c6a4241295a94db18241ecae501299de57eb3fd1318df0e770db0e3ce4bb84d9fb99f478c41ee59c74cfa SHA512 59743039a3316da2c725e2ca3ca97e30d4c4242636523f02aa75baacfbb4191639d4c364ee3feffd5ccdfb004e93f1a390391fd1752918dec16035c430a40b21
+EBUILD abrt-2.10.10-r2.ebuild 2727 BLAKE2B 365cb1dcfb1e6df0a3512593c5fc448ef51e443d93c477691c1c0890ede105a8097a8c354a70ae43792223e856f5b1bd4dc32a09cf4a270fdc0866bd03037755 SHA512 712f39c2c79955ec3061503c0655e30fbbe07f402003ce5d870307c4517507d6380d63de9ed0958d5d5d1c0acfb88483e1e0736dba736a6960397b2062ec4a03
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.10.10-r1.ebuild b/app-admin/abrt/abrt-2.10.10-r2.ebuild
index 12dd86750951..b1301efc7478 100644
--- a/app-admin/abrt/abrt-2.10.10-r1.ebuild
+++ b/app-admin/abrt/abrt-2.10.10-r2.ebuild
@@ -90,6 +90,7 @@ src_configure() {
 
 src_install() {
 	default
+	python_optimize #661706
 
 	keepdir /var/run/abrt
 	# /var/spool/abrt is created by dev-libs/libreport
diff --git a/app-admin/abrt/abrt-2.10.10.ebuild b/app-admin/abrt/abrt-2.10.10.ebuild
deleted file mode 100644
index 92a41f5008a3..000000000000
--- a/app-admin/abrt/abrt-2.10.10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2-utils python-single-r1 systemd user
-
-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="debug selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.43:2
-	>=dev-libs/libreport-2.9.5[python]
-	dev-libs/libxml2
-	dev-libs/nss
-	>=gnome-base/gsettings-desktop-schemas-3.15.1
-	sys-apps/dbus
-	sys-apps/systemd
-	sys-auth/polkit
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-	>=x11-libs/libnotify-0.7
-"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	dev-libs/elfutils
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	sys-apps/util-linux
-	>=sys-devel/gdb-7
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	dev-libs/satyr[${PYTHON_USEDEP}]
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-"
-
-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() {
-	default
-
-	# 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}/$(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")
-		--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.
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	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() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-admin/abrt/abrt-2.10.9.ebuild b/app-admin/abrt/abrt-2.10.9.ebuild
deleted file mode 100644
index 313aab7271b3..000000000000
--- a/app-admin/abrt/abrt-2.10.9.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2-utils python-single-r1 systemd user
-
-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="debug selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.43:2
-	>=dev-libs/libreport-2.9.5[python]
-	dev-libs/libxml2
-	dev-libs/nss
-	>=gnome-base/gsettings-desktop-schemas-3.15.1
-	sys-apps/dbus
-	sys-apps/systemd
-	sys-auth/polkit
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-	>=x11-libs/libnotify-0.7"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	dev-libs/elfutils
-	dev-python/argcomplete
-	dev-python/argh
-	dev-python/humanize
-	sys-apps/util-linux
-	>=sys-devel/gdb-7"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	dev-libs/satyr[${PYTHON_USEDEP}]
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-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() {
-	default
-
-	# 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}/$(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")
-		--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.
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	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' -exec rm -f {} + || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}