[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-05-18 Thread Michael Palimaka 
commit: 4dd37753e221c6b86eacd86446aa5998babf0ae4
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun May 18 15:25:26 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun May 18 15:25:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4dd37753

[kde-base/plasma-desktop] Add blocker wrt bug #510640.

Package-Manager: portage-2.2.8-r1

---
 kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild | 1 +
 kde-base/plasma-desktop/plasma-desktop-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
index f72796c..b891bb5 100644
--- a/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
@@ -80,6 +80,7 @@ RDEPEND="
x11-libs/libXfixes
virtual/libusb:0
)
+   !kde-base/attica:4
!kde-base/knetattach:4
 "
 DEPEND="${RDEPEND}

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 8aea0bf..14500b9 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -80,6 +80,7 @@ RDEPEND="
x11-libs/libXfixes
virtual/libusb:0
)
+   !kde-base/attica:4
!kde-base/knetattach:4
 "
 DEPEND="${RDEPEND}

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-05-26 Thread Johannes Huber 
commit: 022474e8a739fe1036a15d05c3f1413eb9e80f6a
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 18:28:20 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon May 26 18:28:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=022474e8

[kde-base/plasma-desktop] Enable fontconfig by default

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild | 2 +-
 kde-base/plasma-desktop/plasma-desktop-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
index b891bb5..b588775 100644
--- a/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fontconfig pulseaudio usb"
+IUSE="+fontconfig pulseaudio usb"
 
 RDEPEND="
$(add_kdebase_dep kwin)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 14500b9..55aa82d 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
-IUSE="fontconfig pulseaudio usb"
+IUSE="+fontconfig pulseaudio usb"
 
 RDEPEND="
$(add_kdebase_dep kwin)

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-05-29 Thread Johannes Huber 
commit: 82ab823b9c3b5eb52689c2d0e0cd2be3f945349e
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu May 29 13:42:51 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu May 29 13:42:51 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=82ab823b

[kde-base/plasma-desktop] Restore bluetooth, networkamanger USE flags

Feature parity with kde-base/solid-runtime from KDE SC 4.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 55aa82d..810d22d 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
-IUSE="+fontconfig pulseaudio usb"
+IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
 
 RDEPEND="
$(add_kdebase_dep kwin)
@@ -64,12 +64,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

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-04-24 Thread Michael Palimaka 
commit: ffe41cf35e087d172927f4aec5de983700f27675
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 24 17:58:03 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 24 17:58:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ffe41cf3

[kde-base/plasma-desktop] New package.

Package-Manager: portage-2.2.8-r1

---
 kde-base/plasma-desktop/metadata.xml   |  5 ++
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 99 ++
 2 files changed, 104 insertions(+)

diff --git a/kde-base/plasma-desktop/metadata.xml 
b/kde-base/plasma-desktop/metadata.xml
new file mode 100644
index 000..a23f444
--- /dev/null
+++ b/kde-base/plasma-desktop/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   kde
+

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
new file mode 100644
index 000..0caf637
--- /dev/null
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS=""
+IUSE="fontconfig pulseaudio usb"
+
+RDEPEND="
+   $(add_kdebase_dep kwin)
+   $(add_kdebase_dep plasma-workspace)
+   $(add_frameworks_dep attica)
+   $(add_frameworks_dep kactivities)
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kauth)
+   $(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 kdbusaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(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 knewstuff)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(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)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep plasma)
+   $(add_frameworks_dep solid)
+   $(add_frameworks_dep sonnet)
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   media-libs/phonon[qt5]
+   x11-libs/libX11
+   x11-libs/libxcb
+   x11-libs/libXi
+   x11-libs/libxkbfile
+   x11-libs/libXtst
+   fontconfig? (
+   media-libs/fontconfig
+   media-libs/freetype
+   x11-libs/xcb-util-image
+   x11-libs/libXft
+   )
+   pulseaudio? (
+   dev-libs/glib:2
+   media-libs/libcanberra
+   media-sound/pulseaudio
+   )
+   usb? (
+   x11-libs/libXcursor
+   x11-libs/libXfixes
+   virtual/libusb:0
+   )
+   !kde-base/knetattach:4
+"
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5
+   x11-proto/xproto
+   fontconfig? ( x11-libs/libXrender )
+"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package fontconfig Fontconfig)
+   $(cmake-utils_use_find_package pulseaudio PulseAudio)
+   $(cmake-utils_use_find_package usb USB)
+   )
+
+   kde5_src_configure
+}

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-04-24 Thread Michael Palimaka 
commit: f2b04bdc93f256945d0b1141df70b7756bf805d9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 24 18:43:54 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 24 18:43:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f2b04bdc

