Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: app-text/aspell/files/, app-text/aspell/
Date: Sat, 29 Dec 2018 17:33:16
Message-Id: 1546104785.faa3385ba0e9d9be5158016dd29f8a05bc6761c8.blueness@gentoo
1 commit: faa3385ba0e9d9be5158016dd29f8a05bc6761c8
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 17:33:05 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 17:33:05 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=faa3385b
7
8 app-text/aspell: moved to the tree
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 app-text/aspell/Manifest | 1 -
13 app-text/aspell/aspell-0.60.7_rc1.ebuild | 100 --------
14 app-text/aspell/files/aspell-0.60.5-nls.patch | 13 -
15 app-text/aspell/files/aspell-0.60.5-solaris.patch | 27 --
16 .../files/aspell-0.60.6-darwin-bundles.patch | 35 ---
17 app-text/aspell/files/aspell-0.60.6.1-clang.patch | 47 ----
18 .../aspell/files/aspell-0.60.6.1-unicode.patch | 276 ---------------------
19 app-text/aspell/metadata.xml | 4 -
20 8 files changed, 503 deletions(-)
21
22 diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
23 deleted file mode 100644
24 index 7ba272c..0000000
25 --- a/app-text/aspell/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
29
30 diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
31 deleted file mode 100644
32 index 1a29313..0000000
33 --- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
34 +++ /dev/null
35 @@ -1,100 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -inherit autotools flag-o-matic libtool toolchain-funcs
42 -
43 -MY_P="${P/_/-}"
44 -
45 -DESCRIPTION="A spell checker replacement for ispell"
46 -HOMEPAGE="http://aspell.net/"
47 -if [[ "${PV}" = *_rc* ]] ; then
48 - SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
49 -else
50 - SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
51 -fi
52 -
53 -LICENSE="LGPL-2"
54 -SLOT="0"
55 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
56 -IUSE="nls unicode"
57 -
58 -PDEPEND="app-dicts/aspell-en"
59 -LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
60 -hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
61 -for lang in ${LANGS}; do
62 - IUSE+=" l10n_${lang}"
63 - case ${lang} in
64 - de-1901) dict="de-alt" ;;
65 - pt-BR) dict="pt-br" ;;
66 - *) dict="${lang}" ;;
67 - esac
68 - PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
69 -done
70 -unset dict lang LANGS
71 -
72 -# English dictionary 0.5 is incompatible with aspell-0.6
73 -RDEPEND="
74 - sys-libs/ncurses:0=[unicode?]
75 - nls? ( virtual/libintl )
76 - !=app-dicts/aspell-en-0.5*
77 -"
78 -DEPEND="${RDEPEND}
79 - virtual/pkgconfig
80 - nls? ( sys-devel/gettext )
81 -"
82 -
83 -S="${WORKDIR}/${MY_P}"
84 -
85 -HTML_DOCS=( manual/aspell{,-dev}.html )
86 -PATCHES=(
87 - "${FILESDIR}/${PN}-0.60.5-nls.patch"
88 - "${FILESDIR}/${PN}-0.60.5-solaris.patch"
89 - "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
90 - "${FILESDIR}/${PN}-0.60.6.1-clang.patch"
91 - # includes fix for bug #467602
92 - "${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
93 -)
94 -
95 -src_prepare() {
96 - default
97 -
98 - rm m4/lt* m4/libtool.m4 || die
99 - eautoreconf
100 - elibtoolize --reverse-deps
101 -
102 - # Parallel install of libtool libraries doesn't always work.
103 - # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
104 - # This has to be after automake has run so that we don't clobber
105 - # the default target that automake creates for us.
106 - echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
107 -
108 - # unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
109 - # any more. Fix this.
110 - [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
111 - append-cppflags -DNCURSES_WIDECHAR=1
112 -}
113 -
114 -src_configure() {
115 - econf \
116 - $(use_enable nls) \
117 - $(use_enable unicode) \
118 - --disable-static \
119 - --sysconfdir="${EPREFIX}"/etc/aspell
120 -}
121 -
122 -src_install() {
123 - default
124 -
125 - docinto examples
126 - dodoc "${S}"/examples/*.c
127 -
128 - # install ispell/aspell compatibility scripts
129 - newbin scripts/ispell ispell-aspell
130 - newbin scripts/spell spell-aspell
131 -
132 - # we explicitly pass '--disable-static' to econf,
133 - # hence we can delete .la files unconditionally
134 - find "${D}" -name '*.la' -delete || die
135 -}
136
137 diff --git a/app-text/aspell/files/aspell-0.60.5-nls.patch b/app-text/aspell/files/aspell-0.60.5-nls.patch
138 deleted file mode 100644
139 index 3ea7c7c..0000000
140 --- a/app-text/aspell/files/aspell-0.60.5-nls.patch
141 +++ /dev/null
142 @@ -1,13 +0,0 @@
143 -Index: aspell-0.60.5/Makefile.am
144 -===================================================================
145 ---- aspell-0.60.5/Makefile.am
146 -+++ aspell-0.60.5/Makefile.am
147 -@@ -129,7 +129,7 @@ word_list_compress_SOURCES = prog/compre
148 -
149 - aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
150 -
151 --aspell_LDADD = libaspell.la $(CURSES_LIB)
152 -+aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL)
153 -
154 - prezip_bin_SOURCES = prog/prezip.c
155 -
156
157 diff --git a/app-text/aspell/files/aspell-0.60.5-solaris.patch b/app-text/aspell/files/aspell-0.60.5-solaris.patch
158 deleted file mode 100644
159 index 1cfc5f3..0000000
160 --- a/app-text/aspell/files/aspell-0.60.5-solaris.patch
161 +++ /dev/null
162 @@ -1,27 +0,0 @@
163 -* grobian@g.o: on Solaris 10 _XOPEN_SOURCE_EXTENDED may not be
164 - defined when including wchar.h with g++
165 -
166 ---- a/prog/check_funs.cpp
167 -+++ b/prog/check_funs.cpp
168 -@@ -18,10 +18,6 @@
169 -
170 - #include "settings.h"
171 -
172 --#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
173 --# define _XOPEN_SOURCE_EXTENDED 1
174 --#endif
175 --
176 - #ifdef CURSES_NON_POSIX
177 - #define CURSES_ONLY 1
178 - #endif
179 -@@ -35,6 +31,10 @@
180 -
181 - #include "gettext.h"
182 -
183 -+#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
184 -+# define _XOPEN_SOURCE_EXTENDED 1
185 -+#endif
186 -+
187 - using namespace acommon;
188 -
189 - StackPtr<CheckerString> state;
190
191 diff --git a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
192 deleted file mode 100644
193 index 84e0583..0000000
194 --- a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
195 +++ /dev/null
196 @@ -1,35 +0,0 @@
197 -grobian@g.o:
198 -Darwin: fix for finding bundles (libtool modules, no equivalent in ELF)
199 -This patch is not really upstreamable, bundles can have any name, but
200 -Apple suggests using .bundle. libtool on Gentoo generates .bundle files
201 -for modules on Darwin, so we need aspell to actually look for .bundle,
202 -not .so.
203 -
204 ---- a/lib/new_filter.cpp
205 -+++ b/lib/new_filter.cpp
206 -@@ -458,11 +458,23 @@
207 - module->file.assign(option_file.str(), slash + 1 - option_file.str());
208 - //module->file += "lib";
209 - module->file += filter_name;
210 -- module->file += "-filter.so";
211 -+ module->file += "-filter."
212 -+#ifdef __APPLE_CC__
213 -+ "bundle"
214 -+#else
215 -+ "so"
216 -+#endif
217 -+ ;
218 - } else {
219 - if (module->file[0] != '/')
220 - module->file.insert(0, option_file.str(), slash + 1 - option_file.str());
221 -- module->file += ".so";
222 -+ module->file += "."
223 -+#ifdef __APPLE_CC__
224 -+ "bundle"
225 -+#else
226 -+ "so"
227 -+#endif
228 -+ ;
229 - }
230 -
231 - return module.release();
232
233 diff --git a/app-text/aspell/files/aspell-0.60.6.1-clang.patch b/app-text/aspell/files/aspell-0.60.6.1-clang.patch
234 deleted file mode 100644
235 index 8d3e62d..0000000
236 --- a/app-text/aspell/files/aspell-0.60.6.1-clang.patch
237 +++ /dev/null
238 @@ -1,47 +0,0 @@
239 -From https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=180565
240 ---- a/interfaces/cc/aspell.h
241 -+++ b/interfaces/cc/aspell.h
242 -@@ -237,6 +237,7 @@
243 - /******************************** errors ********************************/
244 -
245 -
246 -+#ifndef ASPELL_ERRORS__HPP
247 - extern const struct AspellErrorInfo * const aerror_other;
248 - extern const struct AspellErrorInfo * const aerror_operation_not_supported;
249 - extern const struct AspellErrorInfo * const aerror_cant_copy;
250 -@@ -322,6 +323,7 @@
251 - extern const struct AspellErrorInfo * const aerror_bad_magic;
252 - extern const struct AspellErrorInfo * const aerror_expression;
253 - extern const struct AspellErrorInfo * const aerror_invalid_expression;
254 -+#endif
255 -
256 -
257 - /******************************* speller *******************************/
258 ---- a/prog/aspell.cpp
259 -+++ b/prog/aspell.cpp
260 -@@ -25,6 +25,7 @@
261 - # include <langinfo.h>
262 - #endif
263 -
264 -+#include "errors.hpp"
265 - #include "aspell.h"
266 -
267 - #ifdef USE_FILE_INO
268 -@@ -40,7 +41,6 @@
269 - #include "convert.hpp"
270 - #include "document_checker.hpp"
271 - #include "enumeration.hpp"
272 --#include "errors.hpp"
273 - #include "file_util.hpp"
274 - #include "fstream.hpp"
275 - #include "info.hpp"
276 ---- a/prog/checker_string.hpp
277 -+++ b/prog/checker_string.hpp
278 -@@ -6,6 +6,7 @@
279 -
280 - #include <stdio.h>
281 -
282 -+#include "errors.hpp"
283 - #include "aspell.h"
284 -
285 - #include "vector.hpp"
286
287 diff --git a/app-text/aspell/files/aspell-0.60.6.1-unicode.patch b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch
288 deleted file mode 100644
289 index 8e1957c..0000000
290 --- a/app-text/aspell/files/aspell-0.60.6.1-unicode.patch
291 +++ /dev/null
292 @@ -1,276 +0,0 @@
293 ---- a/configure.ac
294 -+++ b/configure.ac
295 -@@ -2,7 +2,7 @@
296 - AC_CONFIG_SRCDIR(prog/aspell.cpp)
297 - AC_CANONICAL_SYSTEM
298 - AM_INIT_AUTOMAKE
299 --AM_CONFIG_HEADER(gen/settings.h)
300 -+AC_CONFIG_HEADERS([gen/settings.h])
301 -
302 - AM_MAINTAINER_MODE
303 -
304 -@@ -52,14 +52,11 @@
305 - AC_ARG_ENABLE(win32-relocatable,
306 - [ --enable-win32-relocatable])
307 -
308 --AC_ARG_ENABLE(curses,
309 -- AS_HELP_STRING([--enable-curses=LIBFILE],[cursor control library]))
310 -+AC_ARG_ENABLE([curses],
311 -+ AS_HELP_STRING([--enable-curses],[cursor control library]))
312 -
313 --AC_ARG_ENABLE(curses-include,
314 -- [ --enable-curses-include=DIR])
315 --
316 --AC_ARG_ENABLE(wide-curses,
317 -- AS_HELP_STRING([--disable-wide-curses],[disable wide char utf8 cursor control]))
318 -+AC_ARG_ENABLE([unicode],
319 -+ AS_HELP_STRING([--enable-unicode],[enable Unicode support]))
320 -
321 - AC_ARG_ENABLE(regex,
322 - [ --disable-regex])
323 -@@ -312,197 +309,18 @@
324 - [AC_MSG_RESULT(no)]
325 - )
326 -
327 --AC_SUBST(CURSES_LIB)
328 --AC_SUBST(CURSES_INCLUDE)
329 --
330 --if test "$enable_curses" != "no"
331 --then
332 -- use_curses=t
333 -- case "$enable_curses" in
334 -- yes | "" ) ;;
335 -- /* | *lib* | *.a | -l* | -L* ) CURSES_LIB="$enable_curses" ;;
336 -- * ) CURSES_LIB=-l$enable_curses ;;
337 -- esac
338 -- case "$enable_curses_include" in
339 -- yes | no | "") ;;
340 -- -I* ) CURSES_INCLUDE="$enable_curses_include" ;;
341 -- * ) CURSES_INCLUDE=-I$enable_curses_include ;;
342 -- esac
343 --fi
344 --
345 --if test "$use_curses"
346 --then
347 --
348 -- ORIG_LIBS="$LIBS"
349 -- ORIG_CPPFLAGS="$CPPFLAGS"
350 -- CPPFLAGS="$CURSES_INCLUDE $ORIG_CPPFLAGS"
351 --
352 -- if test -z "$CURSES_LIB"
353 -- then
354 --
355 -- AC_MSG_CHECKING(for working curses library)
356 --
357 -- if test "$enable_wide_curses" != "no" -a -n "$have_mblen"
358 -- then
359 -- LIBS="-lncursesw $ORIG_LIBS"
360 -- AC_TRY_LINK(
361 -- [#include <ncursesw/curses.h>], [initscr()],
362 -- [CURSES_LIB=-lncursesw
363 -- AC_DEFINE(CURSES_HEADER, <ncursesw/curses.h>, [Defined to curses header file])
364 -- AC_DEFINE(TERM_HEADER, <ncursesw/term.h>, [Defined to term header file])])
365 -- fi
366 --
367 -- if test -z "$CURSES_LIB"
368 -- then
369 -- LIBS="-lncurses $ORIG_LIBS"
370 -- AC_TRY_LINK(
371 -- [#include <ncurses/curses.h>], [initscr()],
372 -- [CURSES_LIB=-lncurses
373 -- AC_DEFINE(CURSES_HEADER, <ncurses/curses.h>, [Defined to curses header file])
374 -- AC_DEFINE(TERM_HEADER, <ncurses/term.h>, [Defined to term header file])],
375 -- [
376 -- LIBS="-lncurses $ORIG_LIBS"
377 -- AC_TRY_LINK(
378 -- [#include <ncurses.h>], [initscr()],
379 -- [CURSES_LIB=-lncurses
380 -- AC_DEFINE(CURSES_HEADER, <ncurses.h>, [Defined to curses header file])
381 -- AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
382 -- [
383 -- LIBS="-lcurses $ORIG_LIBS"
384 -- AC_TRY_LINK(
385 -- [#include <curses.h>], [initscr()],
386 -- [CURSES_LIB=-lcurses
387 -- AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
388 -- AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
389 -- [
390 -- LIBS="-lncurses $ORIG_LIBS"
391 -- AC_TRY_LINK(
392 -- [#include <curses.h>], [initscr()],
393 -- [CURSES_LIB=-lncurses
394 -- AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
395 -- AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
396 -- ) ]) ]) ])
397 -- fi
398 --
399 -- if test -n "$CURSES_LIB"
400 -- then
401 -- AC_MSG_RESULT([found in $CURSES_LIB])
402 -- else
403 -- AC_MSG_RESULT([not found])
404 -- fi
405 --
406 -- else
407 --
408 -- AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
409 -- AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])
410 --
411 -- fi
412 --
413 -- if test -n "$CURSES_LIB"
414 -- then
415 -- LIBS="$CURSES_LIB $ORIG_LIBS"
416 --
417 -- if test "$enable_wide_curses" != "no"
418 -- then
419 --
420 -- AC_MSG_CHECKING(for wide character support in curses libraray)
421 -- if test -n "$have_mblen"
422 -- then
423 -- AC_TRY_LINK(
424 -- [#include <wchar.h>
425 -- #include CURSES_HEADER
426 -- ],
427 -- [wchar_t wch = 0;
428 -- addnwstr(&wch, 1);],
429 -- [AC_MSG_RESULT(yes)
430 -- AC_DEFINE(HAVE_WIDE_CURSES, 1, [Defined if curses libraray includes wide character support])],
431 -- [
432 --
433 -- AC_TRY_LINK(
434 -- [#define _XOPEN_SOURCE_EXTENDED 1
435 -- #include <wchar.h>
436 -- #include CURSES_HEADER
437 -- ],
438 -- [wchar_t wch = 0;
439 -- addnwstr(&wch, 1);],
440 -- [AC_MSG_RESULT(yes)
441 -- AC_DEFINE(HAVE_WIDE_CURSES, 1)
442 -- AC_DEFINE(DEFINE_XOPEN_SOURCE_EXTENDED, 1,
443 -- [Defined if _XOPEN_SOURCE_EXTENDED needs to be defined.
444 -- (Can't define globally as that will cause problems with some systems)])
445 -- ],
446 -- [AC_MSG_RESULT(no)
447 -- AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])])])
448 -- else
449 -- AC_MSG_RESULT([no, because "mblen" is not supported])
450 -- AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])
451 -- fi
452 --
453 -- fi
454 --
455 -- AC_MSG_CHECKING(if standard curses include sequence will work)
456 -- AC_TRY_LINK(
457 -- [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
458 -- # define _XOPEN_SOURCE_EXTENDED 1
459 -- #endif
460 -- #include <termios.h>
461 -- #include <unistd.h>
462 -- #include CURSES_HEADER
463 -- #include TERM_HEADER
464 -- ],
465 -- [tigetstr(const_cast<char *>("cup"));],
466 -- [AC_MSG_RESULT(yes)
467 -- AC_DEFINE(HAVE_LIBCURSES, 1,
468 -- [Defined if the curses library is available])
469 -- posix_termios=t
470 -- AC_DEFINE(CURSES_INCLUDE_STANDARD, 1,
471 -- [Defined if no special Workarounds are needed for Curses headers])],
472 -- [AC_MSG_RESULT(no)
473 --
474 -- dnl else if
475 -- AC_MSG_CHECKING(if curses workaround I will work)
476 -- AC_TRY_LINK(
477 -- [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
478 -- # define _XOPEN_SOURCE_EXTENDED 1
479 -- #endif
480 -- #include <termios.h>
481 -- #include <unistd.h>
482 -- #include CURSES_HEADER
483 -- extern "C" {char * tigetstr(char * capname);}],
484 -- [tigetstr(const_cast<char *>("cup"));],
485 -- [AC_MSG_RESULT(yes)
486 -- AC_DEFINE(HAVE_LIBCURSES, 1, [])
487 -- posix_termios=t
488 -- AC_DEFINE(CURSES_INCLUDE_WORKAROUND_1, 1,
489 -- [Defined if special Wordaround I is need for Curses headers])],
490 -- [AC_MSG_RESULT(no)
491 --
492 -- dnl else if
493 -- AC_MSG_CHECKING(if curses without Unix stuff will work)
494 -- AC_TRY_LINK(
495 -- [#include CURSES_HEADER
496 -- ],
497 -- [initscr();],
498 -- [AC_MSG_RESULT(yes)
499 -- AC_DEFINE(HAVE_LIBCURSES, 1, [])
500 -- AC_DEFINE(CURSES_ONLY, 1,
501 -- [Defined if curses like POSIX Functions should be used])
502 -- curses_only=t],
503 -- [AC_MSG_RESULT(no)
504 --
505 -- dnl else
506 -- use_curses=false
507 -- CURSES_LIBS=""
508 -- CURSES_INCLUDE=""
509 --
510 -- ]) ]) ])
511 --
512 -- fi
513 --
514 -- CPPFLAGS="$ORIG_CPPFLAGS"
515 -- LIBS="$ORIG_LIBS"
516 --
517 --fi
518 -+AS_IF([test "x$enable_curses" != "xno"],[
519 -+ AS_IF([test "x$enable_unicode" != "xno"],
520 -+ [AC_DEFINE([HAVE_WIDE_CURSES], [1], [Defined if curses library includes wide character support])
521 -+ ncurses_library="ncursesw"],
522 -+ [ncurses_library="ncurses"])
523 -+
524 -+ PKG_CHECK_MODULES([NCURSES], ["$ncurses_library"])
525 -+
526 -+ AC_DEFINE([HAVE_LIBCURSES], [1], [Defined if the curses library is available])
527 -+ AC_DEFINE([CURSES_INCLUDE_STANDARD], [1], [Defined if no special Workarounds are needed for Curses headers])
528 -+ posix_termios=t
529 -+])
530 -
531 - if test -z "$posix_termios" -a -z "$curses_only"
532 - then
533 ---- a/Makefile.am
534 -+++ b/Makefile.am
535 -@@ -121,7 +121,7 @@
536 - # Aspell Program
537 - #
538 -
539 --AM_CPPFLAGS += -DLOCALEDIR="$(localedir)"
540 -+AM_CPPFLAGS += -DLOCALEDIR="$(localedir)" $(NCURSES_CFLAGS)
541 -
542 - bin_PROGRAMS = word-list-compress aspell prezip-bin
543 -
544 -@@ -129,7 +129,7 @@
545 -
546 - aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
547 -
548 --aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL)
549 -+aspell_LDADD = libaspell.la $(NCURSES_LIBS) $(LTLIBINTL)
550 -
551 - prezip_bin_SOURCES = prog/prezip.c
552 -
553 ---- a/prog/check_funs.cpp
554 -+++ b/prog/check_funs.cpp
555 -@@ -62,11 +62,11 @@
556 -
557 - #if HAVE_LIBCURSES
558 -
559 --#include CURSES_HEADER
560 -+#include <curses.h>
561 -
562 - #if CURSES_INCLUDE_STANDARD
563 -
564 --#include TERM_HEADER
565 -+#include <term.h>
566 -
567 - #elif CURSES_INCLUDE_WORKAROUND_1
568 -
569
570 diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
571 deleted file mode 100644
572 index 097975e..0000000
573 --- a/app-text/aspell/metadata.xml
574 +++ /dev/null
575 @@ -1,4 +0,0 @@
576 -<?xml version="1.0" encoding="UTF-8"?>
577 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
578 -<pkgmetadata>
579 -</pkgmetadata>
Report Message
Find on MARC Find on Google Groups