app-office/calligra: Port to ecm.eclass and kde.org.eclass

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild
index f4c78118f36f89f494527d85e90106dbc935ad9c..9e095aa47228a070e4d8d35e1550f59d9e51e9eb 100644 (file)
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -4,16 +4,19 @@
 EAPI=7
 
 CHECKREQS_DISK_BUILD="4G"
-KDE_DOC_DIR="xxx" # contains no language subdirs
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5
+ECM_HANDBOOK_DIR="xxx" # contains no language subdirs
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://www.calligra.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon sheets stage words )
@@ -27,60 +30,60 @@ BDEPEND="
        sys-devel/gettext
 "
 COMMON_DEPEND="
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcodecs)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep kemoticons)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep kguiaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kitemmodels)
-       $(add_frameworks_dep kitemviews)
-       $(add_frameworks_dep kjobwidgets)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep knotifyconfig)
-       $(add_frameworks_dep kparts)
-       $(add_frameworks_dep kross)
-       $(add_frameworks_dep ktextwidgets)
-       $(add_frameworks_dep kwallet)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep sonnet)
-       $(add_qt_dep designer)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtprintsupport)
-       $(add_qt_dep qtscript)
-       $(add_qt_dep qtsvg)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtxml)
        dev-lang/perl
+       >=dev-qt/designer-${QTMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtprintsupport-${QTMIN}:5
+       >=dev-qt/qtscript-${QTMIN}:5
+       >=dev-qt/qtsvg-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcodecs-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdelibs4support-${KFMIN}:5
+       >=kde-frameworks/kemoticons-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kitemmodels-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/kjobwidgets-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/knotifyconfig-${KFMIN}:5
+       >=kde-frameworks/kparts-${KFMIN}:5
+       >=kde-frameworks/kross-${KFMIN}:5
+       >=kde-frameworks/ktextwidgets-${KFMIN}:5
+       >=kde-frameworks/kwallet-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/sonnet-${KFMIN}:5
        sys-libs/zlib
        virtual/libiconv
-       activities? ( $(add_frameworks_dep kactivities) )
+       activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
        charts? ( dev-libs/kdiagram:5 )
        crypt? ( app-crypt/qca:2[qt5(+)] )
        fontconfig? ( media-libs/fontconfig )
-       gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
+       gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
        gsl? ( sci-libs/gsl )
        import-filter? (
-               $(add_frameworks_dep khtml)
                app-text/libetonyek
                app-text/libodfgen
                app-text/libwpd:*
                app-text/libwpg:*
                >=app-text/libwps-0.4
                dev-libs/librevenge
+               >=kde-frameworks/khtml-${KFMIN}:5
                media-libs/libvisio
        )
        lcms? (
@@ -93,19 +96,19 @@ COMMON_DEPEND="
        spacenav? ( dev-libs/libspnav )
        truetype? ( media-libs/freetype:2 )
        X? (
-               $(add_qt_dep qtx11extras)
+               >=dev-qt/qtx11extras-${QTMIN}:5
                x11-libs/libX11
        )
        calligra_features_sheets? ( dev-cpp/eigen:3 )
-       calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
+       calligra_features_stage? ( okular? ( >=kde-apps/okular-19.04.3:5 ) )
        calligra_features_words? (
                dev-libs/libxslt
-               okular? ( $(add_kdeapps_dep okular) )
+               okular? ( >=kde-apps/okular-19.04.3:5 )
        )
 "
 DEPEND="${COMMON_DEPEND}
        dev-libs/boost
-       test? ( $(add_frameworks_dep threadweaver) )
+       test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
        calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
@@ -128,12 +131,12 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-       kde5_pkg_setup
+       ecm_pkg_setup
        check-reqs_pkg_setup
 }
 
 src_prepare() {
-       kde5_src_prepare
+       ecm_src_prepare
 
        if has_version ">=app-text/poppler-0.82"; then
                eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make upstreamable patch
@@ -149,8 +152,8 @@ src_prepare() {
        fi
 
        # Unconditionally disable deprecated deps (required by QtQuick1)
-       punt_bogus_dep Qt5 Declarative
-       punt_bogus_dep Qt5 OpenGL
+       ecm_punt_bogus_dep Qt5 Declarative
+       ecm_punt_bogus_dep Qt5 OpenGL
 
        # Hack around the excessive use of CMake macros
        if use okular && ! use calligra_features_words; then
@@ -180,12 +183,12 @@ src_configure() {
                -DRELEASE_BUILD=ON
                -DWITH_Iconv=ON
                -DPRODUCTSET="${myproducts[*]}"
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package charts KChart)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package charts KChart)
                -DWITH_Qca-qt5=$(usex crypt)
                -DWITH_Fontconfig=$(usex fontconfig)
-               $(cmake-utils_use_find_package gemini Libgit2)
-               $(cmake-utils_use_find_package gemini Qt5QuickWidgets)
+               $(cmake_use_find_package gemini Libgit2)
+               $(cmake_use_find_package gemini Qt5QuickWidgets)
                -DWITH_GSL=$(usex gsl)
                -DWITH_LibEtonyek=$(usex import-filter)
                -DWITH_LibOdfGen=$(usex import-filter)
@@ -194,7 +197,7 @@ src_configure() {
                -DWITH_LibWpd=$(usex import-filter)
                -DWITH_LibWpg=$(usex import-filter)
                -DWITH_LibWps=$(usex import-filter)
-               $(cmake-utils_use_find_package phonon Phonon4Qt5)
+               $(cmake_use_find_package phonon Phonon4Qt5)
                -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
                -DWITH_LCMS2=$(usex lcms)
                -DWITH_Okular5=$(usex okular)
@@ -206,5 +209,5 @@ src_configure() {
                -DWITH_Freetype=$(usex truetype)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }