commit: f854e86d5abaf6855867a5976626e4ae67f94147 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Oct 23 23:10:31 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Oct 23 23:19:36 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f854e86d
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 kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild | 14 +++++++++----- 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 7135bd0367..923afb65ec 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 7135bd0367..923afb65ec 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
