From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 94DD2138253 for ; Wed, 11 May 2016 12:08:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 143DDE07FE; Wed, 11 May 2016 12:08:05 +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 ABB24E07FE for ; Wed, 11 May 2016 12:08:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6FF453408A6 for ; Wed, 11 May 2016 12:08:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B3B295D for ; Wed, 11 May 2016 12:07:59 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1462968459.d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b X-VCS-Branch: master Date: Wed, 11 May 2016 12:07:59 +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: b24ac37e-7e48-471e-b94f-bb48479ea84d X-Archives-Hash: 30da29dedc1a420d3851026f91941647 commit: d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b Author: Michael Palimaka gentoo org> AuthorDate: Wed May 11 12:07:39 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed May 11 12:07:39 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1bc5ac3 kde-plasma/plasma-workspace: introduce temporary subslot operator on dev-qt/qtgui There are a few code paths that are built conditionally depending on which version of Qt is installed. Package-Manager: portage-2.2.28 kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild | 3 ++- kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild index 3e9b16d..9815161 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild @@ -14,6 +14,7 @@ DESCRIPTION="KDE Plasma workspace" KEYWORDS="" IUSE="dbus +geolocation gps prison qalculate" +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 COMMON_DEPEND=" $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) @@ -62,7 +63,7 @@ COMMON_DEPEND=" $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') + $(add_qt_dep qtgui 'jpeg' '' '' '5=') $(add_qt_dep qtnetwork) $(add_qt_dep qtscript) $(add_qt_dep qtsql) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 5365e9c..9393e80 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -14,6 +14,7 @@ DESCRIPTION="KDE Plasma workspace" KEYWORDS="" IUSE="dbus +geolocation gps prison qalculate" +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 COMMON_DEPEND=" $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) @@ -62,7 +63,7 @@ COMMON_DEPEND=" $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') + $(add_qt_dep qtgui 'jpeg' '' '' '5=') $(add_qt_dep qtnetwork) $(add_qt_dep qtscript) $(add_qt_dep qtsql)