Remove unused patches and assign RDEPEND.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

6 files changed, 17 insertions, 57 deletions

diff --git a/dev-util/motor/ChangeLog b/dev-util/motor/ChangeLog
index 4124f5e40950..89b2db1edc2c 100644
--- a/dev-util/motor/ChangeLog
+++ b/dev-util/motor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/motor
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/ChangeLog,v 1.15 2009/09/01 17:27:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/ChangeLog,v 1.16 2009/09/06 17:09:22 idl0r Exp $
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/motor-3.3.0-gcc34-2.patch, -files/motor-3.3.0-gcc34.patch,
+  motor-3.4.0-r1.ebuild, motor-3.4.0-r2.ebuild, motor-3.4.0-r3.ebuild:
+  Remove unused patches and assign RDEPEND.
 
 *motor-3.4.0-r3 (01 Sep 2009)
 
diff --git a/dev-util/motor/files/motor-3.3.0-gcc34-2.patch b/dev-util/motor/files/motor-3.3.0-gcc34-2.patch
deleted file mode 100644
index 1541d2da199c..000000000000
--- a/dev-util/motor/files/motor-3.3.0-gcc34-2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN ../tmp-orig/motor-3.2.4.1/parser/src/parser.c ./parser/src/parser.c
---- ../tmp-orig/motor-3.2.4.1/parser/src/parser.c	2001-11-02 08:44:15.000000000 +0100
-+++ ./parser/src/parser.c	2004-07-21 13:49:04.909656822 +0200
-@@ -313,7 +313,6 @@
- 		buf = mmap(0, *size, PROT_READ, MAP_SHARED, f, 0);
- 		if (buf == MAP_FAILED) buf = NULL;
- 		break;
--	    default:
- 	}
-     }
-     close(f);
-@@ -333,7 +332,6 @@
- 	    // munmap
- 	    munmap(text, size);
- 	    break;
--	default:
-     }
- }
- 
---- ../tmp-orig/motor-3.2.4.1/src/ui/ncurses/uitagbrowser.cc	2002-12-11 09:03:11.000000000 +0100
-+++ ./src/ui/ncurses/uitagbrowser.cc	2004-07-21 14:08:05.463971935 +0200
-@@ -78,7 +78,7 @@
-     cm.setwindow(textwindow(w.x1, w.y1, w.x1+20, 0, uiconf.getcolor(cp_menufr)));
- 
-     for(motortagbrowser::viewscope scope = motortagbrowser::File;
--    scope != motortagbrowser::viewscope_size; (int) scope += 1) {
-+    scope != motortagbrowser::viewscope_size; scope = (motortagbrowser::viewscope) ( scope + 1 ) ) {
- 	cm.additem(0, scope, (string) " " + getscopename(scope));
- 	if(scope == tagbrowser.getscope())
- 	    cm.setpos(cm.getcount()-1);
diff --git a/dev-util/motor/files/motor-3.3.0-gcc34.patch b/dev-util/motor/files/motor-3.3.0-gcc34.patch
deleted file mode 100644
index 4942bb7fe9b5..000000000000
--- a/dev-util/motor/files/motor-3.3.0-gcc34.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- parser/src/parser.c	2004-10-07 19:03:40.500317416 -0400
-+++ parser/src/parser.c	2004-10-07 19:06:22.201735064 -0400
-@@ -314,6 +314,7 @@ char *loadTextFromFile(const char *filen
- 		if (buf == MAP_FAILED) buf = NULL;
- 		break;
- 	    default:
-+		break;
- 	}
-     }
-     close(f);
-@@ -334,6 +335,7 @@ void unloadTextFromFile(char *text, int 
- 	    munmap(text, size);
- 	    break;
- 	default:
-+	    break;
-     }
- }
- 
diff --git a/dev-util/motor/motor-3.4.0-r1.ebuild b/dev-util/motor/motor-3.4.0-r1.ebuild
index 348cb58edd2f..160804817bc3 100644
--- a/dev-util/motor/motor-3.4.0-r1.ebuild
+++ b/dev-util/motor/motor-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.4.0-r1.ebuild,v 1.4 2007/11/13 21:57:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.4.0-r1.ebuild,v 1.5 2009/09/06 17:09:22 idl0r Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
 KEYWORDS="ppc x86"
 IUSE="nls"
 
-DEPEND=">=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.2"
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
diff --git a/dev-util/motor/motor-3.4.0-r2.ebuild b/dev-util/motor/motor-3.4.0-r2.ebuild
index b785c971e6d5..ad86624b5a6f 100644
--- a/dev-util/motor/motor-3.4.0-r2.ebuild
+++ b/dev-util/motor/motor-3.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.4.0-r2.ebuild,v 1.1 2008/12/23 17:46:51 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.4.0-r2.ebuild,v 1.2 2009/09/06 17:09:22 idl0r Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
 IUSE="nls"
 
-DEPEND=">=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.2"
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
diff --git a/dev-util/motor/motor-3.4.0-r3.ebuild b/dev-util/motor/motor-3.4.0-r3.ebuild
index eb520893a121..e092e92d8e27 100644
--- a/dev-util/motor/motor-3.4.0-r3.ebuild
+++ b/dev-util/motor/motor-3.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.4.0-r3.ebuild,v 1.1 2009/09/01 17:27:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.4.0-r3.ebuild,v 1.2 2009/09/06 17:09:22 idl0r Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
 IUSE="nls"
 
-DEPEND=">=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.2"
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {