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

Package-Manager: portage-2.1.9.24/cvs/Linux i686

5 files changed, 10 insertions, 42 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/Manifest b/app-text/diction/Manifest
index acc00523c0f4..12de8dfbc2eb 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -1,6 +1,4 @@
-AUX diction-1.07-style-fail-on-bad-lang.patch 638 RMD160 d7f16745a04a616cbad4c58aaae0c966135f67c3 SHA1 63a5dce01bd6b14cea441d99d2f122cdeb3df69c SHA256 f187a17b59d939779d649309340a0e412504f4198d0e58bbefd3bda7fb077730
-AUX diction-1.09-style-fail-on-bad-lang.patch 636 RMD160 702ca3937eac232f990439e1ecb62a2d44b53b0c SHA1 f103353020aedb9a3e4babb023ec15e14ce4a315 SHA256 cf4d1b09e25a3356c4528aaa5270cf5debbeac217a9e53d8c69d3c7691fa9f63
 DIST diction-1.11.tar.gz 141062 RMD160 c054eb3eb2ffec54d1d48f9e33f138e41c0d4429 SHA1 30c7c778959120d30fa67be9261d41de894f498b SHA256 35c2f1bf8ddf0d5fa9f737ffc8e55230736e5d850ff40b57fdf5ef1d7aa024f6
-EBUILD diction-1.11.ebuild 896 RMD160 20821721d60c76e5d70666a569d4a374d9ff1cc2 SHA1 f8d77196847ce15f4a91314a48a2d5a7b9b415de SHA256 322901dd20107df04cc8ba497cefaa55d8ecdeae7aa1dfbfd64d534bc96de963
-MISC ChangeLog 5150 RMD160 56f15aad87f8bf1bf2d2fecde72eee65537c4987 SHA1 9c0f5fd0fd72f950f148f2703db65d7502afabc0 SHA256 026dacc2d660f6f7a4dc3ad0e9a020822f5f7d7231adb8e18df4462f8f6a4960
+EBUILD diction-1.11.ebuild 903 RMD160 8b690f50d3c2a801a66e4c3715b0717e1dae432a SHA1 dce6f0303c6b399805d07142160aa6c883767dbb SHA256 1cefc8a3301a384395a78495f4a0e5924e531ace69e8525fe652be4dae2dbc97
+MISC ChangeLog 5377 RMD160 08b875f562ee79b969684ae5b04f01cd20237268 SHA1 78016b5409e02215ae50746aa141089f0b9abc03 SHA256 7e913480c108a6146b0313f64b17945c6d9130b27fb6e32976cbc30a0ead383d
 MISC metadata.xml 939 RMD160 a9e8b40670fedd2677a9580de2cd65517591a250 SHA1 057cbb57df02230ec298c9a8ee6ea2a192b7b608 SHA256 eeb2dc3d26b06c4494027b4e45681e9d05e26871c8650c77268a6b8899ec7126
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)
-   {