[patch] diction-results_of_131637.patch

diction-results_of_131637.patch (text/plain), 4.12 KB, created by James Rowe on 2006-06-04 02:40:36 UTC

Prereq: 1.5
Index: diction/diction-1.07.ebuild
===================================================================
--- diction/diction-1.07.ebuild	{cset bc4bad0e-466c-4682-bc37-9108175169e7}
+++ diction/diction-1.07.ebuild	{local clone}
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/diction/diction-1.07.ebuild,v 1.5 2006/06/01 14:25:54 seemant Exp $
 
+inherit eutils
+
 DESCRIPTION="Diction and style checkers for english and german texts"
 HOMEPAGE="http://www.gnu.org/software/diction/diction.html"
 SRC_URI="http://www.moria.de/~michael/diction/${P}.tar.gz"
@@ -9,11 +11,21 @@ SRC_URI="http://www.moria.de/~michael/di
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc ~ppc-macos ~sparc ~x86"
-IUSE=""
+IUSE="unicode"
 
 DEPEND="sys-devel/gettext"
 RDEPEND="virtual/libintl"
 
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	epatch ${FILESDIR}/${P}-style_fail_on_bad_lang.patch
+	if use unicode; then
+		iconv -f ISO-8859-1 -t UTF-8 de > de.new || die "charset conversion failed."
+		mv de.new de
+	fi
+}
+
 src_compile() {
 	./configure --prefix=/usr ||die
 	emake || die
Prereq: 1.1
Index: diction/diction-1.09.ebuild
===================================================================
--- diction/diction-1.09.ebuild	{cset 270cf689-3c3c-4806-b6f6-94631f5e8b5e}
+++ diction/diction-1.09.ebuild	{local clone}
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/diction/diction-1.09.ebuild,v 1.1 2006/04/25 21:06:29 seemant Exp $
 
+inherit eutils
+
 DESCRIPTION="Diction and style checkers for english and german texts"
 HOMEPAGE="http://www.gnu.org/software/diction/diction.html"
 SRC_URI="http://www.moria.de/~michael/diction/${P}.tar.gz"
@@ -9,11 +11,21 @@ SRC_URI="http://www.moria.de/~michael/di
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc-macos ~sparc ~x86"
-IUSE=""
+IUSE="unicode"
 
 DEPEND="sys-devel/gettext"
 RDEPEND="virtual/libintl"
 
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	epatch ${FILESDIR}/${P}-style_fail_on_bad_lang.patch
+	if use unicode; then
+		iconv -f ISO-8859-1 -t UTF-8 de > de.new || die "charset conversion failed."
+		mv de.new de
+	fi
+}
+
 src_install() {
 	make DESTDIR=${D} install
 	dodoc NEWS README
Prereq: 1.1
Index: diction/files/diction-1.07-style_fail_on_bad_lang.patch
===================================================================
--- /dev/null	{cset 3358adbb-78b6-43b9-8bb7-14bf633a1676}
+++ diction/files/diction-1.07-style_fail_on_bad_lang.patch	{local clone}
@@ -0,0 +1,18 @@
+# Fix for problem spotted by Matthias Langer in bug #131637
+
+Index: diction-1.07/style.c
+===================================================================
+--- diction-1.07/style.c	{cset 980e7b47-4932-44e5-a761-6c69c6a771e1}
++++ diction-1.07/style.c	{local clone}
+@@ -894,6 +894,11 @@ int main(int argc, char *argv[]) /*{{{*/
+   }
+   /*}}}*/
+   newHit(&lengths);
++  if (strcmp(docLanguage,"de") && strcmp(docLanguage,"en"))
++  {
++    fprintf(stderr,_("style: Incorrect language option `%s'.\n"),docLanguage);
++    exit(1);
++  }
+   if (optind==argc) sentence("style",stdin,"(stdin)",style,docLanguage,0);
+   else while (optind<argc)
+   {
Prereq: 1.1
Index: diction/files/diction-1.09-style_fail_on_bad_lang.patch
===================================================================
--- /dev/null	{cset 2ceadd45-4ec7-4671-8fbb-cacdf958f334}
+++ diction/files/diction-1.09-style_fail_on_bad_lang.patch	{local clone}
@@ -0,0 +1,18 @@
+# Fix for problem spotted by Matthias Langer in bug #131637
+
+Index: diction-1.10/style.c
+===================================================================
+--- diction-1.10/style.c	{cset f20f6f20-d7da-4aa0-9160-88cf480ce937}
++++ diction-1.10/style.c	{local clone}
+@@ -911,6 +911,11 @@ int main(int argc, char *argv[]) /*{{{*/
+   }
+   /*}}}*/
+   newHit(&lengths);
++  if (strcmp(docLanguage,"de") && strcmp(docLanguage,"en"))
++  {
++    fprintf(stderr,_("style: Incorrect language option `%s'.\n"),docLanguage);
++    exit(1);
++  }
+   if (optind==argc) sentence("style",stdin,"(stdin)",style,docLanguage);
+   else while (optind<argc)
+   {