From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 dev-libs/kreport/Manifest             |  2 +-
 dev-libs/kreport/kreport-3.2.0.ebuild | 48 ++++++++++++++++++++---------------
 2 files changed, 28 insertions(+), 22 deletions(-)

(limited to 'dev-libs/kreport')

diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index 35c84bffbe78..687421953941 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,3 +1,3 @@
 DIST kreport-3.2.0.tar.xz 374072 BLAKE2B b0e4a028464f424e1e6661a02233a0e6f711a890892ea34c8c8ebc12675379a233e9aa8b00f9165e9a82993d43ae2086c7a8c0f5cc17cfaa658614225c7b56c8 SHA512 3f7b8bf8d4c5e88de74b38c55b4c82ac1e3ae11db424b10b85884ff479d25640b0ef7c6f90567cf27a1bab099d4b14a042ddf4549cec9ca7d5b237c3a8f7104c
-EBUILD kreport-3.2.0.ebuild 1227 BLAKE2B 57b45ea219b137472faf06c84856094b1c4b84ddd4a958fe23386f597b0fe209550e7dfbe34d3f9ba6454ee57c80a6d5dea46480541292967fcac61f4741bd35 SHA512 56d43557e5c30b718804824dac09da423aa95c8897fe090ebd2a3837f9694111075784409c7bcf7a7821606b919d6c24cd4bf128798143a2b0831d8274f1a2e5
+EBUILD kreport-3.2.0.ebuild 1343 BLAKE2B 00a2a331bee70beca3e04b3cc8b55c91f5e4bef86220e0b7bfbaffdb0453a3476c427d6434bc111641997c93acca918c5842aa443f6657b01613a21712c8af9c SHA512 c885b487aba1ba67d553917e9f6b74ca0afbab5a760200abd07c2efa488be5cbca6610cc51f2bdd517b791cd8b014d58ad624895c775f08196d02471946c8ef0
 MISC metadata.xml 444 BLAKE2B 6bcc5b1d127a801fae72db2855c9b01ffeef4d118554164d8d7c02e3edd7d0f00e22f3f6dbf45cdbe1b8c764d6efdbd3034ffc6b8cf041b7e9537d59a6629740 SHA512 7356b187c34c57ab44573e7cd3da164888c2b261c2faecc8f890db1eedae63573587447f44356dba9ee2d6218034e13cb093dbed4f63589a6f0544123f7680b9
diff --git a/dev-libs/kreport/kreport-3.2.0.ebuild b/dev-libs/kreport/kreport-3.2.0.ebuild
index 97555f856932..b19cd9dcd243 100644
--- a/dev-libs/kreport/kreport-3.2.0.ebuild
+++ b/dev-libs/kreport/kreport-3.2.0.ebuild
@@ -1,34 +1,40 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_QTHELP="true"
-KDE_TEST="true"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+ECM_QTHELP="true"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5 python-any-r1
+inherit ecm kde.org 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"
+HOMEPAGE="https://community.kde.org/KReport"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="LGPL-2+"
 SLOT="5/4"
-KEYWORDS="amd64 x86"
 IUSE="marble +scripting webkit"
 
 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) )
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	marble? ( >=kde-apps/marble-19.04.3:5= )
+	scripting? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
 "
 DEPEND="${RDEPEND}
@@ -37,14 +43,14 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	python-any-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake_use_find_package marble Marble)
+		$(cmake_use_find_package webkit Qt5WebKitWidgets)
 		-DKREPORT_SCRIPTING=$(usex scripting)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
-- 
cgit v1.2.3