| 1 |
commit: ffdfa148d1896d753e13514ffbbe06a67560dd3c |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 2 21:15:27 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 2 21:15:27 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffdfa148 |
| 7 |
|
| 8 |
x11-themes/qtcurve: Drop deprecated Plasma 4 support |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
x11-themes/qtcurve/metadata.xml | 5 ----- |
| 13 |
x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild | 18 +++++------------- |
| 14 |
2 files changed, 5 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-themes/qtcurve/metadata.xml b/x11-themes/qtcurve/metadata.xml |
| 17 |
index e1666dc..8c91657 100644 |
| 18 |
--- a/x11-themes/qtcurve/metadata.xml |
| 19 |
+++ b/x11-themes/qtcurve/metadata.xml |
| 20 |
@@ -9,11 +9,6 @@ |
| 21 |
<email>qt@g.o</email> |
| 22 |
<name>Gentoo Qt Project</name> |
| 23 |
</maintainer> |
| 24 |
- <use> |
| 25 |
- <flag name="kde">Enable KDE4 support. This adds a QtCurve configuration |
| 26 |
- module to KDE's SystemSettings</flag> |
| 27 |
- <flag name="windeco">Enable window decoration for KWin</flag> |
| 28 |
- </use> |
| 29 |
<upstream> |
| 30 |
<remote-id type="github">QtCurve/qtcurve</remote-id> |
| 31 |
</upstream> |
| 32 |
|
| 33 |
diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild |
| 34 |
index 335092f..11cb549 100644 |
| 35 |
--- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild |
| 36 |
+++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild |
| 37 |
@@ -3,8 +3,7 @@ |
| 38 |
# $Id$ |
| 39 |
|
| 40 |
EAPI=5 |
| 41 |
-KDE_REQUIRED="optional" |
| 42 |
-inherit kde4-base |
| 43 |
+inherit cmake-utils |
| 44 |
|
| 45 |
DESCRIPTION="A set of widget styles for Qt and GTK2" |
| 46 |
HOMEPAGE="https://github.com/QtCurve/qtcurve" |
| 47 |
@@ -20,9 +19,8 @@ fi |
| 48 |
|
| 49 |
LICENSE="LGPL-2+" |
| 50 |
SLOT="0" |
| 51 |
-IUSE="+X gtk kde nls +qt4 qt5 windeco" |
| 52 |
+IUSE="+X gtk nls +qt4 qt5" |
| 53 |
REQUIRED_USE="gtk? ( X ) |
| 54 |
- windeco? ( kde X ) |
| 55 |
|| ( gtk qt4 qt5 )" |
| 56 |
|
| 57 |
RDEPEND="X? ( x11-libs/libxcb |
| 58 |
@@ -39,9 +37,6 @@ RDEPEND="X? ( x11-libs/libxcb |
| 59 |
X? ( dev-qt/qtdbus:5 |
| 60 |
dev-qt/qtx11extras:5 ) |
| 61 |
) |
| 62 |
- kde? ( $(add_kdebase_dep systemsettings) |
| 63 |
- windeco? ( $(add_kdebase_dep kwin) ) |
| 64 |
- ) |
| 65 |
!x11-themes/gtk-engines-qtcurve" |
| 66 |
DEPEND="${RDEPEND} |
| 67 |
virtual/pkgconfig |
| 68 |
@@ -63,19 +58,16 @@ pkg_setup() { |
| 69 |
if ! version_is_at_least 4.7 $(gcc-version) ; then |
| 70 |
append-cxxflags -Doverride= |
| 71 |
fi |
| 72 |
- |
| 73 |
- use kde && kde4-base_pkg_setup |
| 74 |
} |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
- local mycmakeargs |
| 78 |
- mycmakeargs=( |
| 79 |
+ local mycmakeargs=( |
| 80 |
+ -DQTC_QT4_ENABLE_KDE=OFF |
| 81 |
+ -DQTC_QT4_ENABLE_KWIN=OFF |
| 82 |
$(cmake-utils_use_enable gtk GTK2) |
| 83 |
$(cmake-utils_use_enable qt4 QT4) |
| 84 |
$(cmake-utils_use_enable qt5 QT5) |
| 85 |
$(cmake-utils_use X QTC_ENABLE_X11 ) |
| 86 |
- $(cmake-utils_use kde QTC_QT4_ENABLE_KDE ) |
| 87 |
- $(cmake-utils_use windeco QTC_QT4_ENABLE_KWIN ) |
| 88 |
$(cmake-utils_use nls QTC_INSTALL_PO ) |
| 89 |
) |
| 90 |
cmake-utils_src_configure |
Archives