old

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 8 insertions, 374 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index 6ce023e72636..7dcdf69fcfae 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/aspell
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.146 2014/02/11 15:56:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.147 2014/02/11 18:00:40 mr_bones_ Exp $
+
+  11 Feb 2014; Michael Sterrett <mr_bones_@gentoo.org> -aspell-0.50.5-r4.ebuild,
+  -files/aspell-0.50.5-charcount.patch,
+  -files/aspell-0.60.3-templateinstantiations.patch,
+  -files/aspell-0.60.5-gcc-4.3.patch, -files/aspell-0.60.6-replace-fix.patch,
+  -files/aspell-quotechar-fix.patch:
+  old
 
   11 Feb 2014; Michael Sterrett <mr_bones_@gentoo.org> aspell-0.60.6.1.ebuild:
   use has_version instead of built_with_use
diff --git a/app-text/aspell/aspell-0.50.5-r4.ebuild b/app-text/aspell/aspell-0.50.5-r4.ebuild
deleted file mode 100644
index c6aa863e4016..000000000000
--- a/app-text/aspell/aspell-0.50.5-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.5-r4.ebuild,v 1.20 2011/02/06 05:34:40 leio 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="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="gpm"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( sys-libs/gpm )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.50.5-charcount.patch
-	epatch "${FILESDIR}"/${PN}-quotechar-fix.patch
-}
-
-src_compile() {
-	if [ "${ARCH}" == "ppc" ] ; then
-		append-flags -O2 -fsigned-char
-	fi
-	if [ "${ARCH}" == "alpha" ]; then
-		replace-flags -Os -O2
-	fi
-	use gpm && append-ldflags -lgpm
-	filter-flags -fno-rtti
-	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/files/aspell-0.50.5-charcount.patch b/app-text/aspell/files/aspell-0.50.5-charcount.patch
deleted file mode 100644
index b42da38d9800..000000000000
--- a/app-text/aspell/files/aspell-0.50.5-charcount.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nrup aspell-0.50.5.orig/prog/compress.c aspell-0.50.5/prog/compress.c
---- aspell-0.50.5.orig/prog/compress.c	2002-08-31 14:51:11.000000000 -0400
-+++ aspell-0.50.5/prog/compress.c	2004-08-15 15:07:26.000000000 -0400
-@@ -28,24 +28,27 @@
- 
- #endif
- 
-+#define BUFSIZE 256
-+
- void usage () 
- {
-   fputs("Compresses or uncompresses sorted word lists.\n"     , stderr);
-   fputs("For best result the locale should be set to C\n"    , stderr);
-   fputs("before sorting by setting the environmental\n"       , stderr);
-   fputs("variable LANG to \"C\" before sorting.\n"            , stderr);
--  fputs("Copyright 2001 by Kevin Atkinson.\n"  , stderr);
-+  fputs("Copyright 2001-2004 by Kevin Atkinson.\n"  , stderr);
-   fputs("Usage: word-list-compress c[ompress]|d[ecompress]\n" , stderr);
- }
- 
--static int get_word(FILE * in, char * w) 
-+static int get_word(FILE * in, char * w, size_t bufsize) 
- {
-   int c;
-   while (c = getc(in), c != EOF && c <= 32);
-   if (c == EOF) return 0;
-   do {
-     *w++ = (char)(c);
--  } while (c = getc(in), c != EOF && c > 32);
-+  --bufsize;
-+  } while (c = getc(in), c != EOF && c > 32 && bufsize > 1);
-   *w = '\0';
-   ungetc(c, in);
-   if (c == EOF) return 0;
-@@ -61,15 +64,15 @@ int main (int argc, const char *argv[]) 
-     
-   } else if (argv[1][0] == 'c') {
- 
--    char s1[256];
--    char s2[256];
-+    char s1[BUFSIZE];
-+    char s2[BUFSIZE];
-     char * prev = s2;
-     char * cur = s1;
-     *prev = '\0';
- 
-     SETBIN (stdout);
- 
--    while (get_word(stdin, cur)) {
-+    while (get_word(stdin, cur, BUFSIZE)) {
-       int i = 0;
-       /* get the length of the prefix */
-       while (prev[i] != '\0' && cur[i] != '\0' && prev[i] == cur[i])
-@@ -99,9 +102,10 @@ int main (int argc, const char *argv[]) 
-     while (i != -1 ) {
-       if (i == 0)
- 	i = getc(stdin);
--      --i;  
--      while ((c = getc(stdin)) > 32)
-+      --i; if (i < 0) goto error;
-+      while ((c = getc(stdin)) > 32 && i < BUFSIZE)
- 	cur[i++] = (char)c;
-+      if (i >= BUFSIZE) goto error;
-       cur[i] = '\0';
-       fputs(cur, stdout);
-       putc('\n', stdout);
-@@ -109,6 +113,10 @@ int main (int argc, const char *argv[]) 
-     }
-     return 0;
- 
-+error:
-+   fputs("ERROR: Corrupt Input.\n", stderr);
-+   return 2;
-+
-   } else {
- 
-     usage();
diff --git a/app-text/aspell/files/aspell-0.60.3-templateinstantiations.patch b/app-text/aspell/files/aspell-0.60.3-templateinstantiations.patch
deleted file mode 100644
index a533f9e81158..000000000000
--- a/app-text/aspell/files/aspell-0.60.3-templateinstantiations.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- common/string_map.cpp~	2004-07-15 12:58:58.000000000 +0200
-+++ common/string_map.cpp	2005-07-19 14:31:42.000000000 +0200
-@@ -82,3 +82,5 @@
-   }
- }
- 
-+template class acommon::HashTable<acommon::StringMap::Parms>;
-+template class acommon::BlockSList<acommon::StringPair>;
diff --git a/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch b/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch
deleted file mode 100644
index 22d04d089cd5..000000000000
--- a/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Naur aspell-0.60.5-orig/common/convert.cpp aspell-0.60.5/common/convert.cpp
---- aspell-0.60.5-orig/common/convert.cpp	2006-11-18 02:36:01.000000000 -0600
-+++ aspell-0.60.5/common/convert.cpp	2007-12-29 11:17:11.000000000 -0600
-@@ -238,7 +238,7 @@
-   }
- 
-   template <class T>
--  static void free_norm_table(NormTable<T> * d)
-+  void free_norm_table(NormTable<T> * d)
-   {
-     for (T * cur = d->data; cur != d->end; ++cur) {
-       if (cur->sub_table) 
-diff -Naur aspell-0.60.5-orig/common/string.hpp aspell-0.60.5/common/string.hpp
---- aspell-0.60.5-orig/common/string.hpp	2004-11-29 11:50:05.000000000 -0600
-+++ aspell-0.60.5/common/string.hpp	2007-12-29 11:17:11.000000000 -0600
-@@ -129,10 +129,10 @@
-     }
- 
-     char & operator[] (size_t pos) {return begin_[pos];}
--    const char operator[] (size_t pos) const {return begin_[pos];}
-+    char operator[] (size_t pos) const {return begin_[pos];}
- 
-     char & back() {return end_[-1];}
--    const char back() const {return end_[-1];}
-+    char back() const {return end_[-1];}
- 
-     void clear() {end_ = begin_;}
- 
-@@ -492,7 +492,7 @@
- 
- namespace std
- {
--  template<> static inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
-+  template<> inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
- }
- 
- #endif
-diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.cpp aspell-0.60.5/modules/speller/default/affix.cpp
---- aspell-0.60.5-orig/modules/speller/default/affix.cpp	2006-01-21 08:27:54.000000000 -0600
-+++ aspell-0.60.5/modules/speller/default/affix.cpp	2007-12-29 11:17:11.000000000 -0600
-@@ -193,7 +193,7 @@
-   typedef const Conds * Value;
-   typedef const char * Key;
-   static const bool is_multi = false;
--  hash<const char *> hfun;
-+  acommon::hash<const char *> hfun;
-   size_t hash(const char * s) {return hfun(s);}
-   bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;}
-   const char * key(const Conds * c) {return c->str;}
-diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.hpp aspell-0.60.5/modules/speller/default/affix.hpp
---- aspell-0.60.5-orig/modules/speller/default/affix.hpp	2004-11-29 11:50:06.000000000 -0600
-+++ aspell-0.60.5/modules/speller/default/affix.hpp	2007-12-29 11:17:11.000000000 -0600
-@@ -107,7 +107,7 @@
-     {
-       return expand(word,aff,buf,0);
-     }
--    WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
-+    WordAff * expand_suffix(ParmString word, const unsigned char * aff,
-                             ObjStack &, int limit = INT_MAX,
-                             unsigned char * new_aff = 0, WordAff * * * l = 0,
-                             ParmString orig_word = 0) const;
-diff -Naur aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp aspell-0.60.5/modules/speller/default/readonly_ws.cpp
---- aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp	2006-11-18 03:17:19.000000000 -0600
-+++ aspell-0.60.5/modules/speller/default/readonly_ws.cpp	2007-12-29 11:17:11.000000000 -0600
-@@ -726,7 +726,7 @@
-   struct WordLookupParms {
-     const char * block_begin;
-     WordLookupParms() {}
--    typedef Vector<u32int>      Vector;
-+    typedef acommon::Vector<u32int> Vector;
-     typedef u32int              Value;
-     typedef const char *        Key;
-     static const bool is_multi = false;
-diff -Naur aspell-0.60.5-orig/prog/aspell.cpp aspell-0.60.5/prog/aspell.cpp
---- aspell-0.60.5-orig/prog/aspell.cpp	2006-12-19 04:51:08.000000000 -0600
-+++ aspell-0.60.5/prog/aspell.cpp	2007-12-29 11:18:10.000000000 -0600
-@@ -239,6 +239,14 @@
-   return i;
- }
- 
-+static void line_buffer() {
-+#ifndef WIN32
-+  // set up stdin and stdout to be line buffered
-+  assert(setvbuf(stdin, 0, _IOLBF, 0) == 0); 
-+  assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
-+#endif
-+}
-+
- Conv dconv;
- Conv uiconv;
- 
-@@ -686,11 +694,7 @@
- 
- void pipe() 
- {
--#ifndef WIN32
--  // set up stdin and stdout to be line buffered
--  assert(setvbuf(stdin, 0, _IOLBF, 0) == 0); 
--  assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
--#endif
-+  line_buffer();
- 
-   bool terse_mode = true;
-   bool do_time = options->retrieve_bool("time");
-@@ -1651,6 +1655,7 @@
-   Conv oconv(setup_conv(lang, options));
-   String word;
-   String sl;
-+  line_buffer();
-   while (CIN.getline(word)) {
-     const char * w = iconv(word);
-     lang->LangImpl::to_soundslike(sl, w);
-@@ -1675,6 +1680,7 @@
-   Conv oconv(setup_conv(lang, options));
-   String word;
-   GuessInfo gi;
-+  line_buffer();
-   while (CIN.getline(word)) {
-     lang->munch(iconv(word), &gi);
-     COUT << word;
-@@ -1713,6 +1719,7 @@
-   String word, buf;
-   ObjStack exp_buf;
-   WordAff * exp_list;
-+  line_buffer();
-   while (CIN.getline(word)) {
-     buf = word;
-     char * w = iconv(buf.mstr(), buf.size());
-@@ -1799,6 +1806,7 @@
-   String word;
-   String base;
-   String affs;
-+  line_buffer();
-   while (CIN.getline(word)) {
-     word = iconv(word);
- 
-@@ -1882,7 +1890,7 @@
-   typedef SML_WordEntry Value;
-   typedef const char * Key;
-   static const bool is_multi = false;
--  hash<const char *> hash;
-+  acommon::hash<const char *> hash;
-   bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
-   Key key(const Value & v) {return v.word;}
- };
-@@ -2033,7 +2041,7 @@
-   typedef CML_Entry Value;
-   typedef const char * Key;
-   static const bool is_multi = true;
--  hash<const char *> hash;
-+  acommon::hash<const char *> hash;
-   bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
-   Key key(const Value & v) {return v.word;}
- };
diff --git a/app-text/aspell/files/aspell-0.60.6-replace-fix.patch b/app-text/aspell/files/aspell-0.60.6-replace-fix.patch
deleted file mode 100644
index f5c766491338..000000000000
--- a/app-text/aspell/files/aspell-0.60.6-replace-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=327405
-http://sourceforge.net/tracker/?func=detail&aid=2955373&group_id=245&atid=100245
-
-diff -u -r1.19.2.5 check_funs.cpp
---- prog/check_funs.cpp	3 Mar 2010 05:16:24 -0000	1.19.2.5
-+++ prog/check_funs.cpp	3 Mar 2010 05:34:52 -0000
-@@ -327,7 +327,11 @@
-     wnoutrefresh(choice_w);
-     doupdate();
-     line.resize(0);
-+#ifdef HAVE_WIDE_CURSES
-+    wint_t c;
-+#else
-     int c;
-+#endif
-     noecho();
-     int begin_x;
-     {int junk; getyx(choice_w, junk, begin_x);}
-@@ -336,13 +340,12 @@
-     while (true) {
-       handle_last_signal();
- #ifdef HAVE_WIDE_CURSES
--      wint_t wi = 0;
--      int res = wget_wch(choice_w, &wi);
--      c = wi;
-+      int res = wget_wch(choice_w, &c);
-+      if (res == ERR) continue;
- #else
-       c = wgetch(choice_w);
--#endif
-       if (c == ERR) continue;
-+#endif
-       if (c == '\r' || c == '\n' || c == KEY_ENTER) 
-         break;
-       if (c == control('c') || c == KEY_BREAK) {
-@@ -373,7 +376,9 @@
-       } else if (x < max_x && 32 <= c && c != '\x7F' && NOT_KEY /*c < 256*/) {
- #ifdef HAVE_WIDE_CURSES
-         wchar_t wc = c;
--        wins_nwstr(choice_w, &wc, 1);
-+        cchar_t cc;
-+        setcchar(&cc, &wc, 0, 0, NULL);
-+        wins_wch(choice_w, &cc);
- #else
-         winsch(choice_w, c);
- #endif
diff --git a/app-text/aspell/files/aspell-quotechar-fix.patch b/app-text/aspell/files/aspell-quotechar-fix.patch
deleted file mode 100644
index 2c600547d1fa..000000000000
--- a/app-text/aspell/files/aspell-quotechar-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr ./modules/filter/email.cpp ./modules/filter/email.cpp
---- ./modules/filter/email.cpp	2004-04-24 12:39:56.371216800 +0300
-+++ ./modules/filter/email.cpp	2004-04-24 12:40:05.521825696 +0300
-@@ -33,7 +33,8 @@
-         memset(data, 0, sizeof(bool)*256);
- 	return no_err;
-       }
--      bool have(char c) {
-+      bool have(FilterChar::Chr c) {
-+	if (c > 255) return false;
-         return data[static_cast<unsigned char>(c)];
-       }
-       QuoteChars() {clear();}