| 1 |
commit: f854e86d5abaf6855867a5976626e4ae67f94147 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 23 23:10:31 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 23 23:19:36 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f854e86d |
| 7 |
|
| 8 |
kde-plasma/oxygen: Fix KDE_INSTALL_USE_QT_SYS_PATHS warning |
| 9 |
|
| 10 |
Not a thing when building for USE=qt4. |
| 11 |
Adding relevant parts of kde4-base.eclass to src_configure. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.12, Repoman-2.3.3 |
| 14 |
|
| 15 |
kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild | 14 +++++++++----- |
| 16 |
kde-plasma/oxygen/oxygen-9999.ebuild | 14 +++++++++----- |
| 17 |
2 files changed, 18 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild |
| 20 |
index 7135bd0367..923afb65ec 100644 |
| 21 |
--- a/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild |
| 22 |
+++ b/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild |
| 23 |
@@ -3,10 +3,10 @@ |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
|
| 27 |
-inherit kde5 multibuild |
| 28 |
+inherit flag-o-matic kde5 multibuild |
| 29 |
|
| 30 |
DESCRIPTION="Oxygen visual style for the Plasma desktop" |
| 31 |
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen" |
| 32 |
+HOMEPAGE="https://cgit.kde.org/oxygen.git" |
| 33 |
KEYWORDS="" |
| 34 |
IUSE="qt4 wayland" |
| 35 |
|
| 36 |
@@ -67,14 +67,18 @@ src_configure() { |
| 37 |
local mycmakeargs=() |
| 38 |
|
| 39 |
if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then |
| 40 |
- mycmakeargs+=( -DUSE_KDE4=true ) |
| 41 |
+ use debug || append-cppflags -DQT_NO_DEBUG |
| 42 |
+ mycmakeargs+=( |
| 43 |
+ -DUSE_KDE4=true |
| 44 |
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc |
| 45 |
+ ) |
| 46 |
+ cmake-utils_src_configure |
| 47 |
else |
| 48 |
mycmakeargs+=( |
| 49 |
$(cmake-utils_use_find_package wayland KF5Wayland) |
| 50 |
) |
| 51 |
+ kde5_src_configure |
| 52 |
fi |
| 53 |
- |
| 54 |
- kde5_src_configure |
| 55 |
} |
| 56 |
|
| 57 |
multibuild_foreach_variant myconfigure |
| 58 |
|
| 59 |
diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild |
| 60 |
index 7135bd0367..923afb65ec 100644 |
| 61 |
--- a/kde-plasma/oxygen/oxygen-9999.ebuild |
| 62 |
+++ b/kde-plasma/oxygen/oxygen-9999.ebuild |
| 63 |
@@ -3,10 +3,10 @@ |
| 64 |
|
| 65 |
EAPI=6 |
| 66 |
|
| 67 |
-inherit kde5 multibuild |
| 68 |
+inherit flag-o-matic kde5 multibuild |
| 69 |
|
| 70 |
DESCRIPTION="Oxygen visual style for the Plasma desktop" |
| 71 |
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen" |
| 72 |
+HOMEPAGE="https://cgit.kde.org/oxygen.git" |
| 73 |
KEYWORDS="" |
| 74 |
IUSE="qt4 wayland" |
| 75 |
|
| 76 |
@@ -67,14 +67,18 @@ src_configure() { |
| 77 |
local mycmakeargs=() |
| 78 |
|
| 79 |
if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then |
| 80 |
- mycmakeargs+=( -DUSE_KDE4=true ) |
| 81 |
+ use debug || append-cppflags -DQT_NO_DEBUG |
| 82 |
+ mycmakeargs+=( |
| 83 |
+ -DUSE_KDE4=true |
| 84 |
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc |
| 85 |
+ ) |
| 86 |
+ cmake-utils_src_configure |
| 87 |
else |
| 88 |
mycmakeargs+=( |
| 89 |
$(cmake-utils_use_find_package wayland KF5Wayland) |
| 90 |
) |
| 91 |
+ kde5_src_configure |
| 92 |
fi |
| 93 |
- |
| 94 |
- kde5_src_configure |
| 95 |
} |
| 96 |
|
| 97 |
multibuild_foreach_variant myconfigure |
Archives