Remove older versions and cleanup latest ebuild.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

8 files changed, 38 insertions, 526 deletions

diff --git a/app-text/ispell/ChangeLog b/app-text/ispell/ChangeLog
index 1acd85d15a4a..fe6045e4d4d8 100644
--- a/app-text/ispell/ChangeLog
+++ b/app-text/ispell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ispell
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ChangeLog,v 1.46 2011/06/12 12:16:05 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ChangeLog,v 1.47 2012/04/17 14:46:45 scarabeus Exp $
+
+  17 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/ispell-3.2.06-patch.diff, -files/ispell-3.2.06-stripping.diff,
+  -files/local.h.gentoo, -ispell-3.2.06-r6.ebuild, -ispell-3.3.02.ebuild,
+  ispell-3.3.02-r1.ebuild:
+  Remove older versions and cleanup latest ebuild.
 
   12 Jun 2011; Markus Meier <maekke@gentoo.org> ispell-3.3.02-r1.ebuild:
   add ~arm, bug #370183
diff --git a/app-text/ispell/Manifest b/app-text/ispell/Manifest
index 5578b1fb5ab9..48732e5d0fe0 100644
--- a/app-text/ispell/Manifest
+++ b/app-text/ispell/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ispell-3.2.06-patch.diff 7112 RMD160 e65f0bdd0928e6e22472d2489837f9c47d2a48b0 SHA1 c6523dfc9abd591d42375cb826b4680695307353 SHA256 7dbaa324e58e0655db69c67fdd19680a29dffa7c2c06cd7e2c2c2ae4159648c1
-AUX ispell-3.2.06-stripping.diff 942 RMD160 777e309c1ef3cea52f9a099ff240998a9b997aa6 SHA1 a7e2b56d7b96e9714328696ee104092b2aaa41fc SHA256 7464635ef36df5983c9662ae5bc83ee57550aa1f4ca975096f542d55570290cc
 AUX ispell-3.3.02-glibc-2.10.patch 1496 RMD160 b2bbf6fdb9a529ab9a6323274cdff43b66d1f01f SHA1 18ff07115f518928abd9eba67c216dc9086c2c3c SHA256 fb59f0f729538e075efaa0a1454437921873cf821a570885bd41c8db4db18267
-AUX local.h.gentoo 6015 RMD160 9953b4d51e71d52378528960d4677ff9054bff13 SHA1 7347541ff822cbb91ddbb2e3b5f27834da2bcd1e SHA256 f919ac4220a7f7859e89141eb62eb7c4eca092a9be0f55a660ba61f697a8770d
-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 ispell-3.3.02-gentoo-0.2.diff.bz2 5723 RMD160 6c76be7b90ae65196c9ef5dcd89406e03705374c SHA1 631f1aaca6029ebd6d01df6a00541172ef1e6f8a SHA256 22f50af967290f46bf357bc54ad9fa7de433868632a65e8fc5b148e1a55ec218
 DIST ispell-3.3.02-gentoo-0.3.diff.bz2 5912 RMD160 abd9fc91cf01b301f8532ce06b15880d57edbf3c SHA1 287c34bcde66d10592413cc4d6acf042f72613f1 SHA256 2ab38d0228b2aa4ec98f69ee1890c314c8d4e4f76d0614fb874e15ac60964d9d
 DIST ispell-3.3.02.tar.gz 619813 RMD160 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781 SHA1 c0d98e1af3afb8e0b642717c03439ff8881e3d60 SHA256 7ff5aad2722ad80fa86766218b7bc622b25bad2d765ea942ba93c996b113ecb4
