commit: f3ef532def14422f59665f855f62da55b33e8c36 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Thu Jul 21 16:50:26 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Jul 21 17:04:31 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3ef532d
kde-plasma/oxygen: Add USE=qt4, update description Gentoo-bug: 589334 Package-Manager: portage-2.2.28 kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild | 54 +++++++++++++++++++++++------ kde-plasma/oxygen/oxygen-9999.ebuild | 54 +++++++++++++++++++++++------ 2 files changed, 86 insertions(+), 22 deletions(-) diff --git a/kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild index d33bc3f..bbcbb28 100644 --- a/kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild +++ b/kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild @@ -4,14 +4,14 @@ EAPI=6 -inherit kde5 +inherit kde5 multibuild -DESCRIPTION="KDE window manager theme" +DESCRIPTION="Oxygen visual style for the Plasma desktop" HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"; KEYWORDS="" -IUSE="wayland" +IUSE="qt4 wayland" -RDEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep frameworkintegration) $(add_frameworks_dep kcmutils) $(add_frameworks_dep kcompletion) @@ -28,18 +28,50 @@ RDEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) x11-libs/libxcb + qt4? ( + kde-base/kdelibs:4 + x11-libs/libX11 + ) wayland? ( $(add_frameworks_dep kwayland) ) - !kde-base/kdebase-cursors:4 - !kde-base/oxygen:4 " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kservice) + qt4? ( virtual/pkgconfig ) +" +RDEPEND="${COMMON_DEPEND} + !kde-base/kdebase-cursors:4 + !kde-base/kstyles:4 " +pkg_setup() { + kde5_pkg_setup + MULTIBUILD_VARIANTS=( kf5 $(usev qt4) ) +} + src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package wayland KF5Wayland) - ) + myconfigure() { + local mycmakeargs=( + $(cmake-utils_use_find_package wayland KF5Wayland) + ) + + if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then + mycmakeargs+=( -DUSE_KDE4=true ) + fi + + kde5_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant kde5_src_compile +} + +src_test() { + multibuild_foreach_variant kde5_src_test +} - kde5_src_configure +src_install() { + multibuild_foreach_variant kde5_src_install } diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild index d33bc3f..bbcbb28 100644 --- a/kde-plasma/oxygen/oxygen-9999.ebuild +++ b/kde-plasma/oxygen/oxygen-9999.ebuild @@ -4,14 +4,14 @@ EAPI=6 -inherit kde5 +inherit kde5 multibuild -DESCRIPTION="KDE window manager theme" +DESCRIPTION="Oxygen visual style for the Plasma desktop" HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"; KEYWORDS="" -IUSE="wayland" +IUSE="qt4 wayland" -RDEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep frameworkintegration) $(add_frameworks_dep kcmutils) $(add_frameworks_dep kcompletion) @@ -28,18 +28,50 @@ RDEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) x11-libs/libxcb + qt4? ( + kde-base/kdelibs:4 + x11-libs/libX11 + ) wayland? ( $(add_frameworks_dep kwayland) ) - !kde-base/kdebase-cursors:4 - !kde-base/oxygen:4 " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kservice) + qt4? ( virtual/pkgconfig ) +" +RDEPEND="${COMMON_DEPEND} + !kde-base/kdebase-cursors:4 + !kde-base/kstyles:4 " +pkg_setup() { + kde5_pkg_setup + MULTIBUILD_VARIANTS=( kf5 $(usev qt4) ) +} + src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package wayland KF5Wayland) - ) + myconfigure() { + local mycmakeargs=( + $(cmake-utils_use_find_package wayland KF5Wayland) + ) + + if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then + mycmakeargs+=( -DUSE_KDE4=true ) + fi + + kde5_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant kde5_src_compile +} + +src_test() { + multibuild_foreach_variant kde5_src_test +} - kde5_src_configure +src_install() { + multibuild_foreach_variant kde5_src_install }
