commit: f3e054abaefeaf986c490ef96bdf16795d823ea4
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Feb 1 16:43:35 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <jakov.smolic <AT> sartura.hr>
Signed-off-by: Thomas Deutschmann <whissi <AT> 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