-EBUILD ispell-3.2.06-r6.ebuild 1636 RMD160 395aaded83116f047225c753701b242d91bd64ee SHA1 e29217e836655eeaddc6c5ead84868482484276c SHA256 c7390a8c8e3a2ecce126fbb4a06d612ddc66e8d74e7c1c5fe8b5b72952d0b7d6
-EBUILD ispell-3.3.02-r1.ebuild 1850 RMD160 c3ac786766b495c57e76efed6b137e6bd5964c27 SHA1 44527ad46f55bac847d5b336344728589cafbaa0 SHA256 4061024916ae9e51e811a90d7335e779e6af17eb71f5e39becbbf80627e6c99c
-EBUILD ispell-3.3.02.ebuild 1997 RMD160 6c1e8b9057cded6e84994e403128fc24306446e9 SHA1 4bc08e941f49216d74f6a508b348858aa4ca546e SHA256 7b9a760ade2f5eaee743d676c88c0685c6e6e45f241a1788f80efac6f3055aee
-MISC ChangeLog 6647 RMD160 b0735a87d8de9f773a53d248060599f4786ff16b SHA1 8f90661b0b4e4421631187cbdaa1f0b427d399a7 SHA256 e690cb6c0344bdbced3ec9995e0fee87dc154a83f52fd1ee9c74106306ff8915
+EBUILD ispell-3.3.02-r1.ebuild 1736 RMD160 88b5bfe2304a93d508be5068e0f4054d0494cb76 SHA1 43fd16197df7ed574931019b87598484cfe8415e SHA256 a53d15a34df16c3b8cb1e7dd1e8f23c41f0169b2882ebcbb5e66c1cfc6d71950
+MISC ChangeLog 6930 RMD160 55b3ab5cf36f8fd8c4bcc76f989abe70b02699f2 SHA1 35239f763bc82b125c05769942f6f832ef247808 SHA256 090b544f8d515f86e5e19f16f9718005e11056af4bc4f65cb71601d2c3ceed27
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk30rn4ACgkQkKaRLQcq0GLuDgCdFD3JzKoYycAnyeRCocgVIKlD
-HikAn1vwYX0rmBBAfi17aLj3CCTFzAZn
-=zij/
+iQIcBAEBAgAGBQJPjYJgAAoJEOSiRoyO7jvoAjMP/3FYz1juSq13Mtak0qQSdvmi
+4+Ah/Pu9EXr7ZN5yma1Z3EjGyUyuoM1vIpPrivw6v62DIifkmP2Og8oKNxCqwWei
+v/z3qD0yw+fm2OJOzBcxND1OR1aHhWtVwSubij5YSE27hSLiLrUMah41fKhURYH+
+rbY1EX58cuI3Kt5EH+Pg2y0GMii4GT8+jiGCA8MSUe8jQn82GGXbz3RuZE07dsYU
+GGiFS81fVS604nHn9FV8XQVLY8JU0fGz61sGVpCIgvTjFv0Nzzd8fwzK0dBOxfIT
+KJRn8N8tItceTOS+Knq0g4iSMfN6dqWaRo0pxhiPCix7NgLkbHjKtAS4UEN/v2/C
+JRH6fe3x3y2JkLNqnuI4x53OEBsCHEdOxmDJHfxAjJDp1GdwphndrgR92DyVt3Lo
+Oul2NZpG9kPNb1kX5Hv9xSRM9l5hr+5vWqyDPeJT70UmMViMBE7KcnmW31d+Ra0v
+MhMWEh63HTp/QXypbK6X4c8myHeutUpGxP0pNg5E8pI80fJNBM3e79kdBUvOkYHs
+k51RH5EbylQz4qjeD77HT5eZXOsXu4FehROiFx2YlhPzO5ACQ/LDW1a4/x18mjPl
+6ZxgwM/DJygdys6yXgN5ZnuMcllO8TR/F3DnxO35GXdShYOn2nu5+eS3vCnC1HYY
+iOLRfkCSJjgmFDIPlrYN
+=lfKR
 -----END PGP SIGNATURE-----
diff --git a/app-text/ispell/files/ispell-3.2.06-patch.diff b/app-text/ispell/files/ispell-3.2.06-patch.diff
deleted file mode 100644
index 5a641f8945ee..000000000000
--- a/app-text/ispell/files/ispell-3.2.06-patch.diff
+++ /dev/null
@@ -1,190 +0,0 @@
-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/app-text/ispell/files/ispell-3.2.06-stripping.diff b/app-text/ispell/files/ispell-3.2.06-stripping.diff
deleted file mode 100644
index d53678c8e64c..000000000000
--- a/app-text/ispell/files/ispell-3.2.06-stripping.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur ispell-3.2.06.orig/Makefile ispell-3.2.06/Makefile
---- ispell-3.2.06.orig/Makefile	2007-08-18 15:15:59.000000000 +0200
-+++ ispell-3.2.06/Makefile	2007-08-18 15:17:44.000000000 +0200
-@@ -254,7 +254,6 @@
- 	@. ./config.sh; \
- 	  set -x; \
- 	  cd $$BINDIR; \
--	  strip ispell; \
- 	  chmod 755 ispell
- 	@. ./config.sh; \
- 	  set -x; \
-@@ -294,7 +293,6 @@
- 	@. ./config.sh; \
- 	  set -x; \
- 	  cd $$BINDIR; \
--	  strip buildhash icombine ijoin sq unsq; \
- 	  chmod 755 buildhash icombine ijoin \
- 	    munchlist findaffix tryaffix sq unsq
- 	@. ./config.sh; \
-diff -Naur ispell-3.2.06.orig/deformatters/Makefile ispell-3.2.06/deformatters/Makefile
---- ispell-3.2.06.orig/deformatters/Makefile	2001-07-25 23:51:48.000000000 +0200
-+++ ispell-3.2.06/deformatters/Makefile	2007-08-18 15:25:47.000000000 +0200
-@@ -76,7 +76,6 @@
- 	@. ../config.sh; \
- 	  set -x; \
- 	  cd $$BINDIR; \
--	  strip $(PROGRAMS); \
- 	  chmod 755 $(PROGRAMS)
- 
- clean:
diff --git a/app-text/ispell/files/local.h.gentoo b/app-text/ispell/files/local.h.gentoo
deleted file mode 100644
index 492c43dbc586..000000000000
--- a/app-text/ispell/files/local.h.gentoo
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * $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: not supported by cvs2svn $
- * 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/app-text/ispell/ispell-3.2.06-r6.ebuild b/app-text/ispell/ispell-3.2.06-r6.ebuild
deleted file mode 100644
index 8f33842f0fc4..000000000000
--- a/app-text/ispell/ispell-3.2.06-r6.ebuild
+++ /dev/null
@@ -1,62 +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/ispell/ispell-3.2.06-r6.ebuild,v 1.19 2011/02/06 05:59:58 leio 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/${PF}-gentoo-${PATCH_VER}.diff.bz2"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
-IUSE=""
-
-DEPEND="sys-apps/miscfiles
-		>=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}/${PF}-gentoo-${PATCH_VER}.diff"
-	epatch "${FILESDIR}/${P}-patch.diff"
-	epatch "${FILESDIR}/${P}-stripping.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 "Installation Failed"
-
-	rmdir ${D}/usr/share/man/man5
-	rmdir ${D}/usr/share/info
-
-	dodoc Contributors README WISHES || die "installing docs failed"
-
-	dosed ${D}/usr/share/man/man1/ispell.1
-}
diff --git a/app-text/ispell/ispell-3.3.02-r1.ebuild b/app-text/ispell/ispell-3.3.02-r1.ebuild
index bfe5d4ae66d3..073fab0970ce 100644
--- a/app-text/ispell/ispell-3.3.02-r1.ebuild
+++ b/app-text/ispell/ispell-3.3.02-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.3.02-r1.ebuild,v 1.10 2011/06/12 12:16:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.3.02-r1.ebuild,v 1.11 2012/04/17 14:46:45 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils multilib toolchain-funcs
 
 PATCH_VER="0.3"
