From: "Theo Anderson" <telans@posteo.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: x11-misc/i3lock-color/
Date: Mon, 21 Dec 2020 05:31:52 +0000 (UTC) [thread overview]
Message-ID: <1608525620.c1071081a92dde14ebe431f3c41fcac3cf035289.telans@gentoo> (raw)
commit: c1071081a92dde14ebe431f3c41fcac3cf035289
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Mon Dec 21 04:40:20 2020 +0000
Commit: Theo Anderson <telans <AT> posteo <DOT> de>
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
next reply other threads:[~2020-12-21 5:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 5:31 Theo Anderson [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-05 14:33 [gentoo-commits] repo/proj/guru:dev commit in: x11-misc/i3lock-color/ Takuya Wakazono
2024-02-05 10:05 Takuya Wakazono
2021-06-08 7:54 Petrus Zhao
2021-05-30 4:49 Petrus Zhao
2021-04-18 15:53 Andrew Ammerlaan
2021-02-16 11:43 Jian Lin
2021-02-16 11:43 Jian Lin
2021-02-16 11:43 Jian Lin
2021-01-05 20:41 Jian Lin
2021-01-04 1:50 Theo Anderson
2021-01-02 19:00 Jian Lin
2021-01-01 18:58 Jian Lin
2020-12-30 20:25 Jian Lin
2020-12-24 21:55 Jian Lin
2020-12-23 10:13 Theo Anderson
2020-12-21 22:56 Jian Lin
2020-12-21 11:00 Theo Anderson
2020-12-21 5:31 Theo Anderson
2020-09-06 2:12 Petrus Zhao
2020-07-23 4:53 Petrus Zhao
2020-06-17 4:41 Petrus Zhao
2020-06-13 5:46 Petrus Zhao
2020-05-22 6:41 Petrus Zhao
2020-04-19 8:34 Petrus Zhao
2020-04-19 8:34 Petrus Zhao
2020-03-17 6:32 Petrus Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1608525620.c1071081a92dde14ebe431f3c41fcac3cf035289.telans@gentoo \
--to=telans@posteo.de \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox