[gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/

[Sergei Trofimovich]

commit:     ddd177639dfede578d97a4dba8d3526ac6cfcb02
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 21:49:40 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 22:05:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd17763

sys-apps/guix: fix 'localstatedir' to poin to /var/guix

The path is used by /gnu/store binaries and is expected
location for ebuild itself.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/guix/{guix-0.12.0-r1.ebuild => guix-0.12.0-r2.ebuild} | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sys-apps/guix/guix-0.12.0-r1.ebuild 
b/sys-apps/guix/guix-0.12.0-r2.ebuild
similarity index 95%
rename from sys-apps/guix/guix-0.12.0-r1.ebuild
rename to sys-apps/guix/guix-0.12.0-r2.ebuild
index 1cdbf8f156..5acef29608 100644
--- a/sys-apps/guix/guix-0.12.0-r1.ebuild
+++ b/sys-apps/guix/guix-0.12.0-r2.ebuild
@@ -97,6 +97,12 @@ pkg_setup() {
        done
 }
 
+src_configure() {
+       # to be compatible with guix from /gnu/store
+       econf \
+               --localstatedir="${EPREFIX}"/var
+}
+
 src_prepare() {
        copy_boot_guile_binaries
 
@@ -116,6 +122,7 @@ src_install() {
 
        readme.gentoo_create_doc
 
+       keepdir                /etc/guix
        # TODO: will need a tweak for prefix
        keepdir                /gnu/store
        fowners root:guixbuild /gnu/store