rename

2 files changed, 18 insertions, 36 deletions

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 51fee66add79..1f879076682b 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -185,14 +185,14 @@ AUX bash-3.2-process-subst.patch 291 RMD160 0d295ebd160fd80d5c07758f992bb0de8c45
 MD5 6a6536e68777ced16c9e66c086842cc0 files/bash-3.2-process-subst.patch 291
 RMD160 0d295ebd160fd80d5c07758f992bb0de8c45b6a0 files/bash-3.2-process-subst.patch 291
 SHA256 4c04ea6b60f57d6bc6daf85c35d13e24dec5ebac8e1aaf68c0eeaa180e6d2d98 files/bash-3.2-process-subst.patch 291
+AUX bash-3.2-redisplay-cursor.patch 685 RMD160 80fd6fc3eefb4cb589132f8b462b79c3e15d4b90 SHA1 7cb2664f7dd570f46f6302e743262e696f2555d9 SHA256 4bed8131f3ee39fccefc805dbe201eb9b8ce9671b9bc607c3d2a95ac6172d1ba
+MD5 06e25af6bb685144d20fc2be1e72810f files/bash-3.2-redisplay-cursor.patch 685
+RMD160 80fd6fc3eefb4cb589132f8b462b79c3e15d4b90 files/bash-3.2-redisplay-cursor.patch 685
+SHA256 4bed8131f3ee39fccefc805dbe201eb9b8ce9671b9bc607c3d2a95ac6172d1ba files/bash-3.2-redisplay-cursor.patch 685
 AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
 MD5 d192d33c34972e9120bc3f40e555b11c files/bash-3.2-ulimit.patch 449
 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db files/bash-3.2-ulimit.patch 449
 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381 files/bash-3.2-ulimit.patch 449
-AUX bash-3.2_p10-redisplay-cursor.patch 654 RMD160 0fb724f3ea4dfcf77d043afd8a8b8fdbac114c1e SHA1 488a372fc9c5530ba9f7f4aee9e74829e0a74552 SHA256 881e720588069557d73d844d0a2f8e4a0ee7603a330aacb1e5e937268a8f72dc
-MD5 efc48bcc4065736f1e42fdf29bf4e422 files/bash-3.2_p10-redisplay-cursor.patch 654
-RMD160 0fb724f3ea4dfcf77d043afd8a8b8fdbac114c1e files/bash-3.2_p10-redisplay-cursor.patch 654
-SHA256 881e720588069557d73d844d0a2f8e4a0ee7603a330aacb1e5e937268a8f72dc files/bash-3.2_p10-redisplay-cursor.patch 654
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
 MD5 229ccc2980a94877f2e87f957e9da7bf files/bash_logout 205
 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 files/bash_logout 205
@@ -298,18 +298,18 @@ EBUILD bash-3.2_p10.ebuild 4402 RMD160 fbe2b604872008bf523266b50ab4f159971124ea
 MD5 8708824c2262f4484f893ca481ac83c4 bash-3.2_p10.ebuild 4402
 RMD160 fbe2b604872008bf523266b50ab4f159971124ea bash-3.2_p10.ebuild 4402
 SHA256 9acdc3471174bae2f03787d2789ae39295595bb3df2632b2d2e56bd1cec9a2e8 bash-3.2_p10.ebuild 4402
-EBUILD bash-3.2_p15.ebuild 4648 RMD160 6254f2c42bda83909dd33625d60bae49afd89b11 SHA1 7ce2208ae73421e62379a3cb71993463713e2696 SHA256 2b407f4cf3e4ddc40c40bc1b62af69bd998225199c264bba0537b6b01c3bc615
-MD5 3f5f621c56e20b96b88d54fc845c86a2 bash-3.2_p15.ebuild 4648
-RMD160 6254f2c42bda83909dd33625d60bae49afd89b11 bash-3.2_p15.ebuild 4648
-SHA256 2b407f4cf3e4ddc40c40bc1b62af69bd998225199c264bba0537b6b01c3bc615 bash-3.2_p15.ebuild 4648
+EBUILD bash-3.2_p15-r1.ebuild 4711 RMD160 14be63171ecebdd5edacffe0a023c8945090b888 SHA1 ffcbfe717ba09d5760a1ca29cdb6192a88f3df53 SHA256 d8aba264bbe49b728bdb634c39078ccf185e5c97e4f8d9184e3ed868a5f06790
+MD5 a7a78f02e15343614b8119d4234f1065 bash-3.2_p15-r1.ebuild 4711
+RMD160 14be63171ecebdd5edacffe0a023c8945090b888 bash-3.2_p15-r1.ebuild 4711
+SHA256 d8aba264bbe49b728bdb634c39078ccf185e5c97e4f8d9184e3ed868a5f06790 bash-3.2_p15-r1.ebuild 4711
 EBUILD bash-3.2_p9-r1.ebuild 4340 RMD160 d663e053149393248d9ae8a194c5b4bf6d04f794 SHA1 db7f1abd2839e01d542d44f795b934b57db86c2d SHA256 21e4785d3630607b051feed27c8f2c8fd0e8dc62305a66938bcee52979c370aa
 MD5 2ddfec75db6f094863e533d055719767 bash-3.2_p9-r1.ebuild 4340
 RMD160 d663e053149393248d9ae8a194c5b4bf6d04f794 bash-3.2_p9-r1.ebuild 4340
 SHA256 21e4785d3630607b051feed27c8f2c8fd0e8dc62305a66938bcee52979c370aa bash-3.2_p9-r1.ebuild 4340
