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

Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 128 insertions, 12 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/Manifest b/sys-apps/rename/Manifest
index e6c04a1812a9..68f3f9bd22ff 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -1,14 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7120bb481476a39bd1dceb19a301aa64 rename-1.3.ebuild 820
+AUX rename-1.3-rename.patch 2365 RMD160 058cd7c67116ad5697c4a49e2bf87d4733dff34b SHA1 22cf3173e931733c03991ce98f871604b0ab1c8d SHA256 086ee7786e339b26fc692ee0f9c3bd89e2bcb77429176c602f585a1024fcda32
+MD5 8f6710446f3dcc80aa9992a959b620b7 files/rename-1.3-rename.patch 2365
+RMD160 058cd7c67116ad5697c4a49e2bf87d4733dff34b files/rename-1.3-rename.patch 2365
+SHA256 086ee7786e339b26fc692ee0f9c3bd89e2bcb77429176c602f585a1024fcda32 files/rename-1.3-rename.patch 2365
+DIST rename-1.3.tar.gz 83854
+EBUILD rename-1.3.ebuild 868 RMD160 2342e0a92de0db8a5f4c7931e90309ad509ccb5e SHA1 c834cde74a62e1cda57df102821bd4bda1c346e6 SHA256 d83e0126c9bad8475d8c37748e2135308328e8afd5087071ea8cc518c5159d9b
+MD5 cd731bc8d59108d2a9d47ed718a3fd59 rename-1.3.ebuild 868
+RMD160 2342e0a92de0db8a5f4c7931e90309ad509ccb5e rename-1.3.ebuild 868
+SHA256 d83e0126c9bad8475d8c37748e2135308328e8afd5087071ea8cc518c5159d9b rename-1.3.ebuild 868
+MISC ChangeLog 1417 RMD160 f280ee505dad8abdda241a67b07c2c6745ccdec9 SHA1 c788e2fa476624a10c59998b600f327f04750760 SHA256 6998b3c0ddc65f5004af4565a6641417da679ddc5bbab476830afb65014508a4
+MD5 decd4f8a414eb63d6b3205dc8fbb0e7a ChangeLog 1417
+RMD160 f280ee505dad8abdda241a67b07c2c6745ccdec9 ChangeLog 1417
+SHA256 6998b3c0ddc65f5004af4565a6641417da679ddc5bbab476830afb65014508a4 ChangeLog 1417
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 d430fdbd02dfdbd8dcd3e0c9135232bb ChangeLog 1235
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 422775298804a7adef3bc0ad71ef0d77 files/digest-rename-1.3 61
+RMD160 540a04740c8b7a24eda6fb4efd3ea8e3aab4ce24 files/digest-rename-1.3 61
+SHA256 665f38edab86204928de0eee7747d35eb320cf8f8a25e0ed95e95a3457818fbb files/digest-rename-1.3 61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFC+lT5LLFUmVNQ7rkRAsQzAJ903gUzaTJD+4bq5ME9YueFEalr8wCgtsJq
-wFrn3iJOhfjAnKc7MAOGY5M=
-=mZ81
+iD8DBQFEngShamhnQswr0vIRAgZuAKCRVDe6Jmq4RGAmSuo6afBQ+sLAaACeIBKH
+1yxWfRa9meOi5W3OYMvKpQ8=
+=uG3P
 -----END PGP SIGNATURE-----
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
 }