commit: fa8baaa642569c262a77e1993c98052f52fe81b3 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Thu Jan 9 20:00:44 2020 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Thu Jan 9 20:01:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8baaa6
x11-misc/picom: block on x11-misc/compton Renaming is in progress upstream, but some installed files still use the compton alias Closes: https://bugs.gentoo.org/704884 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> x11-misc/picom/{picom-7.5.ebuild => picom-7.5-r1.ebuild} | 3 ++- x11-misc/picom/picom-9999.ebuild | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/x11-misc/picom/picom-7.5.ebuild b/x11-misc/picom/picom-7.5-r1.ebuild similarity index 96% rename from x11-misc/picom/picom-7.5.ebuild rename to x11-misc/picom/picom-7.5-r1.ebuild index 5631ce394b0..23b072007fa 100644 --- a/x11-misc/picom/picom-7.5.ebuild +++ b/x11-misc/picom/picom-7.5-r1.ebuild @@ -33,7 +33,8 @@ RDEPEND="${PYTHON_DEPS} dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre )" + pcre? ( dev-libs/libpcre ) + !x11-misc/compton" DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild index 4199214e6c5..34d4a6e2fb5 100644 --- a/x11-misc/picom/picom-9999.ebuild +++ b/x11-misc/picom/picom-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,7 +29,8 @@ RDEPEND="dev-libs/libev dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre )" + pcre? ( dev-libs/libpcre ) + !x11-misc/compton" DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig
