Gentoo Archives: gentoo-musl

From: Felix Janda <felix.janda@××××××.de>
To: gentoo-musl@l.g.o
Subject: [gentoo-musl] [PATCH] Remove dev-scheme/guile now that autogen-5.18.4 is stable
Date: Wed, 11 May 2016 19:33:12
Message-Id: 20160511193247.GA13240@schubert
1 ---
2 dev-scheme/guile/Manifest | 8 --
3 dev-scheme/guile/files/50guile-gentoo.el | 1 -
4 .../guile/files/guile-1.8.8-fix_guile-config.patch | 14 ---
5 dev-scheme/guile/files/guile-1.8.8-gcc46.patch | 39 -------
6 .../guile/files/guile-1.8.8-makeinfo-5.patch | 71 -------------
7 dev-scheme/guile/files/guile-1.8.8-os_dep.patch | 10 --
8 dev-scheme/guile/guile-1.8.8-r99.ebuild | 113 ---------------------
9 dev-scheme/guile/metadata.xml | 21 ----
10 8 files changed, 277 deletions(-)
11 delete mode 100644 dev-scheme/guile/Manifest
12 delete mode 100644 dev-scheme/guile/files/50guile-gentoo.el
13 delete mode 100644 dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch
14 delete mode 100644 dev-scheme/guile/files/guile-1.8.8-gcc46.patch
15 delete mode 100644 dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
16 delete mode 100644 dev-scheme/guile/files/guile-1.8.8-os_dep.patch
17 delete mode 100644 dev-scheme/guile/guile-1.8.8-r99.ebuild
18 delete mode 100644 dev-scheme/guile/metadata.xml
19
20 diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
21 deleted file mode 100644
22 index 58e394e..0000000
23 --- a/dev-scheme/guile/Manifest
24 +++ /dev/null
25 @@ -1,8 +0,0 @@
26 -AUX 50guile-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
27 -AUX guile-1.8.8-fix_guile-config.patch 494 SHA256 08e4d837a663fc27b037e64f8dd89d89ababb3ed13f1e7845109a0f901f3b0c4 SHA512 3ef2bcb31d5b80dfa2f23b8802b98af713230e59aafe773ca3fd847fbdc7759ebb2d19cead1b6b362a6fa504dfff0c2036d5359aa82b601d664eb2a49a98c970 WHIRLPOOL f6ccd01b09a7aab46fab36464ab49539c9dddb954cc2d1ed709074175273df306d8527bae0d3d83f212903693af00fdf087533611ea416036b1c557ebc0fd283
28 -AUX guile-1.8.8-gcc46.patch 1004 SHA256 9f11b3095ed4aa622a58e3a0805e49f56c258e81c9813c5053cea980cd93948b SHA512 0ace93548dde387c344e13f083d79227cd09506e0cf58ac0892f25c43bfcefe9071e83912b921fba120262884fa92aaabe4d07f8337d89b6da73f0f2c077dcfa WHIRLPOOL cf2ff22da564656387c7a42985d8c4fd004ff411739e1a081f71931c458287bf1166079f5a39b842f7e8b988e62e24e04d541e125340f0256c62b23de602d80b
29 -AUX guile-1.8.8-makeinfo-5.patch 2361 SHA256 f1bfbe27280f6105735a2b4f0cf7883a9a825d4df756b74663112612b7a72438 SHA512 a69ed6cf2fd87c6f3d61cc914eed960fcdebaa151778b1ecf04f1774e6dddf07d17bf90fb3243a08e8c231e391843201d0ba26debedef33199d8dd75f8cbcd09 WHIRLPOOL c392c00f99d68cba17db8f14c68dc153f9cf146a3a6e197c4101959e93eb634a451cf8cdf957216f1c24fafcebf377a93e81682d5c0692506a0dd4c7ac00fa48
30 -AUX guile-1.8.8-os_dep.patch 440 SHA256 e4b54c94aa2087495dc0b4a93e004cc053e5018bbb556c8ea5b674977ea31a52 SHA512 df1681a3e311de4c3f7d4097ab4f92990d1a36f4f47507e967252039479822be9a82d64d483b0f1025c3ecf0ff070d8c7a30ccc4ef0d19db0895f5b9622019c7 WHIRLPOOL 412b0509fdc78b8bd28ee6236c94ed213c95b1da4a666ac1cfef824746ab7dae5cc10bc159d38070c8a17e3363b8f289f27bb6804f50870936ba939116b88a13
31 -DIST guile-1.8.8.tar.gz 3956654 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0 WHIRLPOOL 104810030b5dae16805595a5b398e5a7e600771b64b08d5ff686036e2f273dcec3829a16e4cdb1dbb9db5813f2e225476f83e0535a789bc570fc2fc15a76dbe2
32 -EBUILD guile-1.8.8-r99.ebuild 2779 SHA256 45fab2d11afc92127e17118a13d17785949dd83cea5eb9642643176ca3f69de3 SHA512 506a49b657b5652b1876cb622c05efab745eb05cadc231496f21cf741c24b0aa9781374956e3d692740c64aaa886bcf97ed48642018c11f3473cd31296a395e2 WHIRLPOOL 6e0ed98a1a4de2225f3dfdcaa1f3c9bc6b1228aa4ae1739b94e71134bb08f837960b41dc6807649658c4a611d14af81729e98f66ea608128a051457b9d4d3cdb
33 -MISC metadata.xml 1040 SHA256 a39b8cf38ffdbf8a5d6e2a302ee3b661bb7680f15c51f93ae9ac40eab70ca72b SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3 WHIRLPOOL 6003d8faba29536e6a44b854082ce41ae28fea03552809f6ad7b34023755f81b8156148fc7616c8ba7a9ee8eb917de257434f87084b66c6e0107afcace974f52
34 diff --git a/dev-scheme/guile/files/50guile-gentoo.el b/dev-scheme/guile/files/50guile-gentoo.el
35 deleted file mode 100644
36 index 431f7e9..0000000
37 --- a/dev-scheme/guile/files/50guile-gentoo.el
38 +++ /dev/null
39 @@ -1 +0,0 @@
40 -(add-to-list 'load-path "@SITELISP@")
41 diff --git a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch b/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch
42 deleted file mode 100644
43 index 2b04426..0000000
44 --- a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch
45 +++ /dev/null
46 @@ -1,14 +0,0 @@
47 -diff -ruN 1/configure.in 2/configure.in
48 ---- 1/configure.in 2010-12-13 17:24:39.000000000 +0000
49 -+++ 2/configure.in 2011-04-29 11:53:39.000000000 +0000
50 -@@ -1522,8 +1522,8 @@
51 - #######################################################################
52 -
53 - dnl Tell guile-config what flags guile users should compile and link with.
54 --GUILE_LIBS="$LDFLAGS $LIBS"
55 --GUILE_CFLAGS="$CPPFLAGS $PTHREAD_CFLAGS"
56 -+GUILE_LIBS="$LIBS"
57 -+GUILE_CFLAGS="$PTHREAD_CFLAGS"
58 - AC_SUBST(GUILE_LIBS)
59 - AC_SUBST(GUILE_CFLAGS)
60 -
61 diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc46.patch b/dev-scheme/guile/files/guile-1.8.8-gcc46.patch
62 deleted file mode 100644
63 index b06a0e5..0000000
64 --- a/dev-scheme/guile/files/guile-1.8.8-gcc46.patch
65 +++ /dev/null
66 @@ -1,39 +0,0 @@
67 -Backported upstream patch to fix SIGSEGV with gcc-4.6
68 -
69 -http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94
70 -https://bugs.gentoo.org/show_bug.cgi?id=424475
71 ---- a/configure.in
72 -+++ b/configure.in
73 -@@ -1199,23 +1199,20 @@
74 - AC_RUN_IFELSE([AC_LANG_SOURCE(
75 - [AC_INCLUDES_DEFAULT
76 - int
77 --find_stack_direction ()
78 -+find_stack_direction (int *addr, int depth)
79 - {
80 -- static char *addr = 0;
81 -- auto char dummy;
82 -- if (addr == 0)
83 -- {
84 -- addr = &dummy;
85 -- return find_stack_direction ();
86 -- }
87 -- else
88 -- return (&dummy > addr) ? 1 : -1;
89 -+ int dir, dummy = 0;
90 -+ if (! addr)
91 -+ addr = &dummy;
92 -+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
93 -+ dir = depth ? find_stack_direction (addr, depth - 1) : 0;
94 -+ return dir + dummy;
95 - }
96 -
97 - int
98 --main ()
99 -+main (int argc, char **argv)
100 - {
101 -- return find_stack_direction () < 0;
102 -+ return find_stack_direction (0, argc + !argv + 20) < 0;
103 - }])],
104 - [SCM_I_GSC_STACK_GROWS_UP=1],
105 - [],
106 diff --git a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
107 deleted file mode 100644
108 index 9f3a02c..0000000
109 --- a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
110 +++ /dev/null
111 @@ -1,71 +0,0 @@
112 -From 937da0f2604ea208ec56517c5a41e582f316a246 Mon Sep 17 00:00:00 2001
113 -From: Cyprien Nicolas <cyp@×××××.fr>
114 -Date: Thu, 18 Apr 2013 23:45:23 +0200
115 -Subject: [PATCH] Fix texinfo files for makeinfo-5.1
116 -
117 ----
118 - doc/ref/api-options.texi | 2 +-
119 - doc/ref/api-utility.texi | 2 +-
120 - doc/ref/fdl.texi | 2 +-
121 - doc/ref/gh.texi | 4 ++--
122 - 4 files changed, 5 insertions(+), 5 deletions(-)
123 -
124 -diff --git a/doc/ref/api-options.texi b/doc/ref/api-options.texi
125 -index 7b7a6e0..6ce7291 100644
126 ---- a/doc/ref/api-options.texi
127 -+++ b/doc/ref/api-options.texi
128 -@@ -377,9 +377,9 @@ configure @emph{reading}, @emph{printing}, @emph{debugging} or
129 - * User level options interfaces::
130 - * Reader options::
131 - * Printing options::
132 --* Debugger options::
133 - * Evaluator options::
134 - * Evaluator trap options::
135 -+* Debugger options::
136 - * Examples of option use::
137 - @end menu
138 -
139 -diff --git a/doc/ref/api-utility.texi b/doc/ref/api-utility.texi
140 -index 4a90212..9a4f3cc 100644
141 ---- a/doc/ref/api-utility.texi
142 -+++ b/doc/ref/api-utility.texi
143 -@@ -657,7 +657,7 @@ Return 1 if @var{x} is a Scheme-level hook, 0 otherwise.
144 - @end deftypefn
145 -
146 -
147 --@subsubsection Handling Scheme-level hooks from C code
148 -+@subsubheading Handling Scheme-level hooks from C code
149 -
150 - Here is an example of how to handle Scheme-level hooks from C code using
151 - the above functions.
152 -diff --git a/doc/ref/fdl.texi b/doc/ref/fdl.texi
153 -index 17fe148..4866055 100644
154 ---- a/doc/ref/fdl.texi
155 -+++ b/doc/ref/fdl.texi
156 -@@ -408,7 +408,7 @@ as a draft) by the Free Software Foundation.
157 - @end enumerate
158 -
159 - @page
160 --@appendixsubsec ADDENDUM: How to use this License for your documents
161 -+@appendixsec ADDENDUM: How to use this License for your documents
162 -
163 - To use this License in a document you have written, include a copy of
164 - the License in the document and put the following copyright and
165 -diff --git a/doc/ref/gh.texi b/doc/ref/gh.texi
166 -index 95dfd92..bbd3af1 100644
167 ---- a/doc/ref/gh.texi
168 -+++ b/doc/ref/gh.texi
169 -@@ -995,8 +995,8 @@ These correspond to the Scheme @code{(cons a b)} and @code{(list l0 l1
170 -
171 - @deftypefun SCM gh_car (SCM @var{obj})
172 - @deftypefunx SCM gh_cdr (SCM @var{obj})
173 --@dots{}
174 --
175 -+@deftypefunx SCM gh_c[ad][ad]r (SCM @var{obj})
176 -+@deftypefunx SCM gh_c[ad][ad][ad]r (SCM @var{obj})
177 - @deftypefunx SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj})
178 - These correspond to the Scheme @code{(caadar ls)} procedures etc @dots{}
179 - @end deftypefun
180 ---
181 -1.8.2.1
182 -
183 diff --git a/dev-scheme/guile/files/guile-1.8.8-os_dep.patch b/dev-scheme/guile/files/guile-1.8.8-os_dep.patch
184 deleted file mode 100644
185 index 9fab8da..0000000
186 --- a/dev-scheme/guile/files/guile-1.8.8-os_dep.patch
187 +++ /dev/null
188 @@ -1,10 +0,0 @@
189 ---- a/guile-1.8.8/libguile/gc_os_dep.c
190 -+++ b/guile-1.8.8/libguile/gc_os_dep.c
191 -@@ -1472,6 +1472,7 @@
192 - /* has the right declaration for glibc 2.1. */
193 - # include <sigcontext.h>
194 - # endif /* 0 == __GLIBC_MINOR__ */
195 -+# elif 1
196 - # else /* not 2 <= __GLIBC__ */
197 - /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */
198 - /* one. Check LINUX_VERSION_CODE to see which we should reference. */
199 diff --git a/dev-scheme/guile/guile-1.8.8-r99.ebuild b/dev-scheme/guile/guile-1.8.8-r99.ebuild
200 deleted file mode 100644
201 index 5a74319..0000000
202 --- a/dev-scheme/guile/guile-1.8.8-r99.ebuild
203 +++ /dev/null
204 @@ -1,113 +0,0 @@
205 -# Copyright 1999-2016 Gentoo Foundation
206 -# Distributed under the terms of the GNU General Public License v2
207 -# $Id$
208 -
209 -EAPI=3
210 -inherit eutils autotools flag-o-matic elisp-common
211 -
212 -DESCRIPTION="Scheme interpreter"
213 -HOMEPAGE="http://www.gnu.org/software/guile/"
214 -SRC_URI="mirror://gnu/guile/${P}.tar.gz"
215 -
216 -LICENSE="LGPL-2.1"
217 -KEYWORDS="amd64 arm ~mips ppc x86"
218 -IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads"
219 -RESTRICT="!regex? ( test )"
220 -
221 -DEPEND="
222 - >=dev-libs/gmp-4.1
223 - >=sys-devel/libtool-1.5.6
224 - sys-devel/gettext
225 - emacs? ( virtual/emacs )"
226 -RDEPEND="${DEPEND}"
227 -
228 -# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
229 -# but there are lots of collisions. Most in /usr/share/libguile. Therefore
230 -# I'm slotting this in the same slot as guile-1.6* for now.
231 -SLOT="12"
232 -MAJOR="1.8"
233 -
234 -src_prepare() {
235 - epatch "${FILESDIR}/${P}-fix_guile-config.patch" \
236 - "${FILESDIR}/${P}-gcc46.patch" \
237 - "${FILESDIR}/${P}-os_dep.patch" \
238 - "${FILESDIR}/${P}-makeinfo-5.patch"
239 - sed \
240 - -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
241 - -e "/AM_PROG_CC_STDC/d" \
242 - -i guile-readline/configure.in
243 - eautoreconf
244 -}
245 -
246 -src_configure() {
247 - # see bug #178499
248 - filter-flags -ftree-vectorize
249 -
250 - #will fail for me if posix is disabled or without modules -- hkBst
251 - econf \
252 - --disable-error-on-warning \
253 - --disable-static \
254 - --enable-posix \
255 - $(use_enable networking) \
256 - $(use_enable regex) \
257 - $(use deprecated || use_enable discouraged) \
258 - $(use_enable deprecated) \
259 - $(use_enable emacs elisp) \
260 - $(use_enable nls) \
261 - --disable-rpath \
262 - $(use_enable debug-freelist) \
263 - $(use_enable debug-malloc) \
264 - $(use_enable debug guile-debug) \
265 - $(use_with threads) \
266 - --with-modules \
267 - EMACS=no
268 -}
269 -
270 -src_compile() {
271 - emake || die "make failed"
272 -
273 - # Above we have disabled the build system's Emacs support;
274 - # for USE=emacs we compile (and install) the files manually
275 - if use emacs; then
276 - cd emacs
277 - elisp-compile *.el || die
278 - fi
279 -}
280 -
281 -src_install() {
282 - einstall || die "install failed"
283 -
284 - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
285 -
286 - # texmacs needs this, closing bug #23493
287 - dodir /etc/env.d
288 - echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
289 -
290 - # necessary for registering slib, see bug 206896
291 - keepdir /usr/share/guile/site
292 -
293 - if use emacs; then
294 - elisp-install ${PN} emacs/*.{el,elc} || die
295 - elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
296 - fi
297 -}
298 -
299 -pkg_postinst() {
300 - [ "${EROOT}" == "/" ] && pkg_config
301 - use emacs && elisp-site-regen
302 -}
303 -
304 -pkg_postrm() {
305 - use emacs && elisp-site-regen
306 -}
307 -
308 -pkg_config() {
309 - if has_version dev-scheme/slib; then
310 - einfo "Registering slib with guile"
311 - install_slib_for_guile
312 - fi
313 -}
314 -
315 -_pkg_prerm() {
316 - rm -f "${EROOT}"/usr/share/guile/site/slibcat
317 -}
318 diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml
319 deleted file mode 100644
320 index 02c7884..0000000
321 --- a/dev-scheme/guile/metadata.xml
322 +++ /dev/null
323 @@ -1,21 +0,0 @@
324 -<?xml version="1.0" encoding="UTF-8"?>
325 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
326 -<pkgmetadata>
327 - <maintainer type="project">
328 - <email>scheme@g.o</email>
329 - <name>Gentoo Scheme Project</name>
330 - </maintainer>
331 - <longdescription lang="en">
332 -Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs.
333 - </longdescription>
334 - <use>
335 - <flag name="debug-freelist">Include garbage collector freelist debugging
336 - code</flag>
337 - <flag name="debug-malloc">Include malloc debugging code</flag>
338 - <flag name="deprecated">Enable deprecated features</flag>
339 - <flag name="discouraged"> (implied by deprecated) enable merely discouraged
340 - features</flag>
341 - <flag name="networking">Include networking interfaces</flag>
342 - <flag name="regex"> Include regular expression interfaces</flag>
343 - </use>
344 -</pkgmetadata>
345 --
346 2.7.3

Replies

Subject Author
Re: [gentoo-musl] [PATCH] Remove dev-scheme/guile now that autogen-5.18.4 is stable Felix Janda <felix.janda@××××××.de>