Version bump (bug #518740).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 170 insertions, 6 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 5c5031f2e392..7926f891ec2f 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/hunspell
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.112 2014/01/05 11:34:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.113 2014/08/01 20:00:11 polynomial-c Exp $
+
+*hunspell-1.3.3 (01 Aug 2014)
+
+  01 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> +hunspell-1.3.3.ebuild,
+  +files/hunspell-1.3.3-multibyte-chars.patch:
+  Version bump (bug #518740 by Jan Seeger).
 
   05 Jan 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due http://gentoo.2317880.n4.nabble.com/app-dicts-herd-is-empty-
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 32945ef2dfb6..a00589ae7b34 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,14 +3,27 @@ Hash: SHA256
 
 AUX hunspell-1.3-renameexes.patch 5337 SHA256 4cbeae9c782a2114d09d7920b1dfe355f37711ecd895d800a6b460bb87184f89 SHA512 26cab6d31a22c33e96a118e2b0905bd26e7d224737fab9f4d02f8ed4729032202de37b0d9e42500b0ba8912109bb47eec0e47ed712e9b3a082c9f8a24db52588 WHIRLPOOL 633f1204fa824bdb0507914e13894c7bf68a07438f86bd1baddb2ae884792487816cdda94214fcfff005080ebe9dd352282f38c9e5db86daef1bd04491ad1960
 AUX hunspell-1.3.2-static-lib.patch 451 SHA256 7259ea8f23a4d2717e85f62e3276cbcc23af292f6e77daddeb23bd93dbde0528 SHA512 923ff9f5cc7d32fba73755eaed537af43b95ee8050865c623f6552bcadee4acf9d23d2fcbdba1ffefe648fff05f92c5af5e4b067e31fc306d9258d64eba45ced WHIRLPOOL 1e1dc1cd8cc65d19c215c9ed13b366d84287d29d21cfd3d0d3c2467c7e656bf91c92567d12c6ac8a77f8dd2d902e60611d34e190d53026e04034efc84069fd1b
+AUX hunspell-1.3.3-multibyte-chars.patch 1866 SHA256 1a2f0c6fd79894fa5f556c1715bc4bd05f2409b1d778bc2f597e3d44dc64f457 SHA512 a5b3b2a7b93bf5c5cdf446ae4a85e88e6bf1244c05437df29734241507e715f18ca5967de708f20ab569b55c646f85f4277c1112c867321edfd105a946c7bf9c WHIRLPOOL df9418af8941e8cba06a6b4b63369324fbad358b4c4bface9385f720ac91881150cd832e3c0f5665bc35ae5cd02da9c978233d1254d0ff45370516db58997563
 DIST hunspell-1.3.2.tar.gz 975917 SHA256 b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd SHA512 fdc165af6fc7d66b858184e34851fb6d8022736af4133fe51535afcadd9c7fdb824c05c3d33b948fafcea165ccc23f5918adb7d81e5eeb5525c05abda0cbd43c WHIRLPOOL 40b1fad6c6ed4eee211b040ddffa794063c7474b910cb08de4cfd9a64845ff59bbb3f2bf92a8347dbaf378e65dd4608c316e5a2e65ee9a3eb6504696c3703b75
+DIST hunspell-1.3.3.tar.gz 986081 SHA256 a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c SHA512 7599981d002a4a032c41c83f6287243a4942b0e25c408049a3ba86c16f63ce964800a3ac325ace0402b0d7256690c4a4151a66f19a8f58cc455af0498bb1af04 WHIRLPOOL c10f7f7b326ce886bd031da29e9e04a1f4a5914f24cbe75061ed539958e7a8efaa4d4ea16f2b17437c63d97d6f558a27c092bc43c9f56c75078667d5344402f8
 EBUILD hunspell-1.3.2-r3.ebuild 2526 SHA256 99bc77f7e02b9844926cea5d2a18db265193260124eafab0e49875a3121f1878 SHA512 77cfce6020e9a499847743766043b7d3777dc1b64a00e8ef6b2caae72688d0f890dec70d0bc8b6ce402f8f5640a80a16dc70c63f03c79061eeb13cd9d10b76c2 WHIRLPOOL 081e56a56bb61fec89cad95b8cdccbb5f182bd481c04e5265c2bd7f64c4228c3d2d1109da0574c4f521754bf2dee12b1604a1fe91dbffdaf00cc90f7b9cd49c0
-MISC ChangeLog 15993 SHA256 eb1d4225dad7908a7dd1304a8bb065142aab23bc42d9c1b0956c69795d2af705 SHA512 34aa097c0bc0028aa10899a4605890f9861ce447189de259092079b4db8c36498a3a98f951c4b8e4a8489fc5934dd8979e10e966e12c53c768ffb6b82b7ff6de WHIRLPOOL 94d8652bc9fecf28d84c287ff2f9bf6ff71db9fc4d4fab5362426a145999f6bd3edc2dad776b66988abccb50117a9b6a888f42887a96103840e094b8e6cbc774
+EBUILD hunspell-1.3.3.ebuild 2526 SHA256 88bfaa0b22dcfb840b599788f880e674cb6e12ad6e4b1bc8dcac03e1853d1609 SHA512 4e57ee054f54e3b2c7efac6bb81584d9f7509ebdd4a173ca811b55f191334fad7ff8aee11cfc7ae72f892e10d01f191296a235b8eb6c106a89a6d8ac81237e0a WHIRLPOOL 6d2e08817870b24c3786bb00b22b30033365a366e356d4d3172583cbd86e41c32a8e4e764f2a39d58e9434c7219a34f395218cfea5227b4a50a5a891b9bdada2
+MISC ChangeLog 16201 SHA256 0aaee0df46f862a23e3aacd6c64a54663bb4d476056df438022cd8fc21312334 SHA512 355c1ec76c8cddad7d2d4ee5badae89d00cbe0e1d138dea790e0aada483f1c48215c25a4c11d03e6be66ebe91a52b4e176e9ae37ce56b06279b6cf57324b6566 WHIRLPOOL c986c09f08eaf705cb5ffc653dfb7a5f3b3c60813fa531be0922755d2bb38c03b9f6f820e0fab15f662f5b8c41b263bc40ba6c161caf4443956929f707be328b
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlLJQzEACgkQCaWpQKGI+9QV7gCeKN21121Kx6HIRdJrC+wxqRmA
-EewAn0ICmyhat2qURQwR15ozNA6rvwm5
-=GhsK
+iQIcBAEBCAAGBQJT2/HMAAoJEPiazRVxLXTFmg0QALT6sX8FAa3pViCtimmEakj+
+VHC7i7cORd99e0kuHflG4u6SfTykDKdgstlvy54DJNpweT6aQGeUXWw1dD4BVJd8
+DhmquT6CvrKHv3O7/LYf4S3vpLVon5rVYhpQsE+hokMLHf3ZdtRvh91xFS6ZMRzK
+EBfeZilx0TDw5tFaZe6PcxocPS9Faz1F1r6O3CUCdhaaOMJ0VKUAJnf4uhlXNjcL
+DaOGe+3JviGCp6GHesO5eK9YOnKrCRewbo5nNgTXX7naq7qhE3duCq69Wdj8kQ9+
+/V9itsh7jceUsJYI8mcnN2HdvEJdiIOjLBNdTbNhfhsRhgygw090iRMIQj0VV0/G
+JHrsBjaZnam1VdKbxLB9jOfzjT1XBpa8dGIWt2cfD300te2/WYiRktYTVnQNho16
+O4dluYnZs23a8qRzy2ydr/7NGanzZSxw4OTb5Uc7ppsHUMgMpDv7ZopSVJprodV+
+DqstGafHhBXA/RNXW4QXH2evuqkXv0XqpAHi5qMnjQQVHgdZN/zSDrnDOJsHobrA
+zVzxsGiD4KRmWeHF9ru620p5op8LwqAsFRPtr2U5sTElZ5SyAO1scXerchHqygDp
+0rZNyuMdZSeZc6SU7tCALLSeFsF/viNsbNlDKZ+pTVWxaqSENZVSi/XWvt74t1HC
+NZ6n85Xs6Zj4mBvSp4L3
+=yqZm
 -----END PGP SIGNATURE-----
diff --git a/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch b/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch
new file mode 100644
index 000000000000..848bc8fe8950
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch
@@ -0,0 +1,59 @@
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7781#31
+https://bugs.gentoo.org/518740
+
+--- src/tools/hunspell.cxx
++++ src/tools/hunspell.cxx
+@@ -710,13 +748,22 @@ if (pos >= 0) {
+ 			fflush(stdout);
+ 		} else {
+ 			char ** wlst = NULL;
+-			int ns = pMS[d]->suggest(&wlst, token);
++			int byte_offset = parser->get_tokenpos() + pos;
++			int char_offset = 0;
++			if (strcmp(io_enc, "UTF-8") == 0) {
++				for (int i = 0; i < byte_offset; i++) {
++					if ((buf[i] & 0xc0) != 0x80)
++						char_offset++;
++				}
++			} else {
++				char_offset = byte_offset;
++			}
++			int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
+ 			if (ns == 0) {
+-		    		fprintf(stdout,"# %s %d", token,
+-		    		    parser->get_tokenpos() + pos);
++		    		fprintf(stdout,"# %s %d", token, char_offset);
+ 			} else {
+ 				fprintf(stdout,"& %s %d %d: ", token, ns,
+-				    parser->get_tokenpos() + pos);
++					char_offset);
+ 				fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], io_enc));
+ 			}
+ 			for (int j = 1; j < ns; j++) {
+@@ -745,13 +792,23 @@ if (pos >= 0) {
+ 			if (root) free(root);
+ 		} else {
+ 			char ** wlst = NULL;
++			int byte_offset = parser->get_tokenpos() + pos;
++			int char_offset = 0;
++			if (strcmp(io_enc, "UTF-8") == 0) {
++				for (int i = 0; i < byte_offset; i++) {
++					if ((buf[i] & 0xc0) != 0x80)
++						char_offset++;
++				}
++			} else {
++				char_offset = byte_offset;
++			}
+ 			int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
+ 			if (ns == 0) {
+ 		    		fprintf(stdout,"# %s %d", chenc(token, io_enc, ui_enc),
+-		    		    parser->get_tokenpos() + pos);
++		    		    char_offset);
+ 			} else {
+ 				fprintf(stdout,"& %s %d %d: ", chenc(token, io_enc, ui_enc), ns,
+-				    parser->get_tokenpos() + pos);
++				    char_offset);
+ 				fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], ui_enc));
+ 			}
+ 			for (int j = 1; j < ns; j++) {
+
diff --git a/app-text/hunspell/hunspell-1.3.3.ebuild b/app-text/hunspell/hunspell-1.3.3.ebuild
new file mode 100644
index 000000000000..bbdb4f31411c
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.3.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.3.ebuild,v 1.1 2014/08/01 20:00:11 polynomial-c Exp $
+
+EAPI=5
+inherit eutils multilib autotools flag-o-matic versionator
+
+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 static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+# describe properly mi
+LANGS="af bg ca cs cy da de el en eo es et fo fr ga gl he hr hu ia id is it km
+ku lt lv mk ms nb nl nn pl pt pt_BR ro ru sk sl sq sv sw tn uk zu"
+
+DICT_DEP="app-dicts/myspell-en"
+for lang in ${LANGS}; do
+	if [[ ${lang} == de ]] ; then
+		DICT_DEP+=" linguas_de? (
+			|| (
+				app-dicts/myspell-de
+				app-dicts/myspell-de-alt
+			)
+		)"
+	else
+		DICT_DEP+=" linguas_${lang}? ( app-dicts/myspell-${lang/pt_BR/pt-br} )"
+	fi
+	IUSE+=" linguas_${lang}"
+done
+PDEPEND="${DICT_DEP}"
+
+unset lang LANGS DICT_DEP
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
+	AUTHORS.myspell README.myspell license.myspell
+)
+
+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 \
+		"${FILESDIR}"/${PN}-1.3.3-multibyte-chars.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.
+	# You can do that, libreoffice can find them anywhere, just
+	# ping me when you do so ; -- scarabeus
+	econf \
+		$(use_enable nls) \
+		$(use_with ncurses ui) \
+		$(use_with readline readline) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
+	popd >/dev/null
+}