[kde-base/plasma-desktop] Sort deps.

Package-Manager: portage-2.2.8-r1

---
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 0caf637..8aea0bf 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -67,8 +67,8 @@ RDEPEND="
fontconfig? (
media-libs/fontconfig
media-libs/freetype
-   x11-libs/xcb-util-image
x11-libs/libXft
+   x11-libs/xcb-util-image
)
pulseaudio? (
dev-libs/glib:2

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-04-10 Thread Elias Probst 
commit: 7b2ac3a247239e8f1bf8c674b4887b6cb8b7f515
Author: Elias Probst  eliasprobst  eu>
AuthorDate: Thu Apr 10 11:48:47 2014 +
Commit: Elias Probst  eliasprobst  eu>
CommitDate: Thu Apr 10 11:50:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7b2ac3a2

[kde-base/plasma-desktop] Drop accidentally added WIP ebuild

---
 kde-base/plasma-desktop/metadata.xml   |  5 --
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 97 --
 2 files changed, 102 deletions(-)

diff --git a/kde-base/plasma-desktop/metadata.xml 
b/kde-base/plasma-desktop/metadata.xml
deleted file mode 100644
index 8d1e86a..000
--- a/kde-base/plasma-desktop/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-kde
-

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
deleted file mode 100644
index bb7940c..000
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS=""
-IUSE="dbus X"
-
-COMMON_DEPEND="
-   $(add_kdebase_dep libksysguard)
-   $(add_frameworks_dep kactivities)
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kdeclarative)
-   $(add_frameworks_dep kdesu)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kidletime)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep kjs)
-   $(add_frameworks_dep kjsembed)
-   $(add_frameworks_dep knewstuff)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep krunner)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktexteditor)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep plasma)
-   $(add_frameworks_dep solid)
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtscript:5
-   dev-qt/qtsql:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-libs/phonon[qt5]
-   sys-libs/pam
-   sys-libs/zlib
-   dbus? ( dev-libs/libdbusmenu-qt[qt5] )
-   X? (
-   dev-qt/qtx11extras:5
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-libs/libXau
-   x11-libs/libxcb
-   x11-libs/libXrender
-   x11-libs/xcb-util-keysyms
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   !kde-base/freespacenotifier:4
-   !kde-base/libkworkspace:4
-   !kde-base/libtaskmanager:4
-   !kde-base/kcminit:4
-   !kde-base/kdebase-menu-icons:4
-   !kde-base/kdebase-startkde:4
-   !kde-base/klipper:4
-   !kde-base/krunner:4
-   !kde-base/ksmserver:4
-   !kde-base/ksplash:4
-   !kde-base/kuiserver:4
-   !kde-base/plasma-workspace:4
-"
-DEPEND="${COMMON_DEPEND}
-   X? ( x11-proto/xproto )
-"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-   $(cmake-utils_use_find_package X X11)
-   )
-
-   kde5_src_configure
-}

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-12-02 Thread Michael Palimaka 
commit: 7b52192c321e66459c2ef2beb788aad000adb7b5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Dec  3 07:02:04 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  3 07:02:04 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7b52192c

[kde-base/plasma-desktop] Update blocker logic.

Package-Manager: portage-2.2.14

