Version bump to 1.2.2_beta as per bug 200185.

Package-Manager: portage-2.1.4.2

4 files changed, 197 insertions, 3 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index d4b57bfc89d9..2b57246153f9 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/hunspell
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.34 2007/12/25 20:29:53 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.35 2008/02/10 19:17:26 philantrop Exp $
+
+*hunspell-1.2.2_beta (10 Feb 2008)
+
+  10 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/hunspell-1.2.2b-renameexes.patch, +hunspell-1.2.2_beta.ebuild:
+  Version bump to 1.2.2_beta as per bug 200185.
 
   25 Dec 2007; Jeroen Roovers <jer@gentoo.org> hunspell-1.1.9.ebuild:
   Marked ~hppa for armin76. Fixed quoting issues.
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index f7e13b4ccd32..13a0f9d1af03 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,15 +3,18 @@ AUX hunspell-1.1.4-gettext.patch 493 RMD160 b36cc4eb95431b9c9cf5faf3cd4d8a8a2fb4
 AUX hunspell-1.1.4-libtool.patch 3865 RMD160 b87ea7a9a8d692313235678bd8239314c6b7e65f SHA1 cf4cb83f9a5e047c6b147155c8c765d31ee34393 SHA256 78fec5450650428c78785c405e289252473602e71848f88fa04c51e81f597b63
 AUX hunspell-1.1.4-renameexes.patch 4615 RMD160 d987d3b2b83324f5da9fc0666aa97dc75fcd2005 SHA1 c04f8ed956d6910a8c821315832cefe20d8fec8e SHA256 91bdcb9bcbffeb11ff20fd09ac780b44af79d8be42be3163469d3c1c29649583
 AUX hunspell-1.1.5-renameexes.patch 4706 RMD160 f3297e1b15b8ac53de646bac5625ca749e3b2614 SHA1 1e88a634b018ddd3a8e3dc84862b60c33e9ee05f SHA256 2878b37507245faaa486a12531fca2b6020359776e6013a9b3480e2ff69a9c0b
+AUX hunspell-1.2.2b-renameexes.patch 4178 RMD160 8d99aef3daa09074dd367625bf72aa579f9886ad SHA1 51df548154964f90a289029f1283dde82a56fe1d SHA256 480e9066aae365abff497a9c81f92e564d193b13659ebba8506ed92299bab5cc
 DIST hunspell-1.1.3.tar.gz 437469 RMD160 b04ed38e54b7773e805760906c5d242df1888d7c SHA1 5a006021180a9a8a61759cb02e43188ea5be50f2 SHA256 f49f648c3f1d22d54f11206734e88632a66547e6c20dfb08a2aa747e3f70d86e
 DIST hunspell-1.1.4.tar.gz 438667 RMD160 a90ded6b996d8b2d575268e8a4b025e92b85f378 SHA1 04251adfb351fe809756fc24ea56cd09ef2861a1 SHA256 8d39c03beb71ec1482d2fdbfc2d5b7690c8a70fb6da4885369752ee0d2e3a635
 DIST hunspell-1.1.5-3.tar.gz 651729 RMD160 f41f69569239faa031d16f26f7684f703243eed6 SHA1 2c75f83cf0fd543b4b70f828cdb55cfc614773f5 SHA256 9d153295722e64fbf4da650c679f4e0884d11d66b7809382193118c0a6ef021e
 DIST hunspell-1.1.9.tar.gz 684426 RMD160 e49782df2ada58762036acc3c904a8ace6b19a0a SHA1 a881d9bc8bc6257c956c70c863e872514f8c44d4 SHA256 c36ed98189da373f3f24e7be97425454e6706cc3e0d07ff39f8c1bcd6689d543
