gentoo resync : 02.08.2019

2 files changed, 12 insertions, 8 deletions

diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 7fe4ed8a55d6..353a6dc6d81c 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,13 +1,13 @@
 AUX guix-0.16.0-default-daemon.patch 2082 BLAKE2B c60299f9cf2718fb227340acab688206d5453df98b80890e1659d2e477d2a1e9fe1a2d21fb9696ccdb67dd000d094103a38e979de2105023d175cff69a740846 SHA512 69d2089a089bc4718bcdb6f8e5dd17cff8cd07149d8c10182b7cb22d343d8137b368725d7e3d4bc0d380b0eeabe22cae5b3b914ded0cbdac6307bf9d5c898285
 AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278
-DIST guix-0.16.0.tar.gz 24365691 BLAKE2B 7581f21fc9ccd4813b5e35b6a56980ffcd1ef9b02d5091679c33aaa91edf80acdc2bb9bd1a73acdde71b74d88e990ebbd824267756d9e7b27f94061cfd5a1429 SHA512 fdfa431547a283947147fde67e0dab27361a34caf7862c10659b17f74c63a07e6e834281be48a3dbe05cccd8ef46db5b8a19a6d42668ae2258d696058283724f
 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-0.16.0.ebuild 4095 BLAKE2B 7f66213e8c2ccfb4f50ecd55e8e028528c87479342fd5dad02b3a6d63dd04133a3419493a4a8ee80d7d2f538720d212d9cbe2059f95b8667a987e882200932b1 SHA512 1ad0bb9251c9b12668c6a345857117aebac6851893c5017db9da4c912fe7b1b367081339f90fa9589c5401598f7e7ad4861df0526458eeaddcd83367fa38ca8f
 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 4318 BLAKE2B 0b772abfb69fbd24492842bcb477ec8ea9c6003e385912cd254f35962a10e86dfe56981adc3b83651a7499a322a7b60bf66cfc1048d5f696a816ae14cb499604 SHA512 fedf3fff7bb23ef49e16fe49280a6a52947f3bdef38897f2fc135837d9d2fc1a884c70a1f63eb56a9d58c89eb6bdff33216bf0ed13bf034b828fe20b764cd14f
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-apps/guix/guix-0.16.0.ebuild b/sys-apps/guix/guix-1.0.1.ebuild
index 8ebbad008466..475d3bba8b83 100644
--- a/sys-apps/guix/guix-0.16.0.ebuild
+++ b/sys-apps/guix/guix-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools readme.gentoo-r1 user
+inherit autotools readme.gentoo-r1 systemd user
 
 DESCRIPTION="GNU package manager (nix sibling)"
 HOMEPAGE="https://www.gnu.org/software/guix/"
@@ -40,7 +40,7 @@ copy_boot_guile_binaries() {
 	done
 }
 
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 	$(binary_src_uris)"
 
 LICENSE="GPL-3"
@@ -52,10 +52,10 @@ 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-2.2:=[regex,networking,threads]
 	dev-scheme/bytestructures
 	dev-scheme/guile-gcrypt
-	dev-scheme/guile-git
+	>=dev-scheme/guile-git-0.2.0
 	dev-scheme/guile-json
 	dev-scheme/guile-sqlite3
 	net-libs/gnutls[guile]
@@ -116,6 +116,10 @@ src_prepare() {
 	# 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() {