Added patch to fix replace with accented characters, bug 327405, thank Rafael for report.

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

4 files changed, 168 insertions, 2 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index 7e438ea65628..4f2e542769ff 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/aspell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.123 2010/06/05 15:45:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.124 2010/07/22 21:08:57 pva Exp $
+
+*aspell-0.60.6-r2 (22 Jul 2010)
+
+  22 Jul 2010; Peter Volkov <pva@gentoo.org> +aspell-0.60.6-r2.ebuild,
+  +files/aspell-0.60.6-replace-fix.patch:
+  Added patch to fix replace with accented characters, bug 327405, thank
+  Rafael for report.
 
   05 Jun 2010; Raúl Porcel <armin76@gentoo.org> aspell-0.60.6-r1.ebuild:
   alpha/arm/ia64/s390/sh stable wrt #310015
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 055b73965d68..81dba3338c4b 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,6 +4,7 @@ AUX aspell-0.60.5-gcc-4.3.patch 5460 RMD160 2b90f62f32994154034fc49baf71947f9527
 AUX aspell-0.60.5-nls.patch 443 RMD160 c5d89ec5ca398c990a7bb6598d5283471e43b92a SHA1 d502ebb74c97662af8ea365eb1cfffd222681859 SHA256 9c8a619f97ffcbb6a90bb5d5f0531d0890ca0033dcfae5b0fc70cb635df7b39c
 AUX aspell-0.60.5-solaris.patch 534 RMD160 cf7d1b11b771e916db83058c3f451b6d4b4218f7 SHA1 47f3dccf0a9bc19f8b55a78cd0f2162d1e07913d SHA256 e0d4f52e7cdfcf0ae727dbfd1fa967b9e6b7ad41bb56926108c2bff16ea232ad
 AUX aspell-0.60.6-darwin-bundles.patch 647 RMD160 4839f36d4283a0dd77656eee6905901403cb2dd8 SHA1 c27f1985c61c98c66c4d919d46f53dc4526046b9 SHA256 9e37613a35fa3b77ffad9330e026ad640de2666c1aa9cf930e2195136fb93785
+AUX aspell-0.60.6-replace-fix.patch 1291 RMD160 e026dce5878339d2e83c7a99e5129b481f643dd9 SHA1 619d8fea8cd98d460165f3c0917a2a3a3a8fb7c3 SHA256 f31fe0844d3883c13d6588e08d78433eb9d7ce31d5b2e1cf60ced5c1f23218af
 AUX aspell-quotechar-fix.patch 473 RMD160 200f38438108555bfdc67c68008bced0c3a6b779 SHA1 3602ab6c07818ac0187613d6c54731b65004f741 SHA256 3b5bc1a87613b396b080fb5a13003ac58b9fb443a8d2dc4eb2e03851ddad3a6d
 DIST aspell-0.50.5.tar.gz 1016586 RMD160 6bfb0070e572ffdedf86ea87f50f4958bb418b12 SHA1 0b17272e1773ef133775d5e6be9fbccc8689ff58 SHA256 e385d747d7423846760170476f16f12719cf2846a99e1b5acea13eeb948c1f4d
 DIST aspell-0.60.5.tar.gz 1754865 RMD160 1efc56988a01e60d1fcff0143e910f5cb6618a76 SHA1 170ff906bd909dba32144c972d322cfc8fbff41b SHA256 ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b
@@ -11,6 +12,7 @@ DIST aspell-0.60.6.tar.gz 1777930 RMD160 315638cc7cc4ce9d3dc09c7e15faf637855d504
 EBUILD aspell-0.50.5-r4.ebuild 1918 RMD160 c44f0875467fa48ca1b786bbbd5245f7ba68a2be SHA1 1807881c0b777e1a57d66e60b8b580e31601d593 SHA256 0cb69f5a88638ac387a12f39f21aa7133e2e2246c86a9023549d340bf199ef4c
 EBUILD aspell-0.60.5.ebuild 2997 RMD160 186aa4147a325b0546637dfdcaa0f6a47e27ea5f SHA1 2773248d455e724dfb21ad592965e7a5b7594350 SHA256 444cb843941a60d03706e2a015e5e53109240a6090d0e5052d2378fc8579f104
 EBUILD aspell-0.60.6-r1.ebuild 3714 RMD160 39bc4c9d85fa2086cc8a70500a3700c92c13d299 SHA1 80c91af1590334ed8f4e8f3db2c6ef767468e786 SHA256 4f178b9d89f5e741cc731e2400c97302139a2f4339b4da9cfb2019fc6a6adba3
