enc2xs ignores missing @INC directories (#338802). Cleanup

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

5 files changed, 48 insertions, 24 deletions

diff --git a/perl-core/Encode/ChangeLog b/perl-core/Encode/ChangeLog
index 82faf55e01a4..64d7c789f37c 100644
--- a/perl-core/Encode/ChangeLog
+++ b/perl-core/Encode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for perl-core/Encode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Encode/ChangeLog,v 1.9 2010/09/26 07:35:23 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Encode/ChangeLog,v 1.10 2010/10/31 08:08:05 tove Exp $
+
+*Encode-2.40-r1 (31 Oct 2010)
+
+  31 Oct 2010; Torsten Veller <tove@gentoo.org> +files/gentoo_enc2xs.diff,
+  -Encode-2.39.ebuild, -Encode-2.40.ebuild, +Encode-2.40-r1.ebuild:
+  enc2xs ignores missing @INC directories (#338802). Cleanup
 
 *Encode-2.40 (26 Sep 2010)
 
diff --git a/perl-core/Encode/Encode-2.39.ebuild b/perl-core/Encode/Encode-2.39.ebuild
deleted file mode 100644
index a4535e74f0d1..000000000000
--- a/perl-core/Encode/Encode-2.39.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Encode/Encode-2.39.ebuild,v 1.1 2009/12/02 15:25:45 tove Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=DANKOGAI
-inherit perl-module
-
-DESCRIPTION="character encodings"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!!<dev-lang/perl-5.8.8-r8"
-
-SRC_TEST=do
diff --git a/perl-core/Encode/Encode-2.40.ebuild b/perl-core/Encode/Encode-2.40-r1.ebuild
index a025dca9832c..f73733d1401e 100644
--- a/perl-core/Encode/Encode-2.40.ebuild
+++ b/perl-core/Encode/Encode-2.40-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Encode/Encode-2.40.ebuild,v 1.1 2010/09/26 07:35:23 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Encode/Encode-2.40-r1.ebuild,v 1.1 2010/10/31 08:08:05 tove Exp $
 
 EAPI=3
 
@@ -16,3 +16,4 @@ IUSE=""
 RDEPEND="!!<dev-lang/perl-5.8.8-r8"
 
 SRC_TEST=do
+PATCHES=( "${FILESDIR}"/gentoo_enc2xs.diff )
diff --git a/perl-core/Encode/Manifest b/perl-core/Encode/Manifest
index 5fee20464553..61c02e760584 100644
--- a/perl-core/Encode/Manifest
+++ b/perl-core/Encode/Manifest
@@ -1,6 +1,5 @@
-DIST Encode-2.39.tar.gz 2000369 RMD160 05c3ab3662ac204bb888b22eb57a79c08fbe9561 SHA1 55f87dd541eddaf30369fbd603dddcb467deb837 SHA256 bff15073456a8ffddc059878e5004ca92c714c5fcf5432f017bdfc44fbfb2f35
+AUX gentoo_enc2xs.diff 1085 RMD160 0888341f728d6815a626c8c8c4c7e4e5e832052f SHA1 2f77c0444a485ffb68d0e53632f1937c1ecebdec SHA256 63bf09a68946cd33cbb4af0daf92e7138149f8369ec8bbb66479569906b56bec
 DIST Encode-2.40.tar.gz 1998605 RMD160 84945f90b78be6d84bf0f947dd089d28d3993bb0 SHA1 7df525601126c0038e91cfe67c2ec4e341d5eb08 SHA256 2659ae527070a12c81b04b581f666b2f1f4670a67f182cf8f47141541b5a56e8
-EBUILD Encode-2.39.ebuild 393 RMD160 01b7a15a4deea7545b61d213e97dd652991d3fd7 SHA1 4e4bd8b82995ca669f2445556cfdb1ea4c2a4315 SHA256 787b1f5f4bff4dfbdee732c939af8c6624443c63305fcffa1410efdd147c875b
-EBUILD Encode-2.40.ebuild 393 RMD160 072e06eb02095f612b7a1841c9367140e425b325 SHA1 5984b17147e542d5b7924338796ccd84a5740b20 SHA256 8588210cefd65e1f50e576502337d1d9a7bab8c514d044a952706e58f9a1ad9e
-MISC ChangeLog 848 RMD160 8c0cd6c3789273dde98df0d8ee3a543585c7417e SHA1 5766735f932f5e5422d8e19aa8e0e230d8ed426f SHA256 2b8be929752355750ba0659dfc72294afa97cfd1e7056515265e1cd708e5949b
+EBUILD Encode-2.40-r1.ebuild 441 RMD160 45fcbebe40bbb8da7c085ec87fc491fbf17c031d SHA1 288bacb54f5acf6988701127bf918055f6d74939 SHA256 b0805d882f988e1a78338d5e9d92bdb498df4834ebbd43e03ae9278ddc948a38
+MISC ChangeLog 1085 RMD160 f96a77292ec23b65205b10b8dbf8eb602e16f912 SHA1 0712dddecdc49855b2665dd6b615db54ecbc1f08 SHA256 8537f25e7364f1aafc3ea9f0b5e9bddc69f992669cf3410ab4b7f298d2131c17
 MISC metadata.xml 232 RMD160 4f5ebd738f5ec922b3bc05a021066d96ca747a35 SHA1 87db3101e42db25ebdb295b8ee8dada1bf09a0ca SHA256 2dbef0b5a2495aede3d2284d49d7426f5b7c6163bbadb247eedec6b126220023
diff --git a/perl-core/Encode/files/gentoo_enc2xs.diff b/perl-core/Encode/files/gentoo_enc2xs.diff
new file mode 100644
index 000000000000..8b46ea455089
--- /dev/null
+++ b/perl-core/Encode/files/gentoo_enc2xs.diff
@@ -0,0 +1,36 @@
+From: Torsten Veller <tove@gentoo.org>
+Subject: [PATCH] gentoo/enc2xs
+
+Tweak enc2xs to ignore missing @INC directories
+
+https://bugs.gentoo.org/show_bug.cgi?id=338802
+http://git.debian.org/?p=perl/perl-5.12.git;a=blob;h=227dc105;hb=9d9ed099
+
+---
+ cpan/Encode/bin/enc2xs |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
+index 773c0a0..b95507b 100644
+--- a/cpan/Encode/bin/enc2xs
++++ b/cpan/Encode/bin/enc2xs
+@@ -924,7 +924,7 @@ use vars qw(
+ sub find_e2x{
+     eval { require File::Find; };
+     my (@inc, %e2x_dir);
+-    for my $inc (@INC){
++    for my $inc (grep -d, @INC){
+     push @inc, $inc unless $inc eq '.'; #skip current dir
+     }
+     File::Find::find(
+@@ -1005,7 +1005,7 @@ sub make_configlocal_pm {
+ 	    $LocalMod{$enc} ||= $mod;
+ 	}
+     };
+-    File::Find::find({wanted => $wanted}, @INC);
++    File::Find::find({wanted => $wanted}, grep -d, @INC);
+     $_ModLines = "";
+     for my $enc ( sort keys %LocalMod ) {
+         $_ModLines .=
+-- 
+tg: (e5b15fe..) gentoo/enc2xs (depends on: upstream)