Remove unused patches and assign RDEPEND.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

7 files changed, 21 insertions, 63 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/Manifest b/dev-util/motor/Manifest
index b9e96b57f2ee..581fbde54f1d 100644
--- a/dev-util/motor/Manifest
+++ b/dev-util/motor/Manifest
@@ -1,10 +1,8 @@
 AUX motor-3.2.2-security.patch 319 RMD160 4b0673b239106f88713ccf8a075e6fb65164e937 SHA1 33aaec5a261fb31daaa58142cad9d33700ff6b79 SHA256 da775a2901adfd5101da3f7bd9752b5ad3a9f3ccfb4305d09b5cff3aba0d7e7f
-AUX motor-3.3.0-gcc34-2.patch 1127 RMD160 b9f3d85f6d125c55809075f173c5a6520bb77c52 SHA1 39238dfbf0551923bb0dd4623d783ff0ddf34b7a SHA256 1fe6c8df708011be7ebd590d93d41b143f8cb6dfad70736b0a456e60cb170d00
-AUX motor-3.3.0-gcc34.patch 416 RMD160 04417951a8642b42136ae86e1e08d9303a3925b2 SHA1 a3254f41a84443a7e9e57366c3760bd283571188 SHA256 47acb2f55574f1b05e480634411dd3629b211ed0549ed06c9b24cf3d89b3ae68
 AUX motor-3.4.0-gcc43.patch 316 RMD160 c5e6a012692c16d2be0977d784faf11501617a2c SHA1 bddc0fef4a02438dc941e99543c29954e07bce5f SHA256 a3a036c7696fd9ad76c89aa24f39a6832fa8cdf89142100034b0af7e75f58c69
 DIST motor-3.4.0.tar.bz2 468265 RMD160 bf5dd07744fa1a8868612f32f96776bd915b0063 SHA1 77ce2e54b5251cb4fd688ed2bf3fa92a610e9b42 SHA256 d876ca4567cb691b17c7a8cde1c5a23a9349bdbe70b587804a7b58f21c1d2f42
-EBUILD motor-3.4.0-r1.ebuild 783 RMD160 13378b536146be7c40836e2c688125a49f429516 SHA1 ce05c858f1e8d9a1067059c38f1aa5c749d3319c SHA256 5c7839176866e25213c2db10c8ddd59b041a13438dc077131a299599fce93562
-EBUILD motor-3.4.0-r2.ebuild 830 RMD160 d9a805d46ba6b670ce2250067df6e68cb0ce0ef0 SHA1 f2b766b8ac16262bbfed15c539b681c7e684b588 SHA256 06f1eb2fd363dc21aa9a53ba36ac75b82e764c5d16714fe80f4fd05076394d31
-EBUILD motor-3.4.0-r3.ebuild 860 RMD160 20426b2e93917d4dedc11068fa0aad8f4e22cf49 SHA1 d968b637f89a032d0fed25771c6db3214843e7f8 SHA256 776747132749400bf653899e04dd4a943a3469518ce4a7c52d4ff4132a7e3203
-MISC ChangeLog 2285 RMD160 6d9a87f5e82a29aca22082d8cec4fe3386cd8dfd SHA1 cab23d3a783e70f35d84b48f0d8bbd904b84fd3e SHA256 6b8c5636ea86c0a6c450df8d57e4557561ab0429e74a90dc0e0263cd7c3c8d83
+EBUILD motor-3.4.0-r1.ebuild 801 RMD160 9972c6a3bd62405ef7269b474ee293bc5e367ee8 SHA1 895d7f91672fb1721d14beafbfd20052ad5f3874 SHA256 ddca1975f96b3f204f3f3c3fc4bc2e7f018e856511ac51f5b4ef7164aec53713
+EBUILD motor-3.4.0-r2.ebuild 849 RMD160 6c80d8b6d591f97830d766d88cd34e027c44f7d9 SHA1 c47a710eb5d4d0c47e08f0926adbd7c2b6ce42f7 SHA256 7a4fb945b4ad2e041789278e850d024629d3c6b2a75eddb1196ea77d5a2e03f8
+EBUILD motor-3.4.0-r3.ebuild 883 RMD160 d98cab37f22bd8fe19961cba4d86c645df07eec5 SHA1 0df67db2f56ed9a98fe3062ab0d643de419c44ea SHA256 aa3175b97fb44b6bf993290b0ae811a1f3aaec88129d80cc706163b2725ae7cd
+MISC ChangeLog 2523 RMD160 c59e4f2572974b26ae704ade0403f1a502433cc5 SHA1 43f0b2de677f18302788b9078ed2eae07e214b31 SHA256 dd3f8619d791116f554dcfc6f13d8fef5f428577f8faf0c4ce893655ec4a529c
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
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() {