commit: ffdfa148d1896d753e13514ffbbe06a67560dd3c Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Wed Nov 2 21:15:27 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Nov 2 21:15:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffdfa148
x11-themes/qtcurve: Drop deprecated Plasma 4 support Package-Manager: portage-2.3.2 x11-themes/qtcurve/metadata.xml | 5 ----- x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild | 18 +++++------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/x11-themes/qtcurve/metadata.xml b/x11-themes/qtcurve/metadata.xml index e1666dc..8c91657 100644 --- a/x11-themes/qtcurve/metadata.xml +++ b/x11-themes/qtcurve/metadata.xml @@ -9,11 +9,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="kde">Enable KDE4 support. This adds a QtCurve configuration - module to KDE's SystemSettings</flag> - <flag name="windeco">Enable window decoration for KWin</flag> - </use> <upstream> <remote-id type="github">QtCurve/qtcurve</remote-id> </upstream> diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild index 335092f..11cb549 100644 --- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild +++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild @@ -3,8 +3,7 @@ # $Id$ EAPI=5 -KDE_REQUIRED="optional" -inherit kde4-base +inherit cmake-utils DESCRIPTION="A set of widget styles for Qt and GTK2" HOMEPAGE="https://github.com/QtCurve/qtcurve" @@ -20,9 +19,8 @@ fi LICENSE="LGPL-2+" SLOT="0" -IUSE="+X gtk kde nls +qt4 qt5 windeco" +IUSE="+X gtk nls +qt4 qt5" REQUIRED_USE="gtk? ( X ) - windeco? ( kde X ) || ( gtk qt4 qt5 )" RDEPEND="X? ( x11-libs/libxcb @@ -39,9 +37,6 @@ RDEPEND="X? ( x11-libs/libxcb X? ( dev-qt/qtdbus:5 dev-qt/qtx11extras:5 ) ) - kde? ( $(add_kdebase_dep systemsettings) - windeco? ( $(add_kdebase_dep kwin) ) - ) !x11-themes/gtk-engines-qtcurve" DEPEND="${RDEPEND} virtual/pkgconfig @@ -63,19 +58,16 @@ pkg_setup() { if ! version_is_at_least 4.7 $(gcc-version) ; then append-cxxflags -Doverride= fi - - use kde && kde4-base_pkg_setup } src_configure() { - local mycmakeargs - mycmakeargs=( + local mycmakeargs=( + -DQTC_QT4_ENABLE_KDE=OFF + -DQTC_QT4_ENABLE_KWIN=OFF $(cmake-utils_use_enable gtk GTK2) $(cmake-utils_use_enable qt4 QT4) $(cmake-utils_use_enable qt5 QT5) $(cmake-utils_use X QTC_ENABLE_X11 ) - $(cmake-utils_use kde QTC_QT4_ENABLE_KDE ) - $(cmake-utils_use windeco QTC_QT4_ENABLE_KWIN ) $(cmake-utils_use nls QTC_INSTALL_PO ) ) cmake-utils_src_configure