fix bug 125175

(Portage version: 2.1_pre5-r2)

8 files changed, 53 insertions, 34 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 0e11a7244cf4..91561a01ac67 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.87 2006/02/08 21:01:10 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.88 2006/03/06 11:59:21 blubb Exp $
+
+  06 Mar 2006; Simon Stelling <blubb@gentoo.org> mc-4.6.0-r12.ebuild,
+  mc-4.6.0-r13.ebuild, mc-4.6.0-r14.ebuild:
+  fix bug 125175
 
   28 Jan 2006; Simon Stelling <blubb@gentoo.org>
   +files/mc-4.6.0-bug-102356.patch, mc-4.6.0-r14.ebuild:
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 9b18cae87e89..ba8838e3cff6 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -4,15 +4,15 @@ SHA256 c7acd0ad251a69d852aed097e6765e91e5df096afb5a6293f9472e45a7ce45d0 ChangeLo
 MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
 RMD160 5edd511a40033bc11ed6e486edcce5b23c8305a2 files/chdir-4.6.0.gentoo 159
 SHA256 92fbe981eda972767866b388548c1837dcc32b06549b2dcf3c44d8bfe62d398f files/chdir-4.6.0.gentoo 159
-MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r12 139
-RMD160 65d574b0e1bfa1e413f1450f2c9d69905f7674c5 files/digest-mc-4.6.0-r12 139
-SHA256 8949ed6763ab5c3c66bc46dd578aaf0978f1e05de5253a21b9c3d74a19740e60 files/digest-mc-4.6.0-r12 139
-MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r13 139
-RMD160 65d574b0e1bfa1e413f1450f2c9d69905f7674c5 files/digest-mc-4.6.0-r13 139
-SHA256 8949ed6763ab5c3c66bc46dd578aaf0978f1e05de5253a21b9c3d74a19740e60 files/digest-mc-4.6.0-r13 139
-MD5 947a18b172bf06ad72d511b62cfc0ad8 files/digest-mc-4.6.0-r14 203
-RMD160 8cc35d869ed62cc58298f576fdc28cf38135e46d files/digest-mc-4.6.0-r14 203
-SHA256 c787fe5486c6fd8ee32c3541311af1dc55ff7b1265e9cbc604da7e5bac5283b8 files/digest-mc-4.6.0-r14 203
+MD5 d961327256a8bd927f5ee0c78eb23bc5 files/digest-mc-4.6.0-r12 443
+RMD160 bff00db2180a864c96ce789b2629bf6e5253c230 files/digest-mc-4.6.0-r12 443
+SHA256 0b4bfa74bedfb6aff5b203810ce682c2f631edd05407c3815f73d269f505fc4e files/digest-mc-4.6.0-r12 443
+MD5 d961327256a8bd927f5ee0c78eb23bc5 files/digest-mc-4.6.0-r13 443
+RMD160 bff00db2180a864c96ce789b2629bf6e5253c230 files/digest-mc-4.6.0-r13 443
+SHA256 0b4bfa74bedfb6aff5b203810ce682c2f631edd05407c3815f73d269f505fc4e files/digest-mc-4.6.0-r13 443
+MD5 0ced35f37c3de85887bbf601378d6f14 files/digest-mc-4.6.0-r14 507
+RMD160 d34536d30e439a0dab270cd568b85d24376aa980 files/digest-mc-4.6.0-r14 507
+SHA256 6779516e7826ae8b7160e962808b80dbe5503f5957f3a28fa2846691e7e66085 files/digest-mc-4.6.0-r14 507
 MD5 33aafc4a9c8134eb13d62fed6b81888e files/ebuild.syntax 2588
 RMD160 ce59ba4451f5df962632683b4ba84b3fd6fa7e4c files/ebuild.syntax 2588
 SHA256 532894f690c04c4394f5396ded4545d91924a7e853fa0f190bc55323e27901b2 files/ebuild.syntax 2588
@@ -55,15 +55,18 @@ SHA256 6dff61a04bf35cbc5c9570e3ad194a8d8ffd255096c977997d11aa59cd0f24c9 files/mc
 MD5 7fadf4867e255f1d7254181267759775 files/mc.ini 43
 RMD160 2254610744c484553cd3332a4f45e439b13cceed files/mc.ini 43
 SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1 files/mc.ini 43
-MD5 cbab313c52ad5cde562cf360d4e7582b mc-4.6.0-r12.ebuild 3147
-RMD160 024d6a63c0d5db64169b73b04668b6681a94e814 mc-4.6.0-r12.ebuild 3147
-SHA256 c4be8543836c609eef14fb0b0b3fd73e0fd1dd952211e02fe49614ca62fa9406 mc-4.6.0-r12.ebuild 3147
-MD5 555d357fd8ed626786ac81e143c5fc00 mc-4.6.0-r13.ebuild 3297
-RMD160 a3a115743053c4dcc27d716afe77ab08f2285844 mc-4.6.0-r13.ebuild 3297
-SHA256 432768f49a377a0ac6efebce98835a7db4d0ec00af8f4f4111747174d3f0a8ec mc-4.6.0-r13.ebuild 3297
-MD5 981e691c02dfc4783e0d73236ca4ae41 mc-4.6.0-r14.ebuild 3970
-RMD160 e4ebf61b7ab207f19459ab5cbd92e509dd4acdeb mc-4.6.0-r14.ebuild 3970
-SHA256 8901f749e2335ca4d580a4c3fea92602955b8375a301368523f08cb150322135 mc-4.6.0-r14.ebuild 3970
+MD5 23a5069637af088015fe5f0de8c42883 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+RMD160 c637f92b407fd0321efede161a8c13ba99b68ffd mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+SHA256 0c137b7e9fe9cc623862aba21457b18f4295bf0f8053059474d7f5607833e2e8 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+MD5 1e79d71ebd4abacdf66668f3c77ad1b9 mc-4.6.0-r12.ebuild 3202
+RMD160 7938e234b072c67abec682c43c61e3ccafdb40dd mc-4.6.0-r12.ebuild 3202
+SHA256 c1cf7c83e45848f00331e49ebb3450084f424cda23d8e20535171d3b356733a1 mc-4.6.0-r12.ebuild 3202
+MD5 e1d28815eb6d75cca055e114137c3b71 mc-4.6.0-r13.ebuild 3348
+RMD160 105e654e40e77216d92b487fac1f5dc80f118e74 mc-4.6.0-r13.ebuild 3348
+SHA256 ce703cae3e8207ce72dcc21b4101ce46dc39fb8b1b554528dccf25ea5d904760 mc-4.6.0-r13.ebuild 3348
+MD5 f9824990d33821b71269cc7086183fa3 mc-4.6.0-r14.ebuild 4021
+RMD160 945a246f762fed1e1e2146f099f61ef7ae1dc599 mc-4.6.0-r14.ebuild 4021
+SHA256 431a1fc4001433b96f296d56e5619622168135ce9609e21cc1cc7dfc78784f34 mc-4.6.0-r14.ebuild 4021
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
 SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r12 b/app-misc/mc/files/digest-mc-4.6.0-r12
index c66b6aee0770..62f70e5c7c6c 100644
--- a/app-misc/mc/files/digest-mc-4.6.0-r12
+++ b/app-misc/mc/files/digest-mc-4.6.0-r12
@@ -1,2 +1,5 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
+MD5 23a5069637af088015fe5f0de8c42883 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+RMD160 c637f92b407fd0321efede161a8c13ba99b68ffd mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+SHA256 0c137b7e9fe9cc623862aba21457b18f4295bf0f8053059474d7f5607833e2e8 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
 MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0.patch.bz2 399920
+MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r13 b/app-misc/mc/files/digest-mc-4.6.0-r13
index c66b6aee0770..62f70e5c7c6c 100644
--- a/app-misc/mc/files/digest-mc-4.6.0-r13
+++ b/app-misc/mc/files/digest-mc-4.6.0-r13
@@ -1,2 +1,5 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
+MD5 23a5069637af088015fe5f0de8c42883 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+RMD160 c637f92b407fd0321efede161a8c13ba99b68ffd mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+SHA256 0c137b7e9fe9cc623862aba21457b18f4295bf0f8053059474d7f5607833e2e8 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
 MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0.patch.bz2 399920
+MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r14 b/app-misc/mc/files/digest-mc-4.6.0-r14
index 0d93e8ca2e29..671ee580f2b8 100644
--- a/app-misc/mc/files/digest-mc-4.6.0-r14
+++ b/app-misc/mc/files/digest-mc-4.6.0-r14
@@ -1,3 +1,6 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
+MD5 23a5069637af088015fe5f0de8c42883 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+RMD160 c637f92b407fd0321efede161a8c13ba99b68ffd mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+SHA256 0c137b7e9fe9cc623862aba21457b18f4295bf0f8053059474d7f5607833e2e8 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
 MD5 c2eb2135bcf8dbed1c2fc4a6e41e4917 mc-4.6.0-sambalib-3.0.10.patch.bz2 401006
+MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
 MD5 60a8e4524554a550472622db7fcf728f u7z-4.16beta.tar.bz2 3041
diff --git a/app-misc/mc/mc-4.6.0-r12.ebuild b/app-misc/mc/mc-4.6.0-r12.ebuild
index 39ac904bc2b8..69eb175b12b4 100644
--- a/app-misc/mc/mc-4.6.0-r12.ebuild
+++ b/app-misc/mc/mc-4.6.0-r12.ebuild
@@ -1,13 +1,14 @@
-# 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/app-misc/mc/mc-4.6.0-r12.ebuild,v 1.5 2005/07/07 11:42:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r12.ebuild,v 1.6 2006/03/06 11:59:22 blubb Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="GNU Midnight Commander cli-based file manager"
 HOMEPAGE="http://www.ibiblio.org/mc/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2"
+	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2
+	mirror://gentoo/${P}-can-2004-0226-0231-0232.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -35,7 +36,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-find.patch
 	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
-	epatch ${FILESDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
+	epatch ${DISTDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
 	epatch ${FILESDIR}/${P}-vfs.patch
 	epatch ${FILESDIR}/${P}-ftp.patch
 	epatch ${FILESDIR}/${P}-largefile.patch
diff --git a/app-misc/mc/mc-4.6.0-r13.ebuild b/app-misc/mc/mc-4.6.0-r13.ebuild
index a9a70f4fa4ab..cdb556d8f9a2 100644
--- a/app-misc/mc/mc-4.6.0-r13.ebuild
+++ b/app-misc/mc/mc-4.6.0-r13.ebuild
@@ -1,13 +1,14 @@
-# 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/app-misc/mc/mc-4.6.0-r13.ebuild,v 1.11 2005/07/07 11:42:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r13.ebuild,v 1.12 2006/03/06 11:59:22 blubb Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="GNU Midnight Commander cli-based file manager"
 HOMEPAGE="http://www.ibiblio.org/mc/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2"
+	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2
+	mirror://gentoo/${P}-can-2004-0226-0231-0232.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,8 +38,8 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-find.patch
 	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
-	epatch ${FILESDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
-	epatch ${FILESDIR}/${P}-can-2004-1004-1005-1092-1176.patch.bz2
+	epatch ${DISTDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
+	epatch ${FILESDIR}/${P}-can-2004-1004-1005-1092-1176.patch
 	epatch ${FILESDIR}/${P}-vfs.patch
 	epatch ${FILESDIR}/${P}-ftp.patch
 	epatch ${FILESDIR}/${P}-largefile.patch
diff --git a/app-misc/mc/mc-4.6.0-r14.ebuild b/app-misc/mc/mc-4.6.0-r14.ebuild
index e663075d22f4..895da67b7893 100644
--- a/app-misc/mc/mc-4.6.0-r14.ebuild
+++ b/app-misc/mc/mc-4.6.0-r14.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-misc/mc/mc-4.6.0-r14.ebuild,v 1.7 2006/01/28 10:26:33 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r14.ebuild,v 1.8 2006/03/06 11:59:22 blubb Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,6 +10,7 @@ DESCRIPTION="GNU Midnight Commander cli-based file manager"
 HOMEPAGE="http://www.ibiblio.org/mc/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
 	mirror://gentoo/${P}-sambalib-3.0.10.patch.bz2
+	mirror://gentoo/${P}-can-2004-0226-0231-0232.patch.bz2
 	7zip? ( http://sgh.nightmail.ru/files/u7z/${U7Z} )"
 
 LICENSE="GPL-2"
@@ -54,8 +55,8 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-find.patch
 	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
-	epatch ${FILESDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
-	epatch ${FILESDIR}/${P}-can-2004-1004-1005-1092-1176.patch.bz2
+	epatch ${DISTDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
+	epatch ${FILESDIR}/${P}-can-2004-1004-1005-1092-1176.patch
 	epatch ${FILESDIR}/${P}-vfs.patch
 	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
 		epatch ${FILESDIR}/${P}-7zip.patch