+
 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
@@ -17,13 +18,16 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="sys-apps/miscfiles
-	>=sys-libs/ncurses-5.2"
+RDEPEND="
+	sys-apps/miscfiles
+	>=sys-libs/ncurses-5.2
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo-${PATCH_VER}.diff
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	epatch \
+		"${WORKDIR}"/${P}-gentoo-${PATCH_VER}.diff \
+		"${FILESDIR}"/${P}-glibc-2.10.patch
 
 	sed -e "s:GENTOO_LIBDIR:$(get_libdir):" -i local.h || die
 	sed -e "s:\(^#define CC\).*:\1 \"$(tc-getCC)\":" -i local.h || die
@@ -32,7 +36,7 @@ src_prepare() {
 
 src_configure() {
 	# Prepare config.sh for installation phase to avoid twice rebuild
-	emake -j1 config.sh || die "configuration failed"
+	emake -j1 config.sh
 	sed \
 		-e "s:^\(BINDIR='\)\(.*\):\1${ED}\2:" \
 		-e "s:^\(LIBDIR='\)\(.*\):\1${ED}\2:" \
@@ -42,13 +46,13 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 || die "compilation failed"
+	emake -j1
 }
 
 src_install() {
 	mv config.sh.install config.sh
-	emake -j1 install || die "Installation Failed"
-	dodoc CHANGES Contributors README WISHES || die "installing docs failed"
+	emake -j1 install
+	dodoc CHANGES Contributors README WISHES
 }
 
 pkg_postinst() {
diff --git a/app-text/ispell/ispell-3.3.02.ebuild b/app-text/ispell/ispell-3.3.02.ebuild
deleted file mode 100644
index e56d6061ddc0..000000000000
--- a/app-text/ispell/ispell-3.3.02.ebuild
+++ /dev/null
@@ -1,66 +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/ispell/ispell-3.3.02.ebuild,v 1.2 2007/11/22 19:25:48 philantrop Exp $
-
-inherit eutils multilib
-
-PATCH_VER="0.2"
-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}-gentoo-${PATCH_VER}.diff.bz2"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/miscfiles
-		>=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}/${P}-gentoo-${PATCH_VER}.diff"
-
-	sed -i -e "s:GENTOO_LIBDIR:$(get_libdir):" local.h.gentoo || die "setting libdir failed"
-	cp local.h.gentoo local.h
-}
-
-src_compile() {
-	emake -j1 config.sh || die "configuration failed"
-
-	# 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:^\(MAN45DIR='\)\(.*\):\1${D}\2:" \
-		< config.sh > config.sh.install
-
-	emake -j1 || die "compilation failed"
-}
-
-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/$(get_libdir)/ispell /usr/share/info \
-		/usr/share/man/man1 /usr/share/man/man5
-
-	emake -j1 install || die "Installation Failed"
-
-	rmdir "${D}"/usr/share/info || die "removing empty info dir failed"
-	dodoc CHANGES Contributors README WISHES || die "installing docs failed"
-	dosed "${D}"/usr/share/man/man1/ispell.1 || die "dosed failed"
-}
-
-pkg_postinst() {
-	echo
-	ewarn "If you just updated from an older version of ${PN} you *have* to re-emerge"
-	ewarn "all your dictionaries to avoid segmentation faults and other problems."
-	echo
-}