Version bump, bug #319709, thank Samuli Suominen for report.

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

4 files changed, 204 insertions, 2 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index a7f7a0e351c9..0438953dca52 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,12 @@
 # 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.66 2010/05/14 15:02:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.67 2010/05/17 10:23:42 pva Exp $
+
+*hunspell-1.2.11 (17 May 2010)
+
+  17 May 2010; Peter Volkov <pva@gentoo.org> +hunspell-1.2.11.ebuild,
+  +files/hunspell-1.2.11-renameexes.patch:
+  Version bump, bug #319709, thank Samuli Suominen for report.
 
   14 May 2010; Jeroen Roovers <jer@gentoo.org> hunspell-1.2.9.ebuild:
   Stable for HPPA (bug #319435).
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 04e070b6155e..09713340d03f 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,15 +1,18 @@
 AUX hunspell-1.1.5-renameexes.patch 4706 RMD160 f3297e1b15b8ac53de646bac5625ca749e3b2614 SHA1 1e88a634b018ddd3a8e3dc84862b60c33e9ee05f SHA256 2878b37507245faaa486a12531fca2b6020359776e6013a9b3480e2ff69a9c0b
+AUX hunspell-1.2.11-renameexes.patch 4285 RMD160 9657ab71c70e5e4da6807bc80618f03dd05df840 SHA1 2bc5bbb8b7ee65c19caf0c49a13bc88d994e4437 SHA256 d3458b14625194605b101e645b52f02c04b98851b0987d8554391506c9a917a9
 AUX hunspell-1.2.2-renameexes.patch 3751 RMD160 2429424ecd90246c97e9414f2be7435f67705704 SHA1 a1e76bd5e6a4e21b3bf9c40bbd4ea2d51866fe43 SHA256 ff190919f954dd5314c2f5035d7a33796924316c775745df67c39d3bdfe2c5cc
 AUX hunspell-1.2.9-renameexes.patch 4285 RMD160 2d8700b2cd9afdd2e6f375562e98d1b5111dd7d2 SHA1 fb0d9f31ceaa075b19cd9a69449c6ff0336fa933 SHA256 d407dafede8c0b71b9bbab97a3dda5805d85f0920a95019ad4126f5cec8897a0
 DIST hunspell-1.1.9.tar.gz 684426 RMD160 e49782df2ada58762036acc3c904a8ace6b19a0a SHA1 a881d9bc8bc6257c956c70c863e872514f8c44d4 SHA256 c36ed98189da373f3f24e7be97425454e6706cc3e0d07ff39f8c1bcd6689d543
+DIST hunspell-1.2.11.tar.gz 926658 RMD160 fa67a24131a8ba4d9cdfd5b4ecfb9c728f83fe23 SHA1 0af7cf93a9914790705b670464d2f95a4bea6341 SHA256 3f975c056e0e8883b38ebe75f04a32e3983ea9d951afa035181806b070d06e93
 DIST hunspell-1.2.6.tar.gz 774786 RMD160 8577b508f7c76838e0f582e949c9b9de49b7f389 SHA1 5d75e1212c5757953f35dc16453fdee7ade64ec5 SHA256 c72c7c98143b39ff02b18a88419529b89ffecbec83750a5b9984e59fbf6a5d7b
 DIST hunspell-1.2.7.tar.gz 782364 RMD160 8a7ca3b0dfaf6d396fcd70aa904e0af82910ef34 SHA1 e113fce78c3b7cb010fc6eff4f89fd3b96bd0ea8 SHA256 37d0de21d39a28bcefdc0cb3f24fe8ea10992ff8752139a54807698ec2653046
 DIST hunspell-1.2.8.tar.gz 784360 RMD160 e4fd39e5fadf96da1311f2aa7163ec17eacf0f83 SHA1 eaa76f82fcf08678e49f7a30afdaa268bcc75235 SHA256 af563e13646620e608052b46974e10d0fc3e4d48b1b996f9771cbfac6dfc3c38
 DIST hunspell-1.2.9.tar.gz 802731 RMD160 62522337eea3dd325615a618005a108bb9d2639b SHA1 1e709814eb1fb29377953b3deef32d6c644bb33a SHA256 1569209541fa1c80db50af68cf96b996b7a9066f772bab52293438068b55fa28
 EBUILD hunspell-1.1.9.ebuild 2614 RMD160 ca6c4f80796d100915b7854f7145bf37f0aa9528 SHA1 be4aac45778cd69c14c42b1c5348a15d4174cccf SHA256 b6793325562722d48bda5ff1b2e4b70efa83802010eb2dd5161b43f2165f3420
+EBUILD hunspell-1.2.11.ebuild 2615 RMD160 60327485be749882dc2dccacbb4da24711e34193 SHA1 213099aab40b69b01fdb73ed544193ff8aab4908 SHA256 7dea45f500aaf731472b095a2a31b1b1e2236cb0d80314e8c138657f1ef536a2
 EBUILD hunspell-1.2.6.ebuild 1820 RMD160 c3a27380604cf5b97ca12ca4eb26c12ecc3dd0fb SHA1 71ceee32dc27149948420fa596af02795839220b SHA256 32fe8848c96551067f1e8916b63c2fba6cf1dea92884bf36bacdc5dbed4d4c12
 EBUILD hunspell-1.2.7.ebuild 1836 RMD160 aa4be760637e05e10677b005b00cec172956e153 SHA1 8db8581e178161f88c9f77e2056ac46d91d7ce7b SHA256 9ce31a08ec27f813a8d65a0e59e6e1a9226f87e658b7057e592e5339694c6cfc
 EBUILD hunspell-1.2.8.ebuild 2003 RMD160 0d806e68989c1c1fa64d2f454c6f7d5ae1b3b1f1 SHA1 0212021f97e4605f5badaf42bbbba945a0468fb7 SHA256 964ed2f0e7a6fa315be6d8e9b2f4639d76059cce16dfd2c842ff977ea086a9cc
 EBUILD hunspell-1.2.9.ebuild 2610 RMD160 58725aeb35c2a76941f9f8b7c412a447b0d2c5dd SHA1 43308ff5bded90edf6c9496175d07e1add76ce15 SHA256 4737a9e46e381f6becd35e4362ab26b4d41e2c2c4f437343e435197a357cea5f
-MISC ChangeLog 9654 RMD160 579cc442387037be65c1fff5dc12b48ad827111e SHA1 fac388a691104763592f2fa7e269d7e5f993877d SHA256 09ea5f5cb74d5fb4cf42cdc9fac2d77e2d4d2265e899d65e41b369658c716042
+MISC ChangeLog 9863 RMD160 5b5d8d01fcd760383fdef1402294ceabf873e51a SHA1 902f946838192707e1d99db9b44fa5a17fd81f02 SHA256 3417cdd11c067dcc5df4a3f2272be171639866e4af3381266f5a9b388b3534c3
 MISC metadata.xml 163 RMD160 444608d5dce1eb9307c253140c5f6b011fcbece8 SHA1 87029f6d4a8e381a59cad5f8553f0e5163b11a7e SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb
diff --git a/app-text/hunspell/files/hunspell-1.2.11-renameexes.patch b/app-text/hunspell/files/hunspell-1.2.11-renameexes.patch
new file mode 100644
index 000000000000..e037448a2590
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.2.11-renameexes.patch
@@ -0,0 +1,116 @@
+=== modified file 'src/tools/Makefile.am'
+--- src/tools/Makefile.am	2010-05-17 09:20:26 +0000
++++ src/tools/Makefile.am	2010-05-17 09:23:40 +0000
+@@ -1,4 +1,5 @@
+ 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 +7,8 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.2.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.2.la
+@@ -16,11 +17,11 @@
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.2.la @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.2.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
+ 
+ noinst_PROGRAMS=example
+ 
+
+=== modified file 'src/tools/example.cxx'
+--- src/tools/example.cxx	2010-05-17 09:20:26 +0000
++++ src/tools/example.cxx	2010-05-17 09:22:51 +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	2010-05-17 09:20:26 +0000
++++ src/tools/munch.c	2010-05-17 09:22:51 +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	2010-05-17 09:20:26 +0000
++++ src/tools/unmunch.c	2010-05-17 09:22:51 +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	2010-05-17 09:20:26 +0000
++++ tests/test.sh	2010-05-17 09:22:51 +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*
+@@ -42,7 +42,7 @@
+     mkdir $TEMPDIR/badlogs
+   fi
+   alias hunspell='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-hunspell'
+-  alias analyze='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-analyze'
++  alias analyze='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-hunspell-analyze'
+ fi
+ 
+ # Tests good words
+
diff --git a/app-text/hunspell/hunspell-1.2.11.ebuild b/app-text/hunspell/hunspell-1.2.11.ebuild
new file mode 100644
index 000000000000..2dc91ad33871
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.2.11.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.11.ebuild,v 1.1 2010/05/17 10:23:42 pva Exp $
+
+EAPI="2"
+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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~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.2.11-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 || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell || die "installing docs failed"
+	# hunspell is derived from myspell
+	dodoc AUTHORS.myspell README.myspell license.myspell || die "installing myspell docs failed"
+}
+
+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>."
+}