---
 kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild| 4 ++--
 kde-base/plasma-desktop/plasma-desktop-5.1..ebuild | 4 ++--
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild
index df925e9..5bcac00 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild
@@ -94,8 +94,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/attica:4
!kde-apps/kcontrol:4
!kde-base/kcontrol:4
-   !kde-apps/knetattach:4[-handbook(-)]
-   !kde-base/knetattach:4[-handbook(-)]
+   !kde-apps/knetattach:4[handbook]
+   !kde-base/knetattach:4[handbook]
!kde-apps/kdepasswd:4
!kde-base/kdepasswd:4
!kde-base/solid-actions-kcm:4

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.1..ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.1..ebuild
index 3693803..2a5d079 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.1..ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.1..ebuild
@@ -94,8 +94,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/attica:4
!kde-apps/kcontrol:4
!kde-base/kcontrol:4
-   !kde-apps/knetattach:4[-handbook(-)]
-   !kde-base/knetattach:4[-handbook(-)]
+   !kde-apps/knetattach:4[handbook]
+   !kde-base/knetattach:4[handbook]
!kde-apps/kdepasswd:4
!kde-base/kdepasswd:4
!kde-base/solid-actions-kcm:4

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 3693803..2a5d079 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -94,8 +94,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/attica:4
!kde-apps/kcontrol:4
!kde-base/kcontrol:4
-   !kde-apps/knetattach:4[-handbook(-)]
-   !kde-base/knetattach:4[-handbook(-)]
+   !kde-apps/knetattach:4[handbook]
+   !kde-base/knetattach:4[handbook]
!kde-apps/kdepasswd:4
!kde-base/kdepasswd:4
!kde-base/solid-actions-kcm:4

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-08-07 Thread Johannes Huber 
commit: 8ef71fac6bf6b9ce12b08d6df6ffdd30524dda0f
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Aug  7 21:10:37 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Aug  7 21:10:37 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8ef71fac

[kde-base/plasma-desktop] Block kde-base/solid-actions-kcm

Prevents file collisions.

Package-Manager: portage-2.2.11-r1

---
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 198e681..bc4ea38 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -89,6 +89,7 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/kcontrol:4
!kde-base/knetattach:4
!kde-base/kdepasswd:4
+   !kde-base/solid-actions-kcm:4
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-09-15 Thread Michael Palimaka 
commit: b501d6461ab6c3a7539aba84416a1bdf9079004a
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Sep 15 16:36:42 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Sep 15 16:36:42 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b501d646

[kde-base/plasma-desktop] Update deps.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 8e71a4c..5075289 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -48,6 +48,7 @@ COMMON_DEPEND="
$(add_frameworks_dep plasma)
$(add_frameworks_dep solid)
$(add_frameworks_dep sonnet)
+   dev-qt/qtconcurrent:5
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
@@ -60,6 +61,8 @@ COMMON_DEPEND="
media-libs/phonon[qt5]
x11-libs/libX11
x11-libs/libxcb
+   x11-libs/libXcursor
+   x11-libs/libXfixes
x11-libs/libXi
x11-libs/libxkbfile
x11-libs/libXtst
@@ -94,7 +97,6 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
-   dev-qt/qtconcurrent:5
x11-proto/xproto
fontconfig? ( x11-libs/libXrender )
 "

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-09-18 Thread Michael Palimaka 
commit: 4453500c851d1368649a969499b3a6db746fb4da
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Sep 18 15:20:13 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep 18 15:20:23 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4453500c

[kde-base/plasma-desktop] Ensure that the KWin decoration is always available.

Plasma Desktop requires KWin to run. As far as I know, no other KWin decoration
exists (yet).

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild | 1 +
 kde-base/plasma-desktop/plasma-desktop-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild
index 9a3e3b9..feb7aa4 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild
@@ -13,6 +13,7 @@ IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
 
 COMMON_DEPEND="
$(add_kdebase_dep kwin)
+   $(add_kdebase_dep oxygen kwin)
$(add_kdebase_dep plasma-workspace)
$(add_frameworks_dep attica)
$(add_frameworks_dep kactivities)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 5075289..3c2b03c 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -13,6 +13,7 @@ IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
 
 COMMON_DEPEND="
$(add_kdebase_dep kwin)
+   $(add_kdebase_dep oxygen kwin)
$(add_kdebase_dep plasma-workspace)
$(add_frameworks_dep attica)
$(add_frameworks_dep kactivities)

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-07-12 Thread Johannes Huber 
commit: e2267167eea6d9bda2c1cd3bbaa1b81bb633dbf1
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Jul 12 20:10:40 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jul 12 20:10:40 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e2267167

[kde-base/plasma-desktop] Block kde-base/kdepasswd:4

Prevents file collisions.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index a4c045e..c477631 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -83,6 +83,7 @@ RDEPEND="
)
!kde-base/attica:4
!kde-base/knetattach:4
+   !kde-base/kdepasswd:4
 "
 DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-09-24 Thread Michael Palimaka 
