summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolic <jakov.smolic@sartura.hr>2021-02-01 17:43:35 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-02-04 23:31:57 +0100
commitf3e054abaefeaf986c490ef96bdf16795d823ea4 (patch)
treed9f8b5e982ccface257ee24c6e46d282a3862585 /x11-misc/i3blocks
parentnet-misc/anydesk: Version bump to 6.1.0 (diff)
downloadgentoo-f3e054abaefeaf986c490ef96bdf16795d823ea4.tar.gz
gentoo-f3e054abaefeaf986c490ef96bdf16795d823ea4.tar.bz2
gentoo-f3e054abaefeaf986c490ef96bdf16795d823ea4.zip
x11-misc/i3blocks: Clean up latest ebuild
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'x11-misc/i3blocks')
-rw-r--r--x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch4
-rw-r--r--x11-misc/i3blocks/i3blocks-1.5-r1.ebuild16
-rw-r--r--x11-misc/i3blocks/i3blocks-1.5.ebuild9
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 bfca548e06f1..bc7c065eea8e 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 0ff32627916e..8bd169120d36 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 9922b9524a99..c39a545210f6 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