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 475E7138334 for ; Sat, 2 Jun 2018 12:56:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1507AE0837; Sat, 2 Jun 2018 12:56:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DEEDCE0837 for ; Sat, 2 Jun 2018 12:56:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 309CA335C72 for ; Sat, 2 Jun 2018 12:56:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A36E4291 for ; Sat, 2 Jun 2018 12:56:44 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1527944198.9e0e1cd3a91b8ea02c7de5af4ca89ad8b9916005.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild X-VCS-Directories: x11-themes/qtcurve/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 9e0e1cd3a91b8ea02c7de5af4ca89ad8b9916005 X-VCS-Branch: master Date: Sat, 2 Jun 2018 12:56:44 +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: fed6f3e3-fb1f-4934-a621-aef6f14d4a62 X-Archives-Hash: db4e6654ddf2a3bba1a1bf01c30588b0 commit: 9e0e1cd3a91b8ea02c7de5af4ca89ad8b9916005 Author: Lars Wendler gentoo org> AuthorDate: Sat Jun 2 12:56:38 2018 +0000 Commit: Lars Wendler gentoo 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)"