Remove old patches by jalan (bug #344191). Set RDEPEND.

(Portage version: 2.1.9.24/cvs/Linux i686)

4 files changed, 8 insertions, 38 deletions

diff --git a/app-text/diction/ChangeLog b/app-text/diction/ChangeLog
index 66eb5620afc2..21b630b635ba 100644
--- a/app-text/diction/ChangeLog
+++ b/app-text/diction/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/diction
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/diction/ChangeLog,v 1.39 2010/02/10 19:52:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/diction/ChangeLog,v 1.40 2010/11/04 20:07:53 jer Exp $
+
+  04 Nov 2010; Jeroen Roovers <jer@gentoo.org>
+  -files/diction-1.07-style-fail-on-bad-lang.patch,
+  -files/diction-1.09-style-fail-on-bad-lang.patch, diction-1.11.ebuild:
+  Remove old patches by jalan (bug #344191). Set RDEPEND.
 
   10 Feb 2010; Fabian Groffen <grobian@gentoo.org> diction-1.11.ebuild:
   Marked ~x64-macos
diff --git a/app-text/diction/diction-1.11.ebuild b/app-text/diction/diction-1.11.ebuild
index bc6e48679727..648f430a5c5b 100644
--- a/app-text/diction/diction-1.11.ebuild
+++ b/app-text/diction/diction-1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/diction/diction-1.11.ebuild,v 1.12 2010/02/10 19:52:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/diction/diction-1.11.ebuild,v 1.13 2010/11/04 20:07:53 jer Exp $
 
 DESCRIPTION="Diction and style checkers for english and german texts"
 HOMEPAGE="http://www.gnu.org/software/diction/diction.html"
@@ -13,6 +13,7 @@ IUSE="unicode"
 
 DEPEND="sys-devel/gettext
 	virtual/libintl"
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-text/diction/files/diction-1.07-style-fail-on-bad-lang.patch b/app-text/diction/files/diction-1.07-style-fail-on-bad-lang.patch
deleted file mode 100644
index b7538161a728..000000000000
--- a/app-text/diction/files/diction-1.07-style-fail-on-bad-lang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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)
-   {
diff --git a/app-text/diction/files/diction-1.09-style-fail-on-bad-lang.patch b/app-text/diction/files/diction-1.09-style-fail-on-bad-lang.patch
deleted file mode 100644
index 261398de8fa7..000000000000
--- a/app-text/diction/files/diction-1.09-style-fail-on-bad-lang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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)
-   {