Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/picom/
Date: Thu, 09 Jan 2020 20:01:58
Message-Id: 1578600063.fa8baaa642569c262a77e1993c98052f52fe81b3.voyageur@gentoo
1 commit: fa8baaa642569c262a77e1993c98052f52fe81b3
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 9 20:00:44 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 9 20:01:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8baaa6
7
8 x11-misc/picom: block on x11-misc/compton
9
10 Renaming is in progress upstream, but some installed files still use the
11 compton alias
12
13 Closes: https://bugs.gentoo.org/704884
14 Package-Manager: Portage-2.3.84, Repoman-2.3.20
15 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
16
17 x11-misc/picom/{picom-7.5.ebuild => picom-7.5-r1.ebuild} | 3 ++-
18 x11-misc/picom/picom-9999.ebuild | 5 +++--
19 2 files changed, 5 insertions(+), 3 deletions(-)
20
21 diff --git a/x11-misc/picom/picom-7.5.ebuild b/x11-misc/picom/picom-7.5-r1.ebuild
22 similarity index 96%
23 rename from x11-misc/picom/picom-7.5.ebuild
24 rename to x11-misc/picom/picom-7.5-r1.ebuild
25 index 5631ce394b0..23b072007fa 100644
26 --- a/x11-misc/picom/picom-7.5.ebuild
27 +++ b/x11-misc/picom/picom-7.5-r1.ebuild
28 @@ -33,7 +33,8 @@ RDEPEND="${PYTHON_DEPS}
29 dbus? ( sys-apps/dbus )
30 drm? ( x11-libs/libdrm )
31 opengl? ( virtual/opengl )
32 - pcre? ( dev-libs/libpcre )"
33 + pcre? ( dev-libs/libpcre )
34 + !x11-misc/compton"
35 DEPEND="${RDEPEND}
36 x11-base/xorg-proto"
37 BDEPEND="virtual/pkgconfig
38
39 diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
40 index 4199214e6c5..34d4a6e2fb5 100644
41 --- a/x11-misc/picom/picom-9999.ebuild
42 +++ b/x11-misc/picom/picom-9999.ebuild
43 @@ -1,4 +1,4 @@
44 -# Copyright 1999-2019 Gentoo Authors
45 +# Copyright 1999-2020 Gentoo Authors
46 # Distributed under the terms of the GNU General Public License v2
47
48 EAPI=7
49 @@ -29,7 +29,8 @@ RDEPEND="dev-libs/libev
50 dbus? ( sys-apps/dbus )
51 drm? ( x11-libs/libdrm )
52 opengl? ( virtual/opengl )
53 - pcre? ( dev-libs/libpcre )"
54 + pcre? ( dev-libs/libpcre )
55 + !x11-misc/compton"
56 DEPEND="${RDEPEND}
57 x11-base/xorg-proto"
58 BDEPEND="virtual/pkgconfig