From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D827A1395E1 for ; Wed, 2 Nov 2016 21:15:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23BD3E09AA; Wed, 2 Nov 2016 21:15:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2C6FE09AA for ; Wed, 2 Nov 2016 21:15:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B9B134108B for ; Wed, 2 Nov 2016 21:15:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7A44249B for ; Wed, 2 Nov 2016 21:15:51 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1478121327.ffdfa148d1896d753e13514ffbbe06a67560dd3c.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-themes/qtcurve/metadata.xml x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild X-VCS-Directories: x11-themes/qtcurve/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: ffdfa148d1896d753e13514ffbbe06a67560dd3c X-VCS-Branch: master Date: Wed, 2 Nov 2016 21:15:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 638ce4fa-95cc-491e-b0fe-64f499244a9c X-Archives-Hash: c0f62677bf460219af04695b90bf2b7e commit: ffdfa148d1896d753e13514ffbbe06a67560dd3c Author: Johannes Huber gentoo org> AuthorDate: Wed Nov 2 21:15:27 2016 +0000 Commit: Johannes Huber gentoo 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 @@ qt@gentoo.org Gentoo Qt Project - - Enable KDE4 support. This adds a QtCurve configuration - module to KDE's SystemSettings - Enable window decoration for KWin - QtCurve/qtcurve 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