aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Anderson <telans@posteo.de>2020-12-21 17:40:20 +1300
committerTheo Anderson <telans@posteo.de>2020-12-21 17:40:20 +1300
commitc1071081a92dde14ebe431f3c41fcac3cf035289 (patch)
tree2d09d57201d2190306ce5c64107896b6e748f558 /x11-misc/i3lock-color
parentdev-lang/wren: drop old (diff)
downloadguru-c1071081a92dde14ebe431f3c41fcac3cf035289.tar.gz
guru-c1071081a92dde14ebe431f3c41fcac3cf035289.tar.bz2
guru-c1071081a92dde14ebe431f3c41fcac3cf035289.zip
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@posteo.de>
Diffstat (limited to 'x11-misc/i3lock-color')
-rw-r--r--x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild6
-rw-r--r--x11-misc/i3lock-color/i3lock-color-9999.ebuild4
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 152923c08..6f206c71a 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 072ee1e50..272639c10 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