gentoo resync : 21.05.2019

3 files changed, 2 insertions, 56 deletions

diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index 20dde93857df..35c84bffbe78 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,5 +1,3 @@
-DIST kreport-3.1.0.tar.xz 378980 BLAKE2B 9f6289a38e7fc0d6a7522e55dd5e769a52306edb4855efe79f933f47dbc87f367c865fede453c04402ec03046a9b5c5bb7b9055ff1ec6808319939328ef74862 SHA512 9f96d65ee420aab497b591a4a0d48da8df21f3c6a230ec742f4b2ff12f0e14a86a82e4fb114bb91ff334bcd8bdf3beec0f533507923bec31a6e79bba55213268
 DIST kreport-3.2.0.tar.xz 374072 BLAKE2B b0e4a028464f424e1e6661a02233a0e6f711a890892ea34c8c8ebc12675379a233e9aa8b00f9165e9a82993d43ae2086c7a8c0f5cc17cfaa658614225c7b56c8 SHA512 3f7b8bf8d4c5e88de74b38c55b4c82ac1e3ae11db424b10b85884ff479d25640b0ef7c6f90567cf27a1bab099d4b14a042ddf4549cec9ca7d5b237c3a8f7104c
-EBUILD kreport-3.1.0.ebuild 1211 BLAKE2B fc5786598331a6f068df448b4ccf1ca1ec8d07b4b6441931cf617970e379898f48b23d0a942389bebd057bca874a92b07857570ffeb1a3209f432ad01b72a9d3 SHA512 0535792c6b520c8a5cf3cba244ddeecad9e2ee390f89388ef9cb9183bec62181de3a1ab2e1b470d3b1945969ca74fc25683461294048793ef4e6aa163293c212
-EBUILD kreport-3.2.0.ebuild 1229 BLAKE2B 86da19f27ab7f49e53abe7656bfe26088ca4a7277c5a3ac302195be1c45f0ac6e39045aba71da6234b8657c237e368e575774c9c197ae6f986c1e078b9ccf702 SHA512 3b7a100c3e8c0c6e3d6870c664df536d66e16174904d8789100abde7d158180d2505efb6e61c63184903f7a06391978b9243c06ca7b68ce30e5e3192658a3f57
+EBUILD kreport-3.2.0.ebuild 1227 BLAKE2B 57b45ea219b137472faf06c84856094b1c4b84ddd4a958fe23386f597b0fe209550e7dfbe34d3f9ba6454ee57c80a6d5dea46480541292967fcac61f4741bd35 SHA512 56d43557e5c30b718804824dac09da423aa95c8897fe090ebd2a3837f9694111075784409c7bcf7a7821606b919d6c24cd4bf128798143a2b0831d8274f1a2e5
 MISC metadata.xml 444 BLAKE2B 6bcc5b1d127a801fae72db2855c9b01ffeef4d118554164d8d7c02e3edd7d0f00e22f3f6dbf45cdbe1b8c764d6efdbd3034ffc6b8cf041b7e9537d59a6629740 SHA512 7356b187c34c57ab44573e7cd3da164888c2b261c2faecc8f890db1eedae63573587447f44356dba9ee2d6218034e13cb093dbed4f63589a6f0544123f7680b9
diff --git a/dev-libs/kreport/kreport-3.1.0.ebuild b/dev-libs/kreport/kreport-3.1.0.ebuild
deleted file mode 100644
index 595c6844ae4f..000000000000
--- a/dev-libs/kreport/kreport-3.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Framework for creation and generation of reports in multiple formats"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="5/4"
-KEYWORDS="amd64 x86"
-IUSE="marble +scripting webkit"
-
-RESTRICT+=" test"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-libs/kproperty-3.1.0:5=
-	marble? ( $(add_kdeapps_dep marble '' '' '5=') )
-	scripting? ( $(add_qt_dep qtdeclarative) )
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		-DKREPORT_SCRIPTING=$(usex scripting)
-	)
-	kde5_src_configure
-}
diff --git a/dev-libs/kreport/kreport-3.2.0.ebuild b/dev-libs/kreport/kreport-3.2.0.ebuild
index b47441c3979b..97555f856932 100644
--- a/dev-libs/kreport/kreport-3.2.0.ebuild
+++ b/dev-libs/kreport/kreport-3.2.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Framework for creation and generation of reports in multiple format
 
 LICENSE="LGPL-2+"
 SLOT="5/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="marble +scripting webkit"
 
 RDEPEND="