diff options
Diffstat (limited to 'app-text/aspell')
-rw-r--r-- | app-text/aspell/ChangeLog | 10 | ||||
-rw-r--r-- | app-text/aspell/aspell-0.60.3-r1.ebuild | 71 | ||||
-rw-r--r-- | app-text/aspell/aspell-0.60.3.ebuild | 68 | ||||
-rw-r--r-- | app-text/aspell/aspell-0.60.4-r1.ebuild | 86 | ||||
-rw-r--r-- | app-text/aspell/aspell-0.60.4-r2.ebuild | 105 | ||||
-rw-r--r-- | app-text/aspell/aspell-0.60.4.ebuild | 83 | ||||
-rw-r--r-- | app-text/aspell/aspell-0.60.5.ebuild | 14 | ||||
-rw-r--r-- | app-text/aspell/files/01-gcc3.3-assert.patch | 10 | ||||
-rw-r--r-- | app-text/aspell/files/02-gcc3.3-constcast.patch | 11 | ||||
-rw-r--r-- | app-text/aspell/files/aspell-0.60.4-gcc-4.1-fix.patch | 12 | ||||
-rw-r--r-- | app-text/aspell/files/aspell-0.60.4-nls.patch | 22 | ||||
-rw-r--r-- | app-text/aspell/files/aspell-buffer-fix.patch | 71 | ||||
-rw-r--r-- | app-text/aspell/files/digest-aspell-0.60.3 | 3 | ||||
-rw-r--r-- | app-text/aspell/files/digest-aspell-0.60.3-r1 | 3 | ||||
-rw-r--r-- | app-text/aspell/files/digest-aspell-0.60.4 | 3 | ||||
-rw-r--r-- | app-text/aspell/files/digest-aspell-0.60.4-r1 | 3 | ||||
-rw-r--r-- | app-text/aspell/files/digest-aspell-0.60.4-r2 | 3 |
17 files changed, 17 insertions, 561 deletions
diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog index d2a42b3db724..76268b4e80ea 100644 --- a/app-text/aspell/ChangeLog +++ b/app-text/aspell/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-text/aspell # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.96 2007/08/10 05:15:34 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.97 2007/08/18 12:18:25 philantrop Exp $ + + 18 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> + -files/01-gcc3.3-assert.patch, -files/aspell-0.60.4-gcc-4.1-fix.patch, + -files/02-gcc3.3-constcast.patch, -files/aspell-0.60.4-nls.patch, + -files/aspell-buffer-fix.patch, -aspell-0.60.3.ebuild, + -aspell-0.60.3-r1.ebuild, -aspell-0.60.4.ebuild, -aspell-0.60.4-r1.ebuild, + -aspell-0.60.4-r2.ebuild, aspell-0.60.5.ebuild: + Added the examples USE flag as per bug 111508. Removed obsolete versions. 10 Aug 2007; Jeroen Roovers <jer@gentoo.org> aspell-0.60.5.ebuild: Stable for HPPA (bug #178690). diff --git a/app-text/aspell/aspell-0.60.3-r1.ebuild b/app-text/aspell/aspell-0.60.3-r1.ebuild deleted file mode 100644 index 040050e59668..000000000000 --- a/app-text/aspell/aspell-0.60.3-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.3-r1.ebuild,v 1.4 2007/03/04 07:27:33 genone Exp $ - -inherit libtool eutils flag-o-matic - -DESCRIPTION="A spell checker replacement for ispell" -HOMEPAGE="http://aspell.net/" -SRC_URI="mirror://gnu/aspell/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86" -IUSE="gpm" -# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together - -DEPEND=">=sys-libs/ncurses-5.2 - gpm? ( sys-libs/gpm ) - !=app-dicts/aspell-en-0.5*" -# English dictionary 0.5 is incompatible with aspell-0.6 - -src_unpack() { - unpack ${A}; cd ${S} - epatch ${FILESDIR}/${P}-templateinstantiations.patch -} - -src_compile() { - [ "${ARCH}" == "ppc" ] && append-flags -O2 -fsigned-char - use gpm && append-ldflags -lgpm - filter-flags -fno-rtti - filter-flags -fvisibility=hidden #77109 - elibtoolize --reverse-deps - - econf \ - --disable-static \ - --sysconfdir=/etc/aspell \ - --enable-docdir=/usr/share/doc/${PF} || die - - emake || die -} - -src_install() { - dodoc README* TODO - - make DESTDIR="${D}" install || die - mv ${D}/usr/share/doc/${PF}/man-html ${D}/usr/share/doc/${PF}/html - mv ${D}/usr/share/doc/${PF}/man-text ${D}/usr/share/doc/${PF}/text - - # install ispell/aspell compatibility scripts - exeinto /usr/bin - newexe scripts/ispell ispell-aspell - newexe scripts/spell spell-aspell - - cd examples - make clean || die - docinto examples - dodoc ${S}/examples/* -} - -pkg_postinst() { - elog "You will need to install a dictionary now. Please choose an" - elog "aspell-<LANG> dictionary from the app-dicts category" - elog "After installing an aspell dictionary for your language(s)," - elog "You may use the aspell-import utility to import your personal" - elog "dictionaries from ispell, pspell and the older aspell" - - ewarn "" - ewarn "Please re-emerge ALL your aspell-LANG dictionaries" - ewarn "" - ebeep 5 -} diff --git a/app-text/aspell/aspell-0.60.3.ebuild b/app-text/aspell/aspell-0.60.3.ebuild deleted file mode 100644 index 83ac68a10325..000000000000 --- a/app-text/aspell/aspell-0.60.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.3.ebuild,v 1.6 2007/03/04 07:27:33 genone Exp $ - -inherit libtool eutils flag-o-matic - -DESCRIPTION="A spell checker replacement for ispell" -HOMEPAGE="http://aspell.net/" -SRC_URI="mirror://gnu/aspell/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86" -IUSE="gpm" - -DEPEND=">=sys-libs/ncurses-5.2 - gpm? ( sys-libs/gpm )" - -src_unpack() { - unpack ${A}; cd ${S} - epatch ${FILESDIR}/${P}-templateinstantiations.patch -} - -src_compile() { - [ "${ARCH}" == "ppc" ] && append-flags -O2 -fsigned-char - use gpm && append-ldflags -lgpm - filter-flags -fno-rtti - filter-flags -fvisibility=hidden #77109 - elibtoolize --reverse-deps - - econf \ - --disable-static \ - --sysconfdir=/etc/aspell \ - --enable-docdir=/usr/share/doc/${PF} || die - - emake || die -} - -src_install() { - dodoc README* TODO - - make DESTDIR="${D}" install || die - mv ${D}/usr/share/doc/${PF}/man-html ${D}/usr/share/doc/${PF}/html - mv ${D}/usr/share/doc/${PF}/man-text ${D}/usr/share/doc/${PF}/text - - # install ispell/aspell compatibility scripts - exeinto /usr/bin - newexe scripts/ispell ispell-aspell - newexe scripts/spell spell-aspell - - cd examples - make clean || die - docinto examples - dodoc ${S}/examples/* -} - -pkg_postinst() { - elog "You will need to install a dictionary now. Please choose an" - elog "aspell-<LANG> dictionary from the app-dicts category" - elog "After installing an aspell dictionary for your language(s)," - elog "You may use the aspell-import utility to import your personal" - elog "dictionaries from ispell, pspell and the older aspell" - - ewarn "" - ewarn "Please re-emerge ALL your aspell-LANG dictionaries" - ewarn "" - ebeep 5 -} diff --git a/app-text/aspell/aspell-0.60.4-r1.ebuild b/app-text/aspell/aspell-0.60.4-r1.ebuild deleted file mode 100644 index 9b49b65abb5b..000000000000 --- a/app-text/aspell/aspell-0.60.4-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.4-r1.ebuild,v 1.2 2007/03/04 07:27:33 genone Exp $ - -# N.B. This is before inherit of autotools, as autotools.eclass adds the -# relevant dependencies to DEPEND. -WANT_AUTOMAKE="1.9" - -inherit libtool eutils flag-o-matic autotools - -DESCRIPTION="A spell checker replacement for ispell" -HOMEPAGE="http://aspell.net/" -SRC_URI="mirror://gnu/aspell/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="gpm nls" -# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together - -RDEPEND=">=sys-libs/ncurses-5.2 - gpm? ( sys-libs/gpm ) - nls? ( virtual/libintl ) - !=app-dicts/aspell-en-0.5*" -# English dictionary 0.5 is incompatible with aspell-0.6 - -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/aspell-0.60.3-templateinstantiations.patch - epatch "${FILESDIR}"/aspell-0.60.4-gcc-4.1-fix.patch - epatch "${FILESDIR}/${P}-nls.patch" - - eautomake - elibtoolize --reverse-deps -} - -src_compile() { - use gpm && append-ldflags -lgpm - filter-flags -fno-rtti - filter-flags -fvisibility=hidden #77109 - filter-flags -maltivec -mabi=altivec - use ppc && append-flags -mno-altivec - - econf \ - $(use_enable nls) \ - --disable-static \ - --sysconfdir=/etc/aspell \ - --enable-docdir=/usr/share/doc/${PF} || die - - emake || die -} - -src_install() { - dodoc README* TODO - - make DESTDIR="${D}" install || die - mv "${D}"/usr/share/doc/${PF}/man-html "${D}"/usr/share/doc/${PF}/html - mv "${D}"/usr/share/doc/${PF}/man-text "${D}"/usr/share/doc/${PF}/text - - # install ispell/aspell compatibility scripts - exeinto /usr/bin - newexe scripts/ispell ispell-aspell - newexe scripts/spell spell-aspell - - cd examples - make clean || die - docinto examples - dodoc ${S}/examples/* -} - -pkg_postinst() { - elog "You will need to install a dictionary now. Please choose an" - elog "aspell-<LANG> dictionary from the app-dicts category" - elog "After installing an aspell dictionary for your language(s)," - elog "You may use the aspell-import utility to import your personal" - elog "dictionaries from ispell, pspell and the older aspell" - - ewarn "" - ewarn "Please re-emerge ALL your aspell-LANG dictionaries" - ewarn "" - ebeep 5 -} diff --git a/app-text/aspell/aspell-0.60.4-r2.ebuild b/app-text/aspell/aspell-0.60.4-r2.ebuild deleted file mode 100644 index 2140926fda3c..000000000000 --- a/app-text/aspell/aspell-0.60.4-r2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.4-r2.ebuild,v 1.2 2007/03/04 07:27:33 genone Exp $ - -# N.B. This is before inherit of autotools, as autotools.eclass adds the -# relevant dependencies to DEPEND. -WANT_AUTOMAKE="1.9" - -inherit libtool eutils flag-o-matic autotools - -DESCRIPTION="A spell checker replacement for ispell" -HOMEPAGE="http://aspell.net/" -SRC_URI="mirror://gnu/aspell/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="gpm nls" -# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together - -# Build PDEPEND from list of language codes provided in the tree. -# The PDEPEND string is static - this code just makes it easier to maintain. -def="app-dicts/aspell-en" -for l in \ - "af" "be" "bg" "br" "ca" "cs" "cy" "da" "de" "el" \ - "en" "eo" "es" "et" "fi" "fo" "fr" "ga" "gl" "he" \ - "hr" "is" "it" "nl" "no" "pl" "pt" "ro" "ru" "sk" \ - "sl" "sr" "sv" "uk" "vi"; do - dep="linguas_${l}? ( app-dicts/aspell-${l} )" - [[ -z ${PDEPEND} ]] && - PDEPEND="${dep}" || - PDEPEND="${PDEPEND} -${dep}" - def="!linguas_${l}? ( ${def} )" -done -PDEPEND="${PDEPEND} -${def}" - -RDEPEND=">=sys-libs/ncurses-5.2 - virtual/aspell-dict - gpm? ( sys-libs/gpm ) - nls? ( virtual/libintl ) - !=app-dicts/aspell-en-0.5*" -# English dictionary 0.5 is incompatible with aspell-0.6 - -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/aspell-0.60.3-templateinstantiations.patch - epatch "${FILESDIR}"/aspell-0.60.4-gcc-4.1-fix.patch - epatch "${FILESDIR}/${P}-nls.patch" - - eautomake - elibtoolize --reverse-deps -} - -src_compile() { - use gpm && append-ldflags -lgpm - filter-flags -fno-rtti - filter-flags -fvisibility=hidden #77109 - filter-flags -maltivec -mabi=altivec - use ppc && append-flags -mno-altivec - - econf \ - $(use_enable nls) \ - --disable-static \ - --sysconfdir=/etc/aspell \ - --enable-docdir=/usr/share/doc/${PF} || die - - emake || die -} - -src_install() { - dodoc README* TODO - - make DESTDIR="${D}" install || die - mv "${D}"/usr/share/doc/${PF}/man-html "${D}"/usr/share/doc/${PF}/html - mv "${D}"/usr/share/doc/${PF}/man-text "${D}"/usr/share/doc/${PF}/text - - # install ispell/aspell compatibility scripts - exeinto /usr/bin - newexe scripts/ispell ispell-aspell - newexe scripts/spell spell-aspell - - cd examples - make clean || die - docinto examples - dodoc ${S}/examples/* -} - -pkg_postinst() { - elog "You will need to install a dictionary now. Please choose an" - elog "aspell-<LANG> dictionary from the app-dicts category" - elog "After installing an aspell dictionary for your language(s)," - elog "You may use the aspell-import utility to import your personal" - elog "dictionaries from ispell, pspell and the older aspell" - - ewarn "" - ewarn "Please re-emerge ALL your aspell-LANG dictionaries" - ewarn "" - ebeep 5 -} diff --git a/app-text/aspell/aspell-0.60.4.ebuild b/app-text/aspell/aspell-0.60.4.ebuild deleted file mode 100644 index b93f2ef8f64a..000000000000 --- a/app-text/aspell/aspell-0.60.4.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.4.ebuild,v 1.10 2007/03/04 07:27:33 genone Exp $ - -# N.B. This is before inherit of autotools, as autotools.eclass adds the -# relevant dependencies to DEPEND. -WANT_AUTOMAKE="1.9" - -inherit libtool eutils flag-o-matic autotools - -DESCRIPTION="A spell checker replacement for ispell" -HOMEPAGE="http://aspell.net/" -SRC_URI="mirror://gnu/aspell/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="gpm nls" - -RDEPEND=">=sys-libs/ncurses-5.2 - gpm? ( sys-libs/gpm ) - nls? ( virtual/libintl )" - -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/aspell-0.60.3-templateinstantiations.patch - epatch "${FILESDIR}"/aspell-0.60.4-gcc-4.1-fix.patch - epatch "${FILESDIR}/${P}-nls.patch" - - eautomake - elibtoolize --reverse-deps -} - -src_compile() { - use gpm && append-ldflags -lgpm - filter-flags -fno-rtti - filter-flags -fvisibility=hidden #77109 - filter-flags -maltivec -mabi=altivec - use ppc && append-flags -mno-altivec - - econf \ - $(use_enable nls) \ - --disable-static \ - --sysconfdir=/etc/aspell \ - --enable-docdir=/usr/share/doc/${PF} || die - - emake || die -} - -src_install() { - dodoc README* TODO - - make DESTDIR="${D}" install || die - mv "${D}"/usr/share/doc/${PF}/man-html "${D}"/usr/share/doc/${PF}/html - mv "${D}"/usr/share/doc/${PF}/man-text "${D}"/usr/share/doc/${PF}/text - - # install ispell/aspell compatibility scripts - exeinto /usr/bin - newexe scripts/ispell ispell-aspell - newexe scripts/spell spell-aspell - - cd examples - make clean || die - docinto examples - dodoc ${S}/examples/* -} - -pkg_postinst() { - elog "You will need to install a dictionary now. Please choose an" - elog "aspell-<LANG> dictionary from the app-dicts category" - elog "After installing an aspell dictionary for your language(s)," - elog "You may use the aspell-import utility to import your personal" - elog "dictionaries from ispell, pspell and the older aspell" - - ewarn "" - ewarn "Please re-emerge ALL your aspell-LANG dictionaries" - ewarn "" - ebeep 5 -} diff --git a/app-text/aspell/aspell-0.60.5.ebuild b/app-text/aspell/aspell-0.60.5.ebuild index 85f4251a84b8..6a4f4e13e134 100644 --- a/app-text/aspell/aspell-0.60.5.ebuild +++ b/app-text/aspell/aspell-0.60.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.5.ebuild,v 1.13 2007/08/10 05:15:34 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.5.ebuild,v 1.14 2007/08/18 12:18:25 philantrop Exp $ # N.B. This is before inherit of autotools, as autotools.eclass adds the # relevant dependencies to DEPEND. @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/aspell/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" -IUSE="gpm nls" +IUSE="gpm nls examples" # Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together # Build PDEPEND from list of language codes provided in the tree. @@ -83,10 +83,12 @@ src_install() { newexe scripts/ispell ispell-aspell newexe scripts/spell spell-aspell - cd examples - make clean || die - docinto examples - dodoc ${S}/examples/* + if use examples ; then + cd examples + make clean || die + docinto examples + dodoc ${S}/examples/* + fi } pkg_postinst() { diff --git a/app-text/aspell/files/01-gcc3.3-assert.patch b/app-text/aspell/files/01-gcc3.3-assert.patch deleted file mode 100644 index c7ed293ed43b..000000000000 --- a/app-text/aspell/files/01-gcc3.3-assert.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./prog/checker_string.cpp 2002-09-26 03:42:42.000000000 +0100 -+++ ./prog/checker_string.cpp 2003-06-11 22:05:01.840685592 +0100 -@@ -9,6 +9,7 @@ - #include "document_checker.hpp" - #include "copy_ptr-t.hpp" - #include "asc_ctype.hpp" -+#include <assert.h> - - static int get_line(FILE * in, CharVector & d) - { diff --git a/app-text/aspell/files/02-gcc3.3-constcast.patch b/app-text/aspell/files/02-gcc3.3-constcast.patch deleted file mode 100644 index bd83741d0bfe..000000000000 --- a/app-text/aspell/files/02-gcc3.3-constcast.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./common/posib_err.cpp.orig 2003-06-11 22:18:42.595911832 +0100 -+++ ./common/posib_err.cpp 2003-06-11 22:19:05.749391968 +0100 -@@ -74,7 +74,7 @@ - { - assert(err_ != 0); - assert(err_->refcount == 1); -- char * & m = const_cast<char *>(err_->err->mesg); -+ char * m = const_cast<char *>(err_->err->mesg); - unsigned int orig_len = strlen(m); - unsigned int new_len = fn.size() + 2 + orig_len + 1; - char * s = new char[new_len]; diff --git a/app-text/aspell/files/aspell-0.60.4-gcc-4.1-fix.patch b/app-text/aspell/files/aspell-0.60.4-gcc-4.1-fix.patch deleted file mode 100644 index 04e650965b7e..000000000000 --- a/app-text/aspell/files/aspell-0.60.4-gcc-4.1-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur aspell-0.60.4-orig/modules/filter/nroff.cpp aspell-0.60.4/modules/filter/nroff.cpp ---- aspell-0.60.4-orig/modules/filter/nroff.cpp 2005-11-13 01:37:37.000000000 -0500 -+++ aspell-0.60.4/modules/filter/nroff.cpp 2005-11-13 01:38:16.000000000 -0500 -@@ -73,7 +73,7 @@ - return false; - } - -- bool NroffFilter::process_char (FilterChar::Chr c); -+ bool process_char (FilterChar::Chr c); - - public: - diff --git a/app-text/aspell/files/aspell-0.60.4-nls.patch b/app-text/aspell/files/aspell-0.60.4-nls.patch deleted file mode 100644 index 4041d49a98a8..000000000000 --- a/app-text/aspell/files/aspell-0.60.4-nls.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: aspell-0.60.4/Makefile.am -=================================================================== ---- aspell-0.60.4.orig/Makefile.am -+++ aspell-0.60.4/Makefile.am -@@ -91,7 +91,7 @@ libaspell_la_SOURCES =\ - lib/string_pair_enumeration-c.cpp\ - lib/new_checker.cpp - --libaspell_la_LIBADD = $(LIBINTL) $(PTHREAD_LIB) -+libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB) - - if INCREMENTED_SONAME - libaspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined -@@ -129,7 +129,7 @@ word_list_compress_SOURCES = prog/compre - - aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp - --aspell_LDADD = libaspell.la $(CURSES_LIB) -+aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL) - - prezip_bin_SOURCES = prog/prezip.c - diff --git a/app-text/aspell/files/aspell-buffer-fix.patch b/app-text/aspell/files/aspell-buffer-fix.patch deleted file mode 100644 index c0b0de6be0e5..000000000000 --- a/app-text/aspell/files/aspell-buffer-fix.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -urN aspell-0.50.5/prog/compress.c aspell-0.50.5.new/prog/compress.c ---- aspell-0.50.5/prog/compress.c 2002-08-31 11:51:11.000000000 -0700 -+++ aspell-0.50.5.new/prog/compress.c 2004-06-16 10:14:42.000000000 -0700 -@@ -28,6 +28,11 @@ - - #endif - -+#define WORD_BUFF_SIZE 256 -+ -+int count = 0; -+ -+ - void usage () - { - fputs("Compresses or uncompresses sorted word lists.\n" , stderr); -@@ -45,8 +50,9 @@ - if (c == EOF) return 0; - do { - *w++ = (char)(c); -- } while (c = getc(in), c != EOF && c > 32); -+ } while (c = getc(in), c != EOF && c > 32 && count < (WORD_BUFF_SIZE - 1)); - *w = '\0'; -+ count++; - ungetc(c, in); - if (c == EOF) return 0; - else return 1; -@@ -61,14 +67,15 @@ - - } else if (argv[1][0] == 'c') { - -- char s1[256]; -- char s2[256]; -+ char s1[WORD_BUFF_SIZE]; -+ char s2[WORD_BUFF_SIZE]; - char * prev = s2; - char * cur = s1; - *prev = '\0'; - - SETBIN (stdout); - -+ while (count < WORD_BUFF_SIZE) { - while (get_word(stdin, cur)) { - int i = 0; - /* get the length of the prefix */ -@@ -85,11 +92,12 @@ - prev = s2; cur = s1; - } - } -+ } - return 0; - - } else if (argv[1][0] == 'd') { - -- char cur[256]; -+ char cur[WORD_BUFF_SIZE]; - int i; - int c; - -@@ -100,8 +108,11 @@ - if (i == 0) - i = getc(stdin); - --i; -- while ((c = getc(stdin)) > 32) -+ while ((c = getc(stdin)) > 32 && i < (WORD_BUFF_SIZE -1)) { - cur[i++] = (char)c; -+ count++; -+ } -+ - cur[i] = '\0'; - fputs(cur, stdout); - putc('\n', stdout); diff --git a/app-text/aspell/files/digest-aspell-0.60.3 b/app-text/aspell/files/digest-aspell-0.60.3 deleted file mode 100644 index 6d2305a29844..000000000000 --- a/app-text/aspell/files/digest-aspell-0.60.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ca44ac2fcfdc7213e03d3b5610ce141a aspell-0.60.3.tar.gz 1635824 -RMD160 92e0dd8e271a48f73407e23c2d0246f2827e1789 aspell-0.60.3.tar.gz 1635824 -SHA256 0403ee33f680325aacf200a967062010a959bfd0c35ab55e0049dfec57e9d21c aspell-0.60.3.tar.gz 1635824 diff --git a/app-text/aspell/files/digest-aspell-0.60.3-r1 b/app-text/aspell/files/digest-aspell-0.60.3-r1 deleted file mode 100644 index 6d2305a29844..000000000000 --- a/app-text/aspell/files/digest-aspell-0.60.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ca44ac2fcfdc7213e03d3b5610ce141a aspell-0.60.3.tar.gz 1635824 -RMD160 92e0dd8e271a48f73407e23c2d0246f2827e1789 aspell-0.60.3.tar.gz 1635824 -SHA256 0403ee33f680325aacf200a967062010a959bfd0c35ab55e0049dfec57e9d21c aspell-0.60.3.tar.gz 1635824 diff --git a/app-text/aspell/files/digest-aspell-0.60.4 b/app-text/aspell/files/digest-aspell-0.60.4 deleted file mode 100644 index b06cd5ec9fa6..000000000000 --- a/app-text/aspell/files/digest-aspell-0.60.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4f1737e726d66476b9c7388831305510 aspell-0.60.4.tar.gz 1676825 -RMD160 e0408acd4f3304c957aeea0b17a28d0c44e11064 aspell-0.60.4.tar.gz 1676825 -SHA256 8931d8644da9a71fdd970cafe9d6c20d796ad1d8ef2aaf89a801171104e426e4 aspell-0.60.4.tar.gz 1676825 diff --git a/app-text/aspell/files/digest-aspell-0.60.4-r1 b/app-text/aspell/files/digest-aspell-0.60.4-r1 deleted file mode 100644 index b06cd5ec9fa6..000000000000 --- a/app-text/aspell/files/digest-aspell-0.60.4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4f1737e726d66476b9c7388831305510 aspell-0.60.4.tar.gz 1676825 -RMD160 e0408acd4f3304c957aeea0b17a28d0c44e11064 aspell-0.60.4.tar.gz 1676825 -SHA256 8931d8644da9a71fdd970cafe9d6c20d796ad1d8ef2aaf89a801171104e426e4 aspell-0.60.4.tar.gz 1676825 diff --git a/app-text/aspell/files/digest-aspell-0.60.4-r2 b/app-text/aspell/files/digest-aspell-0.60.4-r2 deleted file mode 100644 index b06cd5ec9fa6..000000000000 --- a/app-text/aspell/files/digest-aspell-0.60.4-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4f1737e726d66476b9c7388831305510 aspell-0.60.4.tar.gz 1676825 -RMD160 e0408acd4f3304c957aeea0b17a28d0c44e11064 aspell-0.60.4.tar.gz 1676825 -SHA256 8931d8644da9a71fdd970cafe9d6c20d796ad1d8ef2aaf89a801171104e426e4 aspell-0.60.4.tar.gz 1676825 |