commit: 2046b91488ae8483c692e6f9fc03eac4d36e2a96
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Sep 24 17:42:10 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep 24 17:42:10 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2046b914

[kde-base/plasma-desktop] Depend on kde-base/breeze as it's now the default 
theme.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 3c2b03c..d6884e4 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
 IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
 
 COMMON_DEPEND="
+   $(add_kdebase_dep breeze)
$(add_kdebase_dep kwin)
$(add_kdebase_dep oxygen kwin)
$(add_kdebase_dep plasma-workspace)

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-08-11 Thread Johannes Huber 
commit: 2796a51c6c1e1a82764eea7d480cbb6885ea215b
Author: Matthew Dawson  mjdsystems  ca>
AuthorDate: Mon Aug 11 15:53:55 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Aug 11 18:40:10 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2796a51c

[kde-base/plasma-desktop] Block kde-base/systemsettings:4 and 
kde-base/plasma-workspace:4

Add a blocker due to various file conflicts with kde-base/systemsettings:4 and
kde-base/plasma-workspace:4.

Package-Manager: portage-2.2.8-r1

---
 kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild| 2 ++
 kde-base/plasma-desktop/plasma-desktop-5.0..ebuild | 2 ++
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
index d411896..445ccc6 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
@@ -89,6 +89,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/knetattach:4
!kde-base/kdepasswd:4
!kde-base/kcontrol:4
+   !kde-base/plasma-workspace:4
+   !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
index 198e681..0e51eae 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
@@ -89,6 +89,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/kcontrol:4
!kde-base/knetattach:4
!kde-base/kdepasswd:4
+   !kde-base/plasma-workspace:4
+   !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index bc4ea38..8e71a4c 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -90,6 +90,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/knetattach:4
!kde-base/kdepasswd:4
!kde-base/solid-actions-kcm:4
+   !kde-base/plasma-workspace:4
+   !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-07-21 Thread Michael Palimaka 
commit: f5dd9f6436e9f67f9bd19fb914aad06e5529d078
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jul 21 18:52:01 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jul 21 18:52:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f5dd9f64

[kde-base/plasma-desktop] Fix dependency.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild | 2 +-
 kde-base/plasma-desktop/plasma-desktop-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
index 73e7b64..3b84991 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
x11-libs/libXft
x11-libs/xcb-util-image
)
-   networkmanager? ( kde-misc/plasma-nm:5 )
+   networkmanager? ( $(add_kdebase_dep plasma-nm) )
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index c477631..fd5671e 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
x11-libs/libXft
x11-libs/xcb-util-image
)
-   networkmanager? ( kde-misc/plasma-nm:5 )
+   networkmanager? ( $(add_kdebase_dep plasma-nm) )
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-07-24 Thread Michael Palimaka 
commit: d069fb3eac9d3014f172db4eb03ffef27b539f16
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jul 24 16:31:07 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jul 24 16:31:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d069fb3e

[kde-base/plasma-desktop] Add missing dependency.

It's required by kcm_useraccount to change user account information.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild| 7 +--
 kde-base/plasma-desktop/plasma-desktop-5.0..ebuild | 7 +--
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 7 +--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
index 3b84991..953cc5d 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Plasma desktop"
 KEYWORDS="~amd64"
 IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
 
-RDEPEND="
+COMMON_DEPEND="
$(add_kdebase_dep kwin)
$(add_kdebase_dep plasma-workspace)
$(add_frameworks_dep attica)
@@ -81,11 +81,14 @@ RDEPEND="
x11-libs/libXfixes
virtual/libusb:0
)
+"
+RDEPEND="${COMMON_DEPEND}
+   sys-apps/accountsservice
!kde-base/attica:4
!kde-base/knetattach:4
!kde-base/kdepasswd:4
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5
x11-proto/xproto
fontconfig? ( x11-libs/libXrender )

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
index fd5671e..8de5c9e 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
 IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
 
-RDEPEND="
+COMMON_DEPEND="
$(add_kdebase_dep kwin)
$(add_kdebase_dep plasma-workspace)
$(add_frameworks_dep attica)
@@ -81,11 +81,14 @@ RDEPEND="
x11-libs/libXfixes
virtual/libusb:0
)
+"
+RDEPEND="${COMMON_DEPEND}
+   sys-apps/accountsservice
!kde-base/attica:4
!kde-base/knetattach:4
!kde-base/kdepasswd:4
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5
x11-proto/xproto
fontconfig? ( x11-libs/libXrender )

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index fd5671e..8de5c9e 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
 IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
 
