[gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     9e0e1cd3a91b8ea02c7de5af4ca89ad8b9916005
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 12:56:38 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 12:56:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0e1cd3

x11-themes/qtcurve: Removed qt4 support.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
index 08539806e18..4f5a52d2a5f 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.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
@@ -77,12 +71,12 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_QT4=OFF
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-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)"