diff options
28 files changed, 34 insertions, 40 deletions
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live index 5700a7a213d..a7ed11d9482 100644 --- a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live +++ b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live @@ -1,4 +1,5 @@ ~kde-frameworks/attica-9999 ** +~kde-frameworks/baloo-9999 ** ~kde-frameworks/bluez-qt-9999 ** ~kde-frameworks/extra-cmake-modules-9999 ** ~kde-frameworks/frameworkintegration-9999 ** @@ -24,6 +25,7 @@ ~kde-frameworks/kdnssd-9999 ** ~kde-frameworks/kdoctools-9999 ** ~kde-frameworks/kemoticons-9999 ** +~kde-frameworks/kfilemetadata-9999 ** ~kde-frameworks/kglobalaccel-9999 ** ~kde-frameworks/kguiaddons-9999 ** ~kde-frameworks/khtml-9999 ** diff --git a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live index 547f60ee2c5..c416669489d 100644 --- a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live +++ b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live @@ -1,11 +1,9 @@ -~kde-plasma/baloo-9999 ** ~kde-plasma/bluedevil-9999 ** ~kde-plasma/breeze-9999 ** ~kde-plasma/kde-cli-tools-9999 ** ~kde-plasma/kde-gtk-config-9999 ** ~kde-plasma/kdecoration-9999 ** ~kde-plasma/kdeplasma-addons-9999 ** -~kde-plasma/kfilemetadata-9999 ** ~kde-plasma/kgamma-9999 ** ~kde-plasma/khelpcenter-9999 ** ~kde-plasma/khotkeys-9999 ** diff --git a/Documentation/package.accept_keywords/kde-frameworks-live.keywords b/Documentation/package.accept_keywords/kde-frameworks-live.keywords index b1727a71c6c..5b4329656a9 100644 --- a/Documentation/package.accept_keywords/kde-frameworks-live.keywords +++ b/Documentation/package.accept_keywords/kde-frameworks-live.keywords @@ -2,6 +2,7 @@ # You can use this file to keyword/unkeyword KDE Frameworks live. # Edit Documentation/package.keywords/.kde-frameworks-live.base/ files instead. ~kde-frameworks/attica-9999 ** +~kde-frameworks/baloo-9999 ** ~kde-frameworks/bluez-qt-9999 ** ~kde-frameworks/extra-cmake-modules-9999 ** ~kde-frameworks/frameworkintegration-9999 ** @@ -27,6 +28,7 @@ ~kde-frameworks/kdnssd-9999 ** ~kde-frameworks/kdoctools-9999 ** ~kde-frameworks/kemoticons-9999 ** +~kde-frameworks/kfilemetadata-9999 ** ~kde-frameworks/kglobalaccel-9999 ** ~kde-frameworks/kguiaddons-9999 ** ~kde-frameworks/khtml-9999 ** diff --git a/Documentation/package.accept_keywords/kde-plasma-live.keywords b/Documentation/package.accept_keywords/kde-plasma-live.keywords index 584975e960d..4bf48b882a9 100644 --- a/Documentation/package.accept_keywords/kde-plasma-live.keywords +++ b/Documentation/package.accept_keywords/kde-plasma-live.keywords @@ -1,14 +1,12 @@ # Autogenerated by regenerate-files, DO NOT EDIT. # You can use this file to keyword/unkeyword KDE Plasma live. # Edit Documentation/package.keywords/.kde-plasma-live.base/ files instead. -~kde-plasma/baloo-9999 ** ~kde-plasma/bluedevil-9999 ** ~kde-plasma/breeze-9999 ** ~kde-plasma/kde-cli-tools-9999 ** ~kde-plasma/kde-gtk-config-9999 ** ~kde-plasma/kdecoration-9999 ** ~kde-plasma/kdeplasma-addons-9999 ** -~kde-plasma/kfilemetadata-9999 ** ~kde-plasma/kgamma-9999 ** ~kde-plasma/khelpcenter-9999 ** ~kde-plasma/khotkeys-9999 ** diff --git a/Documentation/package.mask/kde-frameworks-live b/Documentation/package.mask/kde-frameworks-live index cd659cf3f2c..056a2c6c1be 100644 --- a/Documentation/package.mask/kde-frameworks-live +++ b/Documentation/package.mask/kde-frameworks-live @@ -2,6 +2,7 @@ # Live packages are masked by default. # Edit Documentation/package.unmask/.kde-frameworks-live/ files instead. ~kde-frameworks/attica-9999 +~kde-frameworks/baloo-9999 ~kde-frameworks/bluez-qt-9999 ~kde-frameworks/extra-cmake-modules-9999 ~kde-frameworks/frameworkintegration-9999 @@ -27,6 +28,7 @@ ~kde-frameworks/kdnssd-9999 ~kde-frameworks/kdoctools-9999 ~kde-frameworks/kemoticons-9999 +~kde-frameworks/kfilemetadata-9999 ~kde-frameworks/kglobalaccel-9999 ~kde-frameworks/kguiaddons-9999 ~kde-frameworks/khtml-9999 diff --git a/Documentation/package.mask/kde-plasma-live b/Documentation/package.mask/kde-plasma-live index f575bfd6dba..6a241397f57 100644 --- a/Documentation/package.mask/kde-plasma-live +++ b/Documentation/package.mask/kde-plasma-live @@ -1,14 +1,12 @@ # Autogenerated by regenerate-files, DO NOT EDIT. # Live packages are masked by default. # Edit Documentation/package.unmask/.kde-plasma-live/ files instead. -~kde-plasma/baloo-9999 ~kde-plasma/bluedevil-9999 ~kde-plasma/breeze-9999 ~kde-plasma/kde-cli-tools-9999 ~kde-plasma/kde-gtk-config-9999 ~kde-plasma/kdecoration-9999 ~kde-plasma/kdeplasma-addons-9999 -~kde-plasma/kfilemetadata-9999 ~kde-plasma/kgamma-9999 ~kde-plasma/khelpcenter-9999 ~kde-plasma/khotkeys-9999 diff --git a/Documentation/package.unmask/kde-frameworks-live b/Documentation/package.unmask/kde-frameworks-live index cd659cf3f2c..056a2c6c1be 100644 --- a/Documentation/package.unmask/kde-frameworks-live +++ b/Documentation/package.unmask/kde-frameworks-live @@ -2,6 +2,7 @@ # Live packages are masked by default. # Edit Documentation/package.unmask/.kde-frameworks-live/ files instead. ~kde-frameworks/attica-9999 +~kde-frameworks/baloo-9999 ~kde-frameworks/bluez-qt-9999 ~kde-frameworks/extra-cmake-modules-9999 ~kde-frameworks/frameworkintegration-9999 @@ -27,6 +28,7 @@ ~kde-frameworks/kdnssd-9999 ~kde-frameworks/kdoctools-9999 ~kde-frameworks/kemoticons-9999 +~kde-frameworks/kfilemetadata-9999 ~kde-frameworks/kglobalaccel-9999 ~kde-frameworks/kguiaddons-9999 ~kde-frameworks/khtml-9999 diff --git a/Documentation/package.unmask/kde-plasma-live b/Documentation/package.unmask/kde-plasma-live index f575bfd6dba..6a241397f57 100644 --- a/Documentation/package.unmask/kde-plasma-live +++ b/Documentation/package.unmask/kde-plasma-live @@ -1,14 +1,12 @@ # Autogenerated by regenerate-files, DO NOT EDIT. # Live packages are masked by default. # Edit Documentation/package.unmask/.kde-plasma-live/ files instead. -~kde-plasma/baloo-9999 ~kde-plasma/bluedevil-9999 ~kde-plasma/breeze-9999 ~kde-plasma/kde-cli-tools-9999 ~kde-plasma/kde-gtk-config-9999 ~kde-plasma/kdecoration-9999 ~kde-plasma/kdeplasma-addons-9999 -~kde-plasma/kfilemetadata-9999 ~kde-plasma/kgamma-9999 ~kde-plasma/khelpcenter-9999 ~kde-plasma/khotkeys-9999 diff --git a/kde-apps/baloo-widgets/baloo-widgets-15.07.80.ebuild b/kde-apps/baloo-widgets/baloo-widgets-15.07.80.ebuild index bb1fc9c933d..8f8360db570 100644 --- a/kde-apps/baloo-widgets/baloo-widgets-15.07.80.ebuild +++ b/kde-apps/baloo-widgets/baloo-widgets-15.07.80.ebuild @@ -16,8 +16,8 @@ COMMON_DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) $(add_frameworks_dep kwidgetsaddons) - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) + || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) + || ( $(add_plasma_dep kfilemetadata) $(add_frameworks_dep kfilemetadata) ) dev-qt/qtgui:5 dev-qt/qtwidgets:5 " diff --git a/kde-apps/baloo-widgets/baloo-widgets-15.08.49.9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-15.08.49.9999.ebuild index 1382928f0cb..4e36c1a2467 100644 --- a/kde-apps/baloo-widgets/baloo-widgets-15.08.49.9999.ebuild +++ b/kde-apps/baloo-widgets/baloo-widgets-15.08.49.9999.ebuild @@ -11,13 +11,13 @@ KEYWORDS="" IUSE="" COMMON_DEPEND=" + $(add_frameworks_dep baloo) $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kfilemetadata) $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) $(add_frameworks_dep kwidgetsaddons) - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) dev-qt/qtgui:5 dev-qt/qtwidgets:5 " diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild index 1382928f0cb..4e36c1a2467 100644 --- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild +++ b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild @@ -11,13 +11,13 @@ KEYWORDS="" IUSE="" COMMON_DEPEND=" + $(add_frameworks_dep baloo) $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kfilemetadata) $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) $(add_frameworks_dep kwidgetsaddons) - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) dev-qt/qtgui:5 dev-qt/qtwidgets:5 " diff --git a/kde-apps/dolphin/dolphin-15.07.80.ebuild b/kde-apps/dolphin/dolphin-15.07.80.ebuild index 3fa0d9c9cf6..e068148329c 100644 --- a/kde-apps/dolphin/dolphin-15.07.80.ebuild +++ b/kde-apps/dolphin/dolphin-15.07.80.ebuild @@ -46,8 +46,8 @@ DEPEND=" media-libs/phonon[qt5] semantic-desktop? ( $(add_kdeapps_dep baloo-widgets) - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) + || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) + || ( $(add_plasma_dep kfilemetadata) $(add_frameworks_dep kfilemetadata) ) ) " RDEPEND="${DEPEND} diff --git a/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild b/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild index 5d044ac2caf..a6ce77931a6 100644 --- a/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild +++ b/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild @@ -45,9 +45,9 @@ DEPEND=" dev-qt/qtxml:5 media-libs/phonon[qt5] semantic-desktop? ( + $(add_frameworks_dep baloo) + $(add_frameworks_dep kfilemetadata) $(add_kdeapps_dep baloo-widgets) - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) ) " RDEPEND="${DEPEND} diff --git a/kde-apps/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild index 5d044ac2caf..a6ce77931a6 100644 --- a/kde-apps/dolphin/dolphin-9999.ebuild +++ b/kde-apps/dolphin/dolphin-9999.ebuild @@ -45,9 +45,9 @@ DEPEND=" dev-qt/qtxml:5 media-libs/phonon[qt5] semantic-desktop? ( + $(add_frameworks_dep baloo) + $(add_frameworks_dep kfilemetadata) $(add_kdeapps_dep baloo-widgets) - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) ) " RDEPEND="${DEPEND} diff --git a/kde-apps/gwenview/gwenview-15.04.3.ebuild b/kde-apps/gwenview/gwenview-15.04.3.ebuild index 48e89e49107..a3541061b1b 100644 --- a/kde-apps/gwenview/gwenview-15.04.3.ebuild +++ b/kde-apps/gwenview/gwenview-15.04.3.ebuild @@ -47,7 +47,7 @@ RDEPEND=" media-libs/libpng:0= media-libs/phonon[qt5] virtual/jpeg:0 - semantic-desktop? ( $(add_plasma_dep baloo) ) + semantic-desktop? ( || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 diff --git a/kde-apps/gwenview/gwenview-15.07.80.ebuild b/kde-apps/gwenview/gwenview-15.07.80.ebuild index 85d33d1d7b3..92adb89651d 100644 --- a/kde-apps/gwenview/gwenview-15.07.80.ebuild +++ b/kde-apps/gwenview/gwenview-15.07.80.ebuild @@ -46,7 +46,7 @@ RDEPEND=" virtual/jpeg:0 kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) ) raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) ) - semantic-desktop? ( $(add_plasma_dep baloo) ) + semantic-desktop? ( || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 diff --git a/kde-apps/gwenview/gwenview-15.08.49.9999.ebuild b/kde-apps/gwenview/gwenview-15.08.49.9999.ebuild index 69066b00f64..08976c4e1d1 100644 --- a/kde-apps/gwenview/gwenview-15.08.49.9999.ebuild +++ b/kde-apps/gwenview/gwenview-15.08.49.9999.ebuild @@ -46,7 +46,7 @@ RDEPEND=" virtual/jpeg:0 kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) ) raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) ) - semantic-desktop? ( $(add_plasma_dep baloo) ) + semantic-desktop? ( $(add_frameworks_dep baloo) ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild index 69066b00f64..08976c4e1d1 100644 --- a/kde-apps/gwenview/gwenview-9999.ebuild +++ b/kde-apps/gwenview/gwenview-9999.ebuild @@ -46,7 +46,7 @@ RDEPEND=" virtual/jpeg:0 kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) ) raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) ) - semantic-desktop? ( $(add_plasma_dep baloo) ) + semantic-desktop? ( $(add_frameworks_dep baloo) ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 diff --git a/kde-plasma/baloo/baloo-9999.ebuild b/kde-frameworks/baloo/baloo-9999.ebuild index f512e281c53..d90fba1adf6 100644 --- a/kde-plasma/baloo/baloo-9999.ebuild +++ b/kde-frameworks/baloo/baloo-9999.ebuild @@ -7,12 +7,6 @@ EAPI=5 KDE_PUNT_BOGUS_DEPS="true" inherit kde5 -# version scheme fail by upstream -if [[ ${KDE_BUILD_TYPE} = release ]]; then - PLASMA_VERSION=5.3.0 - SRC_URI="mirror://kde/unstable/plasma/${PLASMA_VERSION}/${PN}-${PV}.tar.xz" -fi - DESCRIPTION="Framework for searching and managing metadata" KEYWORDS="" IUSE="" @@ -24,11 +18,11 @@ DEPEND=" $(add_frameworks_dep kcrash) $(add_frameworks_dep kdbusaddons) $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kfilemetadata) $(add_frameworks_dep ki18n) $(add_frameworks_dep kidletime) $(add_frameworks_dep kio) $(add_frameworks_dep solid) - $(add_plasma_dep kfilemetadata) dev-db/lmdb dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 @@ -36,9 +30,10 @@ DEPEND=" dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-apps/attr - !<kde-base/nepomuk-4.12.50 " RDEPEND="${DEPEND} + !<kde-base/nepomuk-4.12.50 !kde-base/baloo:4[-minimal(-)] !kde-base/baloo:5 + !kde-plasma/baloo " diff --git a/kde-plasma/baloo/metadata.xml b/kde-frameworks/baloo/metadata.xml index a23f444b67d..a23f444b67d 100644 --- a/kde-plasma/baloo/metadata.xml +++ b/kde-frameworks/baloo/metadata.xml diff --git a/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild index a1b21e5ce3e..03a4a8698dd 100644 --- a/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild @@ -33,6 +33,7 @@ DEPEND=" " RDEPEND="${DEPEND} !kde-base/kfilemetadata:5 + !kde-plasma/kfilemetadata " src_configure() { diff --git a/kde-plasma/kfilemetadata/metadata.xml b/kde-frameworks/kfilemetadata/metadata.xml index cecf265f9f2..cecf265f9f2 100644 --- a/kde-plasma/kfilemetadata/metadata.xml +++ b/kde-frameworks/kfilemetadata/metadata.xml diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index 4b8f25edcbb..45c6af6ae64 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -13,10 +13,10 @@ KEYWORDS="" IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad" COMMON_DEPEND=" - $(add_plasma_dep baloo) $(add_plasma_dep kwin) $(add_plasma_dep plasma-workspace) $(add_frameworks_dep attica) + $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) $(add_frameworks_dep karchive) $(add_frameworks_dep kauth) diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild index 6c529b13571..f2fb91946d4 100644 --- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild +++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild @@ -25,8 +25,8 @@ DEPEND=" dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) + $(add_frameworks_dep baloo) + $(add_frameworks_dep kfilemetadata) ) " RDEPEND="${DEPEND} diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild index aaedeedd632..45b0d8c539f 100644 --- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild @@ -15,12 +15,10 @@ KEYWORDS="" IUSE="bluetooth +display-manager gtk +sddm networkmanager +wallpapers" RDEPEND=" - $(add_plasma_dep baloo) $(add_plasma_dep breeze) $(add_plasma_dep kde-cli-tools) $(add_plasma_dep kdecoration) $(add_plasma_dep kdeplasma-addons) - $(add_plasma_dep kfilemetadata) $(add_plasma_dep khelpcenter) $(add_plasma_dep khotkeys) $(add_plasma_dep kinfocenter) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 5a4bbde6d05..3077da77add 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -15,11 +15,11 @@ KEYWORDS="" IUSE="dbus +drkonqi gps prison qalculate +systemmonitor" COMMON_DEPEND=" - $(add_plasma_dep baloo) $(add_plasma_dep kwayland) $(add_plasma_dep kwin) $(add_plasma_dep libkscreen) $(add_plasma_dep libksysguard) + $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) $(add_frameworks_dep kauth) $(add_frameworks_dep kbookmarks) diff --git a/sets/kde-frameworks-live b/sets/kde-frameworks-live index c5eeedc185a..c71913fee46 100644 --- a/sets/kde-frameworks-live +++ b/sets/kde-frameworks-live @@ -1,4 +1,5 @@ ~kde-frameworks/attica-9999 +~kde-frameworks/baloo-9999 ~kde-frameworks/bluez-qt-9999 ~kde-frameworks/extra-cmake-modules-9999 ~kde-frameworks/frameworkintegration-9999 @@ -24,6 +25,7 @@ ~kde-frameworks/kdnssd-9999 ~kde-frameworks/kdoctools-9999 ~kde-frameworks/kemoticons-9999 +~kde-frameworks/kfilemetadata-9999 ~kde-frameworks/kglobalaccel-9999 ~kde-frameworks/kguiaddons-9999 ~kde-frameworks/khtml-9999 diff --git a/sets/kde-plasma-live b/sets/kde-plasma-live index 393535415c3..8e343961a83 100644 --- a/sets/kde-plasma-live +++ b/sets/kde-plasma-live @@ -1,11 +1,9 @@ -~kde-plasma/baloo-9999 ~kde-plasma/bluedevil-9999 ~kde-plasma/breeze-9999 ~kde-plasma/kde-cli-tools-9999 ~kde-plasma/kde-gtk-config-9999 ~kde-plasma/kdecoration-9999 ~kde-plasma/kdeplasma-addons-9999 -~kde-plasma/kfilemetadata-9999 ~kde-plasma/kgamma-9999 ~kde-plasma/khelpcenter-9999 ~kde-plasma/khotkeys-9999 |