-RDEPEND="
+COMMON_DEPEND="
$(add_kdebase_dep kwin)
$(add_kdebase_dep plasma-workspace)
$(add_frameworks_dep attica)
@@ -81,11 +81,14 @@ RDEPEND="
x11-libs/libXfixes
virtual/libusb:0
)
+"
+RDEPEND="${COMMON_DEPEND}
+   sys-apps/accountsservice
!kde-base/attica:4
!kde-base/knetattach:4
!kde-base/kdepasswd:4
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5
x11-proto/xproto
fontconfig? ( x11-libs/libXrender )

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-07-26 Thread Marc Schiffbauer 
commit: 0fcd76ab53f02ef1f386dc79495dbd2132c6b20e
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Jul 26 18:17:19 2014 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Jul 26 18:17:19 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0fcd76ab

[kde-base/plasma-desktop] Added kcontrol:4 blocker

---
 kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild| 1 +
 kde-base/plasma-desktop/plasma-desktop-5.0..ebuild | 1 +
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
index 953cc5d..0b9e397 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
@@ -87,6 +87,7 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/attica:4
!kde-base/knetattach:4
!kde-base/kdepasswd:4
+   !kde-base/kcontrol:4
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
index 8de5c9e..cee1847 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
@@ -85,6 +85,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
sys-apps/accountsservice
!kde-base/attica:4
+   !kde-base/kcontrol:4
!kde-base/knetattach:4
!kde-base/kdepasswd:4
 "

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 8de5c9e..cee1847 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -85,6 +85,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
sys-apps/accountsservice
!kde-base/attica:4
+   !kde-base/kcontrol:4
!kde-base/knetattach:4
!kde-base/kdepasswd:4
 "

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-07-27 Thread Michael Palimaka 
commit: 6d52447d3cb0cd9a10ae0e0ecdc2764acccbe5ac
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 27 19:11:52 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 27 19:11:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6d52447d

[kde-base/plasma-desktop] Add missing dependency.

org.kde.kded5 is called via dbus.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild| 1 +
 kde-base/plasma-desktop/plasma-desktop-5.0..ebuild | 1 +
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
index 0b9e397..d411896 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
@@ -83,6 +83,7 @@ COMMON_DEPEND="
)
 "
 RDEPEND="${COMMON_DEPEND}
+   $(add_frameworks_dep kded)
sys-apps/accountsservice
!kde-base/attica:4
!kde-base/knetattach:4

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
index cee1847..198e681 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0..ebuild
@@ -83,6 +83,7 @@ COMMON_DEPEND="
)
 "
 RDEPEND="${COMMON_DEPEND}
+   $(add_frameworks_dep kded)
sys-apps/accountsservice
!kde-base/attica:4
!kde-base/kcontrol:4

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index cee1847..198e681 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -83,6 +83,7 @@ COMMON_DEPEND="
)
 "
 RDEPEND="${COMMON_DEPEND}
+   $(add_frameworks_dep kded)
sys-apps/accountsservice
!kde-base/attica:4
!kde-base/kcontrol:4

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-06-16 Thread Michael Palimaka 
commit: 07cc1034b153fca6b7edec57d8db5e117555d5a8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jun 16 13:06:18 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jun 16 13:06:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=07cc1034

[kde-base/plasma-desktop] Remove unused dependency.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 810d22d..a4c045e 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -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)

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/files/

2014-10-25 Thread Michael Palimaka 
commit: a470c6bd889410ef88453ec505fe5e3ce6c437f2
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct 25 16:34:13 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct 25 16:34:13 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a470c6bd

[kde-base/plasma-desktop] Remove unused patch.

Package-Manager: portage-2.2.14

---
 .../files/plasma-desktop-5.0.2-qt54.patch  | 93 --
 1 file changed, 93 deletions(-)

diff --git a/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch 
b/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch
deleted file mode 100644
index 28a92b7..000
--- a/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Aleix Pol 
-Date: Fri, 01 Aug 2014 16:35:40 +
-Subject: Fix build in Qt 5.4
-X-Git-Url: 
http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=2ca1f09aea56eb55a508a6c6bb55b2456950f42b