-MISC ChangeLog 24091 RMD160 95c96e1416fbfdc1ee1acc1d9d93d2a2a21d4ead SHA1 1dd0f169e8fb62e80356bbdd60c04b922a948ae4 SHA256 85e71c8f090ceebd2542cb63c99d5231c6d06c67797768fc79446ebef1cc1a7a
-MD5 42a22574a2e1373c92d76072e40f861f ChangeLog 24091
-RMD160 95c96e1416fbfdc1ee1acc1d9d93d2a2a21d4ead ChangeLog 24091
-SHA256 85e71c8f090ceebd2542cb63c99d5231c6d06c67797768fc79446ebef1cc1a7a ChangeLog 24091
+MISC ChangeLog 24297 RMD160 50664f5511fc2ab956947b5013c5329b4eb14f94 SHA1 3acadc0593b1cf72ac77743820443d5388f3c321 SHA256 53dd53e39c9004e42598d6e3e05aab47d00db3c592eb82ef8c4afb0608921510
+MD5 58b08479f7ae8c6480ab9cc35cee4b7b ChangeLog 24297
+RMD160 50664f5511fc2ab956947b5013c5329b4eb14f94 ChangeLog 24297
+SHA256 53dd53e39c9004e42598d6e3e05aab47d00db3c592eb82ef8c4afb0608921510 ChangeLog 24297
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -332,16 +332,16 @@ SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/di
 MD5 1402e96194a7b16e9143eabd20401c9f files/digest-bash-3.2_p10 2279
 RMD160 3f3b2dcde44a26df5efd3fc60c0a503f2322ec4e files/digest-bash-3.2_p10 2279
 SHA256 c981b0f8241affa0fad97552aba77360d3403325f0c6f3da9be4538cd58f83ed files/digest-bash-3.2_p10 2279
-MD5 4a835185c46aecc85b6ac0862205b4c9 files/digest-bash-3.2_p15 3304
-RMD160 d502e564107a37307b87ee9ba56d9dbd99c722a4 files/digest-bash-3.2_p15 3304
-SHA256 8bc4e2d075085097eaf80d8025cc061d3e0b303d5893a4f206b9013c2176ece2 files/digest-bash-3.2_p15 3304
+MD5 4a835185c46aecc85b6ac0862205b4c9 files/digest-bash-3.2_p15-r1 3304
+RMD160 d502e564107a37307b87ee9ba56d9dbd99c722a4 files/digest-bash-3.2_p15-r1 3304
+SHA256 8bc4e2d075085097eaf80d8025cc061d3e0b303d5893a4f206b9013c2176ece2 files/digest-bash-3.2_p15-r1 3304
 MD5 ef1b3c02b997284cb562ba9e3eebf17c files/digest-bash-3.2_p9-r1 2074
 RMD160 3232387aa160a9ea2ee764e929fa58618674d590 files/digest-bash-3.2_p9-r1 2074
 SHA256 1fe387fc344fd77f445608d6e5d99d8547c8c2f0aba4150c6b54720ff7a0b7df files/digest-bash-3.2_p9-r1 2074
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGBN1R8bi6rjpTunYRAhQ6AJ9BM5vn0vzIPy7zXWBg4zGt/DY06gCggfq/
-L8kSBsRUc1YONW9b/bxU0UU=
-=OzOx
+iD8DBQFGBN7n8bi6rjpTunYRAuBlAJ0UvgtTNkdRyenwPFA1GHvRAWe0sACfQIhh
+jOeUEF7bj4CrzosDgeDyEHc=
+=BIKA
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/files/bash-3.2_p10-redisplay-cursor.patch b/app-shells/bash/files/bash-3.2_p10-redisplay-cursor.patch
deleted file mode 100644
index cd8c71c738c7..000000000000
--- a/app-shells/bash/files/bash-3.2_p10-redisplay-cursor.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-*** ../bash-3.2.10/lib/readline/display.c	Fri Jan 19 13:34:50 2007
---- lib/readline/display.c	Sat Mar 10 17:25:44 2007
-***************
-*** 1733,1737 ****
-      {
-        dpos = _rl_col_width (data, 0, new);
-!       if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */
-  	{
-  	  dpos -= woff;
---- 1765,1772 ----
-      {
-        dpos = _rl_col_width (data, 0, new);
-!       /* Use NEW when comparing against the last invisible character in the
-! 	 prompt string, since they're both buffer indices and DPOS is a
-! 	 desired display position. */
-!       if (new > prompt_last_invisible)		/* XXX - don't use woff here */
-  	{
-  	  dpos -= woff;