Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/
Date: Sat, 02 Jun 2018 12:56:49
Message-Id: 1527944198.9e0e1cd3a91b8ea02c7de5af4ca89ad8b9916005.polynomial-c@gentoo
1 commit: 9e0e1cd3a91b8ea02c7de5af4ca89ad8b9916005
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 2 12:56:38 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 2 12:56:38 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0e1cd3
7
8 x11-themes/qtcurve: Removed qt4 support.
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild | 26 ++++++++++----------------
13 1 file changed, 10 insertions(+), 16 deletions(-)
14
15 diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
16 index 08539806e18..4f5a52d2a5f 100644
17 --- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
18 +++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
19 @@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/qtcurve.git"
20
21 LICENSE="LGPL-2+"
22 SLOT="0"
23 -IUSE="+X gtk nls plasma qt4 +qt5 test"
24 +IUSE="+X gtk nls plasma +qt5 test"
25
26 if [[ "${PV}" != 9999 ]] ; then
27 SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
28 @@ -20,25 +20,12 @@ if [[ "${PV}" != 9999 ]] ; then
29 fi
30
31 REQUIRED_USE="gtk? ( X )
32 - || ( gtk qt4 qt5 )
33 + || ( gtk qt5 )
34 plasma? ( qt5 )
35 "
36
37 COMMON_DEPEND="
38 gtk? ( x11-libs/gtk+:2 )
39 - qt4? (
40 - dev-qt/qtcore:4
41 - dev-qt/qtdbus:4
42 - dev-qt/qtgui:4
43 - dev-qt/qtsvg:4
44 - )
45 - qt5? (
46 - $(add_qt_dep qtdbus)
47 - $(add_qt_dep qtgui)
48 - $(add_qt_dep qtsvg)
49 - $(add_qt_dep qtwidgets)
50 - $(add_qt_dep qtx11extras)
51 - )
52 plasma? (
53 $(add_frameworks_dep frameworkintegration)
54 $(add_frameworks_dep karchive)
55 @@ -56,6 +43,13 @@ COMMON_DEPEND="
56 $(add_frameworks_dep kxmlgui)
57 $(add_qt_dep qtprintsupport)
58 )
59 + qt5? (
60 + $(add_qt_dep qtdbus)
61 + $(add_qt_dep qtgui)
62 + $(add_qt_dep qtsvg)
63 + $(add_qt_dep qtwidgets)
64 + $(add_qt_dep qtx11extras)
65 + )
66 X? (
67 x11-libs/libX11
68 x11-libs/libxcb
69 @@ -77,12 +71,12 @@ PATCHES=(
70
71 src_configure() {
72 local mycmakeargs=(
73 + -DENABLE_QT4=OFF
74 -DLIB_INSTALL_DIR="$(get_libdir)"
75 -DQTC_QT4_ENABLE_KDE=OFF
76 -DQTC_QT4_ENABLE_KWIN=OFF
77 -DQTC_KDE4_DEFAULT_HOME=ON
78 -DENABLE_GTK2="$(usex gtk)"
79 - -DENABLE_QT4="$(usex qt4)"
80 -DENABLE_QT5="$(usex qt5)"
81 -DENABLE_TEST="$(usex test)"
82 -DQTC_ENABLE_X11="$(usex X)"