[gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks/files/, x11-misc/i3blocks/

["Ettore Di Giacinto" <mudler@gentoo.org>]

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
 }