diff options
| -rw-r--r-- | x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch | 15 | ||||
| -rw-r--r-- | x11-misc/i3blocks/i3blocks-1.4-r1.ebuild (renamed from x11-misc/i3blocks/i3blocks-1.4.ebuild) | 4 |
2 files changed, 18 insertions, 1 deletions
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 000000000000..04d625dcb47f --- /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 index 37da57dc0564..f932aa4e535e 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 } |