| 1 |
commit: ef689c09fe2160e891269f9644e21010d2287cc2 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 2 12:52:59 2014 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 2 12:52:59 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ef689c09 |
| 7 |
|
| 8 |
[kde-base/plasma-workspace] Call qtpaths explicitly so we can avoid adding the Qt5 bindir to PATH wrt bug #523314. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild | 8 +++++++- |
| 14 |
kde-base/plasma-workspace/plasma-workspace-9999.ebuild | 8 +++++++- |
| 15 |
2 files changed, 14 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild |
| 18 |
index 14bd10a..6bb1980 100644 |
| 19 |
--- a/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild |
| 20 |
+++ b/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild |
| 21 |
@@ -5,7 +5,7 @@ |
| 22 |
EAPI=5 |
| 23 |
|
| 24 |
VIRTUALX_REQUIRED="test" |
| 25 |
-inherit kde5 |
| 26 |
+inherit kde5 multilib |
| 27 |
|
| 28 |
DESCRIPTION="KDE Plasma workspace" |
| 29 |
KEYWORDS="" |
| 30 |
@@ -103,6 +103,12 @@ PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) |
| 31 |
|
| 32 |
RESTRICT="test" |
| 33 |
|
| 34 |
+src_prepare() { |
| 35 |
+ kde5_src_prepare |
| 36 |
+ |
| 37 |
+ sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die |
| 38 |
+} |
| 39 |
+ |
| 40 |
src_configure() { |
| 41 |
local mycmakeargs=( |
| 42 |
$(cmake-utils_use_find_package dbus dbusmenu-qt5) |
| 43 |
|
| 44 |
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 45 |
index 14bd10a..6bb1980 100644 |
| 46 |
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 47 |
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 48 |
@@ -5,7 +5,7 @@ |
| 49 |
EAPI=5 |
| 50 |
|
| 51 |
VIRTUALX_REQUIRED="test" |
| 52 |
-inherit kde5 |
| 53 |
+inherit kde5 multilib |
| 54 |
|
| 55 |
DESCRIPTION="KDE Plasma workspace" |
| 56 |
KEYWORDS="" |
| 57 |
@@ -103,6 +103,12 @@ PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) |
| 58 |
|
| 59 |
RESTRICT="test" |
| 60 |
|
| 61 |
+src_prepare() { |
| 62 |
+ kde5_src_prepare |
| 63 |
+ |
| 64 |
+ sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die |
| 65 |
+} |
| 66 |
+ |
| 67 |
src_configure() { |
| 68 |
local mycmakeargs=( |
| 69 |
$(cmake-utils_use_find_package dbus dbusmenu-qt5) |
Archives