+DIST hunspell-1.2.2b.tar.gz 745643 RMD160 ec18944e259362d8b05e81c15cbfb8e1077cc293 SHA1 1ed31e328e57346d69a108e78e637780387443b3 SHA256 91a67974af4ee5cdfdcd0c0840009356aa3ce1b8d25820dc56c9a594684dad0e
 EBUILD hunspell-1.1.3.ebuild 1705 RMD160 c9a9565193938800382613cc1cba12aefce19713 SHA1 e4a65269b9f7461e333ed1f5314459c444e84224 SHA256 1bc8ffe29137481ee3218dd3da38c4b71bbfe3637fa75cecbc6bcec63f13a3ee
 EBUILD hunspell-1.1.4-r1.ebuild 2324 RMD160 17eb80069ecc0223c468169827ecd05abe35ca4b SHA1 e96bffd308e90a9df1dce5c15a011be8ff100a8b SHA256 f0cdbbe0dab21aa64d6ff42438f358154538ea33417c9b6a6508e8991c1c9f1e
 EBUILD hunspell-1.1.4-r2.ebuild 2588 RMD160 99337418586f403b01415caf9e75478f0e575532 SHA1 b1c0dbe8d544add81f0d6394ff51c07e97f6ec36 SHA256 7947330adb215feeda1db03b0caf8fbd59acc250a424599a997d5eb428fedef6
 EBUILD hunspell-1.1.4.ebuild 1887 RMD160 335609149954c6b73d95bddb0b2c20156011b3c6 SHA1 2a3591506c15a5407ddd935a1cdae951c286322b SHA256 78dad84fdece24da538d36c8df3076ea952e6f9e2ec81719e5bd0d8f7c7dc990
 EBUILD hunspell-1.1.5.ebuild 2597 RMD160 ddcf13615863ea2af9b256cfd478287677ba37f0 SHA1 25558f3d82fbb36e4670d05986ed79e94b17af15 SHA256 653dc679342e9453f0553b2345c93b2b2debc6400a0b68be2599c806ef95c0f1
 EBUILD hunspell-1.1.9.ebuild 2724 RMD160 ab5e368026bd87703fdf7c7a9b935dc7189894c3 SHA1 17538d6268bd3111cab1e351ef4522aef3adc252 SHA256 1e9316cb01a12aa439afd1805d70982a4cc30d127e68cb27f4d2c713f7c19c61
-MISC ChangeLog 4696 RMD160 62d31bc5263eb3835ba1549d5bbd2dac46635dae SHA1 2f34c3cafb7333bc810c023d2a33ef250b3029eb SHA256 90b122a749c4fada9384405e51759d5877af89de2bcc7b2a2131e6303f3617fe
+EBUILD hunspell-1.2.2_beta.ebuild 2693 RMD160 4f33488d75b05e24a3b1b413d5b39ea6ee9e5173 SHA1 cbdcbd4c4fd3d0611c19000c84b318e7f7484921 SHA256 f2a01492278c3c923b5fc2d4e5ddd332c13251f3d495ab738fb27a657504ee1a
+MISC ChangeLog 4915 RMD160 4da35f3cfbb72b87572a428c26f5195275ca529b SHA1 067113b6253ac552ab0b9783fa4378a35a46635c SHA256 dc3967d73e57551f17a8893e0d9fc8ac4b3127d5fc34ff26094e00a706e9d951
 MISC metadata.xml 222 RMD160 a74fc306077c440fea351793a03168651fb28f13 SHA1 45da96e6af3a3e7898ca55691d0e07583b6c75bf SHA256 5e7b34981ea08b001bd6eac085d6876fbeef6a4fdd91575e4e9f988cadf4f03f
