1 |
commit: 48d334d335e508843e01686e55cdf5ca3beec366 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 5 20:05:20 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 5 20:07:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48d334d3 |
7 |
|
8 |
dev-scheme/guile: bump to 3.0.4 (masked) |
9 |
|
10 |
Masking this for testing in case of compatibility problems. |
11 |
Guile is not slotted right now, so committing unmasked initially |
12 |
could mean various packages breaking. |
13 |
|
14 |
Bug: https://bugs.gentoo.org/705554 |
15 |
Bug: https://bugs.gentoo.org/689408 |
16 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
18 |
|
19 |
dev-scheme/guile/Manifest | 1 + |
20 |
dev-scheme/guile/guile-3.0.4.ebuild | 72 +++++++++++++++++++++++++++++++ |
21 |
profiles/arch/amd64/package.use.mask | 5 +++ |
22 |
profiles/arch/arm/armv7a/package.use.mask | 6 +++ |
23 |
profiles/arch/arm64/package.use.mask | 5 +++ |
24 |
profiles/arch/base/package.use.mask | 5 +++ |
25 |
profiles/arch/x86/package.use.mask | 6 +++ |
26 |
profiles/package.mask | 7 +++ |
27 |
8 files changed, 107 insertions(+) |
28 |
|
29 |
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest |
30 |
index fef129316eb..582ceab3047 100644 |
31 |
--- a/dev-scheme/guile/Manifest |
32 |
+++ b/dev-scheme/guile/Manifest |
33 |
@@ -2,3 +2,4 @@ DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533e |
34 |
DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633 |
35 |
DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381dff44ca3ad176ad64adf9b0d200c0b8d34a41e34b15ecf24fa28ddccaa9b033cead25583ff9984b5b7c09ced5 SHA512 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af |
36 |
DIST guile-2.2.7.tar.gz 18129833 BLAKE2B 03c88d753f83e5a797f12808b7b053c9cf6c51f87fb8f3c3db89e54528aafb0e54de2eb951cc622e98fada82a558932bb074a8e739f4175144d4b06ba42f7d60 SHA512 ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773 |
37 |
+DIST guile-3.0.4.tar.gz 21619204 BLAKE2B c8639019d8d69618726f40ecd44ed5a5790c34872119e806d4851671c61fd592608d066f4584df4a8db5f971b64ba9089bbbe935176923b413621953202bbc2d SHA512 d707d89ef0f94f74eb4678bcc79dfa99ea068d68a789f47039b5f00c0b8b01ace567a567c0f971fdc0dfc620c11d9536fc003d8d8e049e2cc158ce8b171e1134 |
38 |
|
39 |
diff --git a/dev-scheme/guile/guile-3.0.4.ebuild b/dev-scheme/guile/guile-3.0.4.ebuild |
40 |
new file mode 100644 |
41 |
index 00000000000..c76a0dda006 |
42 |
--- /dev/null |
43 |
+++ b/dev-scheme/guile/guile-3.0.4.ebuild |
44 |
@@ -0,0 +1,72 @@ |
45 |
+# Copyright 1999-2020 Gentoo Authors |
46 |
+# Distributed under the terms of the GNU General Public License v2 |
47 |
+ |
48 |
+EAPI=7 |
49 |
+ |
50 |
+MAJOR="3.0" |
51 |
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" |
52 |
+HOMEPAGE="https://www.gnu.org/software/guile/" |
53 |
+SRC_URI="mirror://gnu/guile/${P}.tar.gz" |
54 |
+ |
55 |
+LICENSE="LGPL-3+" |
56 |
+SLOT="12/3.0-1" # libguile-2.2.so.1 => 2.2-1 |
57 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
58 |
+IUSE="debug debug-malloc +deprecated +jit +networking +nls +regex +threads" # upstream recommended +networking +nls |
59 |
+REQUIRED_USE="regex" # workaround for bug 596322 |
60 |
+RESTRICT="strip" |
61 |
+ |
62 |
+RDEPEND=" |
63 |
+ >=dev-libs/boehm-gc-7.0:=[threads?] |
64 |
+ dev-libs/gmp:= |
65 |
+ dev-libs/libffi:= |
66 |
+ dev-libs/libltdl:= |
67 |
+ dev-libs/libunistring:0= |
68 |
+ sys-libs/ncurses:0= |
69 |
+ sys-libs/readline:0=" |
70 |
+DEPEND="${RDEPEND}" |
71 |
+BDEPEND=" |
72 |
+ virtual/pkgconfig |
73 |
+ sys-devel/libtool |
74 |
+ sys-devel/gettext" |
75 |
+ |
76 |
+PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" ) |
77 |
+DOCS=( GUILE-VERSION HACKING README ) |
78 |
+ |
79 |
+src_configure() { |
80 |
+ # see bug #676468 |
81 |
+ mv prebuilt/32-bit-big-endian{,.broken} || die |
82 |
+ |
83 |
+ econf \ |
84 |
+ --disable-error-on-warning \ |
85 |
+ --disable-rpath \ |
86 |
+ --disable-static \ |
87 |
+ --enable-posix \ |
88 |
+ --without-libgmp-prefix \ |
89 |
+ --without-libiconv-prefix \ |
90 |
+ --without-libintl-prefix \ |
91 |
+ --without-libltdl-prefix \ |
92 |
+ --without-libreadline-prefix \ |
93 |
+ --without-libunistring-prefix \ |
94 |
+ $(use_enable debug guile-debug) \ |
95 |
+ $(use_enable debug-malloc) \ |
96 |
+ $(use_enable deprecated) \ |
97 |
+ $(use_enable jit) \ |
98 |
+ $(use_enable networking) \ |
99 |
+ $(use_enable nls) \ |
100 |
+ $(use_enable regex) \ |
101 |
+ $(use_with threads) |
102 |
+} |
103 |
+ |
104 |
+src_install() { |
105 |
+ default |
106 |
+ |
107 |
+ # From Novell |
108 |
+ # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0 |
109 |
+ dodir /usr/share/gdb/auto-load/$(get_libdir) |
110 |
+ mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die |
111 |
+ |
112 |
+ # necessary for registering slib, see bug 206896 |
113 |
+ keepdir /usr/share/guile/site |
114 |
+ |
115 |
+ find "${D}" -name '*.la' -delete || die |
116 |
+} |
117 |
|
118 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
119 |
index 15111545cf7..0f87f4a0715 100644 |
120 |
--- a/profiles/arch/amd64/package.use.mask |
121 |
+++ b/profiles/arch/amd64/package.use.mask |
122 |
@@ -17,6 +17,11 @@ |
123 |
|
124 |
#--- END OF EXAMPLES --- |
125 |
|
126 |
+# Sam James <sam@g.o> (2020-10-05) |
127 |
+# Guile only supports JIT on some arches |
128 |
+# (See 9.3.8 in the Guile manual) |
129 |
+dev-scheme/guile -jit |
130 |
+ |
131 |
# Thomas Deutschmann <whissi@g.o> (2020-09-07) |
132 |
# dev-util/nvidia-cuda-toolkit is keyworded on amd64 |
133 |
app-metrics/collectd -collectd_plugins_gpu_nvidia |
134 |
|
135 |
diff --git a/profiles/arch/arm/armv7a/package.use.mask b/profiles/arch/arm/armv7a/package.use.mask |
136 |
index 75303868b9a..961a9bcf203 100644 |
137 |
--- a/profiles/arch/arm/armv7a/package.use.mask |
138 |
+++ b/profiles/arch/arm/armv7a/package.use.mask |
139 |
@@ -1,6 +1,12 @@ |
140 |
# Copyright 1999-2020 Gentoo Authors |
141 |
# Distributed under the terms of the GNU General Public License v2 |
142 |
|
143 |
+# Sam James <sam@g.o> (2020-10-05) |
144 |
+# Guile only supports JIT on some arches |
145 |
+# (armv7 only for arm) |
146 |
+# (See 9.3.8 in the Guile manual) |
147 |
+dev-scheme/guile -jit |
148 |
+ |
149 |
# Mart Raudsepp <leio@g.o> (2020-08-02) |
150 |
# virtual/rust is available here |
151 |
>=media-gfx/eog-3.33.1 -svg |
152 |
|
153 |
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask |
154 |
index 18598f67f07..e45b0ba4439 100644 |
155 |
--- a/profiles/arch/arm64/package.use.mask |
156 |
+++ b/profiles/arch/arm64/package.use.mask |
157 |
@@ -1,6 +1,11 @@ |
158 |
# Copyright 1999-2020 Gentoo Authors |
159 |
# Distributed under the terms of the GNU General Public License v2 |
160 |
|
161 |
+# Sam James <sam@g.o> (2020-10-05) |
162 |
+# Guile only supports JIT on some arches |
163 |
+# (See 9.3.8 in the Guile manual) |
164 |
+dev-scheme/guile -jit |
165 |
+ |
166 |
# Joonas Niilola <juippis@g.o> (2020-10-02) |
167 |
# luajit not available on this arch. |
168 |
dev-libs/efl luajit |
169 |
|
170 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
171 |
index 04b8a4211f4..cd8727fe0f2 100644 |
172 |
--- a/profiles/arch/base/package.use.mask |
173 |
+++ b/profiles/arch/base/package.use.mask |
174 |
@@ -1,6 +1,11 @@ |
175 |
# Copyright 1999-2020 Gentoo Authors |
176 |
# Distributed under the terms of the GNU General Public License v2 |
177 |
|
178 |
+# Sam James <sam@g.o> (2020-10-05) |
179 |
+# Guile only supports JIT on some arches |
180 |
+# (See 9.3.8 in the Guile manual) |
181 |
+dev-scheme/guile jit |
182 |
+ |
183 |
# Sam James <sam@g.o> (2020-09-20) |
184 |
# (for Mikle Kolyada <zlogene@g.o>) |
185 |
# libgcrypt et al no longer support static-libs |
186 |
|
187 |
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask |
188 |
index ad386688a9d..51175ae7b59 100644 |
189 |
--- a/profiles/arch/x86/package.use.mask |
190 |
+++ b/profiles/arch/x86/package.use.mask |
191 |
@@ -1,6 +1,12 @@ |
192 |
# Copyright 1999-2020 Gentoo Authors |
193 |
# Distributed under the terms of the GNU General Public License v2 |
194 |
|
195 |
+# Sam James <sam@g.o> (2020-10-05) |
196 |
+# Guile only supports JIT on some arches |
197 |
+# (armv7 only for arm) |
198 |
+# (See 9.3.8 in the Guile manual) |
199 |
+dev-scheme/guile -jit |
200 |
+ |
201 |
# Georgy Yakovlev <gyakovlev@g.o> (2020-09-18) |
202 |
# swt 4.10 not keyworded on x86 |
203 |
dev-java/openjdk:8 javafx |
204 |
|
205 |
diff --git a/profiles/package.mask b/profiles/package.mask |
206 |
index fc87684b3fc..f209417a1f6 100644 |
207 |
--- a/profiles/package.mask |
208 |
+++ b/profiles/package.mask |
209 |
@@ -32,6 +32,13 @@ |
210 |
|
211 |
#--- END OF EXAMPLES --- |
212 |
|
213 |
+# Sam James <sam@g.o> (2020-10-05) |
214 |
+# Masked for testing. New major versions of Guile |
215 |
+# often break reverse dependencies. |
216 |
+# Guile in Gentoo is not slotted, so let's be cautious. |
217 |
+# bug #705554, bug #689408. |
218 |
+>=dev-scheme/guile-3.0.4 |
219 |
+ |
220 |
# Ulrich Müller <ulm@g.o> (2020-10-04) |
221 |
# Version 1.11 introduced different startup conventions for the server |
222 |
# which breaks the OpenRC init script. Bug #746227. |