second take!

svn path=/; revision=3

36 files changed, 1494 insertions, 0 deletions

diff --git a/trunk/app-text/ispell/Manifest b/trunk/app-text/ispell/Manifest
new file mode 100644
index 0000000..bc893a0
--- /dev/null
+++ b/trunk/app-text/ispell/Manifest
@@ -0,0 +1,17 @@
+AUX ispell-3.2.06-patch.diff 7112 RMD160 e65f0bdd0928e6e22472d2489837f9c47d2a48b0 SHA1 c6523dfc9abd591d42375cb826b4680695307353 SHA256 7dbaa324e58e0655db69c67fdd19680a29dffa7c2c06cd7e2c2c2ae4159648c1
+MD5 968d9a6f9d7e309c232f22b4e72f4a9d files/ispell-3.2.06-patch.diff 7112
+RMD160 e65f0bdd0928e6e22472d2489837f9c47d2a48b0 files/ispell-3.2.06-patch.diff 7112
+SHA256 7dbaa324e58e0655db69c67fdd19680a29dffa7c2c06cd7e2c2c2ae4159648c1 files/ispell-3.2.06-patch.diff 7112
+AUX local.h.gentoo 6015 RMD160 9953b4d51e71d52378528960d4677ff9054bff13 SHA1 7347541ff822cbb91ddbb2e3b5f27834da2bcd1e SHA256 f919ac4220a7f7859e89141eb62eb7c4eca092a9be0f55a660ba61f697a8770d
+MD5 912424a0edd789568666782416a410a2 files/local.h.gentoo 6015
+RMD160 9953b4d51e71d52378528960d4677ff9054bff13 files/local.h.gentoo 6015
+SHA256 f919ac4220a7f7859e89141eb62eb7c4eca092a9be0f55a660ba61f697a8770d files/local.h.gentoo 6015
+DIST ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787 RMD160 d821b99da52ed9d326d653d0bf01b277c30c18ab SHA1 46472cdb0d59efea3dc438fd098d6de7345ce9b5 SHA256 e577e996cb465222ae3c12f53e0a712d97a1c5f3786eaab51d28769f3a9af114
+DIST ispell-3.2.06.tar.gz 580742 RMD160 3f6a3840540ebc753146c427da8ce2d54317b46e SHA1 35f496322cda172d56610417e4e1c7b962f734d7 SHA256 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966
+EBUILD ispell-3.2.06-r7.ebuild 2859 RMD160 76de669ab5ab2bed9e0e6e580eeafb46b4225f5f SHA1 14039ba1baf321226c63ad2e96b55f0d1b3152be SHA256 19b9d589140d7d73a6e4e3f3dc7980a9d6b521b223c8ba18bdcedad80217343d
+MD5 cee658ec1b45d3730b1b5f35ab509f43 ispell-3.2.06-r7.ebuild 2859
+RMD160 76de669ab5ab2bed9e0e6e580eeafb46b4225f5f ispell-3.2.06-r7.ebuild 2859
+SHA256 19b9d589140d7d73a6e4e3f3dc7980a9d6b521b223c8ba18bdcedad80217343d ispell-3.2.06-r7.ebuild 2859
+MD5 1807d88fc35553dcc67ef87a044d744c files/digest-ispell-3.2.06-r7 524
+RMD160 ad71651e16693b5f28d9269f00fd0777388f32c3 files/digest-ispell-3.2.06-r7 524
+SHA256 a40a394c389a994a40614f782c25212556308adfb2450bcf97184b6818a1b13b files/digest-ispell-3.2.06-r7 524
diff --git a/trunk/app-text/ispell/files/digest-ispell-3.2.06-r7 b/trunk/app-text/ispell/files/digest-ispell-3.2.06-r7
new file mode 100644
index 0000000..557aa2a
--- /dev/null
+++ b/trunk/app-text/ispell/files/digest-ispell-3.2.06-r7
@@ -0,0 +1,6 @@
+MD5 65a80f2542e0680409035fb0fac44f8e ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
+RMD160 d821b99da52ed9d326d653d0bf01b277c30c18ab ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
+SHA256 e577e996cb465222ae3c12f53e0a712d97a1c5f3786eaab51d28769f3a9af114 ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
+MD5 d434e1aef1a815294d5012c60c4c414a ispell-3.2.06.tar.gz 580742
+RMD160 3f6a3840540ebc753146c427da8ce2d54317b46e ispell-3.2.06.tar.gz 580742
+SHA256 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966 ispell-3.2.06.tar.gz 580742
diff --git a/trunk/app-text/ispell/files/ispell-3.2.06-patch.diff b/trunk/app-text/ispell/files/ispell-3.2.06-patch.diff
new file mode 100644
index 0000000..5a641f8
--- /dev/null
+++ b/trunk/app-text/ispell/files/ispell-3.2.06-patch.diff
@@ -0,0 +1,190 @@
+diff -Naur ispell-3.2.06-old/Makefile ispell-3.2.06/Makefile
+--- ispell-3.2.06-old/Makefile	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/Makefile	2003-12-13 23:59:23.000000000 +0000
+@@ -415,7 +415,7 @@
+ 	    cat config.X local.h \
+ 	      | sed -n -e "s/^#define[ 	]*$$var[ 	]*"'"'"/$$var=/p" \
+ 	      | sed -e 's/".*$$/'"'/" -e "s/=/='/" \
+-	      | tail -1; \
++	      | tail -n 1; \
+ 	  done > config.sh; \
+ 	echo 'case "$$MAKE_SORTTMP" in "") \
+ 	  SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
+diff -Naur ispell-3.2.06-old/Makepatch ispell-3.2.06/Makepatch
+--- ispell-3.2.06-old/Makepatch	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/Makepatch	2003-12-13 23:59:23.000000000 +0000
+@@ -141,7 +141,7 @@
+ 
+ if [ -r "$destdir/Patch${baserelease}.01" ]
+ then
+-    lastpatch=`ls $destdir/Patch${baserelease}.?? | tail -1 \
++    lastpatch=`ls $destdir/Patch${baserelease}.?? | tail -n 1 \
+       | sed "s;$destdir/Patch${baserelease}.;;"`
+ else
+     lastpatch=00
+diff -Naur ispell-3.2.06-old/findaffix.X ispell-3.2.06/findaffix.X
+--- ispell-3.2.06-old/findaffix.X	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/findaffix.X	2003-12-13 23:59:23.000000000 +0000
+@@ -152,7 +152,7 @@
+ elimlen=1
+ lowcount=10
+ cleanout=no
+-finalsortopts='+3rn -4 +2rn -3 +1 -2 +0 -1'
++finalsortopts='-k 4rn,5 -k 3rn,4 -k 2,3 -k 1,2'
+ tabch=/
+ while :
+ do
+@@ -177,7 +177,7 @@
+ 	    shift
+ 	    ;;
+ 	-f)
+-	    finalsortopts='+2rn -3 +3rn -4 +1 -2 +0 -1'
++	    finalsortopts='-k 3rn,4 -k 4rn,5 -k 2,3 -k 1,2'
+ 	    shift
+ 	    ;;
+ 	-c)
+@@ -256,10 +256,10 @@
+ 	next
+     '"$LOOP"'
+     }' < ${TMP}a \
+-  | sort "-t$tabch" +0 -1 +1 $SORTTMP -o ${TMP}a
++  | sort "-t$tabch" -k 1,2 -k 2 $SORTTMP -o ${TMP}a
+ join "-t$tabch" -o 1.2 2.2 2.3 ${TMP}a ${TMP}a \
+   | awk "-F$tabch" "BEGIN{elimlen=$elimlen}$ELIM" \
+-  | sort "-t$tabch" +1 -2 +0 -1 $SORTTMP \
++  | sort "-t$tabch" -k 2,3 -k 1,2 $SORTTMP \
+   | awk "-F$tabch" 'BEGIN{tabch="'"$tabch"'"; lowcount='"$lowcount"'}
+ 	{
+ 	if ($1 == last1  &&  $2 == last2)
+diff -Naur ispell-3.2.06-old/languages/english/Makefile ispell-3.2.06/languages/english/Makefile
+--- ispell-3.2.06-old/languages/english/Makefile	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/languages/english/Makefile	2003-12-14 00:01:15.000000000 +0000
+@@ -336,7 +336,7 @@
+ 	    done; \
+ 	    trap "rm -f english.sml" 1 2 15; \
+ 	    set -x; \
+-	    eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.sml $$dicts
++	    eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.sml $$dicts
+ 
+ $(DBUILD)english.sml+:	$(CONFIG) $(EXTRADICT)
+ $(DBUILD)english.sml+:	english.0
+@@ -376,7 +376,7 @@
+ 	    done; \
+ 	    trap "rm -f english.med" 1 2 15; \
+ 	    set -x; \
+-	    eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.med $$dicts
++	    eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.med $$dicts
+ 
+ $(DBUILD)english.med+:	$(CONFIG) $(EXTRADICT)
+ $(DBUILD)english.med+:	english.0
+@@ -424,7 +424,7 @@
+ 	    done; \
+ 	    trap "rm -f english.lrg" 1 2 15; \
+ 	    set -x; \
+-	    eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.lrg $$dicts
++	    eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.lrg $$dicts
+ 
+ $(DBUILD)english.lrg+:	$(CONFIG) $(EXTRADICT)
+ $(DBUILD)english.lrg+:	english.0
+@@ -477,7 +477,7 @@
+ 	    done; \
+ 	    trap "rm -f english.xlg" 1 2 15; \
+ 	    set -x; \
+-	    eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.xlg $$dicts
++	    eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.xlg $$dicts
+ 
+ $(DBUILD)english.xlg+:	$(CONFIG) $(EXTRADICT)
+ $(DBUILD)english.xlg+:	english.0
+diff -Naur ispell-3.2.06-old/munchlist.X ispell-3.2.06/munchlist.X
+--- ispell-3.2.06-old/munchlist.X	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/munchlist.X	2003-12-13 23:59:23.000000000 +0000
+@@ -422,7 +422,7 @@
+     cat "$@" | $ISPELL "$wchars" -e1 -d $FAKEHASH -p /dev/null | tr " " '
+ '
+ fi \
+-  | sort $SORTTMP -u +0f -1 +0 \
++  | sort $SORTTMP -u -k 1f,2 -k 1 \
+   | $COMBINE $icflags $langtabs \
+   | sort $SORTTMP -u > $EXPANDEDINPUT
+ #
+@@ -482,7 +482,7 @@
+ $ISPELL "$wchars" -c -W0 -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT \
+   | tr " " '
+ ' \
+-  | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" +0 -1 +1 \
++  | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" -k 1,2 -k 2 \
+   | $JOIN $SIGNED "-t$flagmarker" - $EXPANDEDINPUT > $CRUNCHEDINPUT
+ #
+ # We now have a list of legal roots, and of affixes that apply to the
+@@ -508,7 +508,7 @@
+ #
+ $verbose  &&  echo 'Expanding dictionary into EXPANDEDPAIRS.' 1>&2
+ $ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CRUNCHEDINPUT \
+-  | sort $SORTTMP +1 > $EXPANDEDPAIRS
++  | sort $SORTTMP -k 2 > $EXPANDEDPAIRS
+ #
+ # Now we want to extract the lines in EXPANDEDPAIRS in which the second field
+ # is *not* listed in the original dictionary EXPANDEDINPUT;  these illegal
+@@ -536,7 +536,7 @@
+   | (sed -e 's; .*$;;' ; /bin/rm -f $JOINEDPAIRS $EXPANDEDPAIRS) \
+   | uniq \
+   | (comm -13 - $CRUNCHEDINPUT ; /bin/rm -f $CRUNCHEDINPUT) \
+-  | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
++  | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 \
+   | $COMBINE $langtabs > $LEGALFLAGLIST
+ 
+ #
+@@ -566,7 +566,7 @@
+   | sort $SORTTMP \
+   | uniq -c \
+   | tr '	' ' ' \
+-  | sort $SORTTMP +0rn -1 +2 > $PRODUCTLIST
++  | sort $SORTTMP -k 1rn,2 -k 3 > $PRODUCTLIST
+ 
+ if [ `egrep ' p ' $PRODUCTLIST | wc -l` -gt 0 \
+   -a `egrep ' s ' $PRODUCTLIST | wc -l` -gt 0 ]
+@@ -681,7 +681,7 @@
+ 	#
+ 	$verbose  &&  echo "Creating cross expansions (pass $dbnum)." 1>&2
+ 	$ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CROSSROOTS \
+-	  | sort $SORTTMP +1 > $CROSSEXPANDED
++	  | sort $SORTTMP -k 2 > $CROSSEXPANDED
+ 	#
+ 	# Now we join CROSSEXPANDED against EXPANDEDINPUT to produce
+ 	# CROSSPAIRS, and then comm that against CROSSEXPANDED to
+@@ -765,7 +765,7 @@
+ 	      D
+ 	      }' \
+ 	  | comm -23 - $ILLEGALCOMBOS \
+-	  | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
++	  | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 \
+ 	  | $COMBINE $langtabs > $CROSSROOTS
+ 	mv $CROSSROOTS $LEGALFLAGLIST
+ 	if [ "$debug" = yes ]
+@@ -801,10 +801,10 @@
+ #
+ $verbose  &&  echo 'Eliminating non-optimal affixes.' 1>&2
+ $ISPELL "$wchars" -e4 -d $FAKEHASH -p /dev/null < $LEGALFLAGLIST \
+-  | sort $SORTTMP +1 -2 +2rn -3 +0 -1 \
+-  | sort $SORTTMP -um +1 -2 \
++  | sort $SORTTMP -k 2,3 -k 3rn,4 -k 1,2 \
++  | sort $SORTTMP -um -k 2,3 \
+   | sed -e 's; .*$;;' \
+-  | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 > $MINIMALAFFIXES
++  | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 > $MINIMALAFFIXES
+ /bin/rm -f $LEGALFLAGLIST
+ #
+ # Now we're almost done.  MINIMALAFFIXES covers some (with luck, most)
+@@ -832,10 +832,10 @@
+     fi
+     ($ISPELL "$wchars" -l -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT; \
+ 	$COMBINE $langtabs < $MINIMALAFFIXES) \
+-      | sort $SORTTMP "-t$flagmarker" -u +0f -1 +0
++      | sort $SORTTMP "-t$flagmarker" -u -k 1f,2 -k 1
+ else
+     # MINIMALAFFIXES is empty;  just produce a sorted version of STRIPPEDINPUT
+-    sort $SORTTMP "-t$flagmarker" -u +0f -1 +0 $STRIPPEDINPUT
++    sort $SORTTMP "-t$flagmarker" -u -k 1f,2 -k 1 $STRIPPEDINPUT
+ fi
+ /bin/rm -f ${TMP}*
+ if [ "X$MUNCHMAIL" != X ]
diff --git a/trunk/app-text/ispell/files/local.h.gentoo b/trunk/app-text/ispell/files/local.h.gentoo
new file mode 100644
index 0000000..e3ece06
--- /dev/null
+++ b/trunk/app-text/ispell/files/local.h.gentoo
@@ -0,0 +1,156 @@
+/*
+ * $Id: local.h.gentoo,v 1.1 2002/03/15 05:37:36 tod Exp $
+ */
+
+/*
+ * Copyright 1992, 1993, 1999, 2001, Geoff Kuenning, Claremont, CA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All modifications to the source code must be clearly marked as
+ *    such.  Binary redistributions based on modified source code
+ *    must be clearly marked as modified versions in the documentation
+ *    and/or other materials provided with the distribution.
+ * 4. Any web site or other electronic service that offers ispell for
+ *    download or other electronic transfer as a separate entity, in
+ *    either source or binary form, must also include a prominent statement
+ *    indicating that information about ispell can be obtained from the
+ *    following Web site URL:
+ *	http://fmg-www.cs.ucla.edu/geoff/ispell.html
+ *    If the offering service supports hyperlinks, the aforementioned
+ *    Web site must also be offered as a hyperlink.  Condition #4 does
+ *    not apply if ispell is offered only as part of a larger, aggregated
+ *    product such as a word processor or packaged operating system.
+ * 5. The name of Geoff Kuenning may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * This file is a sample local.h file.  It shows what I believe nearly every
+ * site will want to include in their local.h.  You will probably want to
+ * expand this file;  see "config.X" to learn of #defines that you might
+ * like to add to.
+ */
+
+/*
+ * $Log: local.h.gentoo,v $
+ * Revision 1.1  2002/03/15 05:37:36  tod
+ *
+ * New version.  Hopefully this helps resolve the last of the *spell issues.  Gnome-spell or bust :) Thanks to seemant for his help with the *spells.
+ *
+ * Revision 1.20  2001/07/25 21:51:47  geoff
+ * Minor license update.
+ *
+ * Revision 1.19  2001/07/23 20:24:04  geoff
+ * Update the copyright and the license.
+ *
+ * Revision 1.18  2001/05/30 21:14:47  geoff
+ * Invert the fcntl/mkstemp options so they will default to being used.
+ *
+ * Revision 1.17  2001/05/30 21:04:25  geoff
+ * Add HAS_FCNTL_H and HAS_MKSTEMP.  Also give better comments on the USG
+ * option.
+ *
+ * Revision 1.16  1999/01/08 04:34:43  geoff
+ * Get rid of ELISPDIR and TEXINFODIR
+ *
+ * Revision 1.15  1999/01/07  01:57:57  geoff
+ * Update the copyright.
+ *
+ * Revision 1.14  1995/01/08  23:23:56  geoff
+ * Do some minor clarification of the instructional comments.
+ *
+ * Revision 1.13  1994/05/17  06:37:25  geoff
+ * Add one more item of warning advice to the comments.
+ *
+ * Revision 1.12  1994/02/07  06:00:00  geoff
+ * Add a warning about shell processing restrictions
+ *
+ * Revision 1.11  1994/01/25  07:11:50  geoff
+ * Get rid of all old RCS log lines in preparation for the 3.1 release.
+ *
+ */
+
+/*
+ * WARNING WARNING WARNING
+ *
+ * This file is *NOT* a normal C header file!  Although it uses C
+ * syntax and is included in C programs, it is also processed by shell
+ * scripts that are very stupid about format.
+ *
+ * Do not try to use #if constructs to configure this file for more
+ * than one configuration.  Do not place whitespace after the "#" in
+ * "#define".  Do not attempt to disable lines by commenting them out.
+ * Do not use backslashes to reduce the length of long lines.
+ * None of these things will work the way you expect them to.
+ *
+ * WARNING WARNING WARNING
+ */
+
+#define MINIMENU	/* Display a mini-menu at the bottom of the screen */
+#undef NO8BIT		/* Remove this if you use ISO character sets */
+#define USG		/* Define on System V or if term.c won't compile */
+#undef NO_FCNTL_H	/* Define if you get compile errors on fcntl.h */
+#undef NO_MKSTEMP	/* Define if you get compile or link errors */
+#define HAS_RENAME
+#define INSTALL         "cp"
+
+/*
+ * Important directory paths
+ */
+#define BINDIR		"/usr/bin"
+#define LIBDIR		"/usr/lib/ispell"
+#define TEXINFODIR	"/usr/share/info"
+#define WORDS		"/usr/share/dict/words"
+#define MAN1DIR		"/usr/share/man/man1"
+#define MAN4DIR		"/usr/share/man/man5"
+#define MAN4EXT		".5"
+
+/*
+ * Place any locally-required #include statements here
+ */
+#define CC		"gcc"
+#define YACC		"bison -y"
+#define TERMLIB		"-lncurses"
+#define LANGUAGES       "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash,EXTRADICT=} {british,MASTERDICTS=british.med,HASHFILES=britishmed.hash,EXTRADICT=}"
+/*
+ * Settings
+ */
+
+#define MASKBITS	64
+#define INPUTWORDLEN	128
+#define MAXAFFIXLEN	32
+#define MAXSTRINGCHARS	128
+#define MASTERHASH	"americanmed.hash"
+#define HAS_RENAME
+#define DEFNOBACKUPFLAG 0
+#define BAKEXT          "~"
+#define DEFTEXFLAG      1
+#define EGREPCMD	"/usr/bin/grep -E"
+#define LOOK		"/usr/bin/look -df"
+#define MAKE_SORTTMP	"-T ${TMPDIR-/tmp}"
+#define SORTPERSONAL	2000
+#define USESH
+#define COMMANDFORSPACE
+
diff --git a/trunk/app-text/ispell/ispell-3.2.06-r7.ebuild b/trunk/app-text/ispell/ispell-3.2.06-r7.ebuild
new file mode 100644
index 0000000..b83484b
--- /dev/null
+++ b/trunk/app-text/ispell/ispell-3.2.06-r7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.2.06-r6.ebuild,v 1.16 2006/03/25 06:38:14 grobian Exp $
+
+inherit eutils
+
+PATCH_VER="0.1"
+DESCRIPTION="fast screen-oriented spelling checker"
+HOMEPAGE="http://fmg-www.cs.ucla.edu/geoff/ispell.html"
+SRC_URI="http://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz
+	mirror://gentoo/${P}-r6-gentoo-${PATCH_VER}.diff.bz2"
+
+SLOT="0"
+LICENSE="as-is"
+#KEYWORDS="alpha amd64 hppa mips ppc ppc-macos sparc x86"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+LINGUAS="bg cs da de es et fi fr ga hu it lt nl no pl pt pt-BR ru sl sv"
+for X in ${LINGUAS} ; do # is this correct?
+	IUSE="${IUSE} linguas_${X}"
+done
+
+DEPEND="sys-apps/sed
+	sys-devel/bison
+	sys-apps/miscfiles
+	>=sys-libs/ncurses-5.2"
+RDEPEND=""
+PDEPEND="linguas_bg? ( app-dicts/ispell-bg )
+	linguas_cs? ( app-dicts/ispell-cs )
+	linguas_da? ( app-dicts/ispell-da )
+	linguas_de? ( app-dicts/ispell-de )
+	linguas_es? ( app-dicts/ispell-es )
+	linguas_et? ( app-dicts/ispell-et )
+	linguas_fi? ( || ( app-text/tmispell app-dicts/ispell-fi ) )
+	linguas_fr? ( app-dicts/ispell-fr )
+	linguas_ga? ( app-dicts/ispell-ga )
+	linguas_hu? ( app-dicts/ispell-hu )
+	linguas_it? ( app-dicts/ispell-it )
+	linguas_lt? ( app-dicts/ispell-lt )
+	linguas_nl? ( app-dicts/ispell-nl )
+	linguas_no? ( app-dicts/ispell-no )
+	linguas_pl? ( app-dicts/ispell-pl )
+	linguas_pt? ( app-dicts/ispell-pt )
+	linguas_pt_BR? ( app-dicts/ispell-pt )
+	linguas_ru? ( app-dicts/ispell-ru )
+	linguas_sl? ( app-dicts/ispell-sl )
+	linguas_sv? ( app-dicts/ispell-sv )"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${WORKDIR}"/${P}-r6-gentoo-${PATCH_VER}.diff
+	epatch "${FILESDIR}"/${P}-patch.diff
+}
+
+src_compile() {
+	make config.sh || die
+
+	#Fix config.sh to install to ${D}
+	cp -p config.sh config.sh.orig
+	sed \
+		-e "s:^\(BINDIR='\)\(.*\):\1${D}\2:" \
+		-e "s:^\(LIBDIR='\)\(.*\):\1${D}\2:" \
+		-e "s:^\(MAN1DIR='\)\(.*\):\1${D}\2:" \
+		-e "s:^\(MAN4DIR='\)\(.*\):\1${D}\2:" \
+		< config.sh > config.sh.install
+
+	make || die
+}
+
+src_install() {
+	cp -p  config.sh.install config.sh
+
+	#Need to create the directories to install into
+	#before 'make install'. Build environment **doesn't**
+	#check for existence and create if not already there.
+	dodir /usr/bin /usr/lib/ispell /usr/share/info \
+		/usr/share/man/man1 /usr/share/man/man5
+
+	make \
+		install || die "install failed"
+
+	if use linguas_fi && has_version app-text/tmispell ; then
+		mv ${D}/usr/bin/ispell ${D}/usr/bin/ispell.real
+	fi
+
+	rmdir ${D}/usr/share/man/man5
+	rmdir ${D}/usr/share/info
+
+	dodoc Contributors README WISHES
+
+	dosed ${D}/usr/share/man/man1/ispell.1
+}
+
+pkg_postinst() {
+	if use linguas_fi && has_version app-text/tmispell ; then
+		elog "because linguas_fi was requested:"
+		elog "ispell was installed under ${ROOT}/usr/bin/ispell.real"
+	fi
+}
diff --git a/trunk/app-text/tmispell/Manifest b/trunk/app-text/tmispell/Manifest
new file mode 100644
index 0000000..7d69721
--- /dev/null
+++ b/trunk/app-text/tmispell/Manifest
@@ -0,0 +1,61 @@
+AUX ispell-3.2.06-patch.diff 7112 RMD160 e65f0bdd0928e6e22472d2489837f9c47d2a48b0 SHA1 c6523dfc9abd591d42375cb826b4680695307353 SHA256 7dbaa324e58e0655db69c67fdd19680a29dffa7c2c06cd7e2c2c2ae4159648c1
+MD5 968d9a6f9d7e309c232f22b4e72f4a9d files/ispell-3.2.06-patch.diff 7112
+RMD160 e65f0bdd0928e6e22472d2489837f9c47d2a48b0 files/ispell-3.2.06-patch.diff 7112
+SHA256 7dbaa324e58e0655db69c67fdd19680a29dffa7c2c06cd7e2c2c2ae4159648c1 files/ispell-3.2.06-patch.diff 7112
+AUX tmispell-svn-autoconf-autopoint.patch 267 RMD160 ea881a2d4e5854550877f383258a6deef90398db SHA1 57bdabdc35647755c8dc14d6b9f9a03ae8e63703 SHA256 f0fdf46ad18145bc8891e8cb22882f0f88f268ae320e1988dfeddc625be76ffa
+MD5 4adb1ae2dcbcdc5b29b5ae9e35ba41c4 files/tmispell-svn-autoconf-autopoint.patch 267
+RMD160 ea881a2d4e5854550877f383258a6deef90398db files/tmispell-svn-autoconf-autopoint.patch 267
+SHA256 f0fdf46ad18145bc8891e8cb22882f0f88f268ae320e1988dfeddc625be76ffa files/tmispell-svn-autoconf-autopoint.patch 267
+AUX tmispell-svn-autogen.sh-automake.patch 512 RMD160 8a4dd3183414349608f9139f2d98e944b9dfcbc9 SHA1 81083b93e807eb7f2786764158388d9c53480e93 SHA256 64e66f30fba2a9268f9dd4b92316cc03d1f4f6231fad91cd2aa48f36af6df52d
+MD5 77e3204ba1749fded3961c5c76d3bb7f files/tmispell-svn-autogen.sh-automake.patch 512
+RMD160 8a4dd3183414349608f9139f2d98e944b9dfcbc9 files/tmispell-svn-autogen.sh-automake.patch 512
+SHA256 64e66f30fba2a9268f9dd4b92316cc03d1f4f6231fad91cd2aa48f36af6df52d files/tmispell-svn-autogen.sh-automake.patch 512
+AUX tmispell-svn-autogen.sh-undoc.patch 466 RMD160 aa8d46597be18ac9f4c346d5ed41ba5f42e7df7e SHA1 851299f4b4549fc5b26bfdbe857cf72d7aec5415 SHA256 73299a75cd63eae7f909d6465ce9c29d8d4f358fe24a3e7a95b4b5e1a39b25a2
+MD5 90e4b753c18017241d6263f6085b4292 files/tmispell-svn-autogen.sh-undoc.patch 466
+RMD160 aa8d46597be18ac9f4c346d5ed41ba5f42e7df7e files/tmispell-svn-autogen.sh-undoc.patch 466
+SHA256 73299a75cd63eae7f909d6465ce9c29d8d4f358fe24a3e7a95b4b5e1a39b25a2 files/tmispell-svn-autogen.sh-undoc.patch 466
+AUX tmispell.conf.gentoo 2001 RMD160 90f913b2e0ad48a63171c62fb07d99c1e5724ec6 SHA1 4c8a940252584c8a9316689751ded0e70159f1b4 SHA256 3f2e4c0775216fa25087d1fddbefa82c8dd6ce5d8a72766510f274f566d3b9e0
+MD5 c2756fe4cb09f08c29e0d784eaa7d736 files/tmispell.conf.gentoo 2001
+RMD160 90f913b2e0ad48a63171c62fb07d99c1e5724ec6 files/tmispell.conf.gentoo 2001
+SHA256 3f2e4c0775216fa25087d1fddbefa82c8dd6ce5d8a72766510f274f566d3b9e0 files/tmispell.conf.gentoo 2001
+DIST ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787 RMD160 d821b99da52ed9d326d653d0bf01b277c30c18ab SHA1 46472cdb0d59efea3dc438fd098d6de7345ce9b5 SHA256 e577e996cb465222ae3c12f53e0a712d97a1c5f3786eaab51d28769f3a9af114
+DIST ispell-3.2.06.tar.gz 580742 RMD160 3f6a3840540ebc753146c427da8ce2d54317b46e SHA1 35f496322cda172d56610417e4e1c7b962f734d7 SHA256 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966
+DIST tmispell-voikko-0.4.3.tar.gz 447162 RMD160 67b946f135c9cec509d576e023644bb7b49df53e SHA1 8cfd873acb3edcf22dc3062d1f8da9ee89d8b62f SHA256 9b05b8fce809e383ca4fb1fb8533ef2af658004495413664dc88c4f79d0dadcc
+DIST tmispell-voikko-0.5.0.tar.gz 423157 RMD160 fe642a0c97197907c555acfdcf834da8ab15826b SHA1 3bc277b3bf50e0e81a2f8872ce7f6e8188a7b4a2 SHA256 6368efad9585b53caf3ee2aa8e454ee4cacdbf22d65efde69da0a50859cc146d
+DIST tmispell-voikko-0.6.1.tar.gz 440365 RMD160 057f4b9b1c7cd939aeaf666f5e1b319b33e7b7d9 SHA1 522a47af5c618efdb204fe9eea51e32ecfced096 SHA256 06b8e1ce093a3582488254e5af6759beebf1d02baafa7ea133aa04544c67ffbc
+DIST tmispell-voikko-0.6.tar.gz 440563 RMD160 88c5b26399d29bee6dbbeae4bc6dd2d4593fa77b SHA1 6226e051e33414b6e8b5b861a42d4801eba9451f SHA256 29c8a6d3365ad843b7e59d8d89b8eb014de44f8f817cd3d470dd904ccc1b36aa
+EBUILD tmispell-0.4.3.ebuild 3082 RMD160 50590c4e69f49a002ddbd03768a768763f86db0b SHA1 0bd6e508c4f38426c8278724c1e857f236e1f94f SHA256 7858713ec2e4325dbd5c9823bda486a19d1f71ae817258e27a4d77fcd880db3f
+MD5 788034b76dcccf9922f4a00cf5b42ca2 tmispell-0.4.3.ebuild 3082
+RMD160 50590c4e69f49a002ddbd03768a768763f86db0b tmispell-0.4.3.ebuild 3082
+SHA256 7858713ec2e4325dbd5c9823bda486a19d1f71ae817258e27a4d77fcd880db3f tmispell-0.4.3.ebuild 3082
+EBUILD tmispell-0.5.0.ebuild 1648 RMD160 4cde5eedb4d47672d5cb3e12037ea105507abb5b SHA1 67a408153ea7fd1bc3f421c12b4febeaf741c60b SHA256 61c83a8b28b0b60d235d5b0e1aa5c06ad91046ea266abf0c536bc53f017f5f73
+MD5 95307d20112ef5b973815def0e94cf26 tmispell-0.5.0.ebuild 1648
+RMD160 4cde5eedb4d47672d5cb3e12037ea105507abb5b tmispell-0.5.0.ebuild 1648
+SHA256 61c83a8b28b0b60d235d5b0e1aa5c06ad91046ea266abf0c536bc53f017f5f73 tmispell-0.5.0.ebuild 1648
+EBUILD tmispell-0.6.1.ebuild 1972 RMD160 4f0b9b1475e0457620dd9c58e75b0623f523f72c SHA1 a750af4cd551052937e599b86d5d0b79c7e76951 SHA256 321e6006326d05085c730ef6614ded7fb23181f6cf001d8bb2f87d2ea20177ae
+MD5 1ae2d5af771ed5a6e298c61ad575c2c3 tmispell-0.6.1.ebuild 1972
+RMD160 4f0b9b1475e0457620dd9c58e75b0623f523f72c tmispell-0.6.1.ebuild 1972
+SHA256 321e6006326d05085c730ef6614ded7fb23181f6cf001d8bb2f87d2ea20177ae tmispell-0.6.1.ebuild 1972
+EBUILD tmispell-0.6.ebuild 1685 RMD160 1b4e5144da6c19549ecb77814e94a6ac93b88c47 SHA1 51cd7b16f413c84106530651f07b8425922c2144 SHA256 dedb05589a4d7f6fdb640fbf9f9948a76746316d5d79d303962061ea6bb36abd
+MD5 b8e3f0cac4b9db094e9c730faa7c455d tmispell-0.6.ebuild 1685
+RMD160 1b4e5144da6c19549ecb77814e94a6ac93b88c47 tmispell-0.6.ebuild 1685
+SHA256 dedb05589a4d7f6fdb640fbf9f9948a76746316d5d79d303962061ea6bb36abd tmispell-0.6.ebuild 1685
+EBUILD tmispell-9999.ebuild 2080 RMD160 4e904d05f8e8252ff38bf82d1b626350912175ad SHA1 97d26a9fdaae5bcaf099a79b1f604c437635800d SHA256 5f255eb9af4149e3c79138f0955a867926381a343dd63a2d82b64db3409aecca
+MD5 3886e9118a9e169e079d44b03607f3af tmispell-9999.ebuild 2080
+RMD160 4e904d05f8e8252ff38bf82d1b626350912175ad tmispell-9999.ebuild 2080
+SHA256 5f255eb9af4149e3c79138f0955a867926381a343dd63a2d82b64db3409aecca tmispell-9999.ebuild 2080
+MD5 fad4a2258c00fae8efdf4952e87a82ea files/digest-tmispell-0.4.3 789
+RMD160 d437721979f337ad76897e326d1386bd24d59d5f files/digest-tmispell-0.4.3 789
+SHA256 8313b7d775d7b9d1d084bdd0bbe2373badb3d8d79ebe71bbdedb0df0ccd71769 files/digest-tmispell-0.4.3 789
+MD5 04a81c913baeb685eb206500ef451d93 files/digest-tmispell-0.5.0 265
+RMD160 cc179e06a96d6d4830aa3b43f9ae6f200087e86d files/digest-tmispell-0.5.0 265
+SHA256 c6b7c7f804efa7b1cc68c779058a4ed4827ad29750ffe674af6d453ba36ac1ef files/digest-tmispell-0.5.0 265
+MD5 ec973d7ee4fc4627ee4ee421792f5525 files/digest-tmispell-0.6 259
+RMD160 14fbedf5a85190a296777014a15be4a2e38aee93 files/digest-tmispell-0.6 259
+SHA256 3d0ce7764776038face2d4233dd92f4ef45978f4f51ee078e73e5726acd3db8f files/digest-tmispell-0.6 259
+MD5 08f519ae393cf703e3d1b45eaec37ddd files/digest-tmispell-0.6.1 265
+RMD160 7bbb2060f88393c648e8dd3436daf7050adc2b63 files/digest-tmispell-0.6.1 265
+SHA256 12aa120b7a958741308d563cae536afb6aa7015db73034ff6e69aca5418f2812 files/digest-tmispell-0.6.1 265
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-tmispell-9999 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-tmispell-9999 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-tmispell-9999 1
diff --git a/trunk/app-text/tmispell/files/digest-tmispell-0.4.3 b/trunk/app-text/tmispell/files/digest-tmispell-0.4.3
new file mode 100644
index 0000000..8e8c9e2
--- /dev/null
+++ b/trunk/app-text/tmispell/files/digest-tmispell-0.4.3
@@ -0,0 +1,9 @@
+MD5 65a80f2542e0680409035fb0fac44f8e ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
+RMD160 d821b99da52ed9d326d653d0bf01b277c30c18ab ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
+SHA256 e577e996cb465222ae3c12f53e0a712d97a1c5f3786eaab51d28769f3a9af114 ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
+MD5 d434e1aef1a815294d5012c60c4c414a ispell-3.2.06.tar.gz 580742
+RMD160 3f6a3840540ebc753146c427da8ce2d54317b46e ispell-3.2.06.tar.gz 580742
+SHA256 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966 ispell-3.2.06.tar.gz 580742
+MD5 30a955cc813f8962c4e4b8abde6bc258 tmispell-voikko-0.4.3.tar.gz 447162
+RMD160 67b946f135c9cec509d576e023644bb7b49df53e tmispell-voikko-0.4.3.tar.gz 447162
+SHA256 9b05b8fce809e383ca4fb1fb8533ef2af658004495413664dc88c4f79d0dadcc tmispell-voikko-0.4.3.tar.gz 447162
diff --git a/trunk/app-text/tmispell/files/digest-tmispell-0.5.0 b/trunk/app-text/tmispell/files/digest-tmispell-0.5.0
new file mode 100644
index 0000000..9acb281
--- /dev/null
+++ b/trunk/app-text/tmispell/files/digest-tmispell-0.5.0
@@ -0,0 +1,3 @@
+MD5 782c4e5d00bdfa7ca125662829a49024 tmispell-voikko-0.5.0.tar.gz 423157
+RMD160 fe642a0c97197907c555acfdcf834da8ab15826b tmispell-voikko-0.5.0.tar.gz 423157
+SHA256 6368efad9585b53caf3ee2aa8e454ee4cacdbf22d65efde69da0a50859cc146d tmispell-voikko-0.5.0.tar.gz 423157
diff --git a/trunk/app-text/tmispell/files/digest-tmispell-0.6 b/trunk/app-text/tmispell/files/digest-tmispell-0.6
new file mode 100644
index 0000000..819f96d
--- /dev/null
+++ b/trunk/app-text/tmispell/files/digest-tmispell-0.6
@@ -0,0 +1,3 @@
+MD5 67d992e8e9d7e38f02c1ccd63193d82c tmispell-voikko-0.6.tar.gz 440563
+RMD160 88c5b26399d29bee6dbbeae4bc6dd2d4593fa77b tmispell-voikko-0.6.tar.gz 440563
+SHA256 29c8a6d3365ad843b7e59d8d89b8eb014de44f8f817cd3d470dd904ccc1b36aa tmispell-voikko-0.6.tar.gz 440563
diff --git a/trunk/app-text/tmispell/files/digest-tmispell-0.6.1 b/trunk/app-text/tmispell/files/digest-tmispell-0.6.1
new file mode 100644
index 0000000..73ece93
--- /dev/null
+++ b/trunk/app-text/tmispell/files/digest-tmispell-0.6.1
@@ -0,0 +1,3 @@
+MD5 06ccb2bf53485e1d2d933d6cb0b63bb7 tmispell-voikko-0.6.1.tar.gz 440365
+RMD160 057f4b9b1c7cd939aeaf666f5e1b319b33e7b7d9 tmispell-voikko-0.6.1.tar.gz 440365
+SHA256 06b8e1ce093a3582488254e5af6759beebf1d02baafa7ea133aa04544c67ffbc tmispell-voikko-0.6.1.tar.gz 440365
diff --git a/trunk/app-text/tmispell/files/digest-tmispell-9999 b/trunk/app-text/tmispell/files/digest-tmispell-9999
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trunk/app-text/tmispell/files/digest-tmispell-9999
@@ -0,0 +1 @@
+
diff --git a/trunk/app-text/tmispell/files/ispell-3.2.06-patch.diff b/trunk/app-text/tmispell/files/ispell-3.2.06-patch.diff
new file mode 100644
index 0000000..5a641f8
--- /dev/null
+++ b/trunk/app-text/tmispell/files/ispell-3.2.06-patch.diff
@@ -0,0 +1,190 @@
+diff -Naur ispell-3.2.06-old/Makefile ispell-3.2.06/Makefile
+--- ispell-3.2.06-old/Makefile	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/Makefile	2003-12-13 23:59:23.000000000 +0000
+@@ -415,7 +415,7 @@
+ 	    cat config.X local.h \
+ 	      | sed -n -e "s/^#define[ 	]*$$var[ 	]*"'"'"/$$var=/p" \
+ 	      | sed -e 's/".*$$/'"'/" -e "s/=/='/" \
+-	      | tail -1; \
++	      | tail -n 1; \
+ 	  done > config.sh; \
+ 	echo 'case "$$MAKE_SORTTMP" in "") \
+ 	  SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
+diff -Naur ispell-3.2.06-old/Makepatch ispell-3.2.06/Makepatch
+--- ispell-3.2.06-old/Makepatch	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/Makepatch	2003-12-13 23:59:23.000000000 +0000
+@@ -141,7 +141,7 @@
+ 
+ if [ -r "$destdir/Patch${baserelease}.01" ]
+ then
+-    lastpatch=`ls $destdir/Patch${baserelease}.?? | tail -1 \
++    lastpatch=`ls $destdir/Patch${baserelease}.?? | tail -n 1 \
+       | sed "s;$destdir/Patch${baserelease}.;;"`
+ else
+     lastpatch=00
+diff -Naur ispell-3.2.06-old/findaffix.X ispell-3.2.06/findaffix.X
+--- ispell-3.2.06-old/findaffix.X	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/findaffix.X	2003-12-13 23:59:23.000000000 +0000
+@@ -152,7 +152,7 @@
+ elimlen=1
+ lowcount=10
+ cleanout=no
+-finalsortopts='+3rn -4 +2rn -3 +1 -2 +0 -1'
++finalsortopts='-k 4rn,5 -k 3rn,4 -k 2,3 -k 1,2'
+ tabch=/
+ while :
+ do
+@@ -177,7 +177,7 @@
+ 	    shift
+ 	    ;;
+ 	-f)
+-	    finalsortopts='+2rn -3 +3rn -4 +1 -2 +0 -1'
++	    finalsortopts='-k 3rn,4 -k 4rn,5 -k 2,3 -k 1,2'
+ 	    shift
+ 	    ;;
+ 	-c)
+@@ -256,10 +256,10 @@
+ 	next
+     '"$LOOP"'
+     }' < ${TMP}a \
+-  | sort "-t$tabch" +0 -1 +1 $SORTTMP -o ${TMP}a
++  | sort "-t$tabch" -k 1,2 -k 2 $SORTTMP -o ${TMP}a
+ join "-t$tabch" -o 1.2 2.2 2.3 ${TMP}a ${TMP}a \
+   | awk "-F$tabch" "BEGIN{elimlen=$elimlen}$ELIM" \
+-  | sort "-t$tabch" +1 -2 +0 -1 $SORTTMP \
++  | sort "-t$tabch" -k 2,3 -k 1,2 $SORTTMP \
+   | awk "-F$tabch" 'BEGIN{tabch="'"$tabch"'"; lowcount='"$lowcount"'}
+ 	{
+ 	if ($1 == last1  &&  $2 == last2)
+diff -Naur ispell-3.2.06-old/languages/english/Makefile ispell-3.2.06/languages/english/Makefile
+--- ispell-3.2.06-old/languages/english/Makefile	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/languages/english/Makefile	2003-12-14 00:01:15.000000000 +0000
+@@ -336,7 +336,7 @@
+ 	    done; \
+ 	    trap "rm -f english.sml" 1 2 15; \
+ 	    set -x; \
+-	    eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.sml $$dicts
++	    eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.sml $$dicts
+ 
+ $(DBUILD)english.sml+:	$(CONFIG) $(EXTRADICT)
+ $(DBUILD)english.sml+:	english.0
+@@ -376,7 +376,7 @@
+ 	    done; \
+ 	    trap "rm -f english.med" 1 2 15; \
+ 	    set -x; \
+-	    eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.med $$dicts
++	    eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.med $$dicts
+ 
+ $(DBUILD)english.med+:	$(CONFIG) $(EXTRADICT)
+ $(DBUILD)english.med+:	english.0
+@@ -424,7 +424,7 @@
+ 	    done; \
+ 	    trap "rm -f english.lrg" 1 2 15; \
+ 	    set -x; \
+-	    eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.lrg $$dicts
++	    eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.lrg $$dicts
+ 
+ $(DBUILD)english.lrg+:	$(CONFIG) $(EXTRADICT)
+ $(DBUILD)english.lrg+:	english.0
+@@ -477,7 +477,7 @@
+ 	    done; \
+ 	    trap "rm -f english.xlg" 1 2 15; \
+ 	    set -x; \
+-	    eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.xlg $$dicts
++	    eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.xlg $$dicts
+ 
+ $(DBUILD)english.xlg+:	$(CONFIG) $(EXTRADICT)
+ $(DBUILD)english.xlg+:	english.0
+diff -Naur ispell-3.2.06-old/munchlist.X ispell-3.2.06/munchlist.X
+--- ispell-3.2.06-old/munchlist.X	2003-12-13 23:59:07.000000000 +0000
++++ ispell-3.2.06/munchlist.X	2003-12-13 23:59:23.000000000 +0000
+@@ -422,7 +422,7 @@
+     cat "$@" | $ISPELL "$wchars" -e1 -d $FAKEHASH -p /dev/null | tr " " '
+ '
+ fi \
+-  | sort $SORTTMP -u +0f -1 +0 \
++  | sort $SORTTMP -u -k 1f,2 -k 1 \
+   | $COMBINE $icflags $langtabs \
+   | sort $SORTTMP -u > $EXPANDEDINPUT
+ #
+@@ -482,7 +482,7 @@
+ $ISPELL "$wchars" -c -W0 -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT \
+   | tr " " '
+ ' \
+-  | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" +0 -1 +1 \
++  | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" -k 1,2 -k 2 \
+   | $JOIN $SIGNED "-t$flagmarker" - $EXPANDEDINPUT > $CRUNCHEDINPUT
+ #
+ # We now have a list of legal roots, and of affixes that apply to the
+@@ -508,7 +508,7 @@
+ #
+ $verbose  &&  echo 'Expanding dictionary into EXPANDEDPAIRS.' 1>&2
+ $ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CRUNCHEDINPUT \
+-  | sort $SORTTMP +1 > $EXPANDEDPAIRS
++  | sort $SORTTMP -k 2 > $EXPANDEDPAIRS
+ #
+ # Now we want to extract the lines in EXPANDEDPAIRS in which the second field
+ # is *not* listed in the original dictionary EXPANDEDINPUT;  these illegal
+@@ -536,7 +536,7 @@
+   | (sed -e 's; .*$;;' ; /bin/rm -f $JOINEDPAIRS $EXPANDEDPAIRS) \
+   | uniq \
+   | (comm -13 - $CRUNCHEDINPUT ; /bin/rm -f $CRUNCHEDINPUT) \
+-  | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
++  | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 \
+   | $COMBINE $langtabs > $LEGALFLAGLIST
+ 
+ #
+@@ -566,7 +566,7 @@
+   | sort $SORTTMP \
+   | uniq -c \
+   | tr '	' ' ' \
+-  | sort $SORTTMP +0rn -1 +2 > $PRODUCTLIST
++  | sort $SORTTMP -k 1rn,2 -k 3 > $PRODUCTLIST
+ 
+ if [ `egrep ' p ' $PRODUCTLIST | wc -l` -gt 0 \
+   -a `egrep ' s ' $PRODUCTLIST | wc -l` -gt 0 ]
+@@ -681,7 +681,7 @@
+ 	#
+ 	$verbose  &&  echo "Creating cross expansions (pass $dbnum)." 1>&2
+ 	$ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CROSSROOTS \
+-	  | sort $SORTTMP +1 > $CROSSEXPANDED
++	  | sort $SORTTMP -k 2 > $CROSSEXPANDED
+ 	#
+ 	# Now we join CROSSEXPANDED against EXPANDEDINPUT to produce
+ 	# CROSSPAIRS, and then comm that against CROSSEXPANDED to
+@@ -765,7 +765,7 @@
+ 	      D
+ 	      }' \
+ 	  | comm -23 - $ILLEGALCOMBOS \
+-	  | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
++	  | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 \
+ 	  | $COMBINE $langtabs > $CROSSROOTS
+ 	mv $CROSSROOTS $LEGALFLAGLIST
+ 	if [ "$debug" = yes ]
+@@ -801,10 +801,10 @@
+ #
+ $verbose  &&  echo 'Eliminating non-optimal affixes.' 1>&2
+ $ISPELL "$wchars" -e4 -d $FAKEHASH -p /dev/null < $LEGALFLAGLIST \
+-  | sort $SORTTMP +1 -2 +2rn -3 +0 -1 \
+-  | sort $SORTTMP -um +1 -2 \
++  | sort $SORTTMP -k 2,3 -k 3rn,4 -k 1,2 \
++  | sort $SORTTMP -um -k 2,3 \
+   | sed -e 's; .*$;;' \
+-  | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 > $MINIMALAFFIXES
++  | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 > $MINIMALAFFIXES
+ /bin/rm -f $LEGALFLAGLIST
+ #
+ # Now we're almost done.  MINIMALAFFIXES covers some (with luck, most)
+@@ -832,10 +832,10 @@
+     fi
+     ($ISPELL "$wchars" -l -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT; \
+ 	$COMBINE $langtabs < $MINIMALAFFIXES) \
+-      | sort $SORTTMP "-t$flagmarker" -u +0f -1 +0
++      | sort $SORTTMP "-t$flagmarker" -u -k 1f,2 -k 1
+ else
+     # MINIMALAFFIXES is empty;  just produce a sorted version of STRIPPEDINPUT
+-    sort $SORTTMP "-t$flagmarker" -u +0f -1 +0 $STRIPPEDINPUT
++    sort $SORTTMP "-t$flagmarker" -u -k 1f,2 -k 1 $STRIPPEDINPUT
+ fi
+ /bin/rm -f ${TMP}*
+ if [ "X$MUNCHMAIL" != X ]
diff --git a/trunk/app-text/tmispell/files/tmispell-svn-autoconf-autopoint.patch b/trunk/app-text/tmispell/files/tmispell-svn-autoconf-autopoint.patch
new file mode 100644
index 0000000..6d1f262
--- /dev/null
+++ b/trunk/app-text/tmispell/files/tmispell-svn-autoconf-autopoint.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2006-11-15 22:38:50.000000000 +0200
++++ configure.ac.autopoint	2006-11-15 22:45:10.000000000 +0200
+@@ -79,7 +79,7 @@
+ 
+ dnl ## Gettext
+ AM_GNU_GETTEXT([external])
+-
++AM_GNU_GETTEXT_VERSION(0.15)
+ GETTEXT_PACKAGE=$PACKAGE
+ AC_SUBST(GETTEXT_PACKAGE)
+ 
diff --git a/trunk/app-text/tmispell/files/tmispell-svn-autogen.sh-automake.patch b/trunk/app-text/tmispell/files/tmispell-svn-autogen.sh-automake.patch
new file mode 100644
index 0000000..d6aa858
--- /dev/null
+++ b/trunk/app-text/tmispell/files/tmispell-svn-autogen.sh-automake.patch
@@ -0,0 +1,14 @@
+diff -Naur tmispell-0.4.3.9999/autogen.sh tmispell-0.4.3.9999-g/autogen.sh
+--- tmispell-0.4.3.9999/autogen.sh	2006-07-06 20:08:24.000000000 +0000
++++ tmispell-0.4.3.9999-g/autogen.sh	2006-07-06 20:16:30.000000000 +0000
+@@ -8,8 +8,8 @@
+         -o -name Makefile.in \) -print0 | xargs -0 rm -f
+ 
+ rm -f config.sub config.guess
+-cp /usr/share/misc/config.sub .
+-cp /usr/share/misc/config.guess .
++cp /usr/share/automake/config.sub .
++cp /usr/share/automake/config.guess .
+ cp /usr/share/gettext/config.rpath .
+ 
+ 
diff --git a/trunk/app-text/tmispell/files/tmispell-svn-autogen.sh-undoc.patch b/trunk/app-text/tmispell/files/tmispell-svn-autogen.sh-undoc.patch
new file mode 100644
index 0000000..4aded52
--- /dev/null
+++ b/trunk/app-text/tmispell/files/tmispell-svn-autogen.sh-undoc.patch
@@ -0,0 +1,12 @@
+diff -Naur tmispell-0.4.3.9999/autogen.sh tmispell-0.4.3.9999-g/autogen.sh
+--- tmispell-0.4.3.9999/autogen.sh	2006-07-06 20:21:43.000000000 +0000
++++ tmispell-0.4.3.9999-g/autogen.sh	2006-07-06 20:29:45.000000000 +0000
+@@ -14,7 +14,7 @@
+ 
+ 
+ ## Generate documentation
+-make -C doc/sgml -f Makefile.am generate
++#make -C doc/sgml -f Makefile.am generate
+ cp -f doc/tmispell.en.txt README
+ cp -f doc/tmispell.fi.txt LUEMINUT
+ ln -fs tmispell.en.1.in doc/tmispell.1.in
diff --git a/trunk/app-text/tmispell/files/tmispell.conf.gentoo b/trunk/app-text/tmispell/files/tmispell.conf.gentoo
new file mode 100644
index 0000000..14153a1
--- /dev/null
+++ b/trunk/app-text/tmispell/files/tmispell.conf.gentoo
@@ -0,0 +1,64 @@
+### The ispell program to use
+ispell = /usr/bin/ispell.real
+
+
+### TeX filtering:
+
+# Command filter. Syntax is:
+#     <command_name> <parameters>, ...
+# where <parameters> is a string of letters 'o', 'O', 'p' and 'P' which have
+# meanings
+#     'o': an optional parameter not to be spell checked
+#     'O': an optional parameter to be spell checked
+#     'p': an obligatory parameter not to be spell checked
+#     'P': an obligatory parameter to be spell checked
+tex-command-filter = "
+  addtocounter pp, addtolength pp, alpha p, arabic p, fnsymbol p, roman p,
+  stepcounter p, setcounter pp, usecounter p, value p, newcounter po,
+  refstepcounter p,
+
+  label p, pageref p, ref p,
+
+  newcommand poOP, renewcommand poOP, newenvironment poOPP,
+  renewenvironment poOPP, newtheorem poPo, newfont pp, 
+  floatname pP,
+
+  documentclass op, usepackage op,
+
+  begin po, end p,
+
+  setlength pp, addtolength pp, settowidth pp, settodepth pp, settoheight pp,
+
+  enlargethispage p, hyphenation p,
+
+  pagenumbering p, pagestyle p,
+
+  addvspace p, framebox ooP, hspace p, vspace p, makebox ooP, parbox ooopP,
+  raisebox pooP, rule opp, sbox pO, savebox pooP, usebox p,
+
+  include p, includeonly p, input p,
+
+  addcontentsline ppP, addtocontents pP,
+
+  fontencoding p, fontfamily p, fontseries p, fontshape p, fontsize pp,
+  usefont pppp,
+
+  documentstyle op, cite p, nocite p, psfig p, selectlanguage p,
+  includegraphics op, bibitem op,
+
+  geometry p,"
+
+# TeX environments to skip.
+tex-environment-filter = "equation $ eqnarray displaymath picture 
+                          thebibliography math"
+
+### SGML filtering
+sgml-attributes-to-check = "alt"
+
+### Spell checker entries
+# <identifier> <library> <dictionary> <encoding> <locale> <word_c> <boundary_c>
+suomi	"/usr/lib/libvoikko.so.1"	"/dev/null" "UTF-8"	"fi_FI@euro" "." "-':"
+finnish	"/usr/lib/libvoikko.so.1"	"/dev/null" "UTF-8"	"fi_FI@euro" "." "-':"
+
+# Note that for Finnish you might also need the second entry "finnish",
+# in case some program uses it.
diff --git a/trunk/app-text/tmispell/tmispell-0.4.3.ebuild b/trunk/app-text/tmispell/tmispell-0.4.3.ebuild
new file mode 100644
index 0000000..b3b34b2
--- /dev/null
+++ b/trunk/app-text/tmispell/tmispell-0.4.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+MY_P=${PN}-voikko-${PV}
+# ISPELL build is copypasted from in tree version ebuild defined below!
+ISPELL_PF=ispell-3.2.06-r6
+ISPELL_P=ispell-3.2.06
+ISPELL_PATCH_VER=0.1
+
+DESCRIPTION="Tmispell is interface between ispell OO.o Finnish spellcheckers.
+(This is a voikko patched version)"
+SRC_URI="http://www.hunspell-fi.org/files/${MY_P}.tar.gz
+	http://fmg-www.cs.ucla.edu/geoff/tars/${ISPELL_P}.tar.gz
+	mirror://gentoo/${ISPELL_PF}-gentoo-${ISPELL_PATCH_VER}.diff.bz2"
+HOMEPAGE="http://www.hut.fi/~ptvirtan/programs/tmispell.html"
+
+SLOT="0"
+LICENSE="GPL-2 as-is" #GPL=tmispell as-is=ispell
+KEYWORDS="-x86" # -x86 until I figure how to hack the ispell and all
+#KEYWORDS="alpha amd64 hppa mips ppc ppc-macos sparc x86" # ← ispell has this
+
+DEPEND="!app-text/ispell
+	!app-dicts/ispell-fi
+	app-text/voikko
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )
+	sys-apps/coreutils
+	sys-apps/sed
+	sys-devel/bison
+	sys-apps/miscfiles
+	>=sys-libs/ncurses-5.2"
+RDEPEND="!app-text/ispell
+	app-text/voikko
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+ISPELL_S="${WORKDIR}/${ISPELL_P}/"
+
+src_unpack() {
+	# ispell
+	unpack ${A}
+	cd "${ISPELL_S}"
+	epatch "${WORKDIR}/${ISPELL_PF}-gentoo-${ISPELL_PATCH_VER}.diff"
+	epatch "${FILESDIR}/${ISPELL_P}-patch.diff"
+}
+
+src_compile() {
+	# ispell
+	einfo "compiling ispell..."
+	cd "${ISPELL_S}" # ?
+	make config.sh || die "make config.sh failed"
+	cp -p config.sh config.sh.org
+	sed \
+		-e "s:^\(BINDIR='\)\(.*\):\1${D}\2:" \
+		-e "s:^\(LIBDIR='\)\(.*\):\1${D}\2:" \
+		-e "s:^\(MAN1DIR='\)\(.*\):\1${D}\2:" \
+		-e "s:^\(MAN4DIR='\)\(.*\):\1${D}\2:" \
+		< config.sh > config.sh.install
+	emake -j1 || die "emake ispell failed"
+
+	# tmispell
+	einfo "compiling tmispell..."
+	cd ${S}
+	econf || die "econf tmispell failed"
+	emake || die "emake tmispell failed"
+}
+
+src_install() {
+	# ispell
+	cd ${ISPELL_S}
+	einfo "installing ispell"
+	cp -p config.sh.install config.sh
+	dodir /usr/bin /usr/lib/ispell /usr/share/info \
+		/usr/share/man/man1 /usr/share/man/man5
+	emake install || die "install ispell failed"
+	rmdir ${D}/usr/share/man/man5
+	rmdir ${D}/usr/share/info
+	dodir /usr/share/doc/${ISPELL_P}
+	insinto /usr/share/doc/${ISPELL_P}
+	doins Contributors README WISHES
+	dosed ${D}/usr/share/man/man1/ispell.1
+	# tmispell
+	cd ${S}
+	einfo "installing tmispell"
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog LUEMINUT NEWS NEWS.fi README tmispell.conf.example
+	touch "${D}/usr/lib/ispell/suomi.hash" "${D}/usr/lib/ispell/suomi.aff"
+	touch "${D}/usr/lib/ispell/finnish.hash" "${D}/usr/lib/ispell/finnish.aff"
+	# FIXME: configuration needs sedding for ${ROOT} != / ?
+	insinto /etc/
+	newins "${FILESDIR}/tmispell.conf.gentoo" tmispell.conf
+	mv "${D}/usr/bin/ispell" "${D}/usr/bin/ispell.real"
+	dosym /usr/bin/tmispell /usr/bin/ispell
+}
+
+pkg_postinst() {
+	elog "ispell was installed as /usr/bin/ispell.real,"
+	elog "and tmispell as symlink /usr/bin/ispell→/usr/bin/tmispell"
+}
+
diff --git a/trunk/app-text/tmispell/tmispell-0.5.0.ebuild b/trunk/app-text/tmispell/tmispell-0.5.0.ebuild
new file mode 100644
index 0000000..c983e45
--- /dev/null
+++ b/trunk/app-text/tmispell/tmispell-0.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+MY_P=${PN}-voikko-${PV}
+
+DESCRIPTION="Tmispell is interface between ispell OO.o Finnish spellcheckers.
+(This is a voikko patched version)"
+SRC_URI="http://www.hunspell-fi.org/files/${MY_P}.tar.gz"
+HOMEPAGE="http://www.hut.fi/~ptvirtan/programs/tmispell.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND=">=app-text/ispell-3.2.06-r7
+	!app-dicts/ispell-fi
+	app-text/voikko
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )
+	sys-apps/coreutils
+	sys-apps/sed
+	sys-devel/bison
+	sys-apps/miscfiles
+	>=sys-libs/ncurses-5.2"
+RDEPEND=">=app-text/ispell-3.2.06-r7
+	app-text/voikko
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog LUEMINUT NEWS NEWS.fi README tmispell.conf.example
+	if [[ -d "${ROOT}/usr/lib/ispell" ]] ; then
+		dodir /usr/lib/ispell
+		touch "${D}/usr/lib/ispell/suomi.hash" "${D}/usr/lib/ispell/suomi.aff"
+		touch "${D}/usr/lib/ispell/finnish.hash" "${D}/usr/lib/ispell/finnish.aff"
+	elif [[ -d "${ROOT}/usr/share/ispell" ]] ; then
+		dodir /usr/share/ispell
+		touch "${D}/usr/share/ispell/suomi.hash" "${D}/usr/share/ispell/suomi.aff"
+		touch "${D}/usr/share/ispell/finnish.hash" "${D}/usr/share/ispell/suomi.aff"
+	fi
+	insinto /etc/
+	newins "${FILESDIR}/tmispell.conf.gentoo" tmispell.conf
+	sed -i "s:/usr/bin:${ROOT}/usr/bin:g" "${D}/etc/tmispell.conf"
+	dosym /usr/bin/tmispell /usr/bin/ispell
+}
diff --git a/trunk/app-text/tmispell/tmispell-0.6.1.ebuild b/trunk/app-text/tmispell/tmispell-0.6.1.ebuild
new file mode 100644
index 0000000..b90630c
--- /dev/null
+++ b/trunk/app-text/tmispell/tmispell-0.6.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+MY_P=${PN}-voikko-${PV}
+
+DESCRIPTION="Tmispell is interface between ispell OO.o Finnish spellcheckers."
+SRC_URI="http://www.hunspell-fi.org/files/${MY_P}.tar.gz"
+HOMEPAGE="http://www.hut.fi/~ptvirtan/programs/tmispell.html"
+IUSE="enchant nls"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=app-text/ispell-3.2.06-r7
+	!app-dicts/ispell-fi
+	app-text/voikko
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )
+	sys-apps/coreutils
+	sys-apps/sed
+	sys-devel/bison
+	sys-apps/miscfiles
+	>=sys-libs/ncurses-5.2"
+RDEPEND=">=app-text/ispell-3.2.06-r7
+	app-text/voikko
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	econf $(use_enable enchant ) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog LUEMINUT NEWS README tmispell.conf.example
+	if [[ -d "${ROOT}/usr/lib/ispell" ]] ; then
+		dodir /usr/lib/ispell
+		touch "${D}/usr/lib/ispell/suomi.hash" "${D}/usr/lib/ispell/suomi.aff"
+		touch "${D}/usr/lib/ispell/finnish.hash" "${D}/usr/lib/ispell/finnish.aff"
+	elif [[ -d "${ROOT}/usr/share/ispell" ]] ; then
+		dodir /usr/share/ispell
+		touch "${D}/usr/share/ispell/suomi.hash" "${D}/usr/share/ispell/suomi.aff"
+		touch "${D}/usr/share/ispell/finnish.hash" "${D}/usr/share/ispell/suomi.aff"
+	fi
+	insinto /etc/
+	newins "${FILESDIR}/tmispell.conf.gentoo" tmispell.conf
+	sed -i "s:/usr/bin:${ROOT}/usr/bin:g" "${D}/etc/tmispell.conf"
+	dosym /usr/bin/tmispell /usr/bin/ispell
+}
+
+pkg_postrm() {
+	# FIXME: a bit bogus, because it warns on upgrades and whatnot
+	if has_version app-text/ispell ; then
+		elog "If you are removing tmispell AND leaving ispell you must"
+		elog "remerge ispell or do:"
+		elog "	ln -s ${ROOT}/usr/bin/ispell.real ${ROOT}/usr/bin/ispell "
+		elog "for ispell to work"
+	fi
+}
diff --git a/trunk/app-text/tmispell/tmispell-0.6.ebuild b/trunk/app-text/tmispell/tmispell-0.6.ebuild
new file mode 100644
index 0000000..9d7f447
--- /dev/null
+++ b/trunk/app-text/tmispell/tmispell-0.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+MY_P=${PN}-voikko-${PV}
+
+DESCRIPTION="Tmispell is interface between ispell OO.o Finnish spellcheckers.
+(This is a voikko patched version)"
+SRC_URI="http://www.hunspell-fi.org/files/${MY_P}.tar.gz"
+HOMEPAGE="http://www.hut.fi/~ptvirtan/programs/tmispell.html"
+IUSE="enchant"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=app-text/ispell-3.2.06-r7
+	!app-dicts/ispell-fi
+	app-text/voikko
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )
+	sys-apps/coreutils
+	sys-apps/sed
+	sys-devel/bison
+	sys-apps/miscfiles
+	>=sys-libs/ncurses-5.2"
+RDEPEND=">=app-text/ispell-3.2.06-r7
+	app-text/voikko
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	econf $(use_enable enchant ) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog LUEMINUT NEWS README tmispell.conf.example
+	if [[ -d "${ROOT}/usr/lib/ispell" ]] ; then
+		dodir /usr/lib/ispell
+		touch "${D}/usr/lib/ispell/suomi.hash" "${D}/usr/lib/ispell/suomi.aff"
+		touch "${D}/usr/lib/ispell/finnish.hash" "${D}/usr/lib/ispell/finnish.aff"
+	elif [[ -d "${ROOT}/usr/share/ispell" ]] ; then
+		dodir /usr/share/ispell
+		touch "${D}/usr/share/ispell/suomi.hash" "${D}/usr/share/ispell/suomi.aff"
+		touch "${D}/usr/share/ispell/finnish.hash" "${D}/usr/share/ispell/suomi.aff"
+	fi
+	insinto /etc/
+	newins "${FILESDIR}/tmispell.conf.gentoo" tmispell.conf
+	sed -i "s:/usr/bin:${ROOT}/usr/bin:g" "${D}/etc/tmispell.conf"
+	dosym /usr/bin/tmispell /usr/bin/ispell
+}
diff --git a/trunk/app-text/tmispell/tmispell-9999.ebuild b/trunk/app-text/tmispell/tmispell-9999.ebuild
new file mode 100644
index 0000000..a3c1d61
--- /dev/null
+++ b/trunk/app-text/tmispell/tmispell-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+AT_M4DIR="src/glibmm/m4"
+inherit eutils subversion autotools 
+
+DESCRIPTION="Tmispell is interface between ispell OO.o Finnish spellcheckers.
+(This is a voikko patched version)"
+HOMEPAGE="http://www.hut.fi/~ptvirtan/programs/tmispell.html"
+ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/voikko/trunk/tmispell"
+ESVN_PATCHES="tmispell-svn-autoconf-autopoint.patch"
+IUSE="enchant"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-x86 -amd64" # Live SVN build not for general consumption
+
+DEPEND=">=app-text/ispell-3.2.06-r7
+	!app-dicts/ispell-fi
+	=app-text/voikko-9999
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )
+	sys-apps/coreutils
+	sys-apps/sed
+	sys-devel/bison
+	sys-apps/miscfiles
+	>=sys-libs/ncurses-5.2"
+RDEPEND=">=app-text/ispell-3.2.06-r7
+	=app-text/voikko-9999
+	>=dev-libs/glib-2.0.0
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+	# autogen.sh is b0rken, let’s just:
+	find src -name '*.cc' -o -name '*.hh' | sort > po/POTFILES.in
+	libtoolize --force
+	eaclocal
+	eautoheader
+	eautomake
+	eautoconf
+	eautoheader
+	autopoint
+}
+
+src_compile() {
+	econf $(use_enable enchant ) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog LUEMINUT NEWS README tmispell.conf.example
+	if [[ -d "${ROOT}/usr/lib/ispell" ]] ; then
+		dodir /usr/lib/ispell
+		touch "${D}/usr/lib/ispell/suomi.hash" "${D}/usr/lib/ispell/suomi.aff"
+		touch "${D}/usr/lib/ispell/finnish.hash" "${D}/usr/lib/ispell/finnish.aff"
+	elif [[ -d "${ROOT}/usr/share/ispell" ]] ; then
+		dodir /usr/share/ispell
+		touch "${D}/usr/share/ispell/suomi.hash" "${D}/usr/share/ispell/suomi.aff"
+		touch "${D}/usr/share/ispell/finnish.hash" "${D}/usr/share/ispell/suomi.aff"
+	fi
+	insinto /etc/
+	newins "${FILESDIR}/tmispell.conf.gentoo" tmispell.conf
+	sed -i "s:/usr/bin:${ROOT}/usr/bin:g" "${D}/etc/tmispell.conf"
+	dosym /usr/bin/tmispell /usr/bin/ispell
+}
diff --git a/trunk/app-text/voikko/Manifest b/trunk/app-text/voikko/Manifest
new file mode 100644
index 0000000..00c022a
--- /dev/null
+++ b/trunk/app-text/voikko/Manifest
@@ -0,0 +1,55 @@
+DIST libvoikko-0.9.tar.gz 345484 RMD160 fa93eab3e9a0b24e21acdc6721bd444cd23d6088 SHA1 c8486f500cdda0b34d73854e05ed813ee267450f SHA256 880ff66385dd367827d98d4e770fc94afc5c3d772ade2b71fadf81b85bcb923f
+DIST libvoikko-1.0.tar.gz 347429 RMD160 d9852847063e009f4eb21ac46f8b388ebe097afa SHA1 10f54b41a754765a6ee824418288efb6b7ce3656 SHA256 e73f518d4641d8ab24e823125e7511ecc165e4dd1afbd9532e507e19f445fec6
+DIST libvoikko-1.1.tar.gz 352569 RMD160 5964d89c5cf9890ba4da9db088ef5cfd31885f5e SHA1 af8532d7f69c4fe751830adcf4b29f20b50ea9ad SHA256 2eb2db6691c0ff75db213835a2b17b8c7b9d080dad04704ddc39cbc6fe9e7b40
+DIST libvoikko-1.2.tar.gz 353402 RMD160 f5ec4cd906b514083ac68e090ed8baca3afb659c SHA1 91d16e10e475daaf4e0e7c900d7fa1b85be6688e SHA256 36733a63497d62d4a008ed509d731a5439cbc9af25c63ba1521b65695d1adbd0
+DIST libvoikko-1.3.1.tar.gz 357497 RMD160 ec00dc5cc27cefdc600b9c4eba925f44de443bba SHA1 0bcea56c450ef8437943b7a3902b4e8b799d2c29 SHA256 970a7af255078d265858416a6909a11313d870709c4c0f4d757e23c9c2ea326d
+DIST libvoikko-20060901.tar.gz 352576 RMD160 eabc06ba0f75512222deb671948c7bc3acd30f13 SHA1 21c764bb533b7b218f3242f61e7164a0f4371129 SHA256 6eaa9b6fb1008db7d4098ddb9e98bfb902d16b515f79bb4ee03efc2762874989
+EBUILD voikko-0.9.ebuild 723 RMD160 ef015d9f30e01436368b0ae3718b597dfe41e530 SHA1 53a3ece52bac71af735bc2668d4b10f56dc5b563 SHA256 316a98a57d6fbf01d78fe9dfab3ffc38c445345b465e4a228b8b3d4a6464d62e
+MD5 ed1cf782959413cc325f208c31f236be voikko-0.9.ebuild 723
+RMD160 ef015d9f30e01436368b0ae3718b597dfe41e530 voikko-0.9.ebuild 723
+SHA256 316a98a57d6fbf01d78fe9dfab3ffc38c445345b465e4a228b8b3d4a6464d62e voikko-0.9.ebuild 723
+EBUILD voikko-1.0.ebuild 722 RMD160 7f50ca459d1e69a0c8fdd4759322801e41d944b7 SHA1 d70f9ec55fcc25b362ca102959f42b76944cb176 SHA256 552edd090fb6b1987e571043df437ecca1cb576931bb6d03ad4bcafc3dd3887e
+MD5 556c0ffbed841c5dd04fbfff6cabc21e voikko-1.0.ebuild 722
+RMD160 7f50ca459d1e69a0c8fdd4759322801e41d944b7 voikko-1.0.ebuild 722
+SHA256 552edd090fb6b1987e571043df437ecca1cb576931bb6d03ad4bcafc3dd3887e voikko-1.0.ebuild 722
+EBUILD voikko-1.1.ebuild 729 RMD160 1dc80122d1e34380b02fe62ac0f92a1dd1c1c041 SHA1 7daa15495ce1c0b9f950abfa9ffc13f4a27fdd5b SHA256 7ebf23f0067fd96209cccf9b293e6c385d7523d3277d46382cb8cc1db070e086
+MD5 62c51a22fc19f220cb0b543279d42276 voikko-1.1.ebuild 729
+RMD160 1dc80122d1e34380b02fe62ac0f92a1dd1c1c041 voikko-1.1.ebuild 729
+SHA256 7ebf23f0067fd96209cccf9b293e6c385d7523d3277d46382cb8cc1db070e086 voikko-1.1.ebuild 729
+EBUILD voikko-1.2.ebuild 693 RMD160 dee6b2f0d2b210df10adef01c8fe012972b305d2 SHA1 83f656ab7c32e6e145b6a0395297afa2948d4928 SHA256 ccf23c1ba640278861a34d48c559da03875ef2327e725102a4824c4e6303390a
+MD5 8f637d26531bd5c2e96001515d38b12e voikko-1.2.ebuild 693
+RMD160 dee6b2f0d2b210df10adef01c8fe012972b305d2 voikko-1.2.ebuild 693
+SHA256 ccf23c1ba640278861a34d48c559da03875ef2327e725102a4824c4e6303390a voikko-1.2.ebuild 693
+EBUILD voikko-1.3.1.ebuild 762 RMD160 85562473941f079a4900611a9b56cfc80e966ec4 SHA1 6aa0df7825065fc22764d973fa800d3b9d3441f1 SHA256 c04225c05ea17c3ff0319e117fe1e4f68e74b7141724561992dd2d6d6a1fac43
+MD5 f3a706f9b1b046eabd97d20988d1ba2b voikko-1.3.1.ebuild 762
+RMD160 85562473941f079a4900611a9b56cfc80e966ec4 voikko-1.3.1.ebuild 762
+SHA256 c04225c05ea17c3ff0319e117fe1e4f68e74b7141724561992dd2d6d6a1fac43 voikko-1.3.1.ebuild 762
+EBUILD voikko-99.20060901.ebuild 742 RMD160 27481028c2bca4be2994a834144d526f1ed9e560 SHA1 30f444a4bdef30072f056e63348f32e56b7c9b23 SHA256 1d1f76694df4a50e4efa4aa8dbbeea1964071502367167835369890d6ffb42bc
+MD5 8faf533770fc905b6c871e4b52f74777 voikko-99.20060901.ebuild 742
+RMD160 27481028c2bca4be2994a834144d526f1ed9e560 voikko-99.20060901.ebuild 742
+SHA256 1d1f76694df4a50e4efa4aa8dbbeea1964071502367167835369890d6ffb42bc voikko-99.20060901.ebuild 742
+EBUILD voikko-9999.ebuild 913 RMD160 cf12765b25b241cf09f391136c9d8cff198dc841 SHA1 b253f0afc50971648ebfd3e5b0cdde4839f3c58b SHA256 3679a2c2d4f64f80f69e908fcf3877910b8a7ba17790e4807f282040330fb7de
+MD5 e596faa565991b35e4214e31cce31b26 voikko-9999.ebuild 913
+RMD160 cf12765b25b241cf09f391136c9d8cff198dc841 voikko-9999.ebuild 913
+SHA256 3679a2c2d4f64f80f69e908fcf3877910b8a7ba17790e4807f282040330fb7de voikko-9999.ebuild 913
+MD5 dd3ca91e05c4748295c2d97a1d8ae876 files/digest-voikko-0.9 241
+RMD160 dd1cf037bd14f1e16f1a479d1800e91b66a6e17c files/digest-voikko-0.9 241
+SHA256 54402b188d56d5da5a6475300e0307f8882e99a0c454914f7238b092cda12f3f files/digest-voikko-0.9 241
+MD5 b119cb9118c1ed5150fc7588d73ac76f files/digest-voikko-1.0 241
+RMD160 65a8c830e35cf33fdedcac3970bb8f9e68d0c653 files/digest-voikko-1.0 241
+SHA256 dd74999e290a07da838927823c00e4f9c9343cdfc2f6f0fe3f6ef06745c0fc07 files/digest-voikko-1.0 241
+MD5 743464e054de6464c1cde473c55c5f5b files/digest-voikko-1.1 241
+RMD160 cdb92ce5e37c1123a948b34ac08b5d318c6a1413 files/digest-voikko-1.1 241
+SHA256 1ce3f2ec2b3ee3b3b05c5fdc50b12caf6090a6dc8ce5f2fb53d8ee6d97f85d30 files/digest-voikko-1.1 241
+MD5 a22c80b3dbfff1c9b11cf9ce5b5e76ab files/digest-voikko-1.2 241
+RMD160 7fb3121bcf3297c54044a9a9cae6b2f392ff64c0 files/digest-voikko-1.2 241
+SHA256 9590e489eb5ddae0ea3a9c680a5c0bcb1640c0211f4e2a7c096ffdecfcfeb90a files/digest-voikko-1.2 241
+MD5 7b43b5c45dff0bdf5a51a52921c1166a files/digest-voikko-1.3.1 247
+RMD160 06901c1e9a08e5db50cdc6d0e6d8a8656336d1ff files/digest-voikko-1.3.1 247
+SHA256 a38c070d5433f06b571db06759aa3f5f873dbe6805d79b862f0a4e189346b326 files/digest-voikko-1.3.1 247
+MD5 ea9bb0dae4d289c33ed0969e4002e927 files/digest-voikko-99.20060901 256
+RMD160 2d1d648ebbc0f3972f4ddc60560576dd46cae3ae files/digest-voikko-99.20060901 256
+SHA256 3ddd3312755cbf42d422ef39aad39e95f1ca3fe6bc7044618c7a1fc132946149 files/digest-voikko-99.20060901 256
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-voikko-9999 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-voikko-9999 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-voikko-9999 1
diff --git a/trunk/app-text/voikko/files/digest-voikko-0.9 b/trunk/app-text/voikko/files/digest-voikko-0.9
new file mode 100644
index 0000000..6d837d7
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-0.9
@@ -0,0 +1,3 @@
+MD5 880e4a2dd8be893c500cb80719974cea libvoikko-0.9.tar.gz 345484
+RMD160 fa93eab3e9a0b24e21acdc6721bd444cd23d6088 libvoikko-0.9.tar.gz 345484
+SHA256 880ff66385dd367827d98d4e770fc94afc5c3d772ade2b71fadf81b85bcb923f libvoikko-0.9.tar.gz 345484
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.0 b/trunk/app-text/voikko/files/digest-voikko-1.0
new file mode 100644
index 0000000..a21c912
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-1.0
@@ -0,0 +1,3 @@
+MD5 9f69cfb20366dd96db10e7bb1bca4ae4 libvoikko-1.0.tar.gz 347429
+RMD160 d9852847063e009f4eb21ac46f8b388ebe097afa libvoikko-1.0.tar.gz 347429
+SHA256 e73f518d4641d8ab24e823125e7511ecc165e4dd1afbd9532e507e19f445fec6 libvoikko-1.0.tar.gz 347429
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.1 b/trunk/app-text/voikko/files/digest-voikko-1.1
new file mode 100644
index 0000000..1a15791
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-1.1
@@ -0,0 +1,3 @@
+MD5 85729e8f4cbc12066b4fe9e16cb9bfb4 libvoikko-1.1.tar.gz 352569
+RMD160 5964d89c5cf9890ba4da9db088ef5cfd31885f5e libvoikko-1.1.tar.gz 352569
+SHA256 2eb2db6691c0ff75db213835a2b17b8c7b9d080dad04704ddc39cbc6fe9e7b40 libvoikko-1.1.tar.gz 352569
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.2 b/trunk/app-text/voikko/files/digest-voikko-1.2
new file mode 100644
index 0000000..8129d92
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-1.2
@@ -0,0 +1,3 @@
+MD5 6013d7b0957169b44cf2760c34fb58c2 libvoikko-1.2.tar.gz 353402
+RMD160 f5ec4cd906b514083ac68e090ed8baca3afb659c libvoikko-1.2.tar.gz 353402
+SHA256 36733a63497d62d4a008ed509d731a5439cbc9af25c63ba1521b65695d1adbd0 libvoikko-1.2.tar.gz 353402
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.3.1 b/trunk/app-text/voikko/files/digest-voikko-1.3.1
new file mode 100644
index 0000000..767c8bf
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-1.3.1
@@ -0,0 +1,3 @@
+MD5 03a36ef080f45a742ed72ec793df1983 libvoikko-1.3.1.tar.gz 357497
+RMD160 ec00dc5cc27cefdc600b9c4eba925f44de443bba libvoikko-1.3.1.tar.gz 357497
+SHA256 970a7af255078d265858416a6909a11313d870709c4c0f4d757e23c9c2ea326d libvoikko-1.3.1.tar.gz 357497
diff --git a/trunk/app-text/voikko/files/digest-voikko-99.20060901 b/trunk/app-text/voikko/files/digest-voikko-99.20060901
new file mode 100644
index 0000000..47d0705
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-99.20060901
@@ -0,0 +1,3 @@
+MD5 a00e3787bdb39c4fcbbd4fe102e7a582 libvoikko-20060901.tar.gz 352576
+RMD160 eabc06ba0f75512222deb671948c7bc3acd30f13 libvoikko-20060901.tar.gz 352576
+SHA256 6eaa9b6fb1008db7d4098ddb9e98bfb902d16b515f79bb4ee03efc2762874989 libvoikko-20060901.tar.gz 352576
diff --git a/trunk/app-text/voikko/files/digest-voikko-9999 b/trunk/app-text/voikko/files/digest-voikko-9999
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-9999
@@ -0,0 +1 @@
+
diff --git a/trunk/app-text/voikko/voikko-0.9.ebuild b/trunk/app-text/voikko/voikko-0.9.ebuild
new file mode 100644
index 0000000..5b59b9f
--- /dev/null
+++ b/trunk/app-text/voikko/voikko-0.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_PN="lib${P}"
+DESCRIPTION="Free Finnish spellchecking and huphenation library"
+HOMEPAGE="http://www.hunspell-fi.org/"
+SRC_URI="http://www.hunspell-fi.org/files/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="sci-misc/malaga
+	sci-misc/suomi-malaga
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_PN}
+src_compile() {
+	econf --with-malaga-path=${ROOT}/usr/ \
+		--with-dictionary-path=${ROOT}/usr/lib/suomi-malaga/ \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README TODO
+}
diff --git a/trunk/app-text/voikko/voikko-1.0.ebuild b/trunk/app-text/voikko/voikko-1.0.ebuild
new file mode 100644
index 0000000..6d3dd73
--- /dev/null
+++ b/trunk/app-text/voikko/voikko-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_PN="lib${P}"
+DESCRIPTION="Free Finnish spellchecking and hyphenation library"
+HOMEPAGE="http://www.lemi.fi/voikko/"
+SRC_URI="http://www.hunspell-fi.org/files/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="sci-misc/malaga
+	sci-misc/suomi-malaga
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_PN}
+src_compile() {
+	econf --with-malaga-path=${ROOT}/usr/ \
+		--with-dictionary-path=${ROOT}/usr/lib/suomi-malaga/ \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README TODO
+}
diff --git a/trunk/app-text/voikko/voikko-1.1.ebuild b/trunk/app-text/voikko/voikko-1.1.ebuild
new file mode 100644
index 0000000..38d41d9
--- /dev/null
+++ b/trunk/app-text/voikko/voikko-1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_PN="lib${P}"
+DESCRIPTION="Free Finnish spellchecking and hyphenation library"
+HOMEPAGE="http://www.lemi.fi/voikko/"
+SRC_URI="http://www.hunspell-fi.org/files/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="sci-misc/malaga
+	sci-misc/suomi-malaga
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_PN}
+src_compile() {
+	econf --with-malaga-path=${ROOT}/usr/ \
+		--with-dictionary-path=${ROOT}/usr/lib/suomi-malaga/ \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README TODO
+}
diff --git a/trunk/app-text/voikko/voikko-1.2.ebuild b/trunk/app-text/voikko/voikko-1.2.ebuild
new file mode 100644
index 0000000..f11a48b
--- /dev/null
+++ b/trunk/app-text/voikko/voikko-1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_PN="lib${P}"
+DESCRIPTION="Free Finnish spellchecking and hyphenation library"
+HOMEPAGE="http://www.lemi.fi/voikko/"
+SRC_URI="http://www.hunspell-fi.org/files/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="sci-misc/malaga
+	sci-misc/suomi-malaga
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_PN}
+src_compile() {
+	econf --with-dictionary-path=${ROOT}/usr/lib/suomi-malaga/ \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README TODO
+}
diff --git a/trunk/app-text/voikko/voikko-1.3.1.ebuild b/trunk/app-text/voikko/voikko-1.3.1.ebuild
new file mode 100644
index 0000000..6edd39f
--- /dev/null
+++ b/trunk/app-text/voikko/voikko-1.3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_PN="lib${P}"
+DESCRIPTION="Free Finnish spellchecking and hyphenation library"
+HOMEPAGE="http://www.lemi.fi/voikko/"
+SRC_URI="mirror://sourceforge/voikko/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="sci-misc/malaga
+	|| ( =sci-misc/suomi-malaga-1.0* =sci-misc/suomi-malaga-0.7*
+		=sci-misc/suomi-malaga-9999 )
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_PN}
+
+src_compile() {
+	econf --with-dictionary-path="${ROOT}/usr/lib/suomi-malaga/" \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README TODO
+}
diff --git a/trunk/app-text/voikko/voikko-99.20060901.ebuild b/trunk/app-text/voikko/voikko-99.20060901.ebuild
new file mode 100644
index 0000000..6e02e7d
--- /dev/null
+++ b/trunk/app-text/voikko/voikko-99.20060901.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_PN="libvoikko-1.1"
+DESCRIPTION="Free Finnish spellchecking and hyphenation library"
+HOMEPAGE="http://www.lemi.fi/voikko/"
+SRC_URI="http://www.hunspell-fi.org/voikkotmp/libvoikko-20060901.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-x86"
+IUSE=""
+
+DEPEND="sci-misc/malaga
+	sci-misc/suomi-malaga
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_PN}
+src_compile() {
+	econf --with-malaga-path=${ROOT}/usr/ \
+		--with-dictionary-path=${ROOT}/usr/lib/suomi-malaga/ \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README TODO
+}
diff --git a/trunk/app-text/voikko/voikko-9999.ebuild b/trunk/app-text/voikko/voikko-9999.ebuild
new file mode 100644
index 0000000..89ae7da
--- /dev/null
+++ b/trunk/app-text/voikko/voikko-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+inherit subversion autotools
+
+DESCRIPTION="Free Finnish spellchecking and huphenation library"
+HOMEPAGE="http://www.hunspell-fi.org/"
+ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/voikko/trunk/libvoikko"
+#ESVN_BOOTSTRAP="autogen.sh"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-x86 -amd64" # Live SVN not for public consumption
+IUSE=""
+
+DEPEND="sci-misc/malaga
+	=sci-misc/suomi-malaga-9999
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	subversion_src_unpack
+	cd ${S}
+	eautoreconf
+}
+
+src_compile() {
+	econf --with-malaga-path=${ROOT}/usr/ \
+		--with-dictionary-path=${ROOT}/usr/lib/suomi-malaga/ \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README TODO
+}
+