Rename the help output/manpage as well as the binary #137140 by Andrew Ross.

(Portage version: 2.1.1_pre1-r2)

3 files changed, 106 insertions, 6 deletions

diff --git a/sys-apps/rename/ChangeLog b/sys-apps/rename/ChangeLog
index 2f5d4a5fdd3c..8e9e4c17d779 100644
--- a/sys-apps/rename/ChangeLog
+++ b/sys-apps/rename/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/rename
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/ChangeLog,v 1.11 2005/08/10 19:26:41 ciaranm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/ChangeLog,v 1.12 2006/06/25 03:30:34 vapier Exp $
+
+  25 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/rename-1.3-rename.patch, rename-1.3.ebuild:
+  Rename the help output/manpage as well as the binary #137140 by Andrew Ross.
 
   10 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org> rename-1.3.ebuild:
   Fix SRC_URI, bug #102038
diff --git a/sys-apps/rename/files/rename-1.3-rename.patch b/sys-apps/rename/files/rename-1.3-rename.patch
new file mode 100644
index 000000000000..52a3d9acf6c8
--- /dev/null
+++ b/sys-apps/rename/files/rename-1.3-rename.patch
@@ -0,0 +1,95 @@
+--- rename/rename.c
++++ rename/rename.c
+@@ -594,7 +594,7 @@
+     } else {
+ 	rs = rename(oldp, new);
+ 	if (rs < 0) 
+-	    perror("rename");
++	    perror("renamexm");
+ 	else if (attr & MOD_VERBO)
+ 	    printf("ok\n");
+ 	
+@@ -628,8 +628,8 @@
+ {
+ 
+     char *help = "\
+-Usage: rename SOURCE DEST\n\
+-   or: rename [OPTION] file ...\n\
++Usage: renamexm SOURCE DEST\n\
++   or: renamexm [OPTION] file ...\n\
+ Rename SOURCE to DEST, or substitute characters match the specified pattern\n\
+ in the filename.\n\
+ \n\
+--- rename/rename.1
++++ rename/rename.1
+@@ -1,16 +1,16 @@
+ .TH NAME SECTION
+ .SH Name
+-rename \- file rename tool
++renamexm \- file rename tool
+ 
+ .SH SYNOPSIS
+-.B rename 
++.B renamexm 
+ .I OldName NewName
+ .P
+-.B rename
++.B renamexm
+ .I [options]  files ...
+ 
+ .SH DESCRIPTION
+ This
+-.I rename 
++.I renamexm 
+ is a quick and powerful tool for 
+ .I upcasing, 
+@@ -276,5 +276,5 @@
+ .SH EXAMPLES
+ .TP 
+-.I rename foo food
++.I renamexm foo food
+ Change file 'foo' to 'food', just like 
+ .I mv(1)
+@@ -282,23 +282,23 @@
+ 
+ .TP
+-.I rename -lR *
++.I renamexm -lR *
+ To lowcase all filenames, directories and filenames and directories under 
+ subdirectories.
+ 
+ .TP
+-.I rename -s/abc/xyz/gi *.c
++.I renamexm -s/abc/xyz/gi *.c
+ Substitute all 'abc' substrings appeared in C sources files with 'xyz',
+ ignoring case.
+ 
+ .TP
+-.I rename -vs/.c/.cpp/s *.c
++.I renamexm -vs/.c/.cpp/s *.c
+ Change C sources suffix to C++ sources suffix, with verbose information.
+ 
+ .TP
+-.I rename -s/abc/12345/bi *
++.I renamexm -s/abc/12345/bi *
+ Find the last occurrence of 'abc' and replace it with '12345', ignoring case.
+ 
+ .TP
+-.I rename -o guest -R /home/custom
++.I renamexm -o guest -R /home/custom
+ change the owner of the file '/home/custom' to 'guest'. The 'guest' should 
+ be an effective user in the current system. If '/home/custom' is a directory, 
+@@ -306,5 +306,5 @@
+ 
+ .TP
+-.I rename -s/^[A-Z].*file/nofile/r *
++.I renamexm -s/^[A-Z].*file/nofile/r *
+ The target substring starts with a capital letter, and ends with string 'file'.
+ There are 0 or any numbers of characters between the capital letter and 'file'.
+@@ -312,5 +312,5 @@
+ 
+ .TP
+-.I rename -s/^[A-Z].+file/nofile/eg *
++.I renamexm -s/^[A-Z].+file/nofile/eg *
+ Similar to last example, except it uses extended regular expression, such as 
+ the '+' metacharacter, and replaces all matching strings with 'nofile'.
diff --git a/sys-apps/rename/rename-1.3.ebuild b/sys-apps/rename/rename-1.3.ebuild
index 155f6cff214d..3e420db18b26 100644
--- a/sys-apps/rename/rename-1.3.ebuild
+++ b/sys-apps/rename/rename-1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/rename-1.3.ebuild,v 1.15 2005/08/10 19:26:41 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/rename-1.3.ebuild,v 1.16 2006/06/25 03:30:34 vapier Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="tool for easily renaming files"
 HOMEPAGE="http://rename.berlios.de/"
@@ -15,11 +15,12 @@ IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
 		-e '/strip /s:.*::' \
 		Makefile.in
+	epatch "${FILESDIR}"/${P}-rename.patch
 	tc-export CC
 }