Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-www/files/
Date: Thu, 29 Sep 2016 17:16:22
Message-Id: 1475169269.f2f05e4239ad1c565e9f82b88532a342f2071ef9.amynka@gentoo
1 commit: f2f05e4239ad1c565e9f82b88532a342f2071ef9
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 28 17:10:44 2016 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 17:14:29 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2f05e42
7
8 dev-scheme/guile-www: remove unused patches
9
10 .../files/guile-www-2.30-alive.test.patch | 74 ----------------------
11 .../files/guile-www-2.30-alive.test2.patch | 51 ---------------
12 2 files changed, 125 deletions(-)
13
14 diff --git a/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch b/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch
15 deleted file mode 100644
16 index fdd3b60..00000000
17 --- a/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch
18 +++ /dev/null
19 @@ -1,74 +0,0 @@
20 -From f41bf9380f7b08f5e8c07c9c58d66cd5da7bc356 Mon Sep 17 00:00:00 2001
21 -From: Thien-Thi Nguyen <ttn@×××××××.org>
22 -Date: Thu, 28 Apr 2011 05:13:52 +0000
23 -Subject: [v] Make alive.test avoid (mis-)loading the .scm files, if possible.
24 -
25 -Reported by Bernardo Ezequiel Contreras:
26 -<https://savannah.nongnu.org/bugs/?33175>
27 -
28 -* source/alive.test: If guile has ‘%load-extensions’, create a
29 -preload file that removes ".scm" from it; use that file for
30 -all invocations; and delete it when done. If in debug mode,
31 -display ponderings, as well as ‘guile --version’ output.
32 ----
33 -diff --git a/source/ChangeLog b/source/ChangeLog
34 -index 2b5bd1b..2de79f4 100644
35 ---- a/source/ChangeLog
36 -+++ b/source/ChangeLog
37 -@@ -1,3 +1,15 @@
38 -+2011-04-28 Thien-Thi Nguyen <ttn@×××××××.org>
39 -+
40 -+ [v] Make alive.test avoid (mis-)loading the .scm files, if possible.
41 -+
42 -+ Reported by Bernardo Ezequiel Contreras:
43 -+ <https://savannah.nongnu.org/bugs/?33175>
44 -+
45 -+ * alive.test: If guile has ‘%load-extensions’, create a
46 -+ preload file that removes ".scm" from it; use that file for
47 -+ all invocations; and delete it when done. If in debug mode,
48 -+ display ponderings, as well as ‘guile --version’ output.
49 -+
50 - 2011-01-24 Thien-Thi Nguyen <ttn@×××××××.org>
51 -
52 - Release: 2.29
53 -diff --git a/source/alive.test b/source/alive.test
54 -index 3521fcc..76e91c8 100755
55 ---- a/source/alive.test
56 -+++ b/source/alive.test
57 -@@ -35,6 +35,25 @@ decho ()
58 - if $debug ; then echo "$1" ; fi
59 - }
60 -
61 -+decho 'guile:'
62 -+if $debug ; then ${GUILE-guile} --version ; fi
63 -+
64 -+if $guile -c '%load-extensions' >/dev/null 2>&1 ; then
65 -+ preload=alive.preload
66 -+ echo '(set! %load-extensions (delete ".scm" %load-extensions))' > $preload
67 -+ if $debug ; then
68 -+ decho 'preload:'
69 -+ cat $preload
70 -+ decho 'before:'
71 -+ $guile -c '(begin (write %load-extensions) (newline))'
72 -+ fi
73 -+ guile="$guile -l $preload"
74 -+ if $debug ; then
75 -+ decho 'after:'
76 -+ $guile -c '(begin (write %load-extensions) (newline))'
77 -+ fi
78 -+fi
79 -+
80 - decho 'indivdually:'
81 - { while read m ;
82 - do
83 -@@ -48,4 +67,8 @@ all="`cat $all`"
84 - decho "$guile -c '(use-modules $all)'"
85 - $guile -c "(use-modules $all)"
86 -
87 -+if [ "$preload" ] ; then rm $preload ; fi
88 -+
89 -+exit 0
90 -+
91 - # alive.test ends here
92 ---
93 -cgit v0.9.0.2
94
95 diff --git a/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch b/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch
96 deleted file mode 100644
97 index 9cf7efe..00000000
98 --- a/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch
99 +++ /dev/null
100 @@ -1,51 +0,0 @@
101 -From cfabb94ca727d63f5712860c3fe4132926e498c9 Mon Sep 17 00:00:00 2001
102 -From: Thien-Thi Nguyen <ttn@×××××××.org>
103 -Date: Mon, 02 May 2011 08:32:02 +0000
104 -Subject: [v] Refine preload: Prioritize "" instead of deleting ".scm".
105 -
106 -The 2011-04-28 change goes too far; it impedes
107 -loading system modules used by Guile-WWW modules.
108 -Reported by (Savannah user) vonbecmann:
109 -<https://savannah.nongnu.org/bugs/?33175>.
110 -
111 -* source/alive.test: Don't delete ".scm" from ‘%load-extensions’;
112 -instead, ensure only that "" is at the beginning of the list.
113 ----
114 -diff --git a/source/ChangeLog b/source/ChangeLog
115 -index 2de79f4..ece831e 100644
116 ---- a/source/ChangeLog
117 -+++ b/source/ChangeLog
118 -@@ -1,3 +1,15 @@
119 -+2011-05-02 Thien-Thi Nguyen <ttn@×××××××.org>
120 -+
121 -+ [v] Refine preload: Prioritize "" instead of deleting ".scm".
122 -+
123 -+ The 2011-04-28 change goes too far; it impedes
124 -+ loading system modules used by Guile-WWW modules.
125 -+ Reported by (Savannah user) vonbecmann:
126 -+ <https://savannah.nongnu.org/bugs/?33175>.
127 -+
128 -+ * alive.test: Don't delete ".scm" from ‘%load-extensions’;
129 -+ instead, ensure only that "" is at the beginning of the list.
130 -+
131 - 2011-04-28 Thien-Thi Nguyen <ttn@×××××××.org>
132 -
133 - [v] Make alive.test avoid (mis-)loading the .scm files, if possible.
134 -diff --git a/source/alive.test b/source/alive.test
135 -index 76e91c8..6e430f4 100755
136 ---- a/source/alive.test
137 -+++ b/source/alive.test
138 -@@ -39,8 +39,10 @@ decho 'guile:'
139 - if $debug ; then ${GUILE-guile} --version ; fi
140 -
141 - if $guile -c '%load-extensions' >/dev/null 2>&1 ; then
142 -+ # Make sure "" is at head of list.
143 - preload=alive.preload
144 -- echo '(set! %load-extensions (delete ".scm" %load-extensions))' > $preload
145 -+ echo '(set! %load-extensions (delete "" %load-extensions))' > $preload
146 -+ echo '(set! %load-extensions (cons "" %load-extensions))' >> $preload
147 - if $debug ; then
148 - decho 'preload:'
149 - cat $preload
150 ---
151 -cgit v0.9.0.2