diff --git a/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch b/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch
new file mode 100644
index 000000000000..db70de00e29b
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch
@@ -0,0 +1,105 @@
+diff -Naur hunspell-1.2.2b.orig/src/tools/example.cxx hunspell-1.2.2b/src/tools/example.cxx
+--- hunspell-1.2.2b.orig/src/tools/example.cxx	2008-01-16 11:33:31.000000000 +0100
++++ hunspell-1.2.2b/src/tools/example.cxx	2008-02-10 19:20:39.000000000 +0100
+@@ -17,8 +17,8 @@
+     /* first parse the command line options */
+ 
+     if (argc < 4) {
+-        fprintf(stderr,"example (multiple dictionary version.:\n"); 
+-        fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
++        fprintf(stderr,"hunspell-example (multiple dictionary version.:\n"); 
++        fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+         exit(1);
+     }
+   
+diff -Naur hunspell-1.2.2b.orig/src/tools/Makefile.am hunspell-1.2.2b/src/tools/Makefile.am
+--- hunspell-1.2.2b.orig/src/tools/Makefile.am	2008-01-09 12:27:42.000000000 +0100
++++ hunspell-1.2.2b/src/tools/Makefile.am	2008-02-10 19:17:47.000000000 +0100
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS=analyze chmorph example hunspell munch unmunch hzip hunzip
++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell-example hunspell hunspell-munch hunspell-unmunch hzip hunzip
+ 
+ INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+@@ -6,21 +6,21 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.2.la
+ 
+-munch_SOURCES=munch.c
+-unmunch_SOURCES=unmunch.c
++hunspell_munch_SOURCES=munch.c
++hunspell_unmunch_SOURCES=unmunch.c
+ include_HEADERS=munch.h unmunch.h
+ 
+-example_SOURCES=example.cxx
+-example_LDADD = ../hunspell/libhunspell-1.2.la
++hunspell_example_SOURCES=example.cxx
++hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
+ 
+ hunspell_SOURCES=hunspell.cxx
+ hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \
+ 	../parsers/libparsers.a @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 = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
+ 
+ EXTRA_DIST=makealias affixcompress
+diff -Naur hunspell-1.2.2b.orig/src/tools/munch.c hunspell-1.2.2b/src/tools/munch.c
+--- hunspell-1.2.2b.orig/src/tools/munch.c	2007-04-06 10:05:28.000000000 +0200
++++ hunspell-1.2.2b/src/tools/munch.c	2008-02-10 19:24:19.000000000 +0100
+@@ -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);
+   }
+ 
+diff -Naur hunspell-1.2.2b.orig/src/tools/unmunch.c hunspell-1.2.2b/src/tools/unmunch.c
+--- hunspell-1.2.2b.orig/src/tools/unmunch.c	2007-04-06 10:05:28.000000000 +0200
++++ hunspell-1.2.2b/src/tools/unmunch.c	2008-02-10 19:24:57.000000000 +0100
+@@ -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);
+   }
+ 
+diff -Naur hunspell-1.2.2b.orig/tests/test.sh hunspell-1.2.2b/tests/test.sh
+--- hunspell-1.2.2b.orig/tests/test.sh	2008-02-10 19:29:21.000000000 +0100
++++ hunspell-1.2.2b/tests/test.sh	2008-02-10 19:34:13.000000000 +0100
+@@ -34,7 +34,7 @@
+ shopt -s expand_aliases
+ 
+ alias hunspell='../src/tools/hunspell'
+-alias analyze='../src/tools/analyze'
++alias analyze='../src/tools/hunspell-analyze'
+ 
+ if [ "$VALGRIND" != "" ]; then
+   rm -f $TEMPDIR/test.pid*
diff --git a/app-text/hunspell/hunspell-1.2.2_beta.ebuild b/app-text/hunspell/hunspell-1.2.2_beta.ebuild
new file mode 100644
index 000000000000..35d2b123fa72
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.2.2_beta.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.2_beta.ebuild,v 1.1 2008/02/10 19:17:26 philantrop Exp $
+
+inherit eutils multilib autotools
+
+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 readline"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="readline? ( sys-libs/readline )
+	ncurses? ( sys-libs/ncurses )
+	sys-devel/gettext"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:tail +:tail -n +:' "${S}"/tests/test.sh ||\
+		die "Failed to fix-up tail for POSIX compliance"
+
+	# 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}"/${MY_P}-renameexes.patch
+
+	# Would still be nice to get bug 142787 fixed...
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	# I wanted to put the include files in /usr/include/hunspell
+	# but this means the openoffice build won't find them.
+	econf \
+		$(use_with readline readline) \
+		$(use_with ncurses ui) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+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"
+
+	# Upstream install has a few problems - rather than try to figure out
+	# what's broken in the build system, just fix things up manually.
+
+	# These are included by hunspell.hxx, but aren't installed by the install
+	# script.
+	insinto /usr/include/hunspell/
+	doins license.myspell license.hunspell config.h
+
+	# These are in the wrong place.
+	mv "${D}"/usr/include/munch.h "${D}"/usr/include/hunspell/munch.h
+	mv "${D}"/usr/include/unmunch.h "${D}"/usr/include/hunspell/unmunch.h
+
+	# Libraries include the version in their name, so make a sensible
+	# default symlink.  They should probably be libhunspell.so.1.1 etc.
+	dodir /usr/$(get_libdir)
+	cd "${D}"/usr/$(get_libdir)
+	ln -s libhunspell-1.2.so.0.0.0 libhunspell.so
+}
+
+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>."
+}