From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1243604-garchives=archives.gentoo.org@lists.gentoo.org>
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 C111D1382C5
for <garchives@archives.gentoo.org>; Wed, 20 Jan 2021 15:17:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C111FE081E;
Wed, 20 Jan 2021 15:17:57 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 A8208E081E
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jan 2021 15:17:57 +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 C41E234109E
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jan 2021 15:17:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F80448B
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jan 2021 15:17:55 +0000 (UTC)
From: "Ben Kohler" <bkohler@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" <bkohler@gentoo.org>
Message-ID: <1611155812.e3608eae4362dcb35645750baa382373ae6a54ce.bkohler@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks-contrib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
X-VCS-Directories: x11-misc/i3blocks-contrib/
X-VCS-Committer: bkohler
X-VCS-Committer-Name: Ben Kohler
X-VCS-Revision: e3608eae4362dcb35645750baa382373ae6a54ce
X-VCS-Branch: master
Date: Wed, 20 Jan 2021 15:17:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d0156424-45b2-49f9-b36e-522cfb57c429
X-Archives-Hash: facfb2f4c691ad2f58d75c743cc0a242
commit: e3608eae4362dcb35645750baa382373ae6a54ce
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 15:16:02 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 15:16:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3608eae
x11-misc/i3blocks-contrib: require newer i3blocks & block old
Blocker on old is required because there will be collisions with 1.4,
dependency on newer is required because these scripts use some functions
not available in 1.4 release.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
index 653c846b589..91c7d5c7864 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
@@ -15,7 +15,8 @@ SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
DEPEND=""
-RDEPEND="x11-misc/i3blocks"
+RDEPEND="!<x11-misc/i3blocks-1.5
+ >=x11-misc/i3blocks-1.5"
BDEPEND=""
src_prepare() {