+EBUILD aspell-0.60.6-r2.ebuild 3774 RMD160 3555bf925ac62840850ab9690011164e8c785b49 SHA1 5d83ab9460afe5cc38e6e5b9bc43773a50fe3519 SHA256 d5435b6ef2920aaaf54a99e798b8fd7e0b3dbd6f5c58b88276a3fd4239009e9a
 EBUILD aspell-0.60.6.ebuild 3030 RMD160 c868f25e2ef0538c88fd208bf1734f9764f03adc SHA1 031c6bfeff851491c6e55cce1349ae986433226d SHA256 8233594391bfd549ab1d04ae0260e9299e1f6133be99c892375d7fe639ebde4b
-MISC ChangeLog 18988 RMD160 f2b398c91b4e553b4c542bd5c76b917f76ea8523 SHA1 f41be2b240dd5f58f0a4ecb029988f3d596729f9 SHA256 dce1b894448c25e8930fb2b9e9cc7f04600d793710f52131a09b2f02078ced1b
+MISC ChangeLog 19225 RMD160 ef3bd8167f08b3a272e391d25bdd3d0e44619de2 SHA1 fca548c13057f89dc3b285616d9adc1db177fe58 SHA256 8818b770b870faa657cfb383fedf66ba3b6dc5005a1c1a528c3ac30c565a4de1
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
diff --git a/app-text/aspell/aspell-0.60.6-r2.ebuild b/app-text/aspell/aspell-0.60.6-r2.ebuild
new file mode 100644
index 000000000000..150778ed6f47
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.6-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6-r2.ebuild,v 1.1 2010/07/22 21:08:57 pva Exp $
+
+EAPI="3"
+
+# N.B. This is before inherit of autotools, as autotools.eclass adds the
+# relevant dependencies to DEPEND.
+WANT_AUTOMAKE="1.10"
+
+inherit libtool eutils flag-o-matic autotools
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls examples"
+# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together
+
+# Build PDEPEND from list of language codes provided in the tree.
+# The PDEPEND string is static - this code just makes it easier to maintain.
+def="app-dicts/aspell-en"
+for l in \
+	"af" "be" "bg" "br" "ca" "cs" "cy" "da" "de" "el" \
+	"en" "eo" "es" "et" "fi" "fo" "fr" "ga" "gl" "he" \
+	"hr" "is" "it" "la" "lt" "nl" "no" "pl" "pt" "pt_BR" \
+	"ro" "ru" "sk" "sl" "sr" "sv" "uk" "vi" ; do
+	dep="linguas_${l}? ( app-dicts/aspell-${l/pt_BR/pt-br} )"
+	[[ ${l} = "de" ]] &&
+		dep="linguas_de? ( || ( app-dicts/aspell-de app-dicts/aspell-de-alt ) )"
+	[[ -z ${PDEPEND} ]] &&
+		PDEPEND="${dep}" ||
+		PDEPEND="${PDEPEND}
+${dep}"
+	def="!linguas_${l}? ( ${def} )"
+	IUSE="${IUSE} linguas_${l}"
+done
+PDEPEND="${PDEPEND}
+${def}"
+
+COMMON_DEPEND=">=sys-libs/ncurses-5.2
+	nls? ( virtual/libintl )"
+
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+# English dictionary 0.5 is incompatible with aspell-0.6
+RDEPEND="${COMMON_DEPEND}
+	!=app-dicts/aspell-en-0.5*"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.60.3-templateinstantiations.patch"
+	epatch "${FILESDIR}/${PN}-0.60.5-nls.patch"
+	epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch"
+	epatch "${FILESDIR}/${P}-darwin-bundles.patch"
+	epatch "${FILESDIR}/${P}-replace-fix.patch" #327405
+
+	rm m4/lt* m4/libtool.m4
+	eautoreconf
+	elibtoolize --reverse-deps
+}
+
+src_configure() {
+	filter-flags -fno-rtti
+	filter-flags -fvisibility=hidden #77109
+	filter-flags -maltivec -mabi=altivec
+	use ppc && append-flags -mno-altivec
+
+	# Was bug #46432. Ncurses changed linking with gpm, from NEWS:
+	# "20041009 change GPM initialization, using dl library to load it dynamically
+	# at runtime (Debian #110586)"
+	# and as a side effect it looks like we don't need add gpm library. (20090302)
+	#built_with_use sys-libs/ncurses gpm && mylibs="-lgpm"
+	LIBS="${mylibs}" econf \
+		$(use_enable nls) \
+		--disable-static \
+		--sysconfdir="${EPREFIX}"/etc/aspell \
+		--enable-docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	dodoc README* TODO || die "installing docs failed"
+
+	emake DESTDIR="${D}" install || die "installation failed"
+	mv "${ED}"usr/share/doc/${PF}/man-html "${ED}"usr/share/doc/${PF}/html
+	mv "${ED}"usr/share/doc/${PF}/man-text "${ED}"usr/share/doc/${PF}/text
+
+	# install ispell/aspell compatibility scripts
+	exeinto /usr/bin
+	newexe scripts/ispell ispell-aspell
+	newexe scripts/spell spell-aspell
+
+	if use examples ; then
+		cd examples
+		make clean || die
+		docinto examples
+		dodoc "${S}"/examples/* || die "installing examples failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "In case LINGUAS was not set correctly you may need to install"
+	elog "dictionaries now. Please choose an aspell-<LANG> dictionary or"
+	elog "set LINGUAS correctly and let aspell pull in required packages."
+	elog "After installing an aspell dictionary for your language(s),"
+	elog "You may use the aspell-import utility to import your personal"
+	elog "dictionaries from ispell, pspell and the older aspell"
+}
diff --git a/app-text/aspell/files/aspell-0.60.6-replace-fix.patch b/app-text/aspell/files/aspell-0.60.6-replace-fix.patch
new file mode 100644
index 000000000000..f5c766491338
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.6-replace-fix.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/show_bug.cgi?id=327405
+http://sourceforge.net/tracker/?func=detail&aid=2955373&group_id=245&atid=100245
+
+diff -u -r1.19.2.5 check_funs.cpp
+--- prog/check_funs.cpp	3 Mar 2010 05:16:24 -0000	1.19.2.5
++++ prog/check_funs.cpp	3 Mar 2010 05:34:52 -0000
+@@ -327,7 +327,11 @@
+     wnoutrefresh(choice_w);
+     doupdate();
+     line.resize(0);
++#ifdef HAVE_WIDE_CURSES
++    wint_t c;
++#else
+     int c;
++#endif
+     noecho();
+     int begin_x;
+     {int junk; getyx(choice_w, junk, begin_x);}
+@@ -336,13 +340,12 @@
+     while (true) {
+       handle_last_signal();
+ #ifdef HAVE_WIDE_CURSES
+-      wint_t wi = 0;
+-      int res = wget_wch(choice_w, &wi);
+-      c = wi;
++      int res = wget_wch(choice_w, &c);
++      if (res == ERR) continue;
+ #else
+       c = wgetch(choice_w);
+-#endif
+       if (c == ERR) continue;
++#endif
+       if (c == '\r' || c == '\n' || c == KEY_ENTER) 
+         break;
+       if (c == control('c') || c == KEY_BREAK) {
+@@ -373,7 +376,9 @@
+       } else if (x < max_x && 32 <= c && c != '\x7F' && NOT_KEY /*c < 256*/) {
+ #ifdef HAVE_WIDE_CURSES
+         wchar_t wc = c;
+-        wins_nwstr(choice_w, &wc, 1);
++        cchar_t cc;
++        setcchar(&cc, &wc, 0, 0, NULL);
++        wins_wch(choice_w, &cc);
+ #else
+         winsch(choice_w, c);
+ #endif