From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-863065-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id F2FCE59CA2
	for <garchives@archives.gentoo.org>; Sat, 13 Feb 2016 15:59:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A6F9BE077F;
	Sat, 13 Feb 2016 15:59:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 4D890E077F
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 15:59:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 29223340B25
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 15:59:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D8BAE8E9
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 15:59:11 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
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" <kensington@gentoo.org>
Message-ID: <1455379142.14b9915d6169ac24ae5ae0326b6c91c078c6a076.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.5.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: 14b9915d6169ac24ae5ae0326b6c91c078c6a076
X-VCS-Branch: master
Date: Sat, 13 Feb 2016 15:59:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6a576881-6ced-4d6d-8b1c-b23f85a0357a
X-Archives-Hash: f5302b90f6735368c23c8c3adf27b31d

commit:     14b9915d6169ac24ae5ae0326b6c91c078c6a076
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Feb 12 20:12:40 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 15:59:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14b9915d

kde-plasma/kwin: Add blocker against <kde-apps/kdeartwork-meta-15.08.3-r1

It improves upgrade path from KDE SC 4. Since the Plasma-5 upgrade guide
removes all Plasma-4 depending packages from world, but kdeartwork-meta
is not necessarily part of depgraph on the subsequent rebuild, people
currently face a block if they still have kdeartwork-meta-4.14.3 and
kdeartwork-styles installed.

Package-Manager: portage-2.2.27

 kde-plasma/kwin/kwin-5.5.49.9999.ebuild | 5 +++--
 kde-plasma/kwin/kwin-9999.ebuild        | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/kwin/kwin-5.5.49.9999.ebuild b/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
index 0481f19..1d26ef9 100644
--- a/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
@@ -41,14 +41,14 @@ COMMON_DEPEND="
 	$(add_plasma_dep kdecoration)
 	$(add_plasma_dep kscreenlocker)
 	$(add_plasma_dep kwayland)
-	>=dev-libs/libinput-0.10
-	>=dev-libs/wayland-1.2
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui 'gles2=,opengl(+)')
 	$(add_qt_dep qtscript)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
+	>=dev-libs/libinput-0.10
+	>=dev-libs/wayland-1.2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libepoxy
@@ -72,6 +72,7 @@ RDEPEND="${COMMON_DEPEND}
 			$(add_qt_dep qtmultimedia 'gstreamer010,qml')
 		)
 	)
+	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
 	!kde-base/kwin:4
 	!kde-base/systemsettings:4
 "

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 0481f19..1d26ef9 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -41,14 +41,14 @@ COMMON_DEPEND="
 	$(add_plasma_dep kdecoration)
 	$(add_plasma_dep kscreenlocker)
 	$(add_plasma_dep kwayland)
-	>=dev-libs/libinput-0.10
-	>=dev-libs/wayland-1.2
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui 'gles2=,opengl(+)')
 	$(add_qt_dep qtscript)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
+	>=dev-libs/libinput-0.10
+	>=dev-libs/wayland-1.2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libepoxy
@@ -72,6 +72,7 @@ RDEPEND="${COMMON_DEPEND}
 			$(add_qt_dep qtmultimedia 'gstreamer010,qml')
 		)
 	)
+	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
 	!kde-base/kwin:4
 	!kde-base/systemsettings:4
 "