1 |
commit: 64770a3f8b68eaa6f601b7ae73cc3598df667c2d |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 7 23:38:00 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 7 23:39:09 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64770a3f |
7 |
|
8 |
sys-apps/guix: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
sys-apps/guix/Manifest | 1 - |
14 |
sys-apps/guix/guix-1.0.0-r1.ebuild | 156 ------------------------------------- |
15 |
sys-apps/guix/guix-1.0.0.ebuild | 152 ------------------------------------ |
16 |
3 files changed, 309 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest |
19 |
index 2581e4a979e..6d34e6fd4d0 100644 |
20 |
--- a/sys-apps/guix/Manifest |
21 |
+++ b/sys-apps/guix/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST guix-1.0.0.tar.gz 30707058 BLAKE2B 061aaa7068b2da641a613c36838d9853eeefd6ab6a2d9d9645a86fbeb9a7dcd370cc6a0d2ff45469235c2296edde540471675ed858522dcd6351e853a8617ff8 SHA512 45af6f80d1d4f4a63d00741070904acbb4986241561f52b4e81ce92fcdab6806a9ee10cbabfb6eddf88c4132cf9d678640d3a2c9895f170f8e6cbbf4d2128419 |
24 |
DIST guix-1.0.1.tar.gz 31992360 BLAKE2B 84ef9ffba36d72f3a99167e0089a02f54172c9e8dd95e74aa55467383698aba3b26dc38992dc159903608b0623a707065b129b359e83338f5f361ce0e98e6ea4 SHA512 b884a4c6e099bf12bee547f5b247ac1bfb0d10a227712079ca1a857f75c3cf20d40d2c90780a8b486f5ee8e40366de44487d3f8429e570c561a72073506ac588 |
25 |
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27 |
26 |
DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337 |
27 |
|
28 |
diff --git a/sys-apps/guix/guix-1.0.0-r1.ebuild b/sys-apps/guix/guix-1.0.0-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 475d3bba8b8..00000000000 |
31 |
--- a/sys-apps/guix/guix-1.0.0-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,156 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit autotools readme.gentoo-r1 systemd user |
40 |
- |
41 |
-DESCRIPTION="GNU package manager (nix sibling)" |
42 |
-HOMEPAGE="https://www.gnu.org/software/guix/" |
43 |
- |
44 |
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm |
45 |
-BOOT_GUILE=( |
46 |
- "aarch64-linux 20170217 guile-2.0.14.tar.xz" |
47 |
- "armhf-linux 20150101 guile-2.0.11.tar.xz" |
48 |
- "i686-linux 20131110 guile-2.0.9.tar.xz" |
49 |
- "mips64el-linux 20131110 guile-2.0.9.tar.xz" |
50 |
- "x86_64-linux 20131110 guile-2.0.9.tar.xz" |
51 |
-) |
52 |
- |
53 |
-binary_src_uris() { |
54 |
- local system_date_guilep uri |
55 |
- for system_date_guilep in "${BOOT_GUILE[@]}"; do |
56 |
- # $1 $2 $3 |
57 |
- # "armhf-linux 20150101 guile-2.0.11.tar.xz" |
58 |
- set -- ${system_date_guilep} |
59 |
- uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3" |
60 |
- # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap |
61 |
- echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap" |
62 |
- done |
63 |
-} |
64 |
- |
65 |
-# copy bootstrap binaries from DISTDIR to ${S} |
66 |
-copy_boot_guile_binaries() { |
67 |
- local system_date_guilep |
68 |
- for system_date_guilep in "${BOOT_GUILE[@]}"; do |
69 |
- # $1 $2 $3 |
70 |
- # "armhf-linux 20150101 guile-2.0.11.tar.xz" |
71 |
- set -- ${system_date_guilep} |
72 |
- cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die |
73 |
- done |
74 |
-} |
75 |
- |
76 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz |
77 |
- $(binary_src_uris)" |
78 |
- |
79 |
-LICENSE="GPL-3" |
80 |
-SLOT="0" |
81 |
-KEYWORDS="~amd64 ~x86" |
82 |
-IUSE="" |
83 |
- |
84 |
-RESTRICT=test # complains about size of config.log and refuses to start tests |
85 |
- |
86 |
-RDEPEND=" |
87 |
- dev-libs/libgcrypt:0= |
88 |
- >=dev-scheme/guile-2.2:=[regex,networking,threads] |
89 |
- dev-scheme/bytestructures |
90 |
- dev-scheme/guile-gcrypt |
91 |
- >=dev-scheme/guile-git-0.2.0 |
92 |
- dev-scheme/guile-json |
93 |
- dev-scheme/guile-sqlite3 |
94 |
- net-libs/gnutls[guile] |
95 |
- sys-libs/zlib |
96 |
- app-arch/bzip2 |
97 |
- dev-db/sqlite |
98 |
-" |
99 |
- |
100 |
-DEPEND="${RDEPEND} |
101 |
-" |
102 |
- |
103 |
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch) |
104 |
- |
105 |
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*" |
106 |
- |
107 |
-DISABLE_AUTOFORMATTING=yes |
108 |
-DOC_CONTENTS="Quick start user guide on Gentoo: |
109 |
- |
110 |
-[as root] allow binary substitution to be downloaded (optional) |
111 |
- # guix archive --authorize < /usr/share/guix/ci.guix.info.pub |
112 |
-[as root] enable guix-daemon service: |
113 |
- [systemd] # systemctl enable guix-daemon |
114 |
- [openrc] # rc-update add guix-daemon |
115 |
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile |
116 |
-[as a user] install guix packages: |
117 |
- \$ guix package -i hello |
118 |
-[as a user] configure environment: |
119 |
- Somewhere in .bash_profile you might want to set |
120 |
- export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale |
121 |
- |
122 |
-Next steps: |
123 |
- guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html |
124 |
-" |
125 |
- |
126 |
-pkg_setup() { |
127 |
- enewgroup guixbuild |
128 |
- for i in {1..10}; do |
129 |
- # we list 'guixbuild' twice to |
130 |
- # both assign a primary group for user |
131 |
- # and add a user to /etc/group |
132 |
- enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild |
133 |
- done |
134 |
-} |
135 |
- |
136 |
-src_prepare() { |
137 |
- copy_boot_guile_binaries |
138 |
- |
139 |
- default |
140 |
- # build system is very eager to run automake itself: bug #625166 |
141 |
- eautoreconf |
142 |
- |
143 |
- # guile is trying to avoid recompilation by checking if file |
144 |
- # /usr/lib64/guile/2.2/site-ccache/guix/modules.go |
145 |
- # is newer than |
146 |
- # guix/modules.scm |
147 |
- # In case it is instead of using 'guix/modules.scm' guile |
148 |
- # loads system one (from potentially older version of guix). |
149 |
- # To work it around we bump last modification timestamp of |
150 |
- # '*.scm' files. |
151 |
- find "${S}" -name "*.scm" -exec touch {} + || die |
152 |
- |
153 |
- # Gentoo stores systemd unit files in lib, never in lib64: bug #689772 |
154 |
- sed -i nix/local.mk \ |
155 |
- -e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die |
156 |
-} |
157 |
- |
158 |
-src_configure() { |
159 |
- # to be compatible with guix from /gnu/store |
160 |
- econf \ |
161 |
- --localstatedir="${EPREFIX}"/var |
162 |
-} |
163 |
- |
164 |
-src_compile() { |
165 |
- # guile occasionally fails with 'bad address' |
166 |
- emake -j1 |
167 |
-} |
168 |
- |
169 |
-src_install() { |
170 |
- # TODO: emacs highlighter |
171 |
- default |
172 |
- |
173 |
- readme.gentoo_create_doc |
174 |
- |
175 |
- keepdir /etc/guix |
176 |
- # TODO: will need a tweak for prefix |
177 |
- keepdir /gnu/store |
178 |
- fowners root:guixbuild /gnu/store |
179 |
- fperms 1775 /gnu/store |
180 |
- |
181 |
- keepdir /var/guix/profiles/per-user |
182 |
- fperms 1777 /var/guix/profiles/per-user |
183 |
- |
184 |
- newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon |
185 |
-} |
186 |
- |
187 |
-pkg_postinst() { |
188 |
- readme.gentoo_print_elog |
189 |
-} |
190 |
|
191 |
diff --git a/sys-apps/guix/guix-1.0.0.ebuild b/sys-apps/guix/guix-1.0.0.ebuild |
192 |
deleted file mode 100644 |
193 |
index 218eb8858e5..00000000000 |
194 |
--- a/sys-apps/guix/guix-1.0.0.ebuild |
195 |
+++ /dev/null |
196 |
@@ -1,152 +0,0 @@ |
197 |
-# Copyright 1999-2019 Gentoo Authors |
198 |
-# Distributed under the terms of the GNU General Public License v2 |
199 |
- |
200 |
-EAPI=7 |
201 |
- |
202 |
-inherit autotools readme.gentoo-r1 user |
203 |
- |
204 |
-DESCRIPTION="GNU package manager (nix sibling)" |
205 |
-HOMEPAGE="https://www.gnu.org/software/guix/" |
206 |
- |
207 |
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm |
208 |
-BOOT_GUILE=( |
209 |
- "aarch64-linux 20170217 guile-2.0.14.tar.xz" |
210 |
- "armhf-linux 20150101 guile-2.0.11.tar.xz" |
211 |
- "i686-linux 20131110 guile-2.0.9.tar.xz" |
212 |
- "mips64el-linux 20131110 guile-2.0.9.tar.xz" |
213 |
- "x86_64-linux 20131110 guile-2.0.9.tar.xz" |
214 |
-) |
215 |
- |
216 |
-binary_src_uris() { |
217 |
- local system_date_guilep uri |
218 |
- for system_date_guilep in "${BOOT_GUILE[@]}"; do |
219 |
- # $1 $2 $3 |
220 |
- # "armhf-linux 20150101 guile-2.0.11.tar.xz" |
221 |
- set -- ${system_date_guilep} |
222 |
- uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3" |
223 |
- # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap |
224 |
- echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap" |
225 |
- done |
226 |
-} |
227 |
- |
228 |
-# copy bootstrap binaries from DISTDIR to ${S} |
229 |
-copy_boot_guile_binaries() { |
230 |
- local system_date_guilep |
231 |
- for system_date_guilep in "${BOOT_GUILE[@]}"; do |
232 |
- # $1 $2 $3 |
233 |
- # "armhf-linux 20150101 guile-2.0.11.tar.xz" |
234 |
- set -- ${system_date_guilep} |
235 |
- cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die |
236 |
- done |
237 |
-} |
238 |
- |
239 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz |
240 |
- $(binary_src_uris)" |
241 |
- |
242 |
-LICENSE="GPL-3" |
243 |
-SLOT="0" |
244 |
-KEYWORDS="~amd64 ~x86" |
245 |
-IUSE="" |
246 |
- |
247 |
-RESTRICT=test # complains about size of config.log and refuses to start tests |
248 |
- |
249 |
-RDEPEND=" |
250 |
- dev-libs/libgcrypt:0= |
251 |
- >=dev-scheme/guile-2.2:=[regex,networking,threads] |
252 |
- dev-scheme/bytestructures |
253 |
- dev-scheme/guile-gcrypt |
254 |
- >=dev-scheme/guile-git-0.2.0 |
255 |
- dev-scheme/guile-json |
256 |
- dev-scheme/guile-sqlite3 |
257 |
- net-libs/gnutls[guile] |
258 |
- sys-libs/zlib |
259 |
- app-arch/bzip2 |
260 |
- dev-db/sqlite |
261 |
-" |
262 |
- |
263 |
-DEPEND="${RDEPEND} |
264 |
-" |
265 |
- |
266 |
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch) |
267 |
- |
268 |
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*" |
269 |
- |
270 |
-DISABLE_AUTOFORMATTING=yes |
271 |
-DOC_CONTENTS="Quick start user guide on Gentoo: |
272 |
- |
273 |
-[as root] allow binary substitution to be downloaded (optional) |
274 |
- # guix archive --authorize < /usr/share/guix/ci.guix.info.pub |
275 |
-[as root] enable guix-daemon service: |
276 |
- [systemd] # systemctl enable guix-daemon |
277 |
- [openrc] # rc-update add guix-daemon |
278 |
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile |
279 |
-[as a user] install guix packages: |
280 |
- \$ guix package -i hello |
281 |
-[as a user] configure environment: |
282 |
- Somewhere in .bash_profile you might want to set |
283 |
- export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale |
284 |
- |
285 |
-Next steps: |
286 |
- guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html |
287 |
-" |
288 |
- |
289 |
-pkg_setup() { |
290 |
- enewgroup guixbuild |
291 |
- for i in {1..10}; do |
292 |
- # we list 'guixbuild' twice to |
293 |
- # both assign a primary group for user |
294 |
- # and add a user to /etc/group |
295 |
- enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild |
296 |
- done |
297 |
-} |
298 |
- |
299 |
-src_prepare() { |
300 |
- copy_boot_guile_binaries |
301 |
- |
302 |
- default |
303 |
- # build system is very eager to run automake itself: bug #625166 |
304 |
- eautoreconf |
305 |
- |
306 |
- # guile is trying to avoid recompilation by checking if file |
307 |
- # /usr/lib64/guile/2.2/site-ccache/guix/modules.go |
308 |
- # is newer than |
309 |
- # guix/modules.scm |
310 |
- # In case it is instead of using 'guix/modules.scm' guile |
311 |
- # loads system one (from potentially older version of guix). |
312 |
- # To work it around we bump last modification timestamp of |
313 |
- # '*.scm' files. |
314 |
- find "${S}" -name "*.scm" -exec touch {} + || die |
315 |
-} |
316 |
- |
317 |
-src_configure() { |
318 |
- # to be compatible with guix from /gnu/store |
319 |
- econf \ |
320 |
- --localstatedir="${EPREFIX}"/var |
321 |
-} |
322 |
- |
323 |
-src_compile() { |
324 |
- # guile occasionally fails with 'bad address' |
325 |
- emake -j1 |
326 |
-} |
327 |
- |
328 |
-src_install() { |
329 |
- # TODO: emacs highlighter |
330 |
- default |
331 |
- |
332 |
- readme.gentoo_create_doc |
333 |
- |
334 |
- keepdir /etc/guix |
335 |
- # TODO: will need a tweak for prefix |
336 |
- keepdir /gnu/store |
337 |
- fowners root:guixbuild /gnu/store |
338 |
- fperms 1775 /gnu/store |
339 |
- |
340 |
- keepdir /var/guix/profiles/per-user |
341 |
- fperms 1777 /var/guix/profiles/per-user |
342 |
- |
343 |
- newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon |
344 |
-} |
345 |
- |
346 |
-pkg_postinst() { |
347 |
- readme.gentoo_print_elog |
348 |
-} |