commit: 74965e517c86745900b1b43d515a112aca75a8c6 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Jan 20 11:22:04 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Jan 20 11:23:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74965e51
sys-apps/guix: drop old Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-apps/guix/Manifest | 1 - sys-apps/guix/files/guix-0.12.0-AR.patch | 8 -- .../guix/files/guix-0.12.0-no-json-crate.patch | 38 ------ sys-apps/guix/guix-0.12.0-r3.ebuild | 139 --------------------- 4 files changed, 186 deletions(-) diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest index f3e7839ab6b..72cad7890cc 100644 --- a/sys-apps/guix/Manifest +++ b/sys-apps/guix/Manifest @@ -1,4 +1,3 @@ -DIST guix-0.12.0.tar.gz 15823786 BLAKE2B 96e1156a4ee32ec1500afd5529bade5408f538ea5280817efb1c31b6563e8aeefb554e82e9e4227198bf43e7b440aa062dd31cb607974f22859097e8f072dc84 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3 DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c SHA512 635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69 DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27 diff --git a/sys-apps/guix/files/guix-0.12.0-AR.patch b/sys-apps/guix/files/guix-0.12.0-AR.patch deleted file mode 100644 index c9c91c20734..00000000000 --- a/sys-apps/guix/files/guix-0.12.0-AR.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/config-daemon.ac b/config-daemon.ac -index 056c939..b04deed 100644 ---- a/config-daemon.ac -+++ b/config-daemon.ac -@@ -7,2 +7,3 @@ dnl C++ environment. This macro must be used unconditionnaly. - AC_PROG_CXX -+AM_PROG_AR - AC_LANG([C++]) diff --git a/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch b/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch deleted file mode 100644 index 57b4308a3a8..00000000000 --- a/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 6023041346c79f7ac4105bba2552a82019fae840 -Author: David Thompson <[email protected]> -Date: Fri Dec 30 14:15:35 2016 -0500 - - import: crate: Do not build when guile-json is not available. - - * Makefile.am (MODULES): Add 'guix/import/crate.scm' and - 'guix/scripts/import/crate.scm' only when HAVE_GUILE_JSON. - -diff --git a/Makefile.am b/Makefile.am -index 15939af12..97629f26e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -122,7 +122,6 @@ MODULES = \ - guix/import/snix.scm \ - guix/import/cabal.scm \ - guix/import/cran.scm \ -- guix/import/crate.scm \ - guix/import/hackage.scm \ - guix/import/elpa.scm \ - guix/scripts.scm \ -@@ -142,7 +141,6 @@ MODULES = \ - guix/scripts/lint.scm \ - guix/scripts/challenge.scm \ - guix/scripts/import/cran.scm \ -- guix/scripts/import/crate.scm \ - guix/scripts/import/gnu.scm \ - guix/scripts/import/nix.scm \ - guix/scripts/import/hackage.scm \ -@@ -162,6 +160,8 @@ if HAVE_GUILE_JSON - MODULES += \ - guix/import/github.scm \ - guix/import/json.scm \ -+ guix/import/crate.scm \ -+ guix/scripts/import/crate.scm \ - guix/import/pypi.scm \ - guix/scripts/import/pypi.scm \ - guix/import/cpan.scm \ diff --git a/sys-apps/guix/guix-0.12.0-r3.ebuild b/sys-apps/guix/guix-0.12.0-r3.ebuild deleted file mode 100644 index 3aea5c64be8..00000000000 --- a/sys-apps/guix/guix-0.12.0-r3.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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[regex,networking,threads] - dev-scheme/guile-json - 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 a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile -[as a user] install guix packages: - \$ guix package -i hello -[as a 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 a 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 -}
