commit: 432538e6732206af58ed00e7ebbf711ad344c7bc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 01:18:15 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 01:20:57 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=432538e6
dev-libs: Port to ecm.eclass and kde.org.eclass
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/kasync/kasync-9999.ebuild | 7 ++--
dev-libs/kdiagram/kdiagram-9999.ebuild | 22 ++++++-----
dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild | 15 +++++---
dev-libs/kproperty/kproperty-9999.ebuild | 26 ++++++++-----
dev-libs/kreport/kreport-9999.ebuild | 39 +++++++++++---------
dev-libs/kuserfeedback/kuserfeedback-9999.ebuild | 39 +++++++++++---------
dev-libs/mauikit/mauikit-9999.ebuild | 47 +++++++++++++-----------
7 files changed, 110 insertions(+), 85 deletions(-)
diff --git a/dev-libs/kasync/kasync-9999.ebuild
b/dev-libs/kasync/kasync-9999.ebuild
index bffef24f9f..cbecfe9a9a 100644
--- a/dev-libs/kasync/kasync-9999.ebuild
+++ b/dev-libs/kasync/kasync-9999.ebuild
@@ -3,11 +3,12 @@
EAPI=7
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+inherit ecm kde.org
DESCRIPTION="C++ library for controlling asynchronous tasks"
LICENSE="LGPL-2+"
-KEYWORDS=""
+SLOT="5"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64"
IUSE=""
diff --git a/dev-libs/kdiagram/kdiagram-9999.ebuild
b/dev-libs/kdiagram/kdiagram-9999.ebuild
index 78eeaae089..fa9f73040b 100644
--- a/dev-libs/kdiagram/kdiagram-9999.ebuild
+++ b/dev-libs/kdiagram/kdiagram-9999.ebuild
@@ -3,11 +3,12 @@
EAPI=7
-KDE_EXAMPLES="true"
-KDE_QTHELP="true"
-KDE_TEST="true"
+ECM_EXAMPLES="true"
+ECM_QTHELP="true"
+ECM_TEST="true"
+QTMIN=5.12.3
VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
if [[ ${KDE_BUILD_TYPE} = release ]]; then
KEYWORDS="~amd64 ~arm64 ~x86"
@@ -16,17 +17,20 @@ fi
DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business
diagrams"
HOMEPAGE="https://kde.org/
https://www.kdab.com/development-resources/qt-tools/kd-chart/";
+
+LICENSE="GPL-2" # TODO CHECK
+SLOT="5"
IUSE=""
REQUIRED_USE="test? ( examples )"
BDEPEND="
- $(add_qt_dep linguist-tools)
+ >=dev-qt/linguist-tools-${QTMIN}:5
"
DEPEND="
- $(add_qt_dep qtgui)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
b/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
index ea1a6fc566..f5d9afc869 100644
--- a/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
@@ -3,20 +3,23 @@
EAPI=7
-inherit kde5
+KFMIN=5.64.0
+QTMIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Library to expose vcards to KPeople"
HOMEPAGE="https://cgit.kde.org/kpeoplevcard.git";
LICENSE="LGPL-2.1+"
+SLOT="5"
KEYWORDS=""
IUSE=""
DEPEND="
- $(add_frameworks_dep kcontacts)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kpeople)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kpeople-${KFMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/kproperty/kproperty-9999.ebuild
b/dev-libs/kproperty/kproperty-9999.ebuild
index ce4b462c9b..e3dd5ab866 100644
--- a/dev-libs/kproperty/kproperty-9999.ebuild
+++ b/dev-libs/kproperty/kproperty-9999.ebuild
@@ -3,12 +3,18 @@
EAPI=7
-KDE_QTHELP="true"
-KDE_TEST="true" # build system adds autotests dir based on BUILD_TESTING value
-inherit kde5
+ECM_QTHELP="true"
+ECM_TEST="true" # build system adds autotests dir based on BUILD_TESTING value
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Property editing framework with editor widget similar to Qt
Designer"
-[[ ${KDE_BUILD_TYPE} != live ]] &&
SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+
+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"
@@ -16,12 +22,12 @@ KEYWORDS=""
IUSE=""
DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/kreport/kreport-9999.ebuild
b/dev-libs/kreport/kreport-9999.ebuild
index 246297b2bf..04d2245ae0 100644
--- a/dev-libs/kreport/kreport-9999.ebuild
+++ b/dev-libs/kreport/kreport-9999.ebuild
@@ -3,32 +3,37 @@
EAPI=7
-KDE_QTHELP="true"
-KDE_TEST="true"
+ECM_QTHELP="true"
+ECM_TEST="true"
PYTHON_COMPAT=( python3_{6,7} )
+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"
+
+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=""
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:5= )
+ scripting? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
"
DEPEND="${RDEPEND}
@@ -37,7 +42,7 @@ DEPEND="${RDEPEND}
pkg_setup() {
python-any-r1_pkg_setup
- kde5_pkg_setup
+ ecm_pkg_setup
}
src_configure() {
@@ -46,5 +51,5 @@ src_configure() {
$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-DKREPORT_SCRIPTING=$(usex scripting)
)
- kde5_src_configure
+ ecm_src_configure
}
diff --git a/dev-libs/kuserfeedback/kuserfeedback-9999.ebuild
b/dev-libs/kuserfeedback/kuserfeedback-9999.ebuild
index 6167e6eb1d..ae3bdbbd76 100644
--- a/dev-libs/kuserfeedback/kuserfeedback-9999.ebuild
+++ b/dev-libs/kuserfeedback/kuserfeedback-9999.ebuild
@@ -3,12 +3,15 @@
EAPI=7
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Framework to collect user feedback for applications via telemetry
and surveys"
LICENSE="MIT"
+SLOT="5"
KEYWORDS=""
IUSE="doc"
@@ -16,24 +19,24 @@ BDEPEND="
sys-devel/bison
sys-devel/flex
doc? (
- $(add_qt_dep qdoc)
- $(add_qt_dep qthelp)
+ >=dev-qt/qdoc-${QTMIN}:5
+ >=dev-qt/qthelp-${QTMIN}:5
)
"
DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_qt_dep qtcharts)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
+ >=dev-qt/qtcharts-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
"
RDEPEND="${DEPEND}"
@@ -47,5 +50,5 @@ src_configure() {
-DENABLE_TESTING=$(usex test)
)
- kde5_src_configure
+ ecm_src_configure
}
diff --git a/dev-libs/mauikit/mauikit-9999.ebuild
b/dev-libs/mauikit/mauikit-9999.ebuild
index ca874005ee..94da627111 100644
--- a/dev-libs/mauikit/mauikit-9999.ebuild
+++ b/dev-libs/mauikit/mauikit-9999.ebuild
@@ -3,36 +3,39 @@
EAPI=7
-KDE_QTHELP="true"
-inherit kde5
+ECM_QTHELP="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Templated convergent controls and multiplatform utilities for
Maui applications"
LICENSE="GPL-3"
+SLOT="5"
KEYWORDS=""
IUSE=""
DEPEND="
- $(add_frameworks_dep attica)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kservice)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtquickcontrols2)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwebengine)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/attica-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
"
RDEPEND="${DEPEND}
- $(add_frameworks_dep kirigami)
- $(add_qt_dep qtgraphicaleffects)
- $(add_qt_dep qtmultimedia 'qml')
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+ >=kde-frameworks/kirigami-${KFMIN}:5
"
