gentoo resync : 10.11.2019

4 files changed, 2 insertions, 312 deletions

diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 37f7d04f23e1..fdc163c03ad8 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,13 +1,10 @@
 AUX guix-0.16.0-default-daemon.patch 2082 BLAKE2B c60299f9cf2718fb227340acab688206d5453df98b80890e1659d2e477d2a1e9fe1a2d21fb9696ccdb67dd000d094103a38e979de2105023d175cff69a740846 SHA512 69d2089a089bc4718bcdb6f8e5dd17cff8cd07149d8c10182b7cb22d343d8137b368725d7e3d4bc0d380b0eeabe22cae5b3b914ded0cbdac6307bf9d5c898285
 AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278
-DIST guix-1.0.0.tar.gz 30707058 BLAKE2B 061aaa7068b2da641a613c36838d9853eeefd6ab6a2d9d9645a86fbeb9a7dcd370cc6a0d2ff45469235c2296edde540471675ed858522dcd6351e853a8617ff8 SHA512 45af6f80d1d4f4a63d00741070904acbb4986241561f52b4e81ce92fcdab6806a9ee10cbabfb6eddf88c4132cf9d678640d3a2c9895f170f8e6cbbf4d2128419
 DIST guix-1.0.1.tar.gz 31992360 BLAKE2B 84ef9ffba36d72f3a99167e0089a02f54172c9e8dd95e74aa55467383698aba3b26dc38992dc159903608b0623a707065b129b359e83338f5f361ce0e98e6ea4 SHA512 b884a4c6e099bf12bee547f5b247ac1bfb0d10a227712079ca1a857f75c3cf20d40d2c90780a8b486f5ee8e40366de44487d3f8429e570c561a72073506ac588
 DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
 DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
 DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
 DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 BLAKE2B 8ac6d9cfb59b1e2214c112fa7bfe865966cd06cb0214f360dc337a54e16cb59e4e3aa6da0662a52e6bceedfbb2a9ebb0eb62fe08491e5761912e2ee17b7ecd48 SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0
 DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23
