diff options
23 files changed, 63 insertions, 48 deletions
diff --git a/kde-apps/dolphin/dolphin-5.9999.ebuild b/kde-apps/dolphin/dolphin-5.9999.ebuild index 0e98a8571ce..a16ececdd12 100644 --- a/kde-apps/dolphin/dolphin-5.9999.ebuild +++ b/kde-apps/dolphin/dolphin-5.9999.ebuild @@ -44,9 +44,9 @@ DEPEND=" dev-qt/qtxml:5 media-libs/phonon[qt5] semantic-desktop? ( - $(add_kdebase_dep baloo) - $(add_kdebase_dep baloo-widgets) - $(add_kdebase_dep kfilemetadata) + $(add_kdeplasma_dep baloo) + $(add_kdeplasma_dep baloo-widgets) + $(add_kdeplasma_dep kfilemetadata) ) " RDEPEND="${DEPEND} diff --git a/kde-apps/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild index 5ff375a5419..a16ececdd12 100644 --- a/kde-apps/dolphin/dolphin-9999.ebuild +++ b/kde-apps/dolphin/dolphin-9999.ebuild @@ -4,54 +4,63 @@ EAPI=5 -KDE_HANDBOOK="optional" +EGIT_BRANCH="frameworks" KMNAME="kde-baseapps" -inherit kde4-meta +KDE_HANDBOOK=true +inherit kde5 -DESCRIPTION="A KDE filemanager focusing on usability" +DESCRIPTION="KDE filemanager focusing on usability" HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin" KEYWORDS="" -IUSE="debug semantic-desktop thumbnail" +IUSE="semantic-desktop" DEPEND=" - $(add_kdebase_dep kactivities '' 4.13) + $(add_frameworks_dep kbookmarks) + $(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 ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) $(add_kdeapps_dep libkonq) - media-libs/phonon[qt4] - x11-libs/libXrender + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/phonon[qt5] semantic-desktop? ( - $(add_kdebase_dep baloo) - $(add_kdebase_dep baloo-widgets) - $(add_kdebase_dep kfilemetadata) + $(add_kdeplasma_dep baloo) + $(add_kdeplasma_dep baloo-widgets) + $(add_kdeplasma_dep kfilemetadata) ) " RDEPEND="${DEPEND} - $(add_kdeapps_dep kfind) - thumbnail? ( - $(add_kdeapps_dep thumbnailers) - || ( - $(add_kdeapps_dep ffmpegthumbs) - $(add_kdeapps_dep mplayerthumbs) - ) - ) + !kde-base/dolphin:4 " -RESTRICT="test" -# bug 393129 +S=${S}/${PN} src_configure() { local mycmakeargs=( - $(cmake-utils_use_with semantic-desktop Baloo) - $(cmake-utils_use_with semantic-desktop BalooWidgets) - $(cmake-utils_use_with semantic-desktop KFileMetaData) + $(cmake-utils_use_with semantic-desktop KF5Baloo) + $(cmake-utils_use_with semantic-desktop KF5BalooWidgets) + $(cmake-utils_use_with semantic-desktop KF5FileMetaData) ) - kde4-meta_src_configure -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if ! has_version media-gfx/icoutils ; then - elog "For .exe file preview support, install media-gfx/icoutils." - fi + kde5_src_configure } diff --git a/kde-apps/gwenview/gwenview-14.11.97.ebuild b/kde-apps/gwenview/gwenview-14.11.97.ebuild index 922c5aec551..5c82f7b4b98 100644 --- a/kde-apps/gwenview/gwenview-14.11.97.ebuild +++ b/kde-apps/gwenview/gwenview-14.11.97.ebuild @@ -43,7 +43,7 @@ DEPEND=" media-libs/phonon[qt5] virtual/jpeg:0 x11-libs/libX11 - semantic-desktop? ( $(add_kdebase_dep baloo) ) + semantic-desktop? ( $(add_kdeplasma_dep baloo) ) " RDEPEND="${DEPEND} !kde-base/gwenview:4 diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild index 521989e827c..fd4c3130836 100644 --- a/kde-apps/gwenview/gwenview-9999.ebuild +++ b/kde-apps/gwenview/gwenview-9999.ebuild @@ -43,7 +43,7 @@ DEPEND=" media-libs/phonon[qt5] virtual/jpeg:0 x11-libs/libX11 - semantic-desktop? ( $(add_kdebase_dep baloo) ) + semantic-desktop? ( $(add_kdeplasma_dep baloo) ) " RDEPEND="${DEPEND} !kde-base/gwenview:4 diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild index d04e7c65906..f4849e9d485 100644 --- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild +++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild @@ -44,7 +44,7 @@ RDEPEND=" $(add_kdeapps_dep solid-runtime) crash-reporter? ( $(add_kdeapps_dep drkonqi ) ) handbook? ( || ( - $(add_kdebase_dep khelpcenter) + $(add_kdeplasma_dep khelpcenter) kde-base/khelpcenter:5[compat(+)] ) ) nepomuk? ( $(add_kdeapps_dep nepomuk) ) diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild index 3fcf4a15483..63f301ead7c 100644 --- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild +++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild @@ -44,7 +44,7 @@ RDEPEND=" $(add_kdeapps_dep solid-runtime) crash-reporter? ( $(add_kdeapps_dep drkonqi ) ) handbook? ( || ( - $(add_kdebase_dep khelpcenter) + $(add_kdeplasma_dep khelpcenter) kde-base/khelpcenter:5[compat(+)] ) ) nepomuk? ( $(add_kdeapps_dep nepomuk) ) diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild index 3d818c37006..064be10365d 100644 --- a/kde-apps/okular/okular-5.9999.ebuild +++ b/kde-apps/okular/okular-5.9999.ebuild @@ -46,7 +46,7 @@ DEPEND=" chm? ( dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) - dpi? ( $(add_kdebase_dep libkscreen) ) + dpi? ( $(add_kdeplasma_dep libkscreen) ) ebook? ( app-text/ebook-tools ) jpeg? ( virtual/jpeg:0 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) diff --git a/kde-base/plasma-workspace-wallpapers/Manifest b/kde-base/plasma-workspace-wallpapers/Manifest deleted file mode 100644 index 1208ca4247a..00000000000 --- a/kde-base/plasma-workspace-wallpapers/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST plasma-workspace-wallpapers-5.1.1.tar.xz 29067308 SHA256 62f897e0e78ef7d9b1250a4cd47d178cf1d6aef2af882b85c0ad3ae7134c9398 SHA512 33846cc219c1cff80917da573acadb034ea8b1b944a08597a3f971139bc77cb5e31231fe46cb8767312c558f5367a8c7f25553fd8890161412a189fa0b241bfa WHIRLPOOL fa944849ed1a53b4642a2bff44543182d9bf01f30c0b7657dd900ba0cb3a77112b03e93ed392d25fcf43c55c0c79427bb4e20ee88a1b02291e5c564ae47470e2 -DIST plasma-workspace-wallpapers-5.1.2.tar.xz 29067324 SHA256 dd559d1654590e15f21a68c0d04dae5c3db690f1d7ce424ae5809975423ebea2 SHA512 913dcb68902c51a73c234fd628b4b45576aa54f166b14d9b0fb05cd33e0c0d82bec684ee8e0eb475c8b933cbc69a9a05ce149c192fe3e68bffb52cd898f0d5d1 WHIRLPOOL beb37e062b48407796d3f9687dd07d66f0d428f393ca8ce827b0b32419e5e4c8a7d9f30be9fd26e97c6a4616e6329340a012af5c1de47cb50f07d02f7ef62c0d diff --git a/kde-misc/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-misc/kaccounts-integration/kaccounts-integration-9999.ebuild index 47179b909a8..7943260eb28 100644 --- a/kde-misc/kaccounts-integration/kaccounts-integration-9999.ebuild +++ b/kde-misc/kaccounts-integration/kaccounts-integration-9999.ebuild @@ -24,7 +24,7 @@ DEPEND=" $(add_frameworks_dep kwallet) $(add_frameworks_dep kwidgetsaddons) kdepim? ( - $(add_kdebase_dep kdepimlibs) + $(add_kdeplasma_dep kdepimlibs) ) net-libs/accounts-qt net-libs/signond diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild index 4e934579ee3..7bc03e2dcc6 100644 --- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild @@ -22,7 +22,7 @@ DEPEND=" x11-libs/libfakekey " RDEPEND="${DEPEND} - $(add_kdebase_dep plasma-workspace) + $(add_kdeplasma_dep plasma-workspace) net-dns/avahi " diff --git a/kde-misc/kscreen/kscreen-1.0.71_p1.ebuild b/kde-misc/kscreen/kscreen-1.0.71_p1.ebuild index 8868d7a1ad2..ad408f8fdba 100644 --- a/kde-misc/kscreen/kscreen-1.0.71_p1.ebuild +++ b/kde-misc/kscreen/kscreen-1.0.71_p1.ebuild @@ -17,7 +17,7 @@ IUSE="" S=${WORKDIR}/${PN} DEPEND=" - $(add_kdebase_dep libkscreen) + $(add_kdeplasma_dep libkscreen) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) diff --git a/kde-misc/kscreen/kscreen-9999.ebuild b/kde-misc/kscreen/kscreen-9999.ebuild index 8f36a3d51ad..eabea7d904b 100644 --- a/kde-misc/kscreen/kscreen-9999.ebuild +++ b/kde-misc/kscreen/kscreen-9999.ebuild @@ -14,7 +14,7 @@ KEYWORDS="" IUSE="" DEPEND=" - $(add_kdebase_dep libkscreen '' '5.1.90') + $(add_kdeplasma_dep libkscreen '' '5.1.90') $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) diff --git a/kde-base/baloo-widgets/baloo-widgets-9999.ebuild b/kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild index 86166994b2c..e31004755b5 100644 --- a/kde-base/baloo-widgets/baloo-widgets-9999.ebuild +++ b/kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild @@ -18,8 +18,8 @@ DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) $(add_frameworks_dep kwidgetsaddons) - $(add_kdebase_dep baloo) - $(add_kdebase_dep kfilemetadata) + $(add_kdeplasma_dep baloo) + $(add_kdeplasma_dep kfilemetadata) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 diff --git a/kde-base/baloo-widgets/metadata.xml b/kde-plasma/baloo-widgets/metadata.xml index a23f444b67d..a23f444b67d 100644 --- a/kde-base/baloo-widgets/metadata.xml +++ b/kde-plasma/baloo-widgets/metadata.xml diff --git a/kde-base/kdecoration/kdecoration-9999.ebuild b/kde-plasma/kdecoration/kdecoration-9999.ebuild index 788fd5fd259..788fd5fd259 100644 --- a/kde-base/kdecoration/kdecoration-9999.ebuild +++ b/kde-plasma/kdecoration/kdecoration-9999.ebuild diff --git a/kde-base/kdecoration/metadata.xml b/kde-plasma/kdecoration/metadata.xml index a23f444b67d..a23f444b67d 100644 --- a/kde-base/kdecoration/metadata.xml +++ b/kde-plasma/kdecoration/metadata.xml diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-plasma/kdepimlibs/kdepimlibs-9999.ebuild index 4da64965cbe..4da64965cbe 100644 --- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild +++ b/kde-plasma/kdepimlibs/kdepimlibs-9999.ebuild diff --git a/kde-plasma/kdepimlibs/metadata.xml b/kde-plasma/kdepimlibs/metadata.xml new file mode 100644 index 00000000000..d19719a52ce --- /dev/null +++ b/kde-plasma/kdepimlibs/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>kde</herd> + <use> + <flag name="prison">Enable support for QRcodes in contacts</flag> + </use> +</pkgmetadata> diff --git a/kde-base/plasma-workspace-wallpapers/metadata.xml b/kde-plasma/plasma-workspace-wallpapers/metadata.xml index a23f444b67d..a23f444b67d 100644 --- a/kde-base/plasma-workspace-wallpapers/metadata.xml +++ b/kde-plasma/plasma-workspace-wallpapers/metadata.xml diff --git a/kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.1.ebuild index d1db0cf14f1..d1db0cf14f1 100644 --- a/kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.1.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.1.ebuild diff --git a/kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.2.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.2.ebuild index d1db0cf14f1..d1db0cf14f1 100644 --- a/kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.2.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.2.ebuild diff --git a/kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.9999.ebuild index 97fc946b0e9..97fc946b0e9 100644 --- a/kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.9999.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.9999.ebuild diff --git a/kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild index 97fc946b0e9..97fc946b0e9 100644 --- a/kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild |