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@gentoo.org>

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 5631ce394b05066f44a5fb10f32ca6476ab93fe5..23b072007faeb513ff7639fac9be8d6c89b8122e 100644 (file)
--- 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 4199214e6c561d3658be5a7d7058b18c8203e1ed..34d4a6e2fb595b55da38d2a331cb48374c934af6 100644 (file)
--- 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