From: Chris Williams <chris@bingosnet.co.uk>
Date: Fri, 23 Oct 2009 11:33:09 +0000 (+0100)
Subject: Updated CPANPLUS to cpan version 0.89_04
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d74adc6a1d9383142243c7a8afde44878b9452f1;p=p5sagit%2Fp5-mst-13.2.git

Updated CPANPLUS to cpan version 0.89_04

  Changes for 0.89_04     Fri Oct 23 11:12:57 2009
  ================================================
  * Added deprecated dual-life module support which
    requires newer versions of Module::CoreList and
    Module::Load::Conditional
---

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 143dfde..96a0a30 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -423,7 +423,7 @@ use File::Glob qw(:case);
     'CPANPLUS' =>
 	{
 	'MAINTAINER'	=> 'kane',
-	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-0.89_03.tar.gz',
+	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-0.89_04.tar.gz',
 	'FILES'		=> q[cpan/CPANPLUS],
 	'EXCLUDED'	=> [ qr{^inc/},
 			     qr{^t/dummy-.*\.hidden$},
diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index b0bc973..20f5f8a 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS.pm
@@ -13,7 +13,7 @@ BEGIN {
     use vars        qw( @EXPORT @ISA $VERSION );
     @EXPORT     =   qw( shell fetch get install );
     @ISA        =   qw( Exporter );
-    $VERSION = "0.89_03";     #have to hardcode or cpan.org gets unhappy
+    $VERSION = "0.89_04";     #have to hardcode or cpan.org gets unhappy
 }
 
 ### purely for backward compatibility, so we can call it from the commandline:
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index 60af0a9..75c7f95 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
@@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION];
             CPANPLUS::Internals::Report
         ];
 
-$VERSION = "0.89_03";
+$VERSION = "0.89_04";
 
 =pod
 
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
index 5f7cec0..9e4b67e 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
@@ -1274,6 +1274,8 @@ Returns a boolean indicating if this module is uptodate or not.
             ### that may contain some of our sneakily loaded modules
             ### that aren't installed as such. -- kane
             local $Module::Load::Conditional::CHECK_INC_HASH = 0;
+            ### this should all that is required for deprecated core modules
+            local $Module::Load::Conditional::DEPRECATED = 1;
             my $href = check_install(
                             module  => $self->module,
                             version => $self->version,
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm b/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm
index 1346de8..48f918c 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm
@@ -46,7 +46,7 @@ CPANPLUS::Selfupdate
             'Locale::Maketext::Simple'  => '0.01',
             'Log::Message'              => '0.01',
             'Module::Load'              => '0.10',
-            'Module::Load::Conditional' => '0.28', # returns dir for loaded
+            'Module::Load::Conditional' => '0.31_01', # returns dir for loaded
                                                    # modules
             'version'                   => '0.73', # needed for M::L::C
                                                    # addresses #24630 and 
@@ -62,7 +62,7 @@ CPANPLUS::Selfupdate
             'Archive::Tar'              => '1.23',
             'IO::Zlib'                  => '1.04', # needed for Archive::Tar
             'Object::Accessor'          => '0.34', # mk_aliases support
-            'Module::CoreList'          => '2.09',
+            'Module::CoreList'          => '2.22', # deprecated core modules
             'Module::Pluggable'         => '2.4',
             'Module::Loaded'            => '0.01',
             'Parse::CPAN::Meta'         => '0.02', # config_requires support
@@ -85,7 +85,7 @@ CPANPLUS::Selfupdate
             ],            
             cpantest        => [
                 { 'Test::Reporter'  => '1.34',
-                  'YAML::Tiny'      => '0.0'
+                  'Parse::CPAN::Meta' => '0.0'
                 },
                 sub { 
                     my $cb = shift;
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index a83f57a..5384b6a 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
@@ -26,7 +26,7 @@ local $Data::Dumper::Indent     = 1; # for dumpering from !
 BEGIN {
     use vars        qw[ $VERSION @ISA ];
     @ISA        =   qw[ CPANPLUS::Shell::_Base::ReadLine ];
-    $VERSION = "0.89_03";
+    $VERSION = "0.89_04";
 }
 
 load CPANPLUS::Shell;