Fixed for rmtree patch

(Portage version: 2.0.51.19)

6 files changed, 31 insertions, 15 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index d6455c6ba2b1..bfe0a10777fb 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.112 2005/03/11 15:13:49 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.113 2005/03/11 21:43:43 mcummings Exp $
+
+  11 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  files/CAN-2005-0448-rmtree.patch, perl-5.8.2-r4.ebuild,
+  perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
+  Patch is in the right place and works on any arch. Yay.
+
+  11 Mar 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r4.ebuild,
+  perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
+  The last rmtree patch contains a line that checks <archname>/Errno.pm in
+  your existing perl install. If your kernel changes between perl installs, it
+  dies horribly. Need to find a cleaner solution first. For everyone that just
+  bumped their perls, I am terribly sorry that this wasn't realized earlier.
 
   11 Mar 2005; Michael Cummings <mcummings@gentoo.org> -perl-5.8.2-r2.ebuild,
   -perl-5.8.2-r3.ebuild, -perl-5.8.4-r2.ebuild, -perl-5.8.4-r3.ebuild,
diff --git a/dev-lang/perl/files/CAN-2005-0448-rmtree.patch b/dev-lang/perl/files/CAN-2005-0448-rmtree.patch
index 3f06f6118f56..602a4ad57bcd 100644
--- a/dev-lang/perl/files/CAN-2005-0448-rmtree.patch
+++ b/dev-lang/perl/files/CAN-2005-0448-rmtree.patch
@@ -1,5 +1,5 @@
---- perl-5.8.4.orig/lib/File/Path.pm
-+++ perl-5.8.4/lib/File/Path.pm
+--- Path.pm.old
++++ Path.pm
 @@ -72,27 +72,17 @@
  
  =item *
diff --git a/dev-lang/perl/perl-5.8.2-r4.ebuild b/dev-lang/perl/perl-5.8.2-r4.ebuild
index 69e3466f074e..e693177830e8 100644
--- a/dev-lang/perl/perl-5.8.2-r4.ebuild
+++ b/dev-lang/perl/perl-5.8.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r4.ebuild,v 1.1 2005/03/11 15:10:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r4.ebuild,v 1.2 2005/03/11 21:43:44 mcummings Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -97,8 +97,6 @@ src_unpack() {
 
 	# An additional tempfile patch, bug 75696
 	#epatch ${FILESDIR}/file_path_rmtree.patch
-	# Superceded by the following CAN patch in bug 79685
-	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
 
 	# Bug 80460, perlsuid vulnerability
 	if use perlsuid
@@ -285,6 +283,9 @@ EOF
 			--htmldir="${D}/usr/share/doc/${PF}/html" \
 			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
 	fi
+	cd `find ${D} -name Path.pm|sed -e 's/Path.pm//'`
+	# CAN patch in bug 79685
+	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
 }
 
 pkg_postinst() {
diff --git a/dev-lang/perl/perl-5.8.4-r4.ebuild b/dev-lang/perl/perl-5.8.4-r4.ebuild
index b604cfcdd639..5d292bb2d3af 100644
--- a/dev-lang/perl/perl-5.8.4-r4.ebuild
+++ b/dev-lang/perl/perl-5.8.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r4.ebuild,v 1.1 2005/03/11 15:10:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r4.ebuild,v 1.2 2005/03/11 21:43:44 mcummings Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -119,8 +119,6 @@ src_unpack() {
 
 	# An additional tempfile patch, bug 75696
 	#epatch ${FILESDIR}/file_path_rmtree.patch
-	# Superceded by the following CAN patch in bug 79685
-	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
 
 	# Bug 80460, perlsuid vulnerability
 	if use perlsuid
@@ -350,6 +348,9 @@ EOF
 			--htmldir="${D}/usr/share/doc/${PF}/html" \
 			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
 	fi
+	cd `find ${D} -name Path.pm|sed -e 's/Path.pm//'`
+	# CAN patch in bug 79685
+	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
 }
 
 pkg_postinst() {
diff --git a/dev-lang/perl/perl-5.8.5-r5.ebuild b/dev-lang/perl/perl-5.8.5-r5.ebuild
index 1627c539159f..370d12b30ffd 100644
--- a/dev-lang/perl/perl-5.8.5-r5.ebuild
+++ b/dev-lang/perl/perl-5.8.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r5.ebuild,v 1.1 2005/03/11 15:10:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r5.ebuild,v 1.2 2005/03/11 21:43:44 mcummings Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -122,8 +122,6 @@ src_unpack() {
 
 	# An additional tempfile patch, bug 75696
 	#epatch ${FILESDIR}/file_path_rmtree.patch
-	# Superceded by the following CAN patch in bug 79685
-	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
 
 	# Bug 80460, perlsuid vulnerability
 	if use perlsuid
@@ -339,6 +337,9 @@ EOF
 			--htmldir="${D}/usr/share/doc/${PF}/html" \
 			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
 	fi
+	cd `find ${D} -name Path.pm|sed -e 's/Path.pm//'`
+	# CAN patch in bug 79685
+	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
 }
 
 pkg_postinst() {
diff --git a/dev-lang/perl/perl-5.8.6-r4.ebuild b/dev-lang/perl/perl-5.8.6-r4.ebuild
index 1c057da59089..4d3d60be8119 100644
--- a/dev-lang/perl/perl-5.8.6-r4.ebuild
+++ b/dev-lang/perl/perl-5.8.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r4.ebuild,v 1.1 2005/03/11 15:10:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r4.ebuild,v 1.2 2005/03/11 21:43:44 mcummings Exp $
 
 inherit eutils flag-o-matic gcc multilib
 
@@ -122,8 +122,6 @@ src_unpack() {
 
 	# An additional tempfile patch, bug 75696
 	#epatch ${FILESDIR}/file_path_rmtree.patch
-	# Superceded by the following CAN patch in bug 79685
-	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
 
 	# Bug 80460, perlsuid vulnerability
 	if use perlsuid
@@ -342,6 +340,9 @@ EOF
 			--htmldir="${D}/usr/share/doc/${PF}/html" \
 			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
 	fi
+	cd `find ${D} -name Path.pm|sed -e 's/Path.pm//'`
+	# CAN patch in bug 79685
+	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
 }
 
 pkg_postinst() {