From ddd177639dfede578d97a4dba8d3526ac6cfcb02 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 8 Feb 2017 21:49:40 +0000 Subject: 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 | 132 ---------------------------------- sys-apps/guix/guix-0.12.0-r2.ebuild | 139 ++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 132 deletions(-) delete mode 100644 sys-apps/guix/guix-0.12.0-r1.ebuild create mode 100644 sys-apps/guix/guix-0.12.0-r2.ebuild diff --git a/sys-apps/guix/guix-0.12.0-r1.ebuild b/sys-apps/guix/guix-0.12.0-r1.ebuild deleted file mode 100644 index 1cdbf8f1567f..000000000000 --- a/sys-apps/guix/guix-0.12.0-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit autotools readme.gentoo-r1 user - -DESCRIPTION="GNU package manager (nix sibling)" -HOMEPAGE="https://www.gnu.org/software/guix/" - -# taken from gnu/local.mk -BOOT_GUILE=( - "armhf-linux 20150101 guile-2.0.11.tar.xz" - "i686-linux 20131110 guile-2.0.9.tar.xz" - "mips64el-linux 20131110 guile-2.0.9.tar.xz" - "x86_64-linux 20131110 guile-2.0.9.tar.xz" -) - -binary_src_uris() { - local system_date_guilep uri - for system_date_guilep in "${BOOT_GUILE[@]}"; do - # $1 $2 $3 - # "armhf-linux 20150101 guile-2.0.11.tar.xz" - set -- ${system_date_guilep} - uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3" - # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap - echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap" - done -} - -# copy bootstrap binaries from DISTDIR to ${S} -copy_boot_guile_binaries() { - local system_date_guilep - for system_date_guilep in "${BOOT_GUILE[@]}"; do - # $1 $2 $3 - # "armhf-linux 20150101 guile-2.0.11.tar.xz" - set -- ${system_date_guilep} - cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die - done -} - -SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz - $(binary_src_uris)" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT=test # complains about size of config.log and refuses to start tests - -RDEPEND=" - dev-libs/libgcrypt:0= - >=dev-scheme/guile-2 - sys-libs/zlib - app-arch/bzip2 - dev-db/sqlite -" - -DEPEND="${RDEPEND} -" - -QA_PREBUILT="usr/share/guile/site/2.0/gnu/packages/bootstrap/*" - -PATCHES=( - "${FILESDIR}"/${P}-no-json-crate.patch - "${FILESDIR}"/${P}-AR.patch -) - -DISABLE_AUTOFORMATTING=yes -DOC_CONTENTS="Quick start user guide on Gentoo: - -[as root] allow binary substitution to be downloaded (optional) - # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub -[as root] enable guix-daemon service: - [systemd] # systemctl enable guix-daemon - [openrc] # rc-update add guix-daemon -[as an user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile -[as an user] install guix packages: - \$ guix package -i hello -[as an user] configure environment: - Somewhere in .bash_profile you might want to set - export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale - -Next steps: - guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html -" - -pkg_setup() { - enewgroup guixbuild - for i in {1..10}; do - # we list 'guixbuild' twice to - # both assign a primary group for user - # and add an user to /etc/group - enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild - done -} - -src_prepare() { - copy_boot_guile_binaries - - default - - eautoreconf -} - -src_compile() { - # guile occasionally fails with 'bad address' - emake -j1 -} - -src_install() { - # TODO: emacs highlighter - default - - readme.gentoo_create_doc - - # TODO: will need a tweak for prefix - keepdir /gnu/store - fowners root:guixbuild /gnu/store - fperms 1775 /gnu/store - - keepdir /var/guix/profiles/per-user - fperms 1777 /var/guix/profiles/per-user - - newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-apps/guix/guix-0.12.0-r2.ebuild b/sys-apps/guix/guix-0.12.0-r2.ebuild new file mode 100644 index 000000000000..5acef2960892 --- /dev/null +++ b/sys-apps/guix/guix-0.12.0-r2.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools readme.gentoo-r1 user + +DESCRIPTION="GNU package manager (nix sibling)" +HOMEPAGE="https://www.gnu.org/software/guix/" + +# taken from gnu/local.mk +BOOT_GUILE=( + "armhf-linux 20150101 guile-2.0.11.tar.xz" + "i686-linux 20131110 guile-2.0.9.tar.xz" + "mips64el-linux 20131110 guile-2.0.9.tar.xz" + "x86_64-linux 20131110 guile-2.0.9.tar.xz" +) + +binary_src_uris() { + local system_date_guilep uri + for system_date_guilep in "${BOOT_GUILE[@]}"; do + # $1 $2 $3 + # "armhf-linux 20150101 guile-2.0.11.tar.xz" + set -- ${system_date_guilep} + uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3" + # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap + echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap" + done +} + +# copy bootstrap binaries from DISTDIR to ${S} +copy_boot_guile_binaries() { + local system_date_guilep + for system_date_guilep in "${BOOT_GUILE[@]}"; do + # $1 $2 $3 + # "armhf-linux 20150101 guile-2.0.11.tar.xz" + set -- ${system_date_guilep} + cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die + done +} + +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz + $(binary_src_uris)" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RESTRICT=test # complains about size of config.log and refuses to start tests + +RDEPEND=" + dev-libs/libgcrypt:0= + >=dev-scheme/guile-2 + sys-libs/zlib + app-arch/bzip2 + dev-db/sqlite +" + +DEPEND="${RDEPEND} +" + +QA_PREBUILT="usr/share/guile/site/2.0/gnu/packages/bootstrap/*" + +PATCHES=( + "${FILESDIR}"/${P}-no-json-crate.patch + "${FILESDIR}"/${P}-AR.patch +) + +DISABLE_AUTOFORMATTING=yes +DOC_CONTENTS="Quick start user guide on Gentoo: + +[as root] allow binary substitution to be downloaded (optional) + # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub +[as root] enable guix-daemon service: + [systemd] # systemctl enable guix-daemon + [openrc] # rc-update add guix-daemon +[as an user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile +[as an user] install guix packages: + \$ guix package -i hello +[as an user] configure environment: + Somewhere in .bash_profile you might want to set + export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale + +Next steps: + guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html +" + +pkg_setup() { + enewgroup guixbuild + for i in {1..10}; do + # we list 'guixbuild' twice to + # both assign a primary group for user + # and add an user to /etc/group + enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild + done +} + +src_configure() { + # to be compatible with guix from /gnu/store + econf \ + --localstatedir="${EPREFIX}"/var +} + +src_prepare() { + copy_boot_guile_binaries + + default + + eautoreconf +} + +src_compile() { + # guile occasionally fails with 'bad address' + emake -j1 +} + +src_install() { + # TODO: emacs highlighter + default + + readme.gentoo_create_doc + + keepdir /etc/guix + # TODO: will need a tweak for prefix + keepdir /gnu/store + fowners root:guixbuild /gnu/store + fperms 1775 /gnu/store + + keepdir /var/guix/profiles/per-user + fperms 1777 /var/guix/profiles/per-user + + newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon +} + +pkg_postinst() { + readme.gentoo_print_elog +} -- cgit v1.2.3-65-gdbad