Update Module-Build to CPAN version 0.4202

  [DELTA]

0.4202 - Tue Nov 19 12:48:19 CET 2013

  [BUG FIXES]

  - Don't merge prereqs from meta to mymeta [Leon Timmermans]

26 files changed, 51 insertions, 46 deletions

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index c6bb804725..791b696985 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -788,7 +788,7 @@ use File::Glob qw(:case);
     #
 
     'Module::Build' => {
-        'DISTRIBUTION' => 'LEONT/Module-Build-0.4201.tar.gz',
+        'DISTRIBUTION' => 'LEONT/Module-Build-0.4202.tar.gz',
         'FILES'        => q[cpan/Module-Build],
         'EXCLUDED'     => [
             qw( t/par.t
diff --git a/cpan/Module-Build/lib/Module/Build.pm b/cpan/Module-Build/lib/Module/Build.pm
index bc280e0b0c..e7eaf600ce 100644
--- a/cpan/Module-Build/lib/Module/Build.pm
+++ b/cpan/Module-Build/lib/Module/Build.pm
@@ -18,7 +18,7 @@ use Module::Build::Base;
 
 use vars qw($VERSION @ISA);
 @ISA = qw(Module::Build::Base);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 
 # Inserts the given module into the @ISA hierarchy between
diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm
index 58d3add12a..72bcbae20c 100644
--- a/cpan/Module-Build/lib/Module/Build/Base.pm
+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
@@ -6,7 +6,7 @@ use strict;
 use vars qw($VERSION);
 use warnings;
 
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 BEGIN { require 5.006001 }
 
@@ -1911,18 +1911,20 @@ sub create_mymeta {
 
   # maybe get a copy in spec v2 format (regardless of original source)
 
-  my $mymeta_obj = $self->_get_meta_object(quiet => 0, dynamic => 0, fatal => 1, auto => 0);
-  # if we have metadata, just update it
-  if ($meta_obj && $mymeta_obj) {
-    my $prereqs = $mymeta_obj->effective_prereqs->with_merged_prereqs($meta_obj->effective_prereqs);
+  my $mymeta_obj;
+  if ($meta_obj) {
+    # if we have metadata, just update it
     my %updated = (
       %{ $meta_obj->as_struct({ version => 2.0 }) },
-      prereqs => $prereqs->as_string_hash,
+      prereqs => $self->_normalize_prereqs,
       dynamic_config => 0,
       generated_by => "Module::Build version $Module::Build::VERSION",
     );
     $mymeta_obj = CPAN::Meta->new( \%updated, { lazy_validation => 0 } );
   }
+  else {
+    $mymeta_obj = $self->_get_meta_object(quiet => 0, dynamic => 0, fatal => 1, auto => 0);
+  }
 
   my @created = $self->_write_meta_files( $mymeta_obj, 'MYMETA' );
 
diff --git a/cpan/Module-Build/lib/Module/Build/Compat.pm b/cpan/Module-Build/lib/Module/Build/Compat.pm
index 2518aaca40..8a5ec190e8 100644
--- a/cpan/Module-Build/lib/Module/Build/Compat.pm
+++ b/cpan/Module-Build/lib/Module/Build/Compat.pm
@@ -2,7 +2,7 @@ package Module::Build::Compat;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 
 use File::Basename ();
 use File::Spec;
diff --git a/cpan/Module-Build/lib/Module/Build/Config.pm b/cpan/Module-Build/lib/Module/Build/Config.pm
index 5a132897fd..78b068d13c 100644
--- a/cpan/Module-Build/lib/Module/Build/Config.pm
+++ b/cpan/Module-Build/lib/Module/Build/Config.pm
@@ -2,7 +2,7 @@ package Module::Build::Config;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Config;
 
diff --git a/cpan/Module-Build/lib/Module/Build/ConfigData.pm b/cpan/Module-Build/lib/Module/Build/ConfigData.pm
index 93c5111258..5fa84e976f 100644
--- a/cpan/Module-Build/lib/Module/Build/ConfigData.pm
+++ b/cpan/Module-Build/lib/Module/Build/ConfigData.pm
@@ -167,6 +167,15 @@ do{ my $x = [
        {},
        {},
        {
+         'PPM_support' => {
+                            'description' => 'Generate PPM files for distributions'
+                          },
+         'license_creation' => {
+                                 'description' => 'Create licenses automatically in distributions',
+                                 'requires' => {
+                                                 'Software::License' => 0
+                                               }
+                               },
          'dist_authoring' => {
                                'description' => 'Create new distributions',
                                'requires' => {
@@ -177,34 +186,25 @@ do{ my $x = [
                                                  'Pod::Readme' => '0.04'
                                                }
                              },
+         'inc_bundling_support' => {
+                                     'requires' => {
+                                                     'ExtUtils::Install' => '1.54',
+                                                     'ExtUtils::Installed' => '1.999'
+                                                   },
+                                     'description' => 'Bundle Module::Build in inc/'
+                                   },
          'manpage_support' => {
                                 'description' => 'Create Unix man pages',
                                 'requires' => {
                                                 'Pod::Man' => 0
                                               }
                               },
-         'PPM_support' => {
-                            'description' => 'Generate PPM files for distributions'
-                          },
          'HTML_support' => {
                              'description' => 'Create HTML documentation',
                              'requires' => {
                                              'Pod::Html' => 0
                                            }
-                           },
-         'inc_bundling_support' => {
-                                     'description' => 'Bundle Module::Build in inc/',
-                                     'requires' => {
-                                                     'ExtUtils::Install' => '1.54',
-                                                     'ExtUtils::Installed' => '1.999'
-                                                   }
-                                   },
-         'license_creation' => {
-                                 'requires' => {
-                                                 'Software::License' => 0
-                                               },
-                                 'description' => 'Create licenses automatically in distributions'
-                               }
+                           }
        }
      ];
 $x; }
\ No newline at end of file
diff --git a/cpan/Module-Build/lib/Module/Build/Cookbook.pm b/cpan/Module-Build/lib/Module/Build/Cookbook.pm
index c3d102b796..ea111d9b09 100644
--- a/cpan/Module-Build/lib/Module/Build/Cookbook.pm
+++ b/cpan/Module-Build/lib/Module/Build/Cookbook.pm
@@ -1,7 +1,7 @@
 package Module::Build::Cookbook;
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 
 
 =head1 NAME
diff --git a/cpan/Module-Build/lib/Module/Build/Dumper.pm b/cpan/Module-Build/lib/Module/Build/Dumper.pm
index 948d24a0a0..a3beff2cff 100644
--- a/cpan/Module-Build/lib/Module/Build/Dumper.pm
+++ b/cpan/Module-Build/lib/Module/Build/Dumper.pm
@@ -1,7 +1,7 @@
 package Module::Build::Dumper;
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 
 # This is just a split-out of a wrapper function to do Data::Dumper
 # stuff "the right way".  See:
diff --git a/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm b/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm
index dd3074a7b4..ae92549e14 100644
--- a/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm
+++ b/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm
@@ -4,7 +4,7 @@ package Module::Build::ModuleInfo;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 
 require Module::Metadata;
diff --git a/cpan/Module-Build/lib/Module/Build/Notes.pm b/cpan/Module-Build/lib/Module/Build/Notes.pm
index e269910088..9057459930 100644
--- a/cpan/Module-Build/lib/Module/Build/Notes.pm
+++ b/cpan/Module-Build/lib/Module/Build/Notes.pm
@@ -4,7 +4,7 @@ package Module::Build::Notes;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Data::Dumper;
 use Module::Build::Dumper;
diff --git a/cpan/Module-Build/lib/Module/Build/PPMMaker.pm b/cpan/Module-Build/lib/Module/Build/PPMMaker.pm
index 15f16f0991..4dca2bb2e1 100644
--- a/cpan/Module-Build/lib/Module/Build/PPMMaker.pm
+++ b/cpan/Module-Build/lib/Module/Build/PPMMaker.pm
@@ -4,7 +4,7 @@ use strict;
 use Config;
 use vars qw($VERSION);
 
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 
 # This code is mostly borrowed from ExtUtils::MM_Unix 6.10_03, with a
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Default.pm b/cpan/Module-Build/lib/Module/Build/Platform/Default.pm
index ce97e37d2b..c1824f39f0 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/Default.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/Default.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::Default;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm
index 6a01cc3e97..f92deace62 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::MacOS;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 use vars qw(@ISA);
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm b/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm
index 9928451f05..1454d324b0 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::Unix;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm b/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm
index 104acd9df3..dc2247e850 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::VMS;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 use Config;
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm
index a6c5ed5675..9c3e0e116d 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::VOS;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm b/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm
index 6144854e2a..93610178b4 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::Windows;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 
 use Config;
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/aix.pm b/cpan/Module-Build/lib/Module/Build/Platform/aix.pm
index 0785aa7dd7..0974dcb35e 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/aix.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/aix.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::aix;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm b/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm
index 306fc1d65f..699bcfa2ac 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::cygwin;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm b/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm
index d554243c13..b709438874 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::darwin;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
diff --git a/cpan/Module-Build/lib/Module/Build/Platform/os2.pm b/cpan/Module-Build/lib/Module/Build/Platform/os2.pm
index 936bd2ef0e..70b943dee0 100644
--- a/cpan/Module-Build/lib/Module/Build/Platform/os2.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/os2.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::os2;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
diff --git a/cpan/Module-Build/lib/Module/Build/PodParser.pm b/cpan/Module-Build/lib/Module/Build/PodParser.pm
index d995f7cfaa..268b0b14a1 100644
--- a/cpan/Module-Build/lib/Module/Build/PodParser.pm
+++ b/cpan/Module-Build/lib/Module/Build/PodParser.pm
@@ -2,7 +2,7 @@ package Module::Build::PodParser;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 use vars qw(@ISA);
 
diff --git a/cpan/Module-Build/lib/inc/latest.pm b/cpan/Module-Build/lib/inc/latest.pm
index bb4d8326b6..462087f50e 100644
--- a/cpan/Module-Build/lib/inc/latest.pm
+++ b/cpan/Module-Build/lib/inc/latest.pm
@@ -4,7 +4,7 @@ use if $] >= 5.019, 'deprecate';
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 
 use Carp;
diff --git a/cpan/Module-Build/lib/inc/latest/private.pm b/cpan/Module-Build/lib/inc/latest/private.pm
index ceefbbc1e6..447a05f5c4 100644
--- a/cpan/Module-Build/lib/inc/latest/private.pm
+++ b/cpan/Module-Build/lib/inc/latest/private.pm
@@ -4,7 +4,7 @@ use if $] >= 5.019, 'deprecate';
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4201';
+$VERSION = '0.4202';
 $VERSION = eval $VERSION;
 
 use File::Spec;
diff --git a/cpan/Module-Build/t/mymeta.t b/cpan/Module-Build/t/mymeta.t
index d760edadbb..4e209838a8 100644
--- a/cpan/Module-Build/t/mymeta.t
+++ b/cpan/Module-Build/t/mymeta.t
@@ -24,6 +24,9 @@ my \$builder = Module::Build->new(
   requires            => {
     'File::Spec' => ( \$ENV{BUMP_PREREQ} ? 0.86 : 0 ),
   },
+  configure_requires  => {
+    'Module::Build' => '0.42',
+  }
 );
 
 \$builder->create_build_script();
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index a408b9f528..8d014a3948 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,5 +1,5 @@
 Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf
-Module::Build cpan/Module-Build/lib/Module/Build/ConfigData.pm 39c52788bbc3bfe352ea68ad39f40b218ede3479
+Module::Build cpan/Module-Build/lib/Module/Build/ConfigData.pm 6268ad724d5e61b9066c26da3e78529260969f40
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691
 Text::Balanced cpan/Text-Balanced/t/01_compile.t 1598cf491a48fa546260a2ec41142abe84da533d
 Text::Balanced cpan/Text-Balanced/t/02_extbrk.t 6ba1b64a4604e822dc2260b8ffcea6b406339ee8