Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome/
Date: Thu, 17 Jan 2019 13:59:19
Message-Id: 1547733505.d62c2ae5221c0fa29af815bf3e2253002d3089b0.leio@gentoo
1 commit: d62c2ae5221c0fa29af815bf3e2253002d3089b0
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 17 13:57:52 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 17 13:58:25 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62c2ae5
7
8 gnome-base/gnome-3.24.2: allow gnome-core-apps-3.26 upgrade
9
10 gnome-core-apps dropped IUSE=cdr due to brasero being rather unmaintained.
11 Allow installing gnome-3.24[cdr] with gnome-core-apps-3.26 by assuming it
12 exists, even if it doesn't (instead of not accepting the upgrade), as this
13 is a metapackage and it should be fine that the IUSE=cdr doesn't do anything
14 during migration to 3.26.
15
16 Package-Manager: Portage-2.3.52, Repoman-2.3.12
17 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
18
19 gnome-base/gnome/gnome-3.24.2.ebuild | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22 diff --git a/gnome-base/gnome/gnome-3.24.2.ebuild b/gnome-base/gnome/gnome-3.24.2.ebuild
23 index cbf8482f077..e5213f355a9 100644
24 --- a/gnome-base/gnome/gnome-3.24.2.ebuild
25 +++ b/gnome-base/gnome/gnome-3.24.2.ebuild
26 @@ -1,4 +1,4 @@
27 -# Copyright 1999-2018 Gentoo Foundation
28 +# Copyright 1999-2019 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI=6
32 @@ -20,7 +20,7 @@ S=${WORKDIR}
33 # TODO: check accessibility completeness
34 RDEPEND="
35 >=gnome-base/gnome-core-libs-${PV}[cups?]
36 - >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
37 + >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr(+)?]
38
39 >=gnome-base/gdm-${PV}