From e8cc621e772e485dae710515a75d4e738b21e194 Mon Sep 17 00:00:00 2001
From: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Wed, 3 Dec 2014 13:44:45 +0000
Subject: Update Encode to CPAN version 2.66

  [DELTA]

$Revision: 2.66 $ $Date: 2014/12/02 23:30:34 $
! bin/enc2xs
  Resolved RT#100656: enc2xs -C fails if URL::Encode::XS is installed
  https://rt.cpan.org/Ticket/Display.html?id=100656
---
 cpan/Encode/Encode.pm  | 4 ++--
 cpan/Encode/Encode.xs  | 2 +-
 cpan/Encode/bin/enc2xs | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpan/Encode')

diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index aea332e95b..dd9a042186 100644
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,10 +1,10 @@
 #
-# $Id: Encode.pm,v 2.65 2014/11/27 14:02:45 dankogai Exp $
+# $Id: Encode.pm,v 2.66 2014/12/02 23:30:00 dankogai Exp $
 #
 package Encode;
 use strict;
 use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.65 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.66 $ =~ /(\d+)/g;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 use XSLoader ();
 XSLoader::load( __PACKAGE__, $VERSION );
diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs
index 8463ccecbf..0f12a7cf38 100644
--- a/cpan/Encode/Encode.xs
+++ b/cpan/Encode/Encode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Encode.xs,v 2.32 2014/11/27 14:08:33 dankogai Exp dankogai $
+ $Id: Encode.xs,v 2.32 2014/11/27 14:08:33 dankogai Exp $
  */
 
 #define PERL_NO_GET_CONTEXT
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index bed415e141..276a204ce3 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -10,7 +10,7 @@ use warnings;
 use Getopt::Std;
 use Config;
 my @orig_ARGV = @ARGV;
-our $VERSION  = do { my @r = (q$Revision: 2.15 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION  = do { my @r = (q$Revision: 2.16 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 # These may get re-ordered.
 # RAW is a do_now as inserted by &enter
@@ -1006,9 +1006,9 @@ sub make_configlocal_pm {
 	$mod =~ s/.*\bEncode\b/Encode/o;
 	$mod =~ s/\.pm\z//o;
 	$mod =~ s,/,::,og;
-	warn qq{ require $mod;\n};
 	eval qq{ require $mod; };
-	$@ and die "Can't require $mod: $@\n";
+        return if $@;
+        warn qq{ require $mod;\n};
 	for my $enc ( Encode->encodings() ) {
 	    no warnings;
 	    $in_core{$enc}                   and next;
@@ -1022,7 +1022,7 @@ sub make_configlocal_pm {
         $_ModLines .=
           qq(\$Encode::ExtModule{'$enc'} = "$LocalMod{$enc}";\n);
     }
-    warn $_ModLines;
+    warn $_ModLines if $_ModLines;
     $_LocalVer = _mkversion();
     $_E2X      = find_e2x();
     $_Inc      = $INC{"Encode.pm"};
-- 
cgit v1.2.1