-EBUILD guix-1.0.0-r1.ebuild 4318 BLAKE2B 0b772abfb69fbd24492842bcb477ec8ea9c6003e385912cd254f35962a10e86dfe56981adc3b83651a7499a322a7b60bf66cfc1048d5f696a816ae14cb499604 SHA512 fedf3fff7bb23ef49e16fe49280a6a52947f3bdef38897f2fc135837d9d2fc1a884c70a1f63eb56a9d58c89eb6bdff33216bf0ed13bf034b828fe20b764cd14f
-EBUILD guix-1.0.0.ebuild 4099 BLAKE2B 6972352ba69a95522407debbe30b71a5b7a418a0ceb721390c3987eec72b895281f704b213a891e4ecfb6f6b9be81c1f85a176832be2b5779bfbe0152971adfb SHA512 de5fd8a904bf15bdd3b810ab865e42ac0cca977e3fa1d10df052e27548c20af9cb07e85878c4a344a48337c1f209da7338c4a0f9b66d2ca7da6a5de2fa8e6036
-EBUILD guix-1.0.1.ebuild 4507 BLAKE2B 3d9dd2b0f9f8b091eb9c67df1f60c30b30f442e0d957cc7c2037d79b75673c3a2cf95752619b5a7a7ece664862fdf23ec0db7ce708f3a2bca75a640297388f92 SHA512 8766136693c12181e5b4af9d2f912bfd93b8a9292515480a474c49d1d44425ff1ed099a8517155cc30326a4dbd041505ae031568b2fc100f6245a4fc058c8f86
+EBUILD guix-1.0.1.ebuild 4561 BLAKE2B e83b2007f66bef0612f6aea68f894645c0856a41312857ceef3d3084e4f684d69d87a37a9f7fa1cf6c49f7b585dfc73fab1240c2a588ba9b60c73021aedbeaa1 SHA512 60c31ddb829937de5995e643be99739267345a5ea4aed91953ca593e3d4ac71bc6674cd41bf9019da2fdd0524af91f6f1b69e7a76a45a1af4bff7a75dc2e5d66
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-apps/guix/guix-1.0.0-r1.ebuild b/sys-apps/guix/guix-1.0.0-r1.ebuild
deleted file mode 100644
index 475d3bba8b83..000000000000
--- a/sys-apps/guix/guix-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm
-BOOT_GUILE=(
-	"aarch64-linux  20170217 guile-2.0.14.tar.xz"
-	"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/${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.2:=[regex,networking,threads]
-	dev-scheme/bytestructures
-	dev-scheme/guile-gcrypt
-	>=dev-scheme/guile-git-0.2.0
-	dev-scheme/guile-json
-	dev-scheme/guile-sqlite3
-	net-libs/gnutls[guile]
-	sys-libs/zlib
-	app-arch/bzip2
-	dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
-
-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/ci.guix.info.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_prepare() {
-	copy_boot_guile_binaries
-
-	default
-	# build system is very eager to run automake itself: bug #625166
-	eautoreconf
-
-	# guile is trying to avoid recompilation by checking if file
-	#     /usr/lib64/guile/2.2/site-ccache/guix/modules.go
-	# is newer than
-	#     guix/modules.scm
-	# In case it is instead of using 'guix/modules.scm' guile
-	# loads system one (from potentially older version of guix).
-	# To work it around we bump last modification timestamp of
-	# '*.scm' files.
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Gentoo stores systemd unit files in lib, never in lib64: bug #689772
-	sed -i nix/local.mk \
-		-e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
-}
-
-src_configure() {
-	# to be compatible with guix from /gnu/store
-	econf \
-		--localstatedir="${EPREFIX}"/var
-}
-
-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
-}
diff --git a/sys-apps/guix/guix-1.0.0.ebuild b/sys-apps/guix/guix-1.0.0.ebuild
deleted file mode 100644
index 218eb8858e5d..000000000000
--- a/sys-apps/guix/guix-1.0.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm
-BOOT_GUILE=(
-	"aarch64-linux  20170217 guile-2.0.14.tar.xz"
-	"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/${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.2:=[regex,networking,threads]
-	dev-scheme/bytestructures
-	dev-scheme/guile-gcrypt
-	>=dev-scheme/guile-git-0.2.0
-	dev-scheme/guile-json
-	dev-scheme/guile-sqlite3
-	net-libs/gnutls[guile]
-	sys-libs/zlib
-	app-arch/bzip2
-	dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
-
-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/ci.guix.info.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_prepare() {
-	copy_boot_guile_binaries
-
-	default
-	# build system is very eager to run automake itself: bug #625166
-	eautoreconf
-
-	# guile is trying to avoid recompilation by checking if file
-	#     /usr/lib64/guile/2.2/site-ccache/guix/modules.go
-	# is newer than
-	#     guix/modules.scm
-	# In case it is instead of using 'guix/modules.scm' guile
-	# loads system one (from potentially older version of guix).
-	# To work it around we bump last modification timestamp of
-	# '*.scm' files.
-	find "${S}" -name "*.scm" -exec touch {} + || die
-}
-
-src_configure() {
-	# to be compatible with guix from /gnu/store
-	econf \
-		--localstatedir="${EPREFIX}"/var
-}
-
-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
-}
diff --git a/sys-apps/guix/guix-1.0.1.ebuild b/sys-apps/guix/guix-1.0.1.ebuild
index cb8689ab8712..309d371d09c3 100644
--- a/sys-apps/guix/guix-1.0.1.ebuild
+++ b/sys-apps/guix/guix-1.0.1.ebuild
@@ -122,6 +122,7 @@ src_prepare() {
 	# loads system one (from potentially older version of guix).
 	# To work it around we bump last modification timestamp of
 	# '*.scm' files.
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
 	find "${S}" -name "*.scm" -exec touch {} + || die
 
 	# Gentoo stores systemd unit files in lib, never in lib64: bug #689772