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 D523F138252 for ; Wed, 11 May 2016 12:13:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FCCAE0810; Wed, 11 May 2016 12:13:21 +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 C1A9BE0810 for ; Wed, 11 May 2016 12:13:20 +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 7471C33BF41 for ; Wed, 11 May 2016 12:13:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5044132E for ; Wed, 11 May 2016 12:13:14 +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: <1462968767.6f3e5a639fdaff08d5d460e66ef24e48d9325410.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kwin/kwin-5.6.49.9999.ebuild kde-plasma/kwin/kwin-9999.ebuild X-VCS-Directories: kde-plasma/kwin/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 6f3e5a639fdaff08d5d460e66ef24e48d9325410 X-VCS-Branch: master Date: Wed, 11 May 2016 12:13:14 +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: 62c433b5-8b28-4c7a-8339-463c7703c958 X-Archives-Hash: 4734ca8c8a999382ee08bbdba32a1e8c commit: 6f3e5a639fdaff08d5d460e66ef24e48d9325410 Author: Michael Palimaka gentoo org> AuthorDate: Wed May 11 12:12:47 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed May 11 12:12:47 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6f3e5a63 kde-plasma/kwin: 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/kwin/kwin-5.6.49.9999.ebuild | 2 ++ kde-plasma/kwin/kwin-9999.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kde-plasma/kwin/kwin-5.6.49.9999.ebuild b/kde-plasma/kwin/kwin-5.6.49.9999.ebuild index 1c9623c..7108593 100644 --- a/kde-plasma/kwin/kwin-5.6.49.9999.ebuild +++ b/kde-plasma/kwin/kwin-5.6.49.9999.ebuild @@ -14,6 +14,7 @@ LICENSE="GPL-2+" KEYWORDS="" IUSE="gles2 multimedia" +# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 COMMON_DEPEND=" $(add_frameworks_dep kactivities) $(add_frameworks_dep kauth) @@ -41,6 +42,7 @@ COMMON_DEPEND=" $(add_frameworks_dep plasma) $(add_plasma_dep kdecoration) $(add_plasma_dep kscreenlocker) + $(add_qt_dep qtcore '' '' '5=') $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui 'gles2=,opengl(+)') diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild index efb5fa9..0410178 100644 --- a/kde-plasma/kwin/kwin-9999.ebuild +++ b/kde-plasma/kwin/kwin-9999.ebuild @@ -14,6 +14,7 @@ LICENSE="GPL-2+" KEYWORDS="" IUSE="gles2 multimedia" +# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 COMMON_DEPEND=" $(add_frameworks_dep kactivities) $(add_frameworks_dep kauth) @@ -41,6 +42,7 @@ COMMON_DEPEND=" $(add_frameworks_dep plasma) $(add_plasma_dep kdecoration) $(add_plasma_dep kscreenlocker) + $(add_qt_dep qtcore '' '' '5=') $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui 'gles2=,opengl(+)')