commit: ca9b81a4a22e0cf59ca9daf74644b1d0b8d0ed78
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 13 12:35:35 2014 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Dec 13 12:35:35 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ca9b81a4
Fix some br0ken deps
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
---
kde-apps/dolphin/dolphin-5.9999.ebuild | 6 +-
kde-apps/dolphin/dolphin-9999.ebuild | 73 ++++++++++++----------
kde-apps/gwenview/gwenview-14.11.97.ebuild | 2 +-
kde-apps/gwenview/gwenview-9999.ebuild | 2 +-
.../kdebase-runtime-meta-14.11.97.ebuild | 2 +-
.../kdebase-runtime-meta-9999.ebuild | 2 +-
kde-apps/okular/okular-5.9999.ebuild | 2 +-
.../kaccounts-integration-9999.ebuild | 2 +-
kde-misc/kdeconnect/kdeconnect-9999.ebuild | 2 +-
kde-misc/kscreen/kscreen-1.0.71_p1.ebuild | 2 +-
kde-misc/kscreen/kscreen-9999.ebuild | 2 +-
.../baloo-widgets/baloo-widgets-9999.ebuild | 4 +-
.../baloo-widgets/metadata.xml | 0
.../kdecoration/kdecoration-9999.ebuild | 0
{kde-base => kde-plasma}/kdecoration/metadata.xml | 0
.../kdepimlibs/kdepimlibs-9999.ebuild | 0
.../kdepimlibs}/metadata.xml | 3 +
.../plasma-workspace-wallpapers/metadata.xml | 0
.../plasma-workspace-wallpapers-5.1.1.ebuild | 0
.../plasma-workspace-wallpapers-5.1.2.ebuild | 0
.../plasma-workspace-wallpapers-5.1.9999.ebuild | 0
.../plasma-workspace-wallpapers-9999.ebuild | 0
22 files changed, 58 insertions(+), 46 deletions(-)
diff --git a/kde-apps/dolphin/dolphin-5.9999.ebuild
b/kde-apps/dolphin/dolphin-5.9999.ebuild
index 0e98a85..a16ecec 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 5ff375a..a16ecec 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 922c5ae..5c82f7b 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 521989e..fd4c313 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 d04e7c6..f4849e9 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 3fcf4a1..63f301e 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 3d818c3..064be10 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-misc/kaccounts-integration/kaccounts-integration-9999.ebuild
b/kde-misc/kaccounts-integration/kaccounts-integration-9999.ebuild
index 47179b9..7943260 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 4e93457..7bc03e2 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 8868d7a..ad408f8 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 8f36a3d..eabea7d 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
similarity index 89%
rename from kde-base/baloo-widgets/baloo-widgets-9999.ebuild
rename to kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild
index 8616699..e310047 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
similarity index 100%
copy from kde-base/baloo-widgets/metadata.xml
copy to kde-plasma/baloo-widgets/metadata.xml
diff --git a/kde-base/kdecoration/kdecoration-9999.ebuild
b/kde-plasma/kdecoration/kdecoration-9999.ebuild
similarity index 100%
rename from kde-base/kdecoration/kdecoration-9999.ebuild
rename to kde-plasma/kdecoration/kdecoration-9999.ebuild
diff --git a/kde-base/kdecoration/metadata.xml
b/kde-plasma/kdecoration/metadata.xml
similarity index 100%
rename from kde-base/kdecoration/metadata.xml
rename to kde-plasma/kdecoration/metadata.xml
diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
b/kde-plasma/kdepimlibs/kdepimlibs-9999.ebuild
similarity index 100%
rename from kde-base/kdepimlibs/kdepimlibs-9999.ebuild
rename to kde-plasma/kdepimlibs/kdepimlibs-9999.ebuild
diff --git a/kde-base/baloo-widgets/metadata.xml
b/kde-plasma/kdepimlibs/metadata.xml
similarity index 65%
rename from kde-base/baloo-widgets/metadata.xml
rename to kde-plasma/kdepimlibs/metadata.xml
index a23f444..d19719a 100644
--- a/kde-base/baloo-widgets/metadata.xml
+++ b/kde-plasma/kdepimlibs/metadata.xml
@@ -2,4 +2,7 @@
<!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
similarity index 100%
rename from kde-base/plasma-workspace-wallpapers/metadata.xml
rename to 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
similarity index 100%
rename from
kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.1.ebuild
rename to
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
similarity index 100%
rename from
kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.2.ebuild
rename to
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
similarity index 100%
rename from
kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.1.9999.ebuild
rename to
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
similarity index 100%
rename from
kde-base/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
rename to
kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