-Fix build in Qt 5.4

-
-
 a/applets/kickoff/core/applicationmodel.cpp
-+++ b/applets/kickoff/core/applicationmodel.cpp
-@@ -185,7 +185,7 @@
- const KSycocaEntry::Ptr p = (*it);
- 
- if (p->isType(KST_KService)) {
--const KService::Ptr service = p;
-+const KService::Ptr service = 
KService::Ptr(static_cast(p.data()));
- 
- if (service->noDisplay()) {
- continue;
-@@ -235,7 +235,7 @@
- 
- existingServices[appName] = service;
- } else if (p->isType(KST_KServiceGroup)) {
--const KServiceGroup::Ptr serviceGroup = p;
-+const KServiceGroup::Ptr serviceGroup = 
KServiceGroup::Ptr(static_cast(p.data()));
- 
- if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) 
{
- continue;
-@@ -612,13 +612,13 @@
- KSycocaEntry::Ptr e = (*it);
- 
- if (e->isType(KST_KServiceGroup)) {
--KServiceGroup::Ptr g(e);
-+KServiceGroup::Ptr 
g(KServiceGroup::Ptr(static_cast(e.data(;
- if (!g->noDisplay()) {
- if (createNewProgramListForPath(g->relPath()))
- seenProgramsChanged = true;
- }
- } else if (e->isType(KST_KService)) {
--KService::Ptr s(e);
-+KService::Ptr s(KService::Ptr(static_cast(e.data(;
- if (s->isApplication() && !s->noDisplay()) {
- QString shortStorageId = s->storageId().remove(".desktop");
- QHash::Iterator it_find = 
d->seenPrograms.find(shortStorageId);
-
-From: Kevin Funk 
-Date: Wed, 06 Aug 2014 06:30:39 +
-Subject: Make compile with Qt 5.4
-X-Git-Url: 
http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=ee4927f4f6ba794afaa256ac2e66e46659d6f4e8

-Make compile with Qt 5.4
-
-BUG: 337932

-
-
 a/applets/kicker/plugin/appsmodel.cpp
-+++ b/applets/kicker/plugin/appsmodel.cpp
-@@ -252,7 +252,7 @@
- const KSycocaEntry::Ptr p = (*it);
- 
- if (p->isType(KST_KServiceGroup)) {
--KServiceGroup::Ptr subGroup = static_cast(p);
-+KServiceGroup::Ptr 
subGroup(static_cast(p.data()));
- 
- if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
- m_entryList << new AppGroupEntry(subGroup, this, m_flat, 
m_appNameFormat);
-@@ -295,7 +295,7 @@
- const KSycocaEntry::Ptr p = (*it);
- 
- if (p->isType(KST_KService)) {
--const KService::Ptr service = static_cast(p);
-+const KService::Ptr service(static_cast(p.data()));
- 
- if (!service->noDisplay()) {
- bool found = false;
-@@ -314,11 +314,12 @@
- 
- } else if (p->isType(KST_KServiceGroup)) {
- if (m_flat) {
--processServiceGroup(static_cast(p));
-+const KServiceGroup::Ptr 
serviceGroup(static_cast(p.data()));
-+processServiceGroup(serviceGroup);
- 
- m_sortNeeded = true;
- } else {
--const KServiceGroup::Ptr subGroup = 
static_cast(p);
-+const KServiceGroup::Ptr 
subGroup(static_cast(p.data()));
- 
- if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
- m_entryList << new AppGroupEntry(subGroup, this, m_flat, 
m_appNameFormat);
-

[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/, kde-base/plasma-desktop/files/

2014-09-19 Thread Johannes Huber 
commit: 5a6d71b1fc770c6a4d63a0a5338854741ca7dd45
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Sep 19 17:29:13 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Sep 19 17:30:08 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5a6d71b1

[kde-base/plasma-desktop] Add upstream patch, fixes build with Qt 5.4

Spotted by Franz Fellner  gmail.com>, bug #523222.

Package-Manager: portage-2.2.13

---
 .../files/plasma-desktop-5.0.2-qt54.patch  | 93 ++
 .../plasma-desktop/plasma-desktop-5.0.2.ebuild |  2 +
 2 files changed, 95 insertions(+)

diff --git a/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch 
b/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch
new file mode 100644
index 000..28a92b7
--- /dev/null
+++ b/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch
@@ -0,0 +1,93 @@
+From: Aleix Pol 
+Date: Fri, 01 Aug 2014 16:35:40 +
+Subject: Fix build in Qt 5.4
+X-Git-Url: 
http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=2ca1f09aea56eb55a508a6c6bb55b2456950f42b
+---
+Fix build in Qt 5.4
+---
+
+
+--- a/applets/kickoff/core/applicationmodel.cpp
 b/applets/kickoff/core/applicationmodel.cpp
+@@ -185,7 +185,7 @@
+ const KSycocaEntry::Ptr p = (*it);
+ 
+ if (p->isType(KST_KService)) {
+-const KService::Ptr service = p;
++const KService::Ptr service = 
KService::Ptr(static_cast(p.data()));
+ 
+ if (service->noDisplay()) {
+ continue;
+@@ -235,7 +235,7 @@
+ 
+ existingServices[appName] = service;
+ } else if (p->isType(KST_KServiceGroup)) {
+-const KServiceGroup::Ptr serviceGroup = p;
++const KServiceGroup::Ptr serviceGroup = 
KServiceGroup::Ptr(static_cast(p.data()));
+ 
+ if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) 
{
+ continue;
+@@ -612,13 +612,13 @@
+ KSycocaEntry::Ptr e = (*it);
+ 
+ if (e->isType(KST_KServiceGroup)) {
+-KServiceGroup::Ptr g(e);
++KServiceGroup::Ptr 
g(KServiceGroup::Ptr(static_cast(e.data(;
+ if (!g->noDisplay()) {
+ if (createNewProgramListForPath(g->relPath()))
+ seenProgramsChanged = true;
+ }
+ } else if (e->isType(KST_KService)) {
+-KService::Ptr s(e);
++KService::Ptr s(KService::Ptr(static_cast(e.data(;
+ if (s->isApplication() && !s->noDisplay()) {
+ QString shortStorageId = s->storageId().remove(".desktop");
+ QHash::Iterator it_find = 
d->seenPrograms.find(shortStorageId);
+
+From: Kevin Funk 
+Date: Wed, 06 Aug 2014 06:30:39 +
+Subject: Make compile with Qt 5.4
+X-Git-Url: 
http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=ee4927f4f6ba794afaa256ac2e66e46659d6f4e8
+---
+Make compile with Qt 5.4
+
+BUG: 337932
+---
+
+
+--- a/applets/kicker/plugin/appsmodel.cpp
 b/applets/kicker/plugin/appsmodel.cpp
+@@ -252,7 +252,7 @@
+ const KSycocaEntry::Ptr p = (*it);
+ 
+ if (p->isType(KST_KServiceGroup)) {
+-KServiceGroup::Ptr subGroup = static_cast(p);
++KServiceGroup::Ptr 
subGroup(static_cast(p.data()));
+ 
+ if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
+ m_entryList << new AppGroupEntry(subGroup, this, m_flat, 
m_appNameFormat);
+@@ -295,7 +295,7 @@
+ const KSycocaEntry::Ptr p = (*it);
+ 
+ if (p->isType(KST_KService)) {
+-const KService::Ptr service = static_cast(p);
++const KService::Ptr service(static_cast(p.data()));
+ 
+ if (!service->noDisplay()) {
+ bool found = false;
+@@ -314,11 +314,12 @@
+ 
+ } else if (p->isType(KST_KServiceGroup)) {
+ if (m_flat) {
+-processServiceGroup(static_cast(p));
++const KServiceGroup::Ptr 
serviceGroup(static_cast(p.data()));
++processServiceGroup(serviceGroup);
+ 
+ m_sortNeeded = true;
+ } else {
+-const KServiceGroup::Ptr subGroup = 
static_cast(p);
++const KServiceGroup::Ptr 
subGroup(static_cast(p.data()));
+ 
+ if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
+ m_entryList << new AppGroupEntry(subGroup, this, m_flat, 
m_appNameFormat);
+

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild
index feb7aa4..960d140 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.2.ebuild
@@ -99,6 +99,8 @@ DEPEND="${COMMON_DEPEND}
fontconfig? ( x11-libs/libXrender )
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt54.patch" )
+
 src_configure() {
local mycmakeargs=(