commit: 2b555f7eb0523844928d7b9657461580c62bb755
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 16:50:05 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 16:50:05 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2b555f7e
[kde-base] Add Plasma 2 beta 2, part 1.
---
.../{breeze-4.96.0.ebuild => breeze-4.97.0.ebuild} | 7 +++++-
...s-4.96.0.ebuild => kde-cli-tools-4.97.0.ebuild} | 15 +++++++++++--
...ter-4.96.0.ebuild => khelpcenter-4.97.0.ebuild} | 0
...otkeys-4.96.0.ebuild => khotkeys-4.97.0.ebuild} | 0
...ter-4.96.0.ebuild => kinfocenter-4.97.0.ebuild} | 1 +
...tras-4.96.0.ebuild => kio-extras-4.97.0.ebuild} | 25 ++++++++++++++++------
...uedit-4.96.0.ebuild => kmenuedit-4.97.0.ebuild} | 0
...guard-4.96.0.ebuild => ksysguard-4.97.0.ebuild} | 0
.../{kwin-4.96.0.ebuild => kwin-4.97.0.ebuild} | 0
...kwrited-4.96.0.ebuild => kwrited-4.97.0.ebuild} | 0
...rd-4.96.0.ebuild => libksysguard-4.97.0.ebuild} | 0
.../{milou-4.96.0.ebuild => milou-4.97.0.ebuild} | 0
.../{oxygen-4.96.0.ebuild => oxygen-4.97.0.ebuild} | 1 +
...-4.96.0.ebuild => plasma-desktop-4.97.0.ebuild} | 5 +++--
....96.0.ebuild => plasma-workspace-4.97.0.ebuild} | 25 +++++++++++++++++++++-
...evil-4.96.0.ebuild => powerdevil-4.97.0.ebuild} | 3 ++-
...-4.96.0.ebuild => systemsettings-4.97.0.ebuild} | 0
17 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/kde-base/breeze/breeze-4.96.0.ebuild
b/kde-base/breeze/breeze-4.97.0.ebuild
similarity index 77%
rename from kde-base/breeze/breeze-4.96.0.ebuild
rename to kde-base/breeze/breeze-4.97.0.ebuild
index 252a9b7..6e9e71a 100644
--- a/kde-base/breeze/breeze-4.96.0.ebuild
+++ b/kde-base/breeze/breeze-4.97.0.ebuild
@@ -4,7 +4,6 @@
EAPI=5
-KDE_DEBUG="false"
inherit kde5
DESCRIPTION="Breeze visual style for the Plasma desktop"
@@ -12,6 +11,12 @@
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze";
KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ dev-qt/qtwidgets:5
+"
RDEPEND="
+ ${DEPEND}
dev-qt/qtgraphicaleffects:5
"
diff --git a/kde-base/kde-cli-tools/kde-cli-tools-4.96.0.ebuild
b/kde-base/kde-cli-tools/kde-cli-tools-4.97.0.ebuild
similarity index 84%
rename from kde-base/kde-cli-tools/kde-cli-tools-4.96.0.ebuild
rename to kde-base/kde-cli-tools/kde-cli-tools-4.97.0.ebuild
index f0ab4d6..7d6d66d 100644
--- a/kde-base/kde-cli-tools/kde-cli-tools-4.96.0.ebuild
+++ b/kde-base/kde-cli-tools/kde-cli-tools-4.97.0.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the
system"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools";
KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="X"
DEPEND="
$(add_frameworks_dep kcmutils)
@@ -24,7 +24,6 @@ DEPEND="
$(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_frameworks_dep kwindowsystem)
@@ -32,8 +31,20 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
"
RDEPEND="${DEPEND}"
# requires running kde environment
RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X Qt5X11Extras)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-base/khelpcenter/khelpcenter-4.96.0.ebuild
b/kde-base/khelpcenter/khelpcenter-4.97.0.ebuild
similarity index 100%
rename from kde-base/khelpcenter/khelpcenter-4.96.0.ebuild
rename to kde-base/khelpcenter/khelpcenter-4.97.0.ebuild
diff --git a/kde-base/khotkeys/khotkeys-4.96.0.ebuild
b/kde-base/khotkeys/khotkeys-4.97.0.ebuild
similarity index 100%
rename from kde-base/khotkeys/khotkeys-4.96.0.ebuild
rename to kde-base/khotkeys/khotkeys-4.97.0.ebuild
diff --git a/kde-base/kinfocenter/kinfocenter-4.96.0.ebuild
b/kde-base/kinfocenter/kinfocenter-4.97.0.ebuild
similarity index 98%
rename from kde-base/kinfocenter/kinfocenter-4.96.0.ebuild
rename to kde-base/kinfocenter/kinfocenter-4.97.0.ebuild
index 807ac33..1ca4796 100644
--- a/kde-base/kinfocenter/kinfocenter-4.96.0.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.97.0.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
diff --git a/kde-base/kio-extras/kio-extras-4.96.0.ebuild
b/kde-base/kio-extras/kio-extras-4.97.0.ebuild
similarity index 80%
rename from kde-base/kio-extras/kio-extras-4.96.0.ebuild
rename to kde-base/kio-extras/kio-extras-4.97.0.ebuild
index cb3fc32..4a47f90 100644
--- a/kde-base/kio-extras/kio-extras-4.96.0.ebuild
+++ b/kde-base/kio-extras/kio-extras-4.97.0.ebuild
@@ -7,14 +7,14 @@ EAPI=5
KDE_HANDBOOK="true"
KDE_TEST="true"
VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit fdo-mime kde5
DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kio-extras";
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="exif openexr samba +sftp slp"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="exif openexr phonon samba +sftp slp"
-DEPEND="
+RDEPEND="
$(add_frameworks_dep karchive 'bzip2,lzma')
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcodecs)
@@ -41,13 +41,15 @@ DEPEND="
virtual/jpeg:0
exif? ( media-gfx/exiv2:= )
openexr? ( media-libs/openexr:= )
+ phonon? ( media-libs/phonon[qt5] )
samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient]
>=net-fs/samba-4.0.0_alpha1[client] ) )
sftp? ( >=net-libs/libssh-0.6.0:=[sftp] )
slp? ( net-libs/openslp )
-"
-RDEPEND="${DEPEND}
!kde-base/kdebase-kioslaves:4
"
+DEPEND="${RDEPEND}
+ x11-misc/shared-mime-info
+"
# requires running kde environment
RESTRICT="test"
@@ -56,6 +58,7 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package exif Exiv2)
$(cmake-utils_use_find_package openexr OpenEXR)
+ $(cmake-utils_use_find_package phonon Phonon4Qt5)
$(cmake-utils_use_find_package samba)
$(cmake-utils_use_find_package sftp LibSSH)
$(cmake-utils_use_find_package slp)
@@ -63,3 +66,13 @@ src_configure() {
kde5_src_configure
}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ kde5_pkg_postinst
+ fdo-mime_mime_database_update
+}
diff --git a/kde-base/kmenuedit/kmenuedit-4.96.0.ebuild
b/kde-base/kmenuedit/kmenuedit-4.97.0.ebuild
similarity index 100%
rename from kde-base/kmenuedit/kmenuedit-4.96.0.ebuild
rename to kde-base/kmenuedit/kmenuedit-4.97.0.ebuild
diff --git a/kde-base/ksysguard/ksysguard-4.96.0.ebuild
b/kde-base/ksysguard/ksysguard-4.97.0.ebuild
similarity index 100%
rename from kde-base/ksysguard/ksysguard-4.96.0.ebuild
rename to kde-base/ksysguard/ksysguard-4.97.0.ebuild
diff --git a/kde-base/kwin/kwin-4.96.0.ebuild b/kde-base/kwin/kwin-4.97.0.ebuild
similarity index 100%
rename from kde-base/kwin/kwin-4.96.0.ebuild
rename to kde-base/kwin/kwin-4.97.0.ebuild
diff --git a/kde-base/kwrited/kwrited-4.96.0.ebuild
b/kde-base/kwrited/kwrited-4.97.0.ebuild
similarity index 100%
rename from kde-base/kwrited/kwrited-4.96.0.ebuild
rename to kde-base/kwrited/kwrited-4.97.0.ebuild
diff --git a/kde-base/libksysguard/libksysguard-4.96.0.ebuild
b/kde-base/libksysguard/libksysguard-4.97.0.ebuild
similarity index 100%
rename from kde-base/libksysguard/libksysguard-4.96.0.ebuild
rename to kde-base/libksysguard/libksysguard-4.97.0.ebuild
diff --git a/kde-base/milou/milou-4.96.0.ebuild
b/kde-base/milou/milou-4.97.0.ebuild
similarity index 100%
rename from kde-base/milou/milou-4.96.0.ebuild
rename to kde-base/milou/milou-4.97.0.ebuild
diff --git a/kde-base/oxygen/oxygen-4.96.0.ebuild
b/kde-base/oxygen/oxygen-4.97.0.ebuild
similarity index 95%
rename from kde-base/oxygen/oxygen-4.96.0.ebuild
rename to kde-base/oxygen/oxygen-4.97.0.ebuild
index f34d495..1ad55df 100644
--- a/kde-base/oxygen/oxygen-4.96.0.ebuild
+++ b/kde-base/oxygen/oxygen-4.97.0.ebuild
@@ -16,6 +16,7 @@ DEPEND="
$(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 kservice)
diff --git a/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
b/kde-base/plasma-desktop/plasma-desktop-4.97.0.ebuild
similarity index 94%
rename from kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
rename to kde-base/plasma-desktop/plasma-desktop-4.97.0.ebuild
index b588775..d70e662 100644
--- a/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-4.97.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="KDE Plasma desktop"
KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+fontconfig pulseaudio usb"
+IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
RDEPEND="
$(add_kdebase_dep kwin)
@@ -41,7 +41,6 @@ RDEPEND="
$(add_frameworks_dep kparts)
$(add_frameworks_dep krunner)
$(add_frameworks_dep kservice)
- $(add_frameworks_dep kunitconversion)
$(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
@@ -64,12 +63,14 @@ RDEPEND="
x11-libs/libXi
x11-libs/libxkbfile
x11-libs/libXtst
+ bluetooth? ( net-wireless/bluedevil:5 )
fontconfig? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
x11-libs/xcb-util-image
)
+ networkmanager? ( kde-misc/plasma-nm:5 )
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
b/kde-base/plasma-workspace/plasma-workspace-4.97.0.ebuild
similarity index 81%
rename from kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
rename to kde-base/plasma-workspace/plasma-workspace-4.97.0.ebuild
index 5cbaf23..a0c02a1 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.97.0.ebuild
@@ -9,10 +9,11 @@ inherit kde5
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus X"
+IUSE="dbus prison X"
COMMON_DEPEND="
$(add_kdebase_dep libksysguard)
+ $(add_kdebase_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcompletion)
@@ -41,6 +42,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kservice)
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
@@ -59,6 +61,7 @@ COMMON_DEPEND="
sys-libs/zlib
x11-libs/libkscreen2:5
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+ prison? ( media-libs/prison:5 )
X? (
dev-qt/qtx11extras:5
x11-libs/libICE
@@ -92,9 +95,12 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
"
+PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+ $(cmake-utils_use_find_package prison)
$(cmake-utils_use_find_package X X11)
)
@@ -108,4 +114,21 @@ src_install() {
echo startkde > "${T}"/KDE-5
exeinto /etc/X11/Sessions
doexe "${T}"/KDE-5
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+ echo
}
diff --git a/kde-base/powerdevil/powerdevil-4.96.0.ebuild
b/kde-base/powerdevil/powerdevil-4.97.0.ebuild
similarity index 98%
rename from kde-base/powerdevil/powerdevil-4.96.0.ebuild
rename to kde-base/powerdevil/powerdevil-4.97.0.ebuild
index d5219ba..328816d 100644
--- a/kde-base/powerdevil/powerdevil-4.96.0.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.97.0.ebuild
@@ -33,7 +33,7 @@ DEPEND="
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+ upower? ( virtual/udev )
X? (
dev-qt/qtx11extras:5
x11-libs/libX11
@@ -44,6 +44,7 @@ DEPEND="
RDEPEND="
${DEPEND}
+ upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
!kde-base/powerdevil:4
"
diff --git a/kde-base/systemsettings/systemsettings-4.96.0.ebuild
b/kde-base/systemsettings/systemsettings-4.97.0.ebuild
similarity index 100%
rename from kde-base/systemsettings/systemsettings-4.96.0.ebuild
rename to kde-base/systemsettings/systemsettings-4.97.0.ebuild
