commit: 9d1961698a72fa5515f417cb3838554ed0c123ed Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 13 01:17:56 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=9d196169
app-office: 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> app-office/calligra/calligra-9999.ebuild | 107 ++++++++++++++------------- app-office/kexi/kexi-9999.ebuild | 77 ++++++++++--------- app-office/kmymoney/kmymoney-9999.ebuild | 89 +++++++++++----------- app-office/kraft/kraft-9999.ebuild | 37 +++++---- app-office/libalkimia/libalkimia-9999.ebuild | 50 +++++++------ app-office/skrooge/skrooge-9999.ebuild | 98 ++++++++++++------------ 6 files changed, 245 insertions(+), 213 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 6b6321c20c..fb1ef19c30 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -4,9 +4,11 @@ EAPI=7 CHECKREQS_DISK_BUILD="4G" -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit check-reqs kde5 +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit check-reqs ecm kde.org DESCRIPTION="KDE Office Suite" HOMEPAGE="https://www.calligra.org/"; @@ -19,6 +21,7 @@ fi CAL_FTS=( flow karbon sheets stage words ) LICENSE="GPL-2" +SLOT="5" IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" @@ -28,60 +31,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-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 dev-lang/perl + >=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? ( @@ -94,19 +97,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:5 ) ) calligra_features_words? ( dev-libs/libxslt - okular? ( $(add_kdeapps_dep okular) ) + okular? ( kde-apps/okular: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] ) @@ -120,12 +123,12 @@ pkg_pretend() { } pkg_setup() { - kde5_pkg_setup + ecm_pkg_setup check-reqs_pkg_setup } src_prepare() { - kde5_src_prepare + ecm_src_prepare if ! use test; then sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ @@ -133,8 +136,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 @@ -190,5 +193,5 @@ src_configure() { -DWITH_Freetype=$(usex truetype) ) - kde5_src_configure + ecm_src_configure } diff --git a/app-office/kexi/kexi-9999.ebuild b/app-office/kexi/kexi-9999.ebuild index 0730466c71..47ade34fac 100644 --- a/app-office/kexi/kexi-9999.ebuild +++ b/app-office/kexi/kexi-9999.ebuild @@ -3,46 +3,55 @@ EAPI=7 -# KDE_HANDBOOK="true" -KDE_TEST="forceoptional" -inherit kde5 +# ECM_HANDBOOK="true" +ECM_TEST="forceoptional" +KDE_APPS_MINIMAL=19.04.3 +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Visual database applications creator" -HOMEPAGE="https://kde.org/applications/office/kexi/ http://www.kexi-project.org/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" +HOMEPAGE="https://kde.org/applications/office/org.kde.kexi +https://userbase.kde.org/Kexi"; -KEYWORDS="" +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" IUSE="debug experimental marble mdb mysql postgres sqlite webkit" BDEPEND="sys-devel/gettext" DEPEND=" - $(add_frameworks_dep breeze-icons-rcc) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep designer) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] - marble? ( $(add_kdeapps_dep marble) ) + >=dev-qt/designer-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/breeze-icons-rcc-${KFMIN}:5 + >=kde-frameworks/karchive-${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/kcrash-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/ktexteditor-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + marble? ( kde-apps/marble:5= ) mdb? ( dev-libs/glib:2 virtual/libiconv @@ -58,11 +67,11 @@ RDEPEND="${DEPEND}" src_prepare() { if ! use webkit; then - punt_bogus_dep Qt5 WebKit - punt_bogus_dep Qt5 WebKitWidgets + ecm_punt_bogus_dep Qt5 WebKit + ecm_punt_bogus_dep Qt5 WebKitWidgets fi - kde5_src_prepare + ecm_src_prepare } src_configure() { @@ -77,5 +86,5 @@ src_configure() { ) use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) ) - kde5_src_configure + ecm_src_configure } diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild index b79fa7d81f..7c0b96b91a 100644 --- a/app-office/kmymoney/kmymoney-9999.ebuild +++ b/app-office/kmymoney/kmymoney-9999.ebuild @@ -5,80 +5,85 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) -KDE_HANDBOOK="optional" -KDE_TEST="forceoptional" +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KDE_APPS_MINIMAL=19.04.3 +KFMIN=5.60.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" VIRTUALDBUS_TEST="true" -inherit kde5 python-single-r1 +inherit ecm kde.org python-single-r1 DESCRIPTION="Personal finance manager based on KDE Frameworks" HOMEPAGE="https://kmymoney.org"; + if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2" +SLOT="5" IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob" REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )" BDEPEND="virtual/pkgconfig" COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep sonnet) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error - activities? ( $(add_frameworks_dep kactivities) ) + >=dev-qt/qtdbus-${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 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) addressbook? ( - $(add_frameworks_dep kcontacts) - $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep kidentitymanagement) + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5 + >=kde-apps/kidentitymanagement-${KDE_APPS_MINIMAL}:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.99.40_beta >=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5] ) - holidays? ( $(add_frameworks_dep kholidays) ) + holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) ofx? ( dev-libs/libofx ) webkit? ( - $(add_frameworks_dep kdewebkit) + >=kde-frameworks/kdewebkit-${KFMIN}:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) - !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) + !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) weboob? ( ${PYTHON_DEPS} - $(add_qt_dep qtconcurrent) + >=dev-qt/qtconcurrent-${QTMIN}:5 www-client/weboob[${PYTHON_USEDEP}] ) " @@ -92,7 +97,7 @@ RDEPEND="${COMMON_DEPEND} pkg_setup() { use weboob && python_setup - kde5_pkg_setup + ecm_pkg_setup } src_configure() { @@ -110,7 +115,7 @@ src_configure() { -DENABLE_WEBOOB=$(usex weboob) $(cmake-utils_use_find_package weboob PythonLibs) ) - kde5_src_configure + ecm_src_configure } src_test() { @@ -119,5 +124,5 @@ src_test() { -E "(reports-chart-test|qsqlcipher-test)" ) - kde5_src_test + ecm_src_test } diff --git a/app-office/kraft/kraft-9999.ebuild b/app-office/kraft/kraft-9999.ebuild index 64b25b530f..c566080fff 100644 --- a/app-office/kraft/kraft-9999.ebuild +++ b/app-office/kraft/kraft-9999.ebuild @@ -3,32 +3,37 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +KDE_APPS_MINIMAL=19.04.3 +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org EGIT_REPO_URI="https://github.com/dragotin/kraft"; DESCRIPTION="Software to manage quotes and invoices in small enterprises" HOMEPAGE="http://www.volle-kraft-voraus.de/"; +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" KEYWORDS="" IUSE="pim" DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcontacts) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) dev-cpp/ctemplate + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 pim? ( - $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep akonadi-contacts) + >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5 + >=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5 ) " RDEPEND="${DEPEND} @@ -43,5 +48,5 @@ src_configure() { $(cmake-utils_use_find_package pim KF5AkonadiContact) ) - kde5_src_configure + ecm_src_configure } diff --git a/app-office/libalkimia/libalkimia-9999.ebuild b/app-office/libalkimia/libalkimia-9999.ebuild index 204af9dfcb..b3ca92988e 100644 --- a/app-office/libalkimia/libalkimia-9999.ebuild +++ b/app-office/libalkimia/libalkimia-9999.ebuild @@ -3,17 +3,21 @@ EAPI=7 -KDE_TEST="forceoptional" -KMNAME="alkimia" -inherit kde5 +ECM_TEST="forceoptional" +KDE_ORG_NAME="alkimia" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/${KMNAME}-${PV}.tar.xz" + SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz" KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Library with common classes and functionality used by KDE finance applications" -HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"; +HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323 +https://community.kde.org/Alkimia"; + LICENSE="LGPL-2.1" SLOT="0/8" IUSE="doc gmp plasma" @@ -23,27 +27,27 @@ BDEPEND=" doc? ( app-doc/doxygen ) " DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdelibs4support-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 !gmp? ( sci-libs/mpir:=[cxx] ) gmp? ( dev-libs/gmp:0=[cxx] ) plasma? ( - $(add_frameworks_dep kpackage) - $(add_frameworks_dep plasma) + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 ) " RDEPEND="${DEPEND}" @@ -54,5 +58,5 @@ src_configure() { $(cmake-utils_use_find_package !gmp MPIR) -DBUILD_APPLETS=$(usex plasma) ) - kde5_src_configure + ecm_src_configure } diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild index 234d43d073..b7264f9642 100644 --- a/app-office/skrooge/skrooge-9999.ebuild +++ b/app-office/skrooge/skrooge-9999.ebuild @@ -3,17 +3,23 @@ EAPI=7 -KDE_HANDBOOK="optional" -KDE_TEST="forceoptional" +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit kde5 +inherit ecm kde.org DESCRIPTION="Personal finances manager, aiming at being simple and intuitive" HOMEPAGE="https://skrooge.org/"; -[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="GPL-2" -KEYWORDS="" +SLOT="5" IUSE="activities designer kde ofx webkit" REQUIRED_USE="test? ( designer )" @@ -23,56 +29,56 @@ BDEPEND=" virtual/pkgconfig " COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) - $(add_qt_dep qtsql '' '' '5=') - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 - activities? ( $(add_frameworks_dep kactivities) ) - kde? ( $(add_frameworks_dep krunner) ) + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtscript-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5= + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) + kde? ( >=kde-frameworks/krunner-${KFMIN}:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) - !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) + !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) " DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kwindowsystem) + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 designer? ( - $(add_frameworks_dep kdesignerplugin) - $(add_qt_dep designer) + >=kde-frameworks/kdesignerplugin-${KFMIN}:5 + >=dev-qt/designer-${QTMIN}:5 ) " RDEPEND="${COMMON_DEPEND} - $(add_qt_dep qtquickcontrols) + >=dev-qt/qtquickcontrols-${QTMIN}:5 " # hangs + installs files @@ -88,12 +94,12 @@ src_configure() { -DSKG_WEBENGINE=$(usex !webkit) ) - kde5_src_configure + ecm_src_configure } src_test() { local mycmakeargs=( -DSKG_BUILD_TEST=ON ) - kde5_src_test + ecm_src_test }
