From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 633F213835B for ; Mon, 21 Dec 2020 11:06:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C0682BC045; Mon, 21 Dec 2020 11:06:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74B5A2BC045 for ; Mon, 21 Dec 2020 11:06:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B85C340F41 for ; Mon, 21 Dec 2020 11:06:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3355E3FB for ; Mon, 21 Dec 2020 11:06:49 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1608525620.c1071081a92dde14ebe431f3c41fcac3cf035289.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: x11-misc/i3lock-color/ X-VCS-Repository: repo/proj/guru X-VCS-Files: x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild x11-misc/i3lock-color/i3lock-color-9999.ebuild X-VCS-Directories: x11-misc/i3lock-color/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: c1071081a92dde14ebe431f3c41fcac3cf035289 X-VCS-Branch: master Date: Mon, 21 Dec 2020 11:06:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a10a84f0-91bd-403a-b2ec-feb8f9fc6f7a X-Archives-Hash: 2496d4d43b33c29fa0cf0577282b9d30 commit: c1071081a92dde14ebe431f3c41fcac3cf035289 Author: Theo Anderson posteo de> AuthorDate: Mon Dec 21 04:40:20 2020 +0000 Commit: Andrew Ammerlaan riseup 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 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