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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     ef689c09fe2160e891269f9644e21010d2287cc2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  2 12:52:59 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct  2 12:52:59 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ef689c09

[kde-base/plasma-workspace] Call qtpaths explicitly so we can avoid adding the Qt5 bindir to PATH wrt bug #523314.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild | 8 +++++++-
 kde-base/plasma-workspace/plasma-workspace-9999.ebuild     | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild
index 14bd10a..6bb1980 100644
--- a/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit kde5 multilib
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
@@ -103,6 +103,12 @@ PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
 
 RESTRICT="test"
 
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 14bd10a..6bb1980 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit kde5 multilib
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
@@ -103,6 +103,12 @@ PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
 
 RESTRICT="test"
 
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)