[gentoo-commits] repo/proj/guru:master commit in: x11-misc/i3lock-color/

[Andrew Ammerlaan]

commit:     c1071081a92dde14ebe431f3c41fcac3cf035289
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Mon Dec 21 04:40:20 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Dec 21 04:40:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c1071081

x11-misc/i3lock-color: fix file collisions with x11-misc/i3lock

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild | 6 ++++--
 x11-misc/i3lock-color/i3lock-color-9999.ebuild   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild 
b/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild
index 152923c0..6f206c71 100644
--- a/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild
+++ b/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild
@@ -26,8 +26,10 @@ RDEPEND="
        media-libs/fontconfig:=
        media-libs/libjpeg-turbo
 "
-
-DEPEND="${RDEPEND}"
+DEPEND="
+       ${RDEPEND}
+       !x11-misc/i3lock
+"
 BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}-${MY_PV}"

diff --git a/x11-misc/i3lock-color/i3lock-color-9999.ebuild 
b/x11-misc/i3lock-color/i3lock-color-9999.ebuild
index 072ee1e5..272639c1 100644
--- a/x11-misc/i3lock-color/i3lock-color-9999.ebuild
+++ b/x11-misc/i3lock-color/i3lock-color-9999.ebuild
@@ -26,11 +26,11 @@ RDEPEND="
        media-libs/fontconfig:=
        media-libs/libjpeg-turbo
 "
-
 DEPEND="
        ${RDEPEND}
-       virtual/pkgconfig
+       !x11-misc/i3lock
 "
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
        autoreconf -fiv