Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-util/dialog/, dev-util/dialog/files/
Date: Mon, 21 Jun 2021 05:59:39
Message-Id: 1624255103.dff5464262d280b98a1d903e5cbeb2611c6eb232.sam@gentoo
1 commit: dff5464262d280b98a1d903e5cbeb2611c6eb232
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 21 05:58:23 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 21 05:58:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dff54642
7
8 dev-util/dialog: drop broken EAPI 4 version
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-util/dialog/Manifest | 1 -
14 dev-util/dialog/dialog-1.1.20120706.ebuild | 77 -------------
15 .../dialog/files/dialog-1.1-no-usr-local.patch | 103 ------------------
16 .../dialog-1.1.20100428-no-path-invention.patch | 121 ---------------------
17 .../dialog/files/dialog-1.1.20100428-shared.patch | 80 --------------
18 dev-util/dialog/files/dialog-mkdirs.patch | 16 ---
19 dev-util/dialog/files/dialog-shared.patch | 80 --------------
20 7 files changed, 478 deletions(-)
21
22 diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
23 index 0d0aed2ec5..1eb24922f7 100644
24 --- a/dev-util/dialog/Manifest
25 +++ b/dev-util/dialog/Manifest
26 @@ -1,2 +1 @@
27 -DIST dialog-1.1-20120706.tgz 444554 BLAKE2B d1863ce51fee8e2ab36664b322386a1368b5c30cf11bddd49a7aec5c1760d14cfef2b515c27231b4353e60dfa758d5ab9890ae0114c0c2308e330b58de04af0e SHA512 90000dbdd33226767a45a66a60af25c0e743e78d938b329c980c929c18bcdc5e88031ef7f19ca8ab0471060ff2011aa7d52366cb094537d08ea64f5ef2e0b97d
28 DIST dialog-1.3-20181022.tgz 531815 BLAKE2B c6a34010eb991683356338009998964fde60bcae4181d8b07e6d5b9f0d0e9a61d3f0b112fad02c151b1774380e18b87f93f43fdfe35e0fba86914c029eaa274c SHA512 5d7891086ab6d2f4a815538513b09754a56368bbb0ec3bd107346fd2ed6ae10fa858173447fa609cce28a91e234ed8067d9439efeb973593fff2df1e811a8925
29
30 diff --git a/dev-util/dialog/dialog-1.1.20120706.ebuild b/dev-util/dialog/dialog-1.1.20120706.ebuild
31 deleted file mode 100644
32 index 6606d3fb53..0000000000
33 --- a/dev-util/dialog/dialog-1.1.20120706.ebuild
34 +++ /dev/null
35 @@ -1,77 +0,0 @@
36 -# Copyright 1999-2021 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20120706.ebuild,v 1.1 2012/07/18 17:25:40 jer Exp $
39 -
40 -EAPI="4"
41 -
42 -inherit multilib
43 -
44 -MY_PV="${PV/1.1./1.1-}"
45 -S=${WORKDIR}/${PN}-${MY_PV}
46 -DESCRIPTION="tool to display dialog boxes from a shell"
47 -HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
48 -SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0"
52 -KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
53 -IUSE="examples minimal nls static-libs unicode"
54 -
55 -RDEPEND="
56 - >=app-shells/bash-2.04-r3
57 - !unicode? ( >=sys-libs/ncurses-5.2-r5 )
58 - unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )
59 -"
60 -DEPEND="
61 - ${RDEPEND}
62 - nls? ( sys-devel/gettext )
63 - !minimal? ( sys-devel/libtool )
64 - !<=sys-freebsd/freebsd-contrib-8.9999
65 -"
66 -
67 -src_prepare() {
68 - sed -i configure -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' || die
69 - # configure searches all over the world for some things...
70 - sed -i configure \
71 - -e 's:^test -d "\(/usr\|$prefix\|/usr/local\|/opt\|$HOME\):test -d "XnoX:' || die
72 -}
73 -
74 -src_configure() {
75 - local ncursesw
76 - use unicode && ncursesw="w"
77 - # doing this libtool stuff through configure
78 - # (--with-libtool=/path/to/libtool) strangely breaks the build
79 - local glibtool="libtool"
80 - [[ ${CHOST} == *-darwin* ]] && glibtool="glibtool"
81 - export ac_cv_path_LIBTOOL="$(type -P ${glibtool})"
82 - econf \
83 - --disable-rpath-hack \
84 - $(use_enable nls) \
85 - $(use_with !minimal libtool) \
86 - --with-ncurses${ncursesw}
87 -}
88 -
89 -src_install() {
90 - if use minimal; then
91 - emake DESTDIR="${D}" install
92 - else
93 - emake DESTDIR="${D}" install-full
94 - fi
95 -
96 - dodoc CHANGES README
97 -
98 - if use examples; then
99 - docinto samples
100 - dodoc $( find samples -maxdepth 1 -type f )
101 - docinto samples/copifuncs
102 - dodoc $( find samples/copifuncs -maxdepth 1 -type f )
103 - docinto samples/install
104 - dodoc $( find samples/install -type f )
105 - fi
106 -
107 - if ! use static-libs; then
108 - rm -f \
109 - "${ED}"usr/$(get_libdir)/libdialog.a \
110 - "${ED}"usr/$(get_libdir)/libdialog.la
111 - fi
112 -}
113
114 diff --git a/dev-util/dialog/files/dialog-1.1-no-usr-local.patch b/dev-util/dialog/files/dialog-1.1-no-usr-local.patch
115 deleted file mode 100644
116 index e3d64a9f31..0000000000
117 --- a/dev-util/dialog/files/dialog-1.1-no-usr-local.patch
118 +++ /dev/null
119 @@ -1,103 +0,0 @@
120 -diff -ru dialog-1.1-20080316.orig/configure dialog-1.1-20080316/configure
121 ---- dialog-1.1-20080316.orig/configure 2008-03-25 13:54:12 +0100
122 -+++ dialog-1.1-20080316/configure 2008-03-25 14:18:09 +0100
123 -@@ -5447,15 +5449,15 @@
124 - test -d "$HOME/gettext/include/gettext" && cf_search="$cf_search $HOME/gettext/include/gettext"
125 - }
126 -
127 --test "$prefix" != /usr/local && \
128 --test -d /usr/local && {
129 -- test -n "$verbose" && echo " ... testing include-directories under /usr/local"
130 -- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
131 -- test -d /usr/local/include/gettext && cf_search="$cf_search /usr/local/include/gettext"
132 -- test -d /usr/local/include/gettext/include && cf_search="$cf_search /usr/local/include/gettext/include"
133 -- test -d /usr/local/gettext/include && cf_search="$cf_search /usr/local/gettext/include"
134 -- test -d /usr/local/gettext/include/gettext && cf_search="$cf_search /usr/local/gettext/include/gettext"
135 --}
136 -+#test "$prefix" != /usr/local && \
137 -+#test -d /usr/local && {
138 -+# test -n "$verbose" && echo " ... testing include-directories under /usr/local"
139 -+# test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
140 -+# test -d /usr/local/include/gettext && cf_search="$cf_search /usr/local/include/gettext"
141 -+# test -d /usr/local/include/gettext/include && cf_search="$cf_search /usr/local/include/gettext/include"
142 -+# test -d /usr/local/gettext/include && cf_search="$cf_search /usr/local/gettext/include"
143 -+# test -d /usr/local/gettext/include/gettext && cf_search="$cf_search /usr/local/gettext/include/gettext"
144 -+#}
145 -
146 - test "$prefix" != NONE && \
147 - test -d $prefix && {
148 -@@ -5681,15 +5683,15 @@
149 - test -d "$HOME/intl/lib/intl" && cf_search="$cf_search $HOME/intl/lib/intl"
150 - }
151 -
152 --test "$prefix" != /usr/local && \
153 --test -d /usr/local && {
154 -- test -n "$verbose" && echo " ... testing lib-directories under /usr/local"
155 -- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
156 -- test -d /usr/local/lib/intl && cf_search="$cf_search /usr/local/lib/intl"
157 -- test -d /usr/local/lib/intl/lib && cf_search="$cf_search /usr/local/lib/intl/lib"
158 -- test -d /usr/local/intl/lib && cf_search="$cf_search /usr/local/intl/lib"
159 -- test -d /usr/local/intl/lib/intl && cf_search="$cf_search /usr/local/intl/lib/intl"
160 --}
161 -+#test "$prefix" != /usr/local && \
162 -+#test -d /usr/local && {
163 -+# test -n "$verbose" && echo " ... testing lib-directories under /usr/local"
164 -+# test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
165 -+# test -d /usr/local/lib/intl && cf_search="$cf_search /usr/local/lib/intl"
166 -+# test -d /usr/local/lib/intl/lib && cf_search="$cf_search /usr/local/lib/intl/lib"
167 -+# test -d /usr/local/intl/lib && cf_search="$cf_search /usr/local/intl/lib"
168 -+# test -d /usr/local/intl/lib/intl && cf_search="$cf_search /usr/local/intl/lib/intl"
169 -+#}
170 -
171 - test "$prefix" != NONE && \
172 - test -d $prefix && {
173 -@@ -7596,15 +7598,15 @@
174 - test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
175 - }
176 -
177 --test "$prefix" != /usr/local && \
178 --test -d /usr/local && {
179 -- test -n "$verbose" && echo " ... testing include-directories under /usr/local"
180 -- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
181 -- test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
182 -- test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
183 -- test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
184 -- test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
185 --}
186 -+#test "$prefix" != /usr/local && \
187 -+#test -d /usr/local && {
188 -+ #test -n "$verbose" && echo " ... testing include-directories under /usr/local"
189 -+ #test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
190 -+ #test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
191 -+ #test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
192 -+ #test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
193 -+ #test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
194 -+#}
195 -
196 - test "$prefix" != NONE && \
197 - test -d $prefix && {
198 -@@ -8350,15 +8352,15 @@
199 - test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
200 - }
201 -
202 --test "$prefix" != /usr/local && \
203 --test -d /usr/local && {
204 -- test -n "$verbose" && echo " ... testing lib-directories under /usr/local"
205 -- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
206 -- test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
207 -- test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
208 -- test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
209 -- test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
210 --}
211 -+#test "$prefix" != /usr/local && \
212 -+#test -d /usr/local && {
213 -+# test -n "$verbose" && echo " ... testing lib-directories under /usr/local"
214 -+# test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
215 -+# test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
216 -+# test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
217 -+# test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
218 -+# test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
219 -+#}
220 -
221 - test "$prefix" != NONE && \
222 - test -d $prefix && {
223
224 diff --git a/dev-util/dialog/files/dialog-1.1.20100428-no-path-invention.patch b/dev-util/dialog/files/dialog-1.1.20100428-no-path-invention.patch
225 deleted file mode 100644
226 index 8ac93fc710..0000000000
227 --- a/dev-util/dialog/files/dialog-1.1.20100428-no-path-invention.patch
228 +++ /dev/null
229 @@ -1,121 +0,0 @@
230 -Don't go looking on your own for headers and libs in /opt, /usr/local,
231 -$HOME ...
232 -
233 ---- configure
234 -+++ configure
235 -@@ -5760,17 +5760,6 @@
236 -
237 - cf_search=
238 -
239 --test "/usr" != "$prefix" && \
240 --test -d "/usr" && \
241 --(test $prefix = NONE || test -d $prefix) && {
242 -- test -n "$verbose" && echo " ... testing for include-directories under /usr"
243 -- test -d /usr/include && cf_search="$cf_search /usr/include"
244 -- test -d /usr/include/iconv && cf_search="$cf_search /usr/include/iconv"
245 -- test -d /usr/include/iconv/include && cf_search="$cf_search /usr/include/iconv/include"
246 -- test -d /usr/iconv/include && cf_search="$cf_search /usr/iconv/include"
247 -- test -d /usr/iconv/include/iconv && cf_search="$cf_search /usr/iconv/include/iconv"
248 --}
249 --
250 - test "$prefix" != "NONE" && \
251 - test -d "$prefix" && \
252 - {
253 -@@ -5782,39 +5771,6 @@
254 - test -d $prefix/iconv/include/iconv && cf_search="$cf_search $prefix/iconv/include/iconv"
255 - }
256 -
257 --test "/usr/local" != "$prefix" && \
258 --test -d "/usr/local" && \
259 --(test $prefix = NONE || test -d $prefix) && {
260 -- test -n "$verbose" && echo " ... testing for include-directories under /usr/local"
261 -- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
262 -- test -d /usr/local/include/iconv && cf_search="$cf_search /usr/local/include/iconv"
263 -- test -d /usr/local/include/iconv/include && cf_search="$cf_search /usr/local/include/iconv/include"
264 -- test -d /usr/local/iconv/include && cf_search="$cf_search /usr/local/iconv/include"
265 -- test -d /usr/local/iconv/include/iconv && cf_search="$cf_search /usr/local/iconv/include/iconv"
266 --}
267 --
268 --test "/opt" != "$prefix" && \
269 --test -d "/opt" && \
270 --(test $prefix = NONE || test -d $prefix) && {
271 -- test -n "$verbose" && echo " ... testing for include-directories under /opt"
272 -- test -d /opt/include && cf_search="$cf_search /opt/include"
273 -- test -d /opt/include/iconv && cf_search="$cf_search /opt/include/iconv"
274 -- test -d /opt/include/iconv/include && cf_search="$cf_search /opt/include/iconv/include"
275 -- test -d /opt/iconv/include && cf_search="$cf_search /opt/iconv/include"
276 -- test -d /opt/iconv/include/iconv && cf_search="$cf_search /opt/iconv/include/iconv"
277 --}
278 --
279 --test "$HOME" != "$prefix" && \
280 --test -d "$HOME" && \
281 --(test $prefix = NONE || test -d $prefix) && {
282 -- test -n "$verbose" && echo " ... testing for include-directories under $HOME"
283 -- test -d $HOME/include && cf_search="$cf_search $HOME/include"
284 -- test -d $HOME/include/iconv && cf_search="$cf_search $HOME/include/iconv"
285 -- test -d $HOME/include/iconv/include && cf_search="$cf_search $HOME/include/iconv/include"
286 -- test -d $HOME/iconv/include && cf_search="$cf_search $HOME/iconv/include"
287 -- test -d $HOME/iconv/include/iconv && cf_search="$cf_search $HOME/iconv/include/iconv"
288 --}
289 --
290 - test "$includedir" != NONE && \
291 - test "$includedir" != "/usr/include" && \
292 - test -d "$includedir" && {
293 -@@ -10312,17 +10268,6 @@
294 -
295 - cf_search=
296 -
297 --test "/usr" != "$prefix" && \
298 --test -d "/usr" && \
299 --(test $prefix = NONE || test -d $prefix) && {
300 -- test -n "$verbose" && echo " ... testing for lib-directories under /usr"
301 -- test -d /usr/lib && cf_search="$cf_search /usr/lib"
302 -- test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root"
303 -- test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
304 -- test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib"
305 -- test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
306 --}
307 --
308 - test "$prefix" != "NONE" && \
309 - test -d "$prefix" && \
310 - {
311 -@@ -10334,39 +10279,6 @@
312 - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
313 - }
314 -
315 --test "/usr/local" != "$prefix" && \
316 --test -d "/usr/local" && \
317 --(test $prefix = NONE || test -d $prefix) && {
318 -- test -n "$verbose" && echo " ... testing for lib-directories under /usr/local"
319 -- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
320 -- test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
321 -- test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
322 -- test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
323 -- test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
324 --}
325 --
326 --test "/opt" != "$prefix" && \
327 --test -d "/opt" && \
328 --(test $prefix = NONE || test -d $prefix) && {
329 -- test -n "$verbose" && echo " ... testing for lib-directories under /opt"
330 -- test -d /opt/lib && cf_search="$cf_search /opt/lib"
331 -- test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root"
332 -- test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
333 -- test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib"
334 -- test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
335 --}
336 --
337 --test "$HOME" != "$prefix" && \
338 --test -d "$HOME" && \
339 --(test $prefix = NONE || test -d $prefix) && {
340 -- test -n "$verbose" && echo " ... testing for lib-directories under $HOME"
341 -- test -d $HOME/lib && cf_search="$cf_search $HOME/lib"
342 -- test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root"
343 -- test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
344 -- test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib"
345 -- test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
346 --}
347 --
348 - cf_search="$cf_library_path_list $cf_search"
349 -
350 - for cf_libdir in $cf_search
351
352 diff --git a/dev-util/dialog/files/dialog-1.1.20100428-shared.patch b/dev-util/dialog/files/dialog-1.1.20100428-shared.patch
353 deleted file mode 100644
354 index adcd803e44..0000000000
355 --- a/dev-util/dialog/files/dialog-1.1.20100428-shared.patch
356 +++ /dev/null
357 @@ -1,80 +0,0 @@
358 ---- dialog-1.1-20100428/aclocal.m4
359 -+++ dialog-1.1-20100428/aclocal.m4
360 -@@ -3460,6 +3460,7 @@
361 - ])
362 - # common library maintenance symbols that are convenient for libtool scripts:
363 - LIB_CREATE='${AR} -cr'
364 -+LIB_LIBS=''
365 - LIB_OBJECT='${OBJECTS}'
366 - LIB_SUFFIX=.a
367 - LIB_PREP="$RANLIB"
368 -@@ -3494,7 +3495,8 @@
369 - AC_MSG_ERROR(Cannot find libtool)
370 - fi
371 - ])dnl
372 -- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
373 -+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} ${LDFLAGS} -o'
374 -+ LIB_LIBS='$(LIBS)'
375 - LIB_OBJECT='${OBJECTS:.o=.lo}'
376 - LIB_SUFFIX=.la
377 - LIB_CLEAN='${LIBTOOL} --mode=clean'
378 -@@ -3547,6 +3549,7 @@
379 - AC_SUBST(LIBTOOL_OPTS)
380 -
381 - AC_SUBST(LIB_CREATE)
382 -+AC_SUBST(LIB_LIBS)
383 - AC_SUBST(LIB_OBJECT)
384 - AC_SUBST(LIB_SUFFIX)
385 - AC_SUBST(LIB_PREP)
386 ---- dialog-1.1-20100428/configure
387 -+++ dialog-1.1-20100428/configure
388 -@@ -8305,6 +8305,7 @@
389 -
390 - # common library maintenance symbols that are convenient for libtool scripts:
391 - LIB_CREATE='${AR} -cr'
392 -+LIB_LIBS=''
393 - LIB_OBJECT='${OBJECTS}'
394 - LIB_SUFFIX=.a
395 - LIB_PREP="$RANLIB"
396 -@@ -8409,7 +8410,8 @@
397 - echo "$as_me: error: Cannot find libtool" >&2;}
398 - { (exit 1); exit 1; }; }
399 - fi
400 -- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
401 -+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} ${LDFLAGS} -o'
402 -+ LIB_LIBS='$(LIBS)'
403 - LIB_OBJECT='${OBJECTS:.o=.lo}'
404 - LIB_SUFFIX=.la
405 - LIB_CLEAN='${LIBTOOL} --mode=clean'
406 -@@ -13848,6 +13850,7 @@
407 - s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
408 - s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
409 - s,@LIB_CREATE@,$LIB_CREATE,;t t
410 -+s,@LIB_LIBS@,$LIB_LIBS,;t t
411 - s,@LIB_OBJECT@,$LIB_OBJECT,;t t
412 - s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
413 - s,@LIB_PREP@,$LIB_PREP,;t t
414 ---- dialog-1.1-20100428/makefile.in
415 -+++ dialog-1.1-20100428/makefile.in
416 -@@ -54,6 +54,7 @@
417 - LIBTOOL_CLEAN = @LIB_CLEAN@
418 - LIBTOOL_COMPILE = @LIB_COMPILE@
419 - LIBTOOL_CREATE = @LIB_CREATE@
420 -+LIBTOOL_LIBS = @LIB_LIBS@
421 - LIBTOOL_LINK = @LIB_LINK@
422 - LIBTOOL_INSTALL = @LIB_INSTALL@
423 - LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
424 -@@ -140,11 +141,11 @@
425 - $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
426 -
427 - $(LIB) : $(LIB_OBJECT)
428 -- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
429 -+ $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBTOOL_LIBS)
430 - $(RANLIB) $@
431 -
432 - dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
433 -- $(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
434 -+ $(LINK) $(LDFLAGS) -o $@ dialog$o -L. -ldialog $(LIBS)
435 -
436 - clean \
437 - distclean \
438
439 diff --git a/dev-util/dialog/files/dialog-mkdirs.patch b/dev-util/dialog/files/dialog-mkdirs.patch
440 deleted file mode 100644
441 index 70bdcef40c..0000000000
442 --- a/dev-util/dialog/files/dialog-mkdirs.patch
443 +++ /dev/null
444 @@ -1,16 +0,0 @@
445 ---- mkdirs.sh.orig 2007-03-19 16:28:39.000000000 +0100
446 -+++ mkdirs.sh 2007-03-19 16:28:56.000000000 +0100
447 -@@ -21,11 +21,11 @@
448 - esac
449 -
450 - if test ! -d "$pathcomp"; then
451 -- echo "mkdir $pathcomp" 1>&2
452 -+ echo "mkdir -p $pathcomp" 1>&2
453 - case "$pathcomp" in
454 - [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
455 - ;; # DOSISH systems
456 -- * ) mkdir "$pathcomp" || errstatus=$? ;;
457 -+ * ) mkdir -p "$pathcomp" || errstatus=$? ;;
458 - esac
459 - fi
460 -
461
462 diff --git a/dev-util/dialog/files/dialog-shared.patch b/dev-util/dialog/files/dialog-shared.patch
463 deleted file mode 100644
464 index 9e58ba48a4..0000000000
465 --- a/dev-util/dialog/files/dialog-shared.patch
466 +++ /dev/null
467 @@ -1,80 +0,0 @@
468 ---- dialog-1.1-20080819/aclocal.m4
469 -+++ dialog-1.1-20080819/aclocal.m4
470 -@@ -3037,6 +3037,7 @@
471 - ])
472 - # common library maintenance symbols that are convenient for libtool scripts:
473 - LIB_CREATE='${AR} -cr'
474 -+LIB_LIBS=''
475 - LIB_OBJECT='${OBJECTS}'
476 - LIB_SUFFIX=.a
477 - LIB_PREP="$RANLIB"
478 -@@ -3071,7 +3072,8 @@
479 - AC_MSG_ERROR(Cannot find libtool)
480 - fi
481 - ])dnl
482 -- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
483 -+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LDFLAGS} -o'
484 -+ LIB_LIBS='$(LIBS)'
485 - LIB_OBJECT='${OBJECTS:.o=.lo}'
486 - LIB_SUFFIX=.la
487 - LIB_CLEAN='${LIBTOOL} --mode=clean'
488 -@@ -3114,6 +3116,7 @@
489 - AC_SUBST(LIBTOOL_OPTS)
490 -
491 - AC_SUBST(LIB_CREATE)
492 -+AC_SUBST(LIB_LIBS)
493 - AC_SUBST(LIB_OBJECT)
494 - AC_SUBST(LIB_SUFFIX)
495 - AC_SUBST(LIB_PREP)
496 ---- dialog-1.1-20080819/configure
497 -+++ dialog-1.1-20080819/configure
498 -@@ -7113,6 +7113,7 @@
499 -
500 - # common library maintenance symbols that are convenient for libtool scripts:
501 - LIB_CREATE='${AR} -cr'
502 -+LIB_LIBS=''
503 - LIB_OBJECT='${OBJECTS}'
504 - LIB_SUFFIX=.a
505 - LIB_PREP="$RANLIB"
506 -@@ -7217,7 +7218,8 @@
507 - echo "$as_me: error: Cannot find libtool" >&2;}
508 - { (exit 1); exit 1; }; }
509 - fi
510 -- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
511 -+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LDFLAGS} -o'
512 -+ LIB_LIBS='$(LIBS)'
513 - LIB_OBJECT='${OBJECTS:.o=.lo}'
514 - LIB_SUFFIX=.la
515 - LIB_CLEAN='${LIBTOOL} --mode=clean'
516 -@@ -11460,6 +11462,7 @@
517 - s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
518 - s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
519 - s,@LIB_CREATE@,$LIB_CREATE,;t t
520 -+s,@LIB_LIBS@,$LIB_LIBS,;t t
521 - s,@LIB_OBJECT@,$LIB_OBJECT,;t t
522 - s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
523 - s,@LIB_PREP@,$LIB_PREP,;t t
524 ---- dialog-1.1-20080819/makefile.in
525 -+++ dialog-1.1-20080819/makefile.in
526 -@@ -51,6 +51,7 @@
527 - LIBTOOL_CLEAN = @LIB_CLEAN@
528 - LIBTOOL_COMPILE = @LIB_COMPILE@
529 - LIBTOOL_CREATE = @LIB_CREATE@
530 -+LIBTOOL_LIBS = @LIB_LIBS@
531 - LIBTOOL_LINK = @LIB_LINK@
532 - LIBTOOL_INSTALL = @LIB_INSTALL@
533 - LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
534 -@@ -125,11 +126,11 @@
535 - $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
536 -
537 - $(LIB) : $(LIB_OBJECT)
538 -- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
539 -+ $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBTOOL_LIBS)
540 - $(RANLIB) $@
541 -
542 - dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
543 -- $(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
544 -+ $(LINK) $(LDFLAGS) -o $@ dialog$o -L. -ldialog $(LIBS)
545 -
546 - clean \
547 - distclean \