Update META files and remove blead customizations following previous commit

(The customizations were added to "fix" failures caused by the previous
upgrade of CPAN::Meta. This upgrade reverts the offending parts, so those
"fix"es can now be reverted too.)

6 files changed, 7 insertions, 15 deletions

diff --git a/META.json b/META.json
index 34f1038f84..e23642723f 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "perl5-porters@perl.org"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "CPAN::Meta version 2.140630",
+   "generated_by" : "CPAN::Meta version 2.140640",
    "license" : [
       "perl_5"
    ],
diff --git a/META.yml b/META.yml
index 1387c0f4f6..4cbc7d05b1 100644
--- a/META.yml
+++ b/META.yml
@@ -4,7 +4,7 @@ author:
   - perl5-porters@perl.org
 build_requires: {}
 dynamic_config: 1
-generated_by: 'CPAN::Meta version 2.140630, CPAN::Meta::Converter version 2.140630'
+generated_by: 'CPAN::Meta version 2.140640, CPAN::Meta::Converter version 2.140640'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index ee1c0f279c..0ed3576a87 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -484,8 +484,6 @@ use File::Glob qw(:case);
             'PATCHING',
             'README.packaging',
         ],
-        # Needs sending upstream:
-        'CUSTOMIZED'   => ['t/metafile_data.t'],
     },
 
     'ExtUtils::Manifest' => {
@@ -808,12 +806,8 @@ use File::Glob qw(:case);
             qr{^contrib/},
             qr{^inc},
         ],
-        'CUSTOMIZED' => [
-            # Generated file, not part of the CPAN distro:
-            'lib/Module/Build/ConfigData.pm',
-            # Needs sending upstream:
-            'lib/Module/Build/Base.pm'
-        ],
+        # Generated file, not part of the CPAN distro:
+        'CUSTOMIZED' => ['lib/Module/Build/ConfigData.pm'],
         'DEPRECATED' => '5.019000',
     },
 
diff --git a/cpan/ExtUtils-MakeMaker/t/metafile_data.t b/cpan/ExtUtils-MakeMaker/t/metafile_data.t
index 85ccceb62b..668ae52cc8 100644
--- a/cpan/ExtUtils-MakeMaker/t/metafile_data.t
+++ b/cpan/ExtUtils-MakeMaker/t/metafile_data.t
@@ -711,7 +711,7 @@ my $new_mm = sub {
 
         generated_by => "ExtUtils::MakeMaker version 6.5707, CPAN::Meta::Converter version 2.110580",
         'meta-spec'  => {
-            url         => 'https://metacpan.org/pod/CPAN::Meta::Spec',
+            url         => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
             version     => 2,
         },
     };
diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm
index eba6edf9cf..84e137fb4f 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.4205_01';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 BEGIN { require 5.006001 }
 
@@ -4740,7 +4740,7 @@ sub get_metadata {
     generated_by => "Module::Build version $Module::Build::VERSION",
     'meta-spec' => {
       version => '2',
-      url     => 'https://metacpan.org/pod/CPAN::Meta::Spec',
+      url     => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
     },
     dynamic_config => exists $p->{dynamic_config} ? $p->{dynamic_config} : 1,
     release_status => $self->release_status,
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index ce360c7cfd..cd4bdde1b8 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,6 +1,4 @@
 Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf
-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/metafile_data.t f7b1c333830449de89da5cb7e891778b90ea8fb0
-Module::Build cpan/Module-Build/lib/Module/Build/Base.pm 5d9444ab1b651f353430edbf549ea3ca3532c57a
 Module::Build cpan/Module-Build/lib/Module/Build/ConfigData.pm 85eb9656e68d1f256737dc52d86b5d0fed28f832
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691
 Text::Balanced cpan/Text-Balanced/t/01_compile.t 1598cf491a48fa546260a2ec41142abe84da533d