Added patch for bug #151951, thanks dev-zero for pointing out

Package-Manager: portage-2.1.1

4 files changed, 35 insertions, 10 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index cfb9a0338a46..45d3a06e357a 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.62 2006/04/11 20:13:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.63 2006/10/19 20:17:19 grobian Exp $
+
+  19 Oct 2006; Fabian Groffen <grobian@gentoo.org>
+  +files/tcsh-6.14-makefile.patch, tcsh-6.14-r3.ebuild:
+  Added patch for bug #151951, thanks dev-zero for pointing out
 
   11 Apr 2006; Fabian Groffen <grobian@gentoo.org> tcsh-6.14-r3.ebuild:
   Adding USE-flag catalogs for NLS catalogs support. Thanks to Kouya Sakamoto
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 7f95320a3bed..14148cbd3411 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,3 +1,7 @@
+AUX tcsh-6.14-makefile.patch 482 RMD160 ef0aa8ec9a43218532588bc1b755e2c2f69c9ea8 SHA1 b26685966259b02d5a1f0f8994c0741e50841a31 SHA256 7036e1d68ce181405800d78b33f9884da6e36f590f5287190911ddec65a540ce
+MD5 aa6c43b9854237fd849fab55f518fc7a files/tcsh-6.14-makefile.patch 482
+RMD160 ef0aa8ec9a43218532588bc1b755e2c2f69c9ea8 files/tcsh-6.14-makefile.patch 482
+SHA256 7036e1d68ce181405800d78b33f9884da6e36f590f5287190911ddec65a540ce files/tcsh-6.14-makefile.patch 482
 AUX tcsh-6.14-r2.patch 2057 RMD160 8fba8a743944e04e8f03525ee0f8763576d251ec SHA1 361e3187c00f401183ea20247fb99fd1a33b3047 SHA256 cdc6f499a9eef1876604a0072562aad4b594e12c6073a98ea7a2f33d88aa21c5
 MD5 dc3f6395569049b5f3a1547364be0260 files/tcsh-6.14-r2.patch 2057
 RMD160 8fba8a743944e04e8f03525ee0f8763576d251ec files/tcsh-6.14-r2.patch 2057
@@ -8,14 +12,14 @@ RMD160 8ab4e49fbfd979aed6cfdd5bd45c5e37fa810394 files/tcsh-6.14.00-debian-dircol
 SHA256 a9568a2a474ef662a665c87c52983fea7999e5cf2bc4920d45baa2558c9dc32a files/tcsh-6.14.00-debian-dircolors.patch 444
 DIST tcsh-6.14-conffiles.tar.bz2 20200 RMD160 96e5e43985fe1b6e53b4a2a53f1b7bed3c2ae103 SHA1 3ec8841c88b2c99c6b5978b907d9f3daa22faa7c SHA256 1bae5000c84593187974580c48b0edcec88e2f6363e3c1ec1e43da45c9a63049
 DIST tcsh-6.14.00.tar.gz 859780 RMD160 fa7635225ceb0225aedcfad5dd9d8e17d8d70849 SHA1 55a08b31a57cfd8631edd1fb7e42f18578d8198a SHA256 fd738ac0c003d283a214d15d46c1bc3fb80afad697110994dccb8d101f0d6f0e
-EBUILD tcsh-6.14-r3.ebuild 2405 RMD160 cbb6fe0ef69abc9fa6d5038f7475428bda12f201 SHA1 8b4c065a71b6534a7a7cb2c302fa4574f79ae39c SHA256 d94b403d075a2dccc36cf15784ac8f63b98671b8b49a9d3817647975fb34ac6b
-MD5 4485f0d861de222d20f2e721bcf485e0 tcsh-6.14-r3.ebuild 2405
-RMD160 cbb6fe0ef69abc9fa6d5038f7475428bda12f201 tcsh-6.14-r3.ebuild 2405
-SHA256 d94b403d075a2dccc36cf15784ac8f63b98671b8b49a9d3817647975fb34ac6b tcsh-6.14-r3.ebuild 2405
-MISC ChangeLog 8874 RMD160 64eacb0cb4f1edd471b0766743751096564f16f4 SHA1 b7f280e7e4603430e5dfff97df4656615b54e930 SHA256 6e89e5bf3ebf70628295cbf0d0f2e96d0b75e779095f640acf2e6e740336fe24
-MD5 389fc79d0e1e53660ca829b3a34c1f38 ChangeLog 8874
-RMD160 64eacb0cb4f1edd471b0766743751096564f16f4 ChangeLog 8874
-SHA256 6e89e5bf3ebf70628295cbf0d0f2e96d0b75e779095f640acf2e6e740336fe24 ChangeLog 8874
+EBUILD tcsh-6.14-r3.ebuild 2461 RMD160 b6927db0ea964666c01f8ef5d11dcdb44771702a SHA1 c518e799bdf515f88783e4e16eb2d40ee361f0b3 SHA256 16d851fa2b98951b74a0dddada0714d35e49ed9fe8d71deacb5348ff4d04d83d
+MD5 d6238111d23e48c7f59fde38d9866b19 tcsh-6.14-r3.ebuild 2461
+RMD160 b6927db0ea964666c01f8ef5d11dcdb44771702a tcsh-6.14-r3.ebuild 2461
+SHA256 16d851fa2b98951b74a0dddada0714d35e49ed9fe8d71deacb5348ff4d04d83d tcsh-6.14-r3.ebuild 2461
+MISC ChangeLog 9046 RMD160 b300f28642c28656355bafb2429ad7b0fe2290d1 SHA1 a7dfda1e4e60a9313f1305181195521ce4eb8392 SHA256 fc51b4e3422718efeb49d1077da87fe365c545c879ef81cb7bad6f80422c7b67
+MD5 65ee6b00cdf4791c1501d472e526db73 ChangeLog 9046
+RMD160 b300f28642c28656355bafb2429ad7b0fe2290d1 ChangeLog 9046
+SHA256 fc51b4e3422718efeb49d1077da87fe365c545c879ef81cb7bad6f80422c7b67 ChangeLog 9046
 MISC metadata.xml 655 RMD160 10cac0d0a38ab114ec6f34be1fed837f38a77f40 SHA1 8e04b7ca425f5469ce8515c2ab8fce6cf166b3ca SHA256 bde0b24fe9a295482f3394de9b3d658bbcc2e58504136785fd4a6210b1d2e28b
 MD5 57ae68ef95b893d172203de06faf380d metadata.xml 655
 RMD160 10cac0d0a38ab114ec6f34be1fed837f38a77f40 metadata.xml 655
diff --git a/app-shells/tcsh/files/tcsh-6.14-makefile.patch b/app-shells/tcsh/files/tcsh-6.14-makefile.patch
new file mode 100644
index 000000000000..6d85aa0588f3
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.14-makefile.patch
@@ -0,0 +1,16 @@
+* don't strip (portage does that for us)
+* don't try to move away an older tcsh binary; we don't install in / so
+  that only results in an ugly error message
+
+--- tcsh-6.14.00/Makefile.in
++++ tcsh-6.14.00/Makefile.in
+@@ -477,9 +477,7 @@
+ 
+ install: tcsh$(EXEEXT) 
+ 	-mkdir -p ${DESTBIN}
+-	-mv -f ${DESTBIN}/tcsh$(EXEEXT)  ${DESTBIN}/tcsh.old
+ 	cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
+-	-strip ${DESTBIN}/tcsh$(EXEEXT)
+ 	chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
+ 
+ install.man: tcsh.man
diff --git a/app-shells/tcsh/tcsh-6.14-r3.ebuild b/app-shells/tcsh/tcsh-6.14-r3.ebuild
index 024300592b9b..3f13a8009354 100644
--- a/app-shells/tcsh/tcsh-6.14-r3.ebuild
+++ b/app-shells/tcsh/tcsh-6.14-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r3.ebuild,v 1.14 2006/09/17 07:36:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r3.ebuild,v 1.15 2006/10/19 20:17:19 grobian Exp $
 
 inherit eutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}/${MY_P}"-debian-dircolors.patch # bug #120792
 	epatch "${FILESDIR}/${P}"-r2.patch
+	epatch "${FILESDIR}/${P}"-makefile.patch # bug #151951
 
 	if use catalogs ;
 	then