diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-24 01:10:31 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-24 01:19:36 +0200 |
| commit | f854e86d5abaf6855867a5976626e4ae67f94147 (patch) | |
| tree | 34ef7f4893b2d4aa8ca23dfa7d58684fa5968a97 | |
| parent | ab201ec9fd7c49059d9fef5060b391022db3fc08 (diff) | |
| download | kde-f854e86d5abaf6855867a5976626e4ae67f94147.tar.gz kde-f854e86d5abaf6855867a5976626e4ae67f94147.tar.bz2 kde-f854e86d5abaf6855867a5976626e4ae67f94147.zip | |
kde-plasma/oxygen: Fix KDE_INSTALL_USE_QT_SYS_PATHS warning
Not a thing when building for USE=qt4.
Adding relevant parts of kde4-base.eclass to src_configure.
Package-Manager: Portage-2.3.12, Repoman-2.3.3
| -rw-r--r-- | kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild | 14 | ||||
| -rw-r--r-- | kde-plasma/oxygen/oxygen-9999.ebuild | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild index 7135bd03679..923afb65ecd 100644 --- a/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild +++ b/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild @@ -3,10 +3,10 @@ EAPI=6 -inherit kde5 multibuild +inherit flag-o-matic kde5 multibuild DESCRIPTION="Oxygen visual style for the Plasma desktop" -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen" +HOMEPAGE="https://cgit.kde.org/oxygen.git" KEYWORDS="" IUSE="qt4 wayland" @@ -67,14 +67,18 @@ src_configure() { local mycmakeargs=() if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then - mycmakeargs+=( -DUSE_KDE4=true ) + use debug || append-cppflags -DQT_NO_DEBUG + mycmakeargs+=( + -DUSE_KDE4=true + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + ) + cmake-utils_src_configure else mycmakeargs+=( $(cmake-utils_use_find_package wayland KF5Wayland) ) + kde5_src_configure fi - - kde5_src_configure } multibuild_foreach_variant myconfigure diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild index 7135bd03679..923afb65ecd 100644 --- a/kde-plasma/oxygen/oxygen-9999.ebuild +++ b/kde-plasma/oxygen/oxygen-9999.ebuild @@ -3,10 +3,10 @@ EAPI=6 -inherit kde5 multibuild +inherit flag-o-matic kde5 multibuild DESCRIPTION="Oxygen visual style for the Plasma desktop" -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen" +HOMEPAGE="https://cgit.kde.org/oxygen.git" KEYWORDS="" IUSE="qt4 wayland" @@ -67,14 +67,18 @@ src_configure() { local mycmakeargs=() if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then - mycmakeargs+=( -DUSE_KDE4=true ) + use debug || append-cppflags -DQT_NO_DEBUG + mycmakeargs+=( + -DUSE_KDE4=true + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + ) + cmake-utils_src_configure else mycmakeargs+=( $(cmake-utils_use_find_package wayland KF5Wayland) ) + kde5_src_configure fi - - kde5_src_configure } multibuild_foreach_variant myconfigure |