commit: 8abab8f0b4dce52db8e968d591a5aa4bc75bf75d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 13 00:29:51 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 13 00:31:12 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8abab8f0
kde-misc: Port to ecm.eclass and kde.org.eclass Fix a few HOMEPAGEs and LICENSEs in the process. Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/akonadiclient/akonadiclient-9999.ebuild | 27 ++++---- kde-misc/apper/apper-9999.ebuild | 58 +++++++++-------- kde-misc/colord-kde/colord-kde-9999.ebuild | 33 +++++----- kde-misc/itinerary/itinerary-9999.ebuild | 38 ++++++----- kde-misc/kdeconnect/kdeconnect-9999.ebuild | 68 ++++++++++---------- kde-misc/kdiff3/kdiff3-9999.ebuild | 38 ++++++----- kde-misc/kimtoy/kimtoy-9999.ebuild | 44 ++++++------- kde-misc/kio-fuse/kio-fuse-9999.ebuild | 17 ++--- kde-misc/kio-gdrive/kio-gdrive-9999.ebuild | 38 +++++------ kde-misc/kio-stash/kio-stash-9999.ebuild | 16 ++--- .../kmarkdownwebview/kmarkdownwebview-9999.ebuild | 25 ++++---- kde-misc/kolor-manager/kolor-manager-9999.ebuild | 15 ++--- kde-misc/kooka/kooka-9999.ebuild | 35 ++++++----- .../kpublictransport/kpublictransport-9999.ebuild | 13 ++-- kde-misc/kregexpeditor/kregexpeditor-9999.ebuild | 36 ++++++----- kde-misc/krename/krename-9999.ebuild | 43 +++++++------ kde-misc/krusader/krusader-9999.ebuild | 68 ++++++++++---------- kde-misc/ktrip/ktrip-9999.ebuild | 20 +++--- kde-misc/kwebkitpart/kwebkitpart-9999.ebuild | 35 ++++++----- kde-misc/latte-dock/latte-dock-9999.ebuild | 56 ++++++++--------- .../plasma-applet-network-monitor-9999.ebuild | 18 +++--- .../plasma-applet-weather-widget-9999.ebuild | 20 +++--- kde-misc/plasma-pass/plasma-pass-9999.ebuild | 23 ++++--- .../plasma-redshift-control-9999.ebuild | 5 +- kde-misc/rsibreak/rsibreak-9999.ebuild | 49 ++++++++------- kde-misc/skanlite/skanlite-9999.ebuild | 35 ++++++----- kde-misc/wacomtablet/wacomtablet-9999.ebuild | 44 +++++++------ kde-misc/zanshin/zanshin-9999.ebuild | 73 ++++++++++++---------- 28 files changed, 532 insertions(+), 458 deletions(-) diff --git a/kde-misc/akonadiclient/akonadiclient-9999.ebuild b/kde-misc/akonadiclient/akonadiclient-9999.ebuild index 5129c4059a..c41b3560fd 100644 --- a/kde-misc/akonadiclient/akonadiclient-9999.ebuild +++ b/kde-misc/akonadiclient/akonadiclient-9999.ebuild @@ -3,28 +3,31 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Commandline interface for accessing Akonadi" HOMEPAGE="https://cgit.kde.org/akonadiclient.git/"; -LICENSE="GPL-2" +LICENSE="GPL-2" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcontacts) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_kdeapps_dep akonadi 'xml') - $(add_qt_dep qtwidgets) + >=dev-qt/qtwidgets-${QTMIN}:5 + kde-apps/akonadi:5[xml] + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 " RDEPEND="${DEPEND}" src_prepare() { - cmake-utils_src_prepare - punt_bogus_dep KF5 KIO # we don't need it with >=Qt-5.10 + ecm_src_prepare + ecm_punt_bogus_dep KF5 KIO # we don't need it with >=Qt-5.10 } diff --git a/kde-misc/apper/apper-9999.ebuild b/kde-misc/apper/apper-9999.ebuild index c51815dbac..0ca2efdd36 100644 --- a/kde-misc/apper/apper-9999.ebuild +++ b/kde-misc/apper/apper-9999.ebuild @@ -3,41 +3,45 @@ EAPI=7 -inherit kde5 +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="KDE Plasma PackageKit frontend" -HOMEPAGE="https://cgit.kde.org/apper.git"; +HOMEPAGE="https://kde.org/applications/system/org.kde.apper +https://userbase.kde.org/Apper"; LICENSE="GPL-2" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kcmutils) - $(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 kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep solid) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtcore) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxmlpatterns) >=app-admin/packagekit-qt-1.0.0 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxmlpatterns-${QTMIN}:5 + >=kde-frameworks/kcmutils-${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/kded-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + kde-plasma/libkworkspace:5 " RDEPEND="${DEPEND}" @@ -50,5 +54,5 @@ src_configure() { -DMAINTAINER=OFF ) - kde5_src_configure + ecm_src_configure } diff --git a/kde-misc/colord-kde/colord-kde-9999.ebuild b/kde-misc/colord-kde/colord-kde-9999.ebuild index e3b5ff7b52..f98c8be25e 100644 --- a/kde-misc/colord-kde/colord-kde-9999.ebuild +++ b/kde-misc/colord-kde/colord-kde-9999.ebuild @@ -3,43 +3,46 @@ EAPI=7 -inherit kde5 +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Provides interfaces and session daemon to colord" HOMEPAGE="https://cgit.kde.org/colord-kde.git"; #SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2+" +SLOT="5" KEYWORDS="" IUSE="" COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr " DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kwindowsystem) + >=kde-frameworks/kwindowsystem-${KFMIN}:5 " RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) + kde-plasma/kde-cli-tools:5 x11-misc/colord " pkg_postinst() { - kde5_pkg_postinst + ecm_pkg_postinst if ! has_version "gnome-extra/gnome-color-manager"; then elog "You may want to install gnome-extra/gnome-color-manager to add support for" elog "colorhug calibration devices." diff --git a/kde-misc/itinerary/itinerary-9999.ebuild b/kde-misc/itinerary/itinerary-9999.ebuild index 401da518d5..b5d6c2ff00 100644 --- a/kde-misc/itinerary/itinerary-9999.ebuild +++ b/kde-misc/itinerary/itinerary-9999.ebuild @@ -3,34 +3,38 @@ EAPI=7 -KDE_TEST="forceoptional" -inherit kde5 +ECM_TEST="forceoptional" +KDE_APPS_MINIMAL=19.04.3 +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Data Model and Extraction System for Travel Reservation information" -HOMEPAGE="https://kde.org/applications/office/kontact/"; +HOMEPAGE+=" https://www.volkerkrause.eu/2018/08/19/kde-itinerary-introduction.html"; LICENSE="LGPL-2+" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kcontacts) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kholidays) - $(add_frameworks_dep ki18n) - $(add_kdeapps_dep kitinerary) - $(add_kdeapps_dep kpkpass) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtpositioning) - $(add_qt_dep qtwidgets) + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtpositioning-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/kitinerary-${KDE_APPS_MINIMAL}:5 + >=kde-apps/kpkpass-${KDE_APPS_MINIMAL}:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kholidays-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 kde-misc/kpublictransport:5 sys-libs/zlib " RDEPEND="${DEPEND} - $(add_frameworks_dep kirigami) - $(add_frameworks_dep prison) - $(add_qt_dep qtquickcontrols2) + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/prison-${KFMIN}:5 !kde-apps/itinerary " diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild index 5fcb07b123..40ca7d9d79 100644 --- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild @@ -3,44 +3,48 @@ EAPI=7 -KDE_HANDBOOK="optional" -KDE_TEST="true" -KMNAME="${PN}-kde" +ECM_HANDBOOK="optional" +ECM_TEST="true" +KDE_ORG_NAME="${PN}-kde" KDE_SELINUX_MODULE="${PN}" -inherit kde5 +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-${PV}.tar.xz" + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KDE_ORG_NAME}-${PV}.tar.xz" KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Adds communication between KDE Plasma and your smartphone" HOMEPAGE="https://kde.org/ https://community.kde.org/KDEConnect"; + LICENSE="GPL-2+" +SLOT="5" IUSE="app bluetooth kde mousepad phonon pulseaudio sms wayland" DEPEND=" - $(add_frameworks_dep kcmutils) - $(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 knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) >=app-crypt/qca-2.1.0:2[qt5(+),ssl] - app? ( $(add_frameworks_dep kdeclarative) ) - bluetooth? ( $(add_qt_dep qtbluetooth) ) - kde? ( $(add_frameworks_dep krunner) ) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcmutils-${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/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + app? ( >=kde-frameworks/kdeclarative-${KFMIN}:5 ) + bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 ) + kde? ( >=kde-frameworks/krunner-${KFMIN}:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 @@ -48,15 +52,15 @@ DEPEND=" ) phonon? ( media-libs/phonon ) pulseaudio? ( media-libs/pulseaudio-qt ) - sms? ( $(add_frameworks_dep kpeople) ) - wayland? ( $(add_frameworks_dep kwayland) ) + sms? ( >=kde-frameworks/kpeople-${KFMIN}:5 ) + wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) " RDEPEND="${DEPEND} - $(add_qt_dep qtquickcontrols2) + >=dev-qt/qtquickcontrols2-${QTMIN}:5 net-fs/sshfs - app? ( $(add_frameworks_dep kirigami) ) + app? ( >=kde-frameworks/kirigami-${KFMIN}:5 ) sms? ( - $(add_frameworks_dep kirigami) + >=kde-frameworks/kirigami-${KFMIN}:5 dev-libs/kpeoplevcard ) " @@ -75,11 +79,11 @@ src_configure() { $(cmake-utils_use_find_package wayland KF5Wayland) ) - kde5_src_configure + ecm_src_configure } pkg_postinst(){ - kde5_pkg_postinst + ecm_pkg_postinst elog "The Android .apk file is available via" elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"; diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild index 9d64282038..ffea6cce80 100644 --- a/kde-misc/kdiff3/kdiff3-9999.ebuild +++ b/kde-misc/kdiff3/kdiff3-9999.ebuild @@ -3,31 +3,35 @@ EAPI=7 -KDE_HANDBOOK="optional" -inherit kde5 +ECM_HANDBOOK="optional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Frontend to diff3 based on KDE Frameworks" -HOMEPAGE="https://userbase.kde.org/KDiff3"; +HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3 +https://userbase.kde.org/KDiff3"; LICENSE="GPL-2" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kparts) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 " RDEPEND="${DEPEND} sys-apps/diffutils diff --git a/kde-misc/kimtoy/kimtoy-9999.ebuild b/kde-misc/kimtoy/kimtoy-9999.ebuild index 8c1e6a0daf..8c28415c5c 100644 --- a/kde-misc/kimtoy/kimtoy-9999.ebuild +++ b/kde-misc/kimtoy/kimtoy-9999.ebuild @@ -3,39 +3,41 @@ EAPI=7 -inherit kde5 +inherit ecm kde.org -DESCRIPTION="An input method frontend for Plasma" +DESCRIPTION="Input method frontend for Plasma" HOMEPAGE="https://www.linux-apps.com/content/show.php?content=140967"; -if [[ ${KDE_BUILD_TYPE} != live ]]; then + +if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="https://dl.opendesktop.org/api/files/download/id/1466629206/140967-${P}.tar.bz2"; + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2+" -KEYWORDS="" +SLOT="5" IUSE="libressl scim semantic-desktop" DEPEND=" - $(add_frameworks_dep karchive) - $(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 knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + kde-frameworks/karchive:5 + kde-frameworks/kconfig:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kdbusaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kiconthemes:5 + kde-frameworks/kio:5 + kde-frameworks/knewstuff:5 + kde-frameworks/knotifications:5 + kde-frameworks/kwidgetsaddons:5 + kde-frameworks/kwindowsystem:5 + kde-frameworks/kxmlgui:5 + kde-frameworks/plasma:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) @@ -44,14 +46,14 @@ DEPEND=" >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) + semantic-desktop? ( kde-frameworks/kfilemetadata:5 ) " RDEPEND="${DEPEND} >=app-i18n/fcitx-4.0 " src_prepare() { - kde5_src_prepare + ecm_src_prepare # bug 581736 cmake_comment_add_subdirectory po @@ -64,5 +66,5 @@ src_configure() { $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) ) - kde5_src_configure + ecm_src_configure } diff --git a/kde-misc/kio-fuse/kio-fuse-9999.ebuild b/kde-misc/kio-fuse/kio-fuse-9999.ebuild index 90ef852be6..a45fd511ac 100644 --- a/kde-misc/kio-fuse/kio-fuse-9999.ebuild +++ b/kde-misc/kio-fuse/kio-fuse-9999.ebuild @@ -3,22 +3,25 @@ EAPI=7 -KDE_TEST="optional" -inherit kde5 +ECM_TEST="optional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="FUSE interface for KIO" HOMEPAGE="https://feverfew.home.blog/2019/09/10/kiofuse-final-report/"; LICENSE="GPL-3+" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 sys-fs/fuse:3 " RDEPEND="${DEPEND}" diff --git a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild index 4159029308..c6605a101a 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild @@ -3,10 +3,11 @@ EAPI=7 -KDE_APPS_MINIMAL="19.08.0" -KDE_HANDBOOK="forceoptional" -KDE_TEST="optional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="KIO Slave for Google Drive service" HOMEPAGE="https://phabricator.kde.org/project/profile/72/"; @@ -16,25 +17,24 @@ if [[ ${KDE_BUILD_TYPE} != live ]] ; then KEYWORDS="~amd64 ~x86" fi +LICENSE="GPL-2+" +SLOT="5" IUSE="+kaccounts" BDEPEND="dev-util/intltool" -COMMON_DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_kdeapps_dep libkgapi) - $(add_qt_dep qtwidgets) - kaccounts? ( $(add_kdeapps_dep kaccounts-integration) ) +RDEPEND=" + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/libkgapi-19.08.0:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + kaccounts? ( kde-apps/kaccounts-integration:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) " -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) -" -RDEPEND="${COMMON_DEPEND} - kaccounts? ( $(add_kdeapps_dep kaccounts-providers) ) +DEPEND="${RDEPEND} + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 " DOCS=( README.md ) @@ -43,5 +43,5 @@ src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package kaccounts KAccounts) ) - kde5_src_configure + ecm_src_configure } diff --git a/kde-misc/kio-stash/kio-stash-9999.ebuild b/kde-misc/kio-stash/kio-stash-9999.ebuild index be903b8d4d..6c265262b5 100644 --- a/kde-misc/kio-stash/kio-stash-9999.ebuild +++ b/kde-misc/kio-stash/kio-stash-9999.ebuild @@ -3,8 +3,8 @@ EAPI=7 -KDE_TEST="forceoptional" -inherit kde5 +ECM_TEST="forceoptional" +inherit ecm kde.org DESCRIPTION="KIO Slave and daemon to stash discontinuous file selections" HOMEPAGE="https://arnavdhamija.com/2017/07/04/kio-stash-shipped/ https://cgit.kde.org/kio-stash.git"; @@ -17,11 +17,11 @@ IUSE="" RESTRICT+=" test" DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_qt_dep qtdbus) + dev-qt/qtdbus:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kdbusaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 " RDEPEND="${DEPEND}" diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-9999.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-9999.ebuild index aaf4567461..e6a1542b34 100644 --- a/kde-misc/kmarkdownwebview/kmarkdownwebview-9999.ebuild +++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-9999.ebuild @@ -3,28 +3,29 @@ EAPI=7 -inherit kde5 +inherit ecm kde.org DESCRIPTION="KPart for rendering Markdown content" HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"; LICENSE="!webkit? ( BSD ) LGPL-2.1+" +SLOT="5" KEYWORDS="" IUSE="webkit" DEPEND=" - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kparts:5 + kde-frameworks/kxmlgui:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( - $(add_qt_dep qtwebchannel) - $(add_qt_dep qtwebengine 'widgets') + dev-qt/qtwebchannel:5 + dev-qt/qtwebengine:5[widgets] ) " RDEPEND="${DEPEND}" @@ -34,5 +35,5 @@ src_configure() { -DUSE_QTWEBKIT=$(usex webkit) ) - kde5_src_configure + ecm_src_configure } diff --git a/kde-misc/kolor-manager/kolor-manager-9999.ebuild b/kde-misc/kolor-manager/kolor-manager-9999.ebuild index 320ea44333..ba8530c4df 100644 --- a/kde-misc/kolor-manager/kolor-manager-9999.ebuild +++ b/kde-misc/kolor-manager/kolor-manager-9999.ebuild @@ -3,22 +3,23 @@ EAPI=7 -KDE_HANDBOOK="optional" -KDE_PO_DIRS="doc/user/po" -inherit kde5 +ECM_HANDBOOK="optional" +ECM_PO_DIRS="doc/user/po" +inherit ecm kde.org DESCRIPTION="KControl module for Oyranos CMS cross desktop settings" HOMEPAGE="https://www.oyranos.org/kolormanager"; LICENSE="BSD-2" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_qt_dep qtwidgets) + dev-qt/qtwidgets:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 diff --git a/kde-misc/kooka/kooka-9999.ebuild b/kde-misc/kooka/kooka-9999.ebuild index c07bd6fca3..cb2af95101 100644 --- a/kde-misc/kooka/kooka-9999.ebuild +++ b/kde-misc/kooka/kooka-9999.ebuild @@ -3,32 +3,35 @@ EAPI=7 -KDE_HANDBOOK="true" -inherit kde5 +ECM_HANDBOOK="true" +inherit ecm kde.org DESCRIPTION="Scanning application by KDE" HOMEPAGE="https://userbase.kde.org/Kooka https://techbase.kde.org/Projects/Kooka"; + +LICENSE="GPL-2+" +SLOT="5" KEYWORDS="" BDEPEND=" virtual/pkgconfig " DEPEND=" - $(add_frameworks_dep kcompletion) - $(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 kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) app-text/libpaper + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + kde-frameworks/kcompletion:5 + kde-frameworks/kconfig:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kiconthemes:5 + kde-frameworks/kservice:5 + kde-frameworks/ktextwidgets:5 + kde-frameworks/kwidgetsaddons:5 + kde-frameworks/kxmlgui:5 media-gfx/sane-backends media-libs/tiff:0 " diff --git a/kde-misc/kpublictransport/kpublictransport-9999.ebuild b/kde-misc/kpublictransport/kpublictransport-9999.ebuild index 511af78346..dea798062d 100644 --- a/kde-misc/kpublictransport/kpublictransport-9999.ebuild +++ b/kde-misc/kpublictransport/kpublictransport-9999.ebuild @@ -3,20 +3,23 @@ EAPI=7 -KDE_TEST="forceoptional" -inherit kde5 +ECM_TEST="forceoptional" +KFMIN=5.64.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Library for accessing public transport timetables and other information" HOMEPAGE="https://cgit.kde.org/kpublictransport.git/tree/ https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"; LICENSE="LGPL-2+" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 " RDEPEND="${DEPEND}" diff --git a/kde-misc/kregexpeditor/kregexpeditor-9999.ebuild b/kde-misc/kregexpeditor/kregexpeditor-9999.ebuild index bfda12488b..287134ac7e 100644 --- a/kde-misc/kregexpeditor/kregexpeditor-9999.ebuild +++ b/kde-misc/kregexpeditor/kregexpeditor-9999.ebuild @@ -3,30 +3,32 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +inherit ecm kde.org DESCRIPTION="GUI for creating and editing regular expressions" +LICENSE="GPL-2" +SLOT="5" KEYWORDS="" IUSE="" -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) -" -RDEPEND="${DEPEND}" BDEPEND=" sys-devel/bison sys-devel/flex " +DEPEND=" + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + kde-frameworks/kconfig:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kcrash:5 + kde-frameworks/ki18n:5 + kde-frameworks/kiconthemes:5 + kde-frameworks/kio:5 + kde-frameworks/ktextwidgets:5 + kde-frameworks/kwidgetsaddons:5 +" +RDEPEND="${DEPEND}" diff --git a/kde-misc/krename/krename-9999.ebuild b/kde-misc/krename/krename-9999.ebuild index b08d475949..43357aa582 100644 --- a/kde-misc/krename/krename-9999.ebuild +++ b/kde-misc/krename/krename-9999.ebuild @@ -3,37 +3,40 @@ EAPI=7 -KDE_TEST="true" -inherit kde5 +ECM_TEST="true" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Powerful batch file renamer" HOMEPAGE="https://kde.org/applications/utilities/org.kde.krename https://userbase.kde.org/KRename"; LICENSE="GPL-2" +SLOT="5" KEYWORDS="" IUSE="exif office pdf taglib truetype" BDEPEND="sys-devel/gettext" DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kjs-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 exif? ( media-gfx/exiv2:= ) - office? ( $(add_frameworks_dep karchive) ) + office? ( >=kde-frameworks/karchive-${KFMIN}:5 ) pdf? ( app-text/podofo:= ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) @@ -49,5 +52,5 @@ src_configure() { $(cmake-utils_use_find_package truetype Freetype) ) - kde5_src_configure + ecm_src_configure } diff --git a/kde-misc/krusader/krusader-9999.ebuild b/kde-misc/krusader/krusader-9999.ebuild index d1cc1161c3..731f5f5e99 100644 --- a/kde-misc/krusader/krusader-9999.ebuild +++ b/kde-misc/krusader/krusader-9999.ebuild @@ -3,8 +3,10 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" @@ -13,49 +15,51 @@ fi DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras" HOMEPAGE="https://krusader.org/"; + LICENSE="GPL-2+" +SLOT="5" IUSE="" COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${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/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/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${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/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 sys-apps/acl sys-libs/zlib " DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) + >=dev-qt/qtconcurrent-${QTMIN}:5 " RDEPEND="${COMMON_DEPEND} - $(add_kdeapps_dep kio-extras) + kde-apps/kio-extras:5 " pkg_postinst() { - kde5_pkg_postinst + ecm_pkg_postinst if ! has_version kde-apps/thumbnailers:${SLOT} || ! has_version kde-apps/ffmpegthumbs:${SLOT} ; then diff --git a/kde-misc/ktrip/ktrip-9999.ebuild b/kde-misc/ktrip/ktrip-9999.ebuild index 91549777ab..4e7296ad1c 100644 --- a/kde-misc/ktrip/ktrip-9999.ebuild +++ b/kde-misc/ktrip/ktrip-9999.ebuild @@ -3,26 +3,28 @@ EAPI=7 -inherit kde5 +KFMIN=5.60.0 +inherit ecm kde.org DESCRIPTION="Public transport assistant targeted towards mobile Linux and Android" HOMEPAGE="https://cgit.kde.org/kpublictransport.git/tree/ https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"; LICENSE="GPL-2+" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep ki18n) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + >=kde-frameworks/ki18n-${KFMIN}:5 kde-misc/kpublictransport:5 " RDEPEND="${DEPEND} - $(add_frameworks_dep kirigami) - $(add_frameworks_dep plasma) - $(add_qt_dep qtquickcontrols) - $(add_qt_dep qtquickcontrols2) + dev-qt/qtquickcontrols:5 + dev-qt/qtquickcontrols2:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 " diff --git a/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild b/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild index ef0bb74b92..b7f58ad8fb 100644 --- a/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild +++ b/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild @@ -3,32 +3,33 @@ EAPI=7 -inherit kde5 +inherit ecm kde.org DESCRIPTION="WebKit KPart for Konqueror" HOMEPAGE="https://cgit.kde.org/kwebkitpart.git"; LICENSE="LGPL-2" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdewebkit) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep sonnet) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 - $(add_qt_dep qtwidgets) + dev-qt/qtwidgets:5 + kde-frameworks/kcompletion:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kdewebkit:5 + kde-frameworks/ki18n:5 + kde-frameworks/kiconthemes:5 + kde-frameworks/kio:5 + kde-frameworks/kparts:5 + kde-frameworks/kservice:5 + kde-frameworks/kwidgetsaddons:5 + kde-frameworks/kxmlgui:5 + kde-frameworks/sonnet:5 " RDEPEND="${DEPEND}" diff --git a/kde-misc/latte-dock/latte-dock-9999.ebuild b/kde-misc/latte-dock/latte-dock-9999.ebuild index 3c9f5501f3..0a477aa5d5 100644 --- a/kde-misc/latte-dock/latte-dock-9999.ebuild +++ b/kde-misc/latte-dock/latte-dock-9999.ebuild @@ -3,8 +3,9 @@ EAPI=7 -FRAMEWORKS_MINIMAL="5.63.0" -inherit kde5 +KFMIN=5.63.0 +QTMIN=5.12.3 +inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" @@ -12,38 +13,37 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then fi DESCRIPTION="Elegant dock, based on KDE Frameworks" -HOMEPAGE="https://store.kde.org/p/1169519/ - https://github.com/psifidotos/Latte-Dock"; +HOMEPAGE="https://kde.org/applications/utilities/org.kde.latte-dock"; LICENSE="GPL-2+" SLOT="0" IUSE="" DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma X) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtgui 'xcb') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[xcb] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5[X] x11-libs/libSM x11-libs/libX11 x11-libs/libxcb diff --git a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-9999.ebuild b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-9999.ebuild index 7781f6cf42..84c82fb3fe 100644 --- a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-9999.ebuild +++ b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-9999.ebuild @@ -3,23 +3,25 @@ EAPI=7 -inherit kde5 +inherit ecm -DESCRIPTION="Plasma 5 applet for monitoring active network connections" -HOMEPAGE="https://store.kde.org/p/998914/ -https://github.com/kotelnik/plasma-applet-network-monitor"; - -if [[ ${KDE_BUILD_TYPE} = live ]] ; then +if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git"; + inherit git-r3 else SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" fi +DESCRIPTION="Plasma 5 applet for monitoring active network connections" +HOMEPAGE="https://store.kde.org/p/998914/ +https://github.com/kotelnik/plasma-applet-network-monitor"; + LICENSE="GPL-2+" -KEYWORDS="" +SLOT="5" IUSE="" DEPEND=" - $(add_frameworks_dep plasma) + kde-frameworks/plasma:5 " RDEPEND="${DEPEND}" diff --git a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-9999.ebuild b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-9999.ebuild index c1236be22d..9c28e7d1e0 100644 --- a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-9999.ebuild +++ b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-9999.ebuild @@ -3,24 +3,26 @@ EAPI=7 -inherit kde5 +inherit ecm -DESCRIPTION="Plasma 5 applet for weather forecasts" -HOMEPAGE="https://store.kde.org/p/998917/ -https://github.com/kotelnik/plasma-applet-weather-widget"; - -if [[ ${KDE_BUILD_TYPE} = live ]] ; then +if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git"; + inherit git-r3 else SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" fi +DESCRIPTION="Plasma 5 applet for weather forecasts" +HOMEPAGE="https://store.kde.org/p/998917/ +https://github.com/kotelnik/plasma-applet-weather-widget"; + LICENSE="GPL-2+" -KEYWORDS="" +SLOT="5" IUSE="" DEPEND=" - $(add_frameworks_dep plasma) - $(add_qt_dep qtxmlpatterns 'qml') + dev-qt/qtxmlpatterns:5[qml] + kde-frameworks/plasma:5 " RDEPEND="${DEPEND}" diff --git a/kde-misc/plasma-pass/plasma-pass-9999.ebuild b/kde-misc/plasma-pass/plasma-pass-9999.ebuild index d1ea19ba7f..2c33622044 100644 --- a/kde-misc/plasma-pass/plasma-pass-9999.ebuild +++ b/kde-misc/plasma-pass/plasma-pass-9999.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit kde5 +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Plasma applet to access password from pass" HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://cgit.kde.org/plasma-pass.git/"; @@ -14,18 +16,19 @@ if [[ ${KDE_BUILD_TYPE} != live ]] ; then fi LICENSE="LGPL-2.1+" +SLOT="5" IUSE="" DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtgui) + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 " RDEPEND="${DEPEND} - $(add_frameworks_dep kirigami) + >=kde-frameworks/kirigami-${KFMIN}:5 " diff --git a/kde-misc/plasma-redshift-control/plasma-redshift-control-9999.ebuild b/kde-misc/plasma-redshift-control/plasma-redshift-control-9999.ebuild index 37eda1c1c7..1e4d93909a 100644 --- a/kde-misc/plasma-redshift-control/plasma-redshift-control-9999.ebuild +++ b/kde-misc/plasma-redshift-control/plasma-redshift-control-9999.ebuild @@ -3,16 +3,17 @@ EAPI=7 -inherit kde5 +inherit ecm kde.org DESCRIPTION="Plasma 5 applet for controlling redshift" HOMEPAGE="https://store.kde.org/p/998916/"; LICENSE="GPL-2+" +SLOT="5" KEYWORDS="" IUSE="" -DEPEND="$(add_frameworks_dep plasma)" +DEPEND="kde-frameworks/plasma:5" RDEPEND="${DEPEND} x11-misc/redshift " diff --git a/kde-misc/rsibreak/rsibreak-9999.ebuild b/kde-misc/rsibreak/rsibreak-9999.ebuild index b5ef4e5efc..712f1a81d4 100644 --- a/kde-misc/rsibreak/rsibreak-9999.ebuild +++ b/kde-misc/rsibreak/rsibreak-9999.ebuild @@ -3,41 +3,46 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit kde5 +inherit ecm kde.org DESCRIPTION="Small utility which bothers you at certain intervals" -HOMEPAGE="https://userbase.kde.org/RSIBreak"; +HOMEPAGE="https://kde.org/applications/utilities/org.kde.rsibreak +https://userbase.kde.org/RSIBreak"; + if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -KEYWORDS="" +SLOT="5" IUSE="" BDEPEND="sys-devel/gettext" DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 " # bug 587170 for frameworkintegration RDEPEND="${DEPEND} - $(add_frameworks_dep frameworkintegration) + >=kde-frameworks/frameworkintegration-${KFMIN}:5 " diff --git a/kde-misc/skanlite/skanlite-9999.ebuild b/kde-misc/skanlite/skanlite-9999.ebuild index 5a401d4754..a063c421ed 100644 --- a/kde-misc/skanlite/skanlite-9999.ebuild +++ b/kde-misc/skanlite/skanlite-9999.ebuild @@ -3,29 +3,32 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org -DESCRIPTION="KDE image scanning application" -HOMEPAGE="https://kde.org/applications/graphics/skanlite"; +DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks" +HOMEPAGE="https://kde.org/applications/graphics/org.kde.skanlite"; LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )" +SLOT="5" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep libksane '' 19.03.80) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/libksane-19.04.0: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/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 media-libs/libpng:0= " RDEPEND="${DEPEND}" diff --git a/kde-misc/wacomtablet/wacomtablet-9999.ebuild b/kde-misc/wacomtablet/wacomtablet-9999.ebuild index 425a10b3b2..40025e2b24 100644 --- a/kde-misc/wacomtablet/wacomtablet-9999.ebuild +++ b/kde-misc/wacomtablet/wacomtablet-9999.ebuild @@ -3,36 +3,40 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit kde5 +inherit ecm kde.org DESCRIPTION="System settings module for Wacom tablets" -HOMEPAGE="https://userbase.kde.org/Wacomtablet https://store.kde.org/p/1127862"; +HOMEPAGE="https://kde.org/applications/system/org.kde.wacomtablet +https://userbase.kde.org/Wacomtablet"; LICENSE="GPL-2" +SLOT="5" KEYWORDS="" IUSE="" BDEPEND="sys-devel/gettext" RDEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=dev-libs/libwacom-0.30 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb @@ -48,5 +52,5 @@ src_test() { -E "(Test.KDED.DBusTabletService)" ) - kde5_src_test + ecm_src_test } diff --git a/kde-misc/zanshin/zanshin-9999.ebuild b/kde-misc/zanshin/zanshin-9999.ebuild index f24ff35dd8..04a85155a1 100644 --- a/kde-misc/zanshin/zanshin-9999.ebuild +++ b/kde-misc/zanshin/zanshin-9999.ebuild @@ -3,53 +3,60 @@ EAPI=7 -KDE_TEST="forceoptional" +ECM_TEST="forceoptional" +KDE_APPS_MINIMAL=19.04.3 +KFMIN=5.60.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit kde5 +inherit ecm kde.org DESCRIPTION="Getting things done application by KDE" -HOMEPAGE="https://zanshin.kde.org/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="http://files.kde.org/zanshin/${P}.tar.bz2"; +HOMEPAGE="https://zanshin.kde.org/ https://userbase.kde.org/Zanshin +https://kde.org/applications/utilities/org.kde.zanshin"; +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="http://files.kde.org/zanshin/${P}.tar.bz2"; + KEYWORDS="~amd64 ~x86" +fi LICENSE="|| ( GPL-2 GPL-3 )" -KEYWORDS="" +SLOT="5" IUSE="" BDEPEND=" - test? ( $(add_kdeapps_dep akonadi 'tools') ) + test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] ) " COMMON_DEPEND=" - $(add_frameworks_dep kcalendarcore) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcontacts) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kparts) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep akonadi-calendar) - $(add_kdeapps_dep akonadi-contacts) - $(add_kdeapps_dep kmime) - $(add_kdeapps_dep kontactinterface) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5 + >=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5 + >=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5 + >=kde-apps/kmime-${KDE_APPS_MINIMAL}:5 + >=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5 + >=kde-frameworks/kcalendarcore-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}: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/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 " DEPEND="${COMMON_DEPEND} dev-libs/boost " RDEPEND="${COMMON_DEPEND} !kde-misc/zanshin:4 - $(add_kdeapps_dep kdepim-runtime) + >=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5 "
