commit:     5eaccd80636ccc19b72ea0385a77b9da1376a817
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 07:47:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 29 12:31:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eaccd80

x11-themes/qtcurve: Drop USE=qt4 from live

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-themes/qtcurve/qtcurve-9999.ebuild | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild 
b/x11-themes/qtcurve/qtcurve-9999.ebuild
index f201fa6e79a..0c90108fce5 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/qtcurve.git";
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="+X gtk nls plasma qt4 +qt5 test"
+IUSE="+X gtk nls plasma +qt5 test"
 
 if [[ "${PV}" != 9999 ]] ; then
        SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> 
${P}.tar.gz"
@@ -20,25 +20,12 @@ if [[ "${PV}" != 9999 ]] ; then
 fi
 
 REQUIRED_USE="gtk? ( X )
-       || ( gtk qt4 qt5 )
+       || ( gtk qt5 )
        plasma? ( qt5 )
 "
 
 COMMON_DEPEND="
        gtk? ( x11-libs/gtk+:2 )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtdbus:4
-               dev-qt/qtgui:4
-               dev-qt/qtsvg:4
-       )
-       qt5? (
-               $(add_qt_dep qtdbus)
-               $(add_qt_dep qtgui)
-               $(add_qt_dep qtsvg)
-               $(add_qt_dep qtwidgets)
-               $(add_qt_dep qtx11extras)
-       )
        plasma? (
                $(add_frameworks_dep frameworkintegration)
                $(add_frameworks_dep karchive)
@@ -56,6 +43,13 @@ COMMON_DEPEND="
                $(add_frameworks_dep kxmlgui)
                $(add_qt_dep qtprintsupport)
        )
+       qt5? (
+               $(add_qt_dep qtdbus)
+               $(add_qt_dep qtgui)
+               $(add_qt_dep qtsvg)
+               $(add_qt_dep qtwidgets)
+               $(add_qt_dep qtx11extras)
+       )
        X? (
                x11-libs/libX11
                x11-libs/libxcb
@@ -78,11 +72,11 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 src_configure() {
        local mycmakeargs=(
                -DLIB_INSTALL_DIR="$(get_libdir)"
+               -DENABLE_QT4=OFF
                -DQTC_QT4_ENABLE_KDE=OFF
                -DQTC_QT4_ENABLE_KWIN=OFF
                -DQTC_KDE4_DEFAULT_HOME=ON
                -DENABLE_GTK2="$(usex gtk)"
-               -DENABLE_QT4="$(usex qt4)"
                -DENABLE_QT5="$(usex qt5)"
                -DENABLE_TEST="$(usex test)"
                -DQTC_ENABLE_X11="$(usex X)"

Reply via email to