From: Mart Raudsepp <leio@gentoo.org>
Date: Thu, 17 Jan 2019 13:57:52 +0000 (+0200)
Subject: gnome-base/gnome-3.24.2: allow gnome-core-apps-3.26 upgrade
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d62c2ae5221c0fa29af815bf3e2253002d3089b0;p=gentoo.git

gnome-base/gnome-3.24.2: allow gnome-core-apps-3.26 upgrade

gnome-core-apps dropped IUSE=cdr due to brasero being rather unmaintained.
Allow installing gnome-3.24[cdr] with gnome-core-apps-3.26 by assuming it
exists, even if it doesn't (instead of not accepting the upgrade), as this
is a metapackage and it should be fine that the IUSE=cdr doesn't do anything
during migration to 3.26.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
---

diff --git a/gnome-base/gnome/gnome-3.24.2.ebuild b/gnome-base/gnome/gnome-3.24.2.ebuild
index cbf8482f077a..e5213f355a9f 100644
--- a/gnome-base/gnome/gnome-3.24.2.ebuild
+++ b/gnome-base/gnome/gnome-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ S=${WORKDIR}
 # TODO: check accessibility completeness
 RDEPEND="
 	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
+	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr(+)?]
 
 	>=gnome-base/gdm-${PV}