gentoo resync : 05.02.2020

3 files changed, 2 insertions, 93 deletions

diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 14343898097c..701a234652ef 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,5 +1,3 @@
 DIST libreport-2.10.0.tar.gz 2278084 BLAKE2B 95ac1fbf32e6e021e9553b35b10f9e46b7ea2e9cc6f21e53eb39a32a5261f7a6e49b2172381fdea30341fcc4311928691e68749a8bb5c41a4bf709151935687a SHA512 978ea442d82b75abf80b2075f540cb05c5577387a9221f2070c9695c4546d36169738d223f5e903d0b774b7e1566a6111c55a6bb51a0822ad1676095f067c45b
-DIST libreport-2.9.5.tar.gz 2271742 BLAKE2B e74d694c0012e984aab8044e99fee8e12a197c0a2edb933e78f045260043d40557509056b1093bc13cbe983976d5525cde1f7596a942760df10c857e99d6b56e SHA512 f207710d88f39870d08e3a5fdfa3e1d5a808625bd36b1dcce363cefd39e582bad6be6dc4224db5e1df4404734c3dd69c437c377303fe978ae21b608fceb833ce
-EBUILD libreport-2.10.0.ebuild 1942 BLAKE2B adf7184972a3a926adcb01d0633a9aebe2f0c2fbfffaf4aa06861a6f1a6c0bf908d1b01fe1f19ff0367dce54058be4edb10fffd25af388f6b58da8d1b765c6a9 SHA512 56f4d0d8a655beb8cf349ed95ae34161e43d15f058ce7f89eb0ded399f087ec3fae4d641f4b4ac3e65fd800630f6c3875c3034c5c9a33e9f1e6298f0f84b5064
-EBUILD libreport-2.9.5.ebuild 1931 BLAKE2B 3af1a4379d0b69953827807f5c2670b9fe85fb052fcf6780c0b4d3194af4856c05a400151de09acfbef550b91776a16c0280d0b484a57d8df4106519555600e8 SHA512 cac7b2de2722064f6ce08e8e79b2a24464a9c82abfb1e8bccdadf084b1645718571cf94409d114781db6642ba3c50183c93916fecbf3bfab1102a2eb0391149e
+EBUILD libreport-2.10.0.ebuild 1940 BLAKE2B 93d61e530d0160f88733545e2283c7af8e421311a6c8665b572739acc7635aa90ba69d8b3aaf45fa59dc3d76543203dcdd1b9edccd334ea1b6fd67d9b4951c29 SHA512 cbaac321369f9a593ee2be582d0d7cd6e71b2326a825e7ef7b9afcecb73523172a77007b1e24b96e5293299cb770f99381373b16b22a2399d818687b7c1a4a34
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libreport/libreport-2.10.0.ebuild b/dev-libs/libreport/libreport-2.10.0.ebuild
index f44fc8f3ffbb..16e818b499dc 100644
--- a/dev-libs/libreport/libreport-2.10.0.ebuild
+++ b/dev-libs/libreport/libreport-2.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+gtk python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libreport/libreport-2.9.5.ebuild b/dev-libs/libreport/libreport-2.9.5.ebuild
deleted file mode 100644
index ff234bf99f20..000000000000
--- a/dev-libs/libreport/libreport-2.9.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools python-r1 user
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://github.com/abrt/libreport"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+gtk python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-admin/augeas
-	>=dev-libs/glib-2.43:2
-	dev-libs/satyr
-	dev-libs/json-c:=
-	dev-libs/libtar
-	dev-libs/libxml2:2
-	dev-libs/newt:=
-	dev-libs/xmlrpc-c:=
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/dbus
-	sys-apps/systemd
-	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
-	python? ( ${PYTHON_DEPS} )
-	x11-misc/xdg-utils
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	default
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-bugzilla
-		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
-		--without-python2
-		$(usex python "--with-python3" "--without-python3")
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir \
-			econf "${myargs[@]}"
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	use python && python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	use python && python_foreach_impl run_in_build_dir default
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}