* [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks/files/, x11-misc/i3blocks/
@ 2017-02-20 19:25 Ettore Di Giacinto
0 siblings, 0 replies; 3+ messages in thread
From: Ettore Di Giacinto @ 2017-02-20 19:25 UTC (permalink / raw
To: gentoo-commits
commit: 02653bc04ab68205e229fb04e96db27613e223ca
Author: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 18:26:17 2017 +0000
Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 19:24:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02653bc0
x11-misc/i3blocks: revbump, fixes bug #610090
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch | 15 +++++++++++++++
.../{i3blocks-1.4.ebuild => i3blocks-1.4-r1.ebuild} | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch b/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch
new file mode 100644
index 0000000000..04d625dcb4
--- /dev/null
+++ b/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch
@@ -0,0 +1,15 @@
+--- i3blocks-1.4/~Makefile 2017-02-20 18:56:06.340061271 +0100
++++ i3blocks-1.4/Makefile 2017-02-20 18:56:27.518915055 +0100
+@@ -4,11 +4,7 @@ ifndef PREFIX
+ PREFIX=/usr/local
+ endif
+ ifndef SYSCONFDIR
+- ifeq ($(PREFIX),/usr)
+- SYSCONFDIR=/etc
+- else
+- SYSCONFDIR=$(PREFIX)/etc
+- endif
++ SYSCONFDIR=/etc
+ endif
+ ifndef LIBEXECDIR
+ LIBEXECDIR=$(PREFIX)/libexec
diff --git a/x11-misc/i3blocks/i3blocks-1.4.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
similarity index 86%
rename from x11-misc/i3blocks/i3blocks-1.4.ebuild
rename to x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index 37da57dc05..f932aa4e53 100644
--- a/x11-misc/i3blocks/i3blocks-1.4.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,6 +29,8 @@ RDEPEND="app-admin/sysstat
DEPEND="app-text/ronn"
+PATCHES=( "${FILESDIR}/${PN}-default-sysconfdir.patch" ) #610090
+
src_install() {
emake DESTDIR="${D}" PREFIX="/usr" install
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks/files/, x11-misc/i3blocks/
@ 2021-02-04 22:32 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2021-02-04 22:32 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks/files/, x11-misc/i3blocks/
@ 2021-02-04 22:32 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2021-02-04 22:32 UTC (permalink / raw
To: gentoo-commits
commit: d37027f4334674ef60124f86dee6d338f17b680b
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Feb 1 16:44:03 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=d37027f4
x11-misc/i3blocks: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
x11-misc/i3blocks/Manifest | 1 -
.../files/i3blocks-default-sysconfdir.patch | 15 ----------
x11-misc/i3blocks/i3blocks-1.4-r1.ebuild | 34 ----------------------
x11-misc/i3blocks/i3blocks-1.5.ebuild | 31 --------------------
4 files changed, 81 deletions(-)
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index 21bd03633fd..40dac9e344e 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,2 +1 @@
-DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534
diff --git a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch b/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch
deleted file mode 100644
index 04d625dcb47..00000000000
--- a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- i3blocks-1.4/~Makefile 2017-02-20 18:56:06.340061271 +0100
-+++ i3blocks-1.4/Makefile 2017-02-20 18:56:27.518915055 +0100
-@@ -4,11 +4,7 @@ ifndef PREFIX
- PREFIX=/usr/local
- endif
- ifndef SYSCONFDIR
-- ifeq ($(PREFIX),/usr)
-- SYSCONFDIR=/etc
-- else
-- SYSCONFDIR=$(PREFIX)/etc
-- endif
-+ SYSCONFDIR=/etc
- endif
- ifndef LIBEXECDIR
- LIBEXECDIR=$(PREFIX)/libexec
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
deleted file mode 100644
index ce2f86de762..00000000000
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-
-SLOT="0"
-LICENSE="GPL-3"
-
-RDEPEND="app-admin/sysstat
- media-sound/playerctl
- sys-apps/lm-sensors
- sys-power/acpi
- || ( x11-wm/i3 x11-wm/i3-gaps )"
-
-DEPEND="app-text/ronn"
-
-PATCHES=( "${FILESDIR}/${PN}-default-sysconfdir.patch" ) #610090
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild b/x11-misc/i3blocks/i3blocks-1.5.ebuild
deleted file mode 100644
index c39a545210f..00000000000
--- a/x11-misc/i3blocks/i3blocks-1.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="highly flexible status line for the i3 window manager"
-HOMEPAGE="https://github.com/vivien/i3blocks"
-if [[ ${PV} = *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/vivien/${PN}"
-else
- SRC_URI="https://github.com/vivien/i3blocks/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-PATCHES=( "${FILESDIR}"/${PN}-disable-bash-completion.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_install() {
- default
- newbashcomp bash-completion ${PN}
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-04 22:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-04 22:32 [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks/files/, x11-misc/i3blocks/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2021-02-04 22:32 Thomas Deutschmann
2017-02-20 19:25 Ettore Di Giacinto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox