summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2020-01-09 21:00:44 +0100
committerBernard Cafarelli <voyageur@gentoo.org>2020-01-09 21:01:03 +0100
commitfa8baaa642569c262a77e1993c98052f52fe81b3 (patch)
tree11a8b1830ad0e31ac3f09c2048e01886fca43f94
parentapp-admin/rsyslog-8.1911.0-r1: amd64 stable (bug 704338) (diff)
downloadgentoo-fa8baaa642569c262a77e1993c98052f52fe81b3.tar.gz
gentoo-fa8baaa642569c262a77e1993c98052f52fe81b3.tar.bz2
gentoo-fa8baaa642569c262a77e1993c98052f52fe81b3.zip
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>
-rw-r--r--x11-misc/picom/picom-7.5-r1.ebuild (renamed from x11-misc/picom/picom-7.5.ebuild)3
-rw-r--r--x11-misc/picom/picom-9999.ebuild5
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
index 5631ce394b05..23b072007fae 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 4199214e6c56..34d4a6e2fb59 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