From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-881025-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 2B5CE138252 for <garchives@archives.gentoo.org>; Thu, 12 May 2016 10:51:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2451CE076B; Thu, 12 May 2016 10:51:09 +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 ADC36E076B for <gentoo-commits@lists.gentoo.org>; Thu, 12 May 2016 10:51:08 +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 6C43E340871 for <gentoo-commits@lists.gentoo.org>; Thu, 12 May 2016 10:51:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A53033E for <gentoo-commits@lists.gentoo.org>; Thu, 12 May 2016 10:50:59 +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: <1463050248.1e597004f6c2212a2941818d30c956ada276d915.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-5.6.49.9999.ebuild 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: 1e597004f6c2212a2941818d30c956ada276d915 X-VCS-Branch: master Date: Thu, 12 May 2016 10:50:59 +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: c55dbcc4-6f62-4431-bf3b-5ba6b4d4668b X-Archives-Hash: 040c2adaf560783495e71f0b09587d0f commit: 1e597004f6c2212a2941818d30c956ada276d915 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Thu May 12 10:50:40 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu May 12 10:50:48 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1e597004 kde-plasma/plasma-workspace-wallpapers: raise blocker to avoid file collisions In kde-apps/kde-wallpapers-15.08.3-r1, the colliding wallpapers are removed unconditionally. -r0 however requires the minimal USE flag to be enabled. This reverts commit 71156264b6a25f736c2764ce32e6196cc5b575c7. Gentoo-bug: 582778 Package-Manager: portage-2.2.28 .../plasma-workspace-wallpapers-5.6.49.9999.ebuild | 2 +- .../plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.49.9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.49.9999.ebuild index 88313cc..6369428 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.49.9999.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.49.9999.ebuild @@ -16,4 +16,4 @@ DEPEND=" $(add_frameworks_dep extra-cmake-modules) $(add_qt_dep qtcore) " -RDEPEND="!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]" +RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]" 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 88313cc..6369428 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild @@ -16,4 +16,4 @@ DEPEND=" $(add_frameworks_dep extra-cmake-modules) $(add_qt_dep qtcore) " -RDEPEND="!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]" +RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]"