From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-847192-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 6D2621388C1
	for <garchives@archives.gentoo.org>; Wed, 18 Nov 2015 07:59:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C84A321C027;
	Wed, 18 Nov 2015 07:59:42 +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 2275621C02A
	for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 07:59:42 +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 551EF34069F
	for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 07:59:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 695FB1004
	for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 07:59:38 +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: <1447833561.a662dd4dd6cc974297dceb24a704a04bb1375ccd.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace-wallpapers/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
X-VCS-Directories: kde-plasma/plasma-workspace-wallpapers/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: a662dd4dd6cc974297dceb24a704a04bb1375ccd
X-VCS-Branch: master
Date: Wed, 18 Nov 2015 07:59:38 +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: 92f73d35-d716-4659-b5ab-af089ef3d63c
X-Archives-Hash: 831a0c1fe5a1031c0806d0dc22732062

commit:     a662dd4dd6cc974297dceb24a704a04bb1375ccd
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Nov 18 00:08:56 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 07:59:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a662dd4d

kde-plasma/plasma-workspace-wallpapers: Add blocker

<kde-apps/kde-wallpapers-15.08.3-r1[-minimal] collides with Autumn files.

Package-Manager: portage-2.2.24

 .../plasma-workspace-wallpapers-9999.ebuild                         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
index eb74255..7c2885a 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
@@ -12,7 +12,5 @@ DESCRIPTION="Additional wallpapers for the Plasma workspace"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-"
-RDEPEND=""
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]"