Version bump, bug 357833, thank teidakankan AT gmail.com and Atman Sense for report

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

4 files changed, 225 insertions, 3 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index f7a7f7dc6a01..50b9317e8046 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/hunspell
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.81 2010/11/24 08:42:52 grobian Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.82 2011/05/24 17:42:43 pva Exp $
+
+*hunspell-1.3.2 (24 May 2011)
+
+  24 May 2011; Peter Volkov <pva@gentoo.org> +hunspell-1.3.2.ebuild,
+  +files/hunspell-1.3-renameexes.patch:
+  Version bump, bug 357833, thank teidakankan AT gmail.com and Atman Sense for
+  report
 
   24 Nov 2010; Fabian Groffen <grobian@gentoo.org>
   hunspell-1.2.12-r1.ebuild:
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index ae37518007ef..9b3ff81ede11 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,12 +1,15 @@
 AUX hunspell-1.2.11-renameexes.patch 4285 RMD160 9657ab71c70e5e4da6807bc80618f03dd05df840 SHA1 2bc5bbb8b7ee65c19caf0c49a13bc88d994e4437 SHA256 d3458b14625194605b101e645b52f02c04b98851b0987d8554391506c9a917a9
 AUX hunspell-1.2.12-renameexes.patch 4448 RMD160 cb46c1aa32c8b082e6dab592a2f536c9b5c99428 SHA1 f488a451f4dc6fec8a8119ff0c1f9bd460cfb62e SHA256 af667dc36f89437556b128f962f0373151f0132b871caebb50c083cac56afdab
 AUX hunspell-1.2.9-renameexes.patch 4285 RMD160 2d8700b2cd9afdd2e6f375562e98d1b5111dd7d2 SHA1 fb0d9f31ceaa075b19cd9a69449c6ff0336fa933 SHA256 d407dafede8c0b71b9bbab97a3dda5805d85f0920a95019ad4126f5cec8897a0
+AUX hunspell-1.3-renameexes.patch 5337 RMD160 ede4ade083311df655d2458ebaf9510c498d1559 SHA1 9c234b8835d669761753f000b4535b9ec7dda058 SHA256 4cbeae9c782a2114d09d7920b1dfe355f37711ecd895d800a6b460bb87184f89
 DIST hunspell-1.2.11.tar.gz 926658 RMD160 fa67a24131a8ba4d9cdfd5b4ecfb9c728f83fe23 SHA1 0af7cf93a9914790705b670464d2f95a4bea6341 SHA256 3f975c056e0e8883b38ebe75f04a32e3983ea9d951afa035181806b070d06e93
 DIST hunspell-1.2.12.tar.gz 969894 RMD160 43bdf7c06d06e8f983b7cce88e71df833c22cd13 SHA1 0a2ab4b1e15c3dad3f05f474d1ae15ee361c35f8 SHA256 5f592a7112df2114cec772574f2837cb9de499e6bf9d35df327a42ab3e820e69
 DIST hunspell-1.2.9.tar.gz 802731 RMD160 62522337eea3dd325615a618005a108bb9d2639b SHA1 1e709814eb1fb29377953b3deef32d6c644bb33a SHA256 1569209541fa1c80db50af68cf96b996b7a9066f772bab52293438068b55fa28
+DIST hunspell-1.3.2.tar.gz 975917 RMD160 f193de180f9ac29cfb54824a45366ba57b27e5c4 SHA1 902c76d2b55a22610e2227abc4fd26cbe606a51c SHA256 b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd
 EBUILD hunspell-1.2.11.ebuild 2615 RMD160 28bdaebc816b9f9ac3be681c3da9873a958b34d6 SHA1 9deba2b51321a1f7004a2c1d293183fc3c4bcdc7 SHA256 088eac8cf44db3bfb276cc49a01f1575f190d68907ea4e46e15ee23152170a02
 EBUILD hunspell-1.2.12-r1.ebuild 2703 RMD160 7db6db5440c1b8b963f1e3b0ec8bc789d7cbec00 SHA1 58c122d5033a377611153847a0c9766e4e54a303 SHA256 e0d971af58b91413674d267543112143e24c3614fa11b443c09f646f4aa69cd7
 EBUILD hunspell-1.2.12.ebuild 2621 RMD160 db695fe7f18ce4e17f3c4c6216eea3d0b127b37a SHA1 b82ea264580cd2f8f4fd33f724d413ce678d3561 SHA256 a80195f6d464a0efd916bb2abac61c5d51ebfcff2731fc85e2bab0ed5606b86d
 EBUILD hunspell-1.2.9.ebuild 2607 RMD160 a953707108b91b7fdddcde388ffc02b5e73841b3 SHA1 925658d1efca17e1e6919d21288243f280641af2 SHA256 ea2bcb382438fab671fb15761f923eb2dc914d211a045b23d1ffdf57d607f409
-MISC ChangeLog 11636 RMD160 cc82abfc3cf01acef0f702809a4cdb0f836dd7e4 SHA1 dd2f7bf2150d8c4b77b9ddfa295fca685936203d SHA256 90ec79eb1de28480ca4d570ae080340e9ca6ea5bf43f46edc799345330773560
+EBUILD hunspell-1.3.2.ebuild 2526 RMD160 7ce8fc209912fed3d5c490d437b95641a7ecb87c SHA1 34dec26f6602448d7c1741eb9cc58cc5d4423071 SHA256 229f24df622acc316c3c9f23fdbd3a6467067b292cb0ae7bc6063399eab0f39a
+MISC ChangeLog 11861 RMD160 2f10dcf25c92ab042739990956cd10216e297e45 SHA1 b6a1eac2f18ac75896f235148d02263936878a45 SHA256 65d1a76c9c91b7f47e70e094826f73ebb1dc0a7947c5ee11c50f424e0918e53a
 MISC metadata.xml 163 RMD160 444608d5dce1eb9307c253140c5f6b011fcbece8 SHA1 87029f6d4a8e381a59cad5f8553f0e5163b11a7e SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb
diff --git a/app-text/hunspell/files/hunspell-1.3-renameexes.patch b/app-text/hunspell/files/hunspell-1.3-renameexes.patch
new file mode 100644
index 000000000000..70c5b748edba
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.3-renameexes.patch
@@ -0,0 +1,135 @@
+=== modified file 'src/tools/Makefile.am'
+--- src/tools/Makefile.am	2011-05-24 15:55:29 +0000
++++ src/tools/Makefile.am	2011-05-24 15:58:36 +0000
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
+ 
+ INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+@@ -6,8 +6,8 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.3.la
+ 
+-munch_SOURCES=munch.c munch.h
+-unmunch_SOURCES=unmunch.c unmunch.h
++hunspell_munch_SOURCES=munch.c munch.h
++hunspell_unmunch_SOURCES=unmunch.c unmunch.h
+ 
+ example_SOURCES=example.cxx
+ example_LDADD = ../hunspell/libhunspell-1.3.la
+@@ -16,11 +16,11 @@
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.3.la @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.3.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.3.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
+ 
+ noinst_PROGRAMS=example
+ 
+
+=== modified file 'src/tools/chmorph.cxx'
+--- src/tools/chmorph.cxx	2011-05-24 15:55:29 +0000
++++ src/tools/chmorph.cxx	2011-05-24 16:00:54 +0000
+@@ -19,11 +19,11 @@
+     for (int i = 1; i < 6; i++)
+ 	if (!argv[i]) {
+ 	    fprintf(stderr, 
+-	    "chmorph - change affixes by morphological analysis and generation\n" 
+-	    "correct syntax is:\nchmorph affix_file "
++	    "hunspell-chmorph - change affixes by morphological analysis and generation\n" 
++	    "correct syntax is:\nhunspell-chmorph affix_file "
+             "dictionary_file file_to_convert STRING1 STRING2\n"
+             "STRINGS may be arbitrary parts of the morphological descriptions\n"
+-	    "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
++	    "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
+ 	    " (convert informal Hungarian second person texts to formal third person texts)\n");
+ 	    exit(1);
+ 	}
+
+=== modified file 'src/tools/example.cxx'
+--- src/tools/example.cxx	2011-05-24 15:55:29 +0000
++++ src/tools/example.cxx	2011-05-24 15:55:37 +0000
+@@ -17,8 +17,8 @@
+     /* first parse the command line options */
+ 
+     if (argc < 4) {
+-        fprintf(stderr,"example (now it works with more dictionary files):\n"); 
+-        fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
++        fprintf(stderr,"hunspell-example (now it works with more dictionary files):\n"); 
++        fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+         exit(1);
+     }
+   
+
+=== modified file 'src/tools/munch.c'
+--- src/tools/munch.c	2011-05-24 15:55:29 +0000
++++ src/tools/munch.c	2011-05-24 15:55:37 +0000
+@@ -42,14 +42,14 @@
+        wf = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"munch word_list_file affix_file\n");
++    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
+     exit(1);
+   }
+   if (argv[2]) {
+        af = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"munch word_list_file affix_file\n");
++    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
+     exit(1);
+   }
+ 
+
+=== modified file 'src/tools/unmunch.c'
+--- src/tools/unmunch.c	2011-05-24 15:55:29 +0000
++++ src/tools/unmunch.c	2011-05-24 15:55:37 +0000
+@@ -39,14 +39,14 @@
+        wf = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"unmunch dic_file affix_file\n");
++    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
+     exit(1);
+   }
+   if (argv[2]) {
+        af = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"unmunch dic_file affix_file\n");
++    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
+     exit(1);
+   }
+ 
+
+=== modified file 'tests/test.sh'
+--- tests/test.sh	2011-05-24 15:55:29 +0000
++++ tests/test.sh	2011-05-24 15:55:37 +0000
+@@ -34,7 +34,7 @@
+ shopt -s expand_aliases
+ 
+ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
+-alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
++alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
+ 
+ if [ "$VALGRIND" != "" ]; then
+   rm -f $TEMPDIR/test.pid*
+@@ -43,7 +43,7 @@
+   fi
+ 
+   alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
+-  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
++  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
+ fi
+ 
+ # Tests good words
+
diff --git a/app-text/hunspell/hunspell-1.3.2.ebuild b/app-text/hunspell/hunspell-1.3.2.ebuild
new file mode 100644
index 000000000000..9254e6049f82
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.3.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.2.ebuild,v 1.1 2011/05/24 17:42:43 pva Exp $
+
+EAPI="4"
+inherit eutils multilib autotools flag-o-matic
+
+MY_P=${PN}-${PV/_beta/b}
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo."
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="readline? ( sys-libs/readline )
+	ncurses? ( sys-libs/ncurses )
+	sys-devel/gettext"
+RDEPEND="${DEPEND}"
+
+#TODO: "ia" "mi" - check what they are and add appropriate desc...
+def="app-dicts/myspell-en"
+for l in \
+"af" "bg" "ca" "cs" "cy" "da" "de" "el" "en" "eo" "es" "et" "fo" "fr" "ga" \
+"gl" "he" "hr" "hu" "id" "it" "ku" "lt" "lv" "mk" "ms" "nb" "nl" \
+"nn" "pl" "pt" "ro" "ru" "sk" "sl" "sv" "sw" "tn" "uk" "zu" \
+; do
+	dep="linguas_${l}? ( app-dicts/myspell-${l/pt_BR/pt-br} )"
+	[[ ${l} = "de" ]] &&
+		dep="linguas_de? ( || ( app-dicts/myspell-de app-dicts/myspell-de-alt ) )"
+	[[ -z ${PDEPEND} ]] &&
+		PDEPEND="${dep}" ||
+		PDEPEND="${PDEPEND}
+${dep}"
+	def="!linguas_${l}? ( ${def} )"
+	IUSE="${IUSE} linguas_${l}"
+done
+PDEPEND="${PDEPEND}
+${def}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Upstream package creates some executables which names are too generic
+	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+	# It modifies a Makefile.am file, hence eautoreconf.
+	epatch "${FILESDIR}"/${PN}-1.3-renameexes.patch
+	eautoreconf
+}
+
+src_configure() {
+	# missing somehow, and I am too lazy to fix it properly
+	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+	# I wanted to put the include files in /usr/include/hunspell
+	# but this means the openoffice build won't find them.
+	econf \
+		$(use_enable nls) \
+		$(use_with ncurses ui) \
+		$(use_with readline readline)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
+	# hunspell is derived from myspell
+	dodoc AUTHORS.myspell README.myspell license.myspell
+}
+
+pkg_postinst() {
+	elog "To use this package you will also need a dictionary."
+	elog "Hunspell uses myspell format dictionaries; find them"
+	elog "in the app-dicts category as myspell-<LANG>."
+}