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 9ED2B1382C5 for ; Thu, 4 Feb 2021 22:32:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA1BAE08C4; Thu, 4 Feb 2021 22:32:08 +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 D538BE08C4 for ; Thu, 4 Feb 2021 22:32:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 EA0B934266B for ; Thu, 4 Feb 2021 22:32:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8158B49 for ; Thu, 4 Feb 2021 22:32:06 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1612477917.f3e054abaefeaf986c490ef96bdf16795d823ea4.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks/files/, x11-misc/i3blocks/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch x11-misc/i3blocks/i3blocks-1.5-r1.ebuild x11-misc/i3blocks/i3blocks-1.5.ebuild X-VCS-Directories: x11-misc/i3blocks/files/ x11-misc/i3blocks/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: f3e054abaefeaf986c490ef96bdf16795d823ea4 X-VCS-Branch: master Date: Thu, 4 Feb 2021 22:32:06 +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: 87a5d865-2dfb-47ca-bb97-233058331349 X-Archives-Hash: c8f1ca99f6220c089041b2f0be2b8f67 commit: f3e054abaefeaf986c490ef96bdf16795d823ea4 Author: Jakov Smolic sartura hr> AuthorDate: Mon Feb 1 16:43:35 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Feb 4 22:31:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e054ab x11-misc/i3blocks: Clean up latest ebuild Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: Thomas Deutschmann gentoo.org> .../files/i3blocks-disable-bash-completion.patch | 4 ++-- x11-misc/i3blocks/i3blocks-1.5-r1.ebuild | 16 ++++------------ x11-misc/i3blocks/i3blocks-1.5.ebuild | 9 +++------ 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch index bfca548e06f..bc7c065eea8 100644 --- a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch +++ b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch @@ -1,5 +1,5 @@ ---- a/Makefile.am 2019-10-20 22:46:55.603462157 +0200 -+++ b/Makefile.am 2019-10-20 22:47:29.893461028 +0200 +--- a/Makefile.am ++++ b/Makefile.am @@ -29,14 +29,3 @@ dist_sysconf_DATA = \ diff --git a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild index 0ff32627916..8bd169120d3 100644 --- a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild +++ b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild @@ -5,22 +5,14 @@ EAPI=7 inherit autotools bash-completion-r1 -if [[ ${PV} = 9999 ]]; then - inherit git-r3 -fi - DESCRIPTION="highly flexible status line for the i3 window manager" HOMEPAGE="https://github.com/vivien/i3blocks" -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/vivien/${PN}" -else - SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi +SRC_URI="https://github.com/vivien/i3blocks/archive/${PV}.tar.gz -> ${P}.tar.gz" -IUSE="+contrib" -SLOT="0" LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="+contrib" PDEPEND="contrib? ( x11-misc/i3blocks-contrib )" diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild b/x11-misc/i3blocks/i3blocks-1.5.ebuild index 9922b9524a9..c39a545210f 100644 --- a/x11-misc/i3blocks/i3blocks-1.5.ebuild +++ b/x11-misc/i3blocks/i3blocks-1.5.ebuild @@ -5,16 +5,13 @@ EAPI=7 inherit autotools bash-completion-r1 -if [[ ${PV} = 9999 ]]; then - inherit git-r3 -fi - DESCRIPTION="highly flexible status line for the i3 window manager" HOMEPAGE="https://github.com/vivien/i3blocks" -if [[ ${PV} = 9999 ]]; then +if [[ ${PV} = *9999 ]]; then + inherit git-r3 EGIT_REPO_URI="https://github.com/vivien/${PN}" else - SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/vivien/i3blocks/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 ~arm64 x86" fi