Use recent ExtUtils::MakeMaker features to generate a better META.yml

diff --git a/Makefile.PL b/Makefile.PL
index 8cfa41cec9d5d496e564363bc33cfd1bb524b34f..ab02c447a7c9199e802ac1be8257540cd676e7c1 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,29 +4,32 @@ use strict;
 use warnings;
 use ExtUtils::MakeMaker;
 
-my $BUILD_REQUIRES = {
- 'ExtUtils::MakeMaker' => 0,
- 'Test::More'          => 0,
-};
+my $dist = 'CPANPLUS-Dist-Gentoo';
 
-sub build_req {
- my $tometa = ' >> $(DISTVNAME)/META.yml;';
- my $build_req = 'echo "build_requires:" ' . $tometa;
- foreach my $mod ( sort { lc $a cmp lc $b } keys %$BUILD_REQUIRES ) {
-  my $ver = $BUILD_REQUIRES->{$mod};
-  $build_req .= sprintf 'echo "    %-30s %s" %s', "$mod:", $ver, $tometa;
- }
- return $build_req;
-}
+my %META = (
+ configure_requires => {
+  'ExtUtils::MakeMaker' => 0,
+ },
+ build_requires => {
+  'ExtUtils::MakeMaker' => 0,
+  'Test::More'          => 0,
+ },
+ resources => {
+  bugtracker => "http://rt.cpan.org/NoAuth/ReportBug.html?Queue=$dist",
+  homepage   => "http://search.cpan.org/dist/$dist/",
+  license    => 'http://dev.perl.org/licenses/',
+  repository => "http://git.profvince.com/perl/modules/$dist.git",
+ },
+);
 
 WriteMakefile(
-    NAME          => 'CPANPLUS::Dist::Gentoo',
-    AUTHOR        => 'Vincent Pit <perl@profvince.com>',
-    LICENSE       => 'perl',
-    VERSION_FROM  => 'lib/CPANPLUS/Dist/Gentoo.pm',
-    ABSTRACT_FROM => 'lib/CPANPLUS/Dist/Gentoo.pm',
-    PL_FILES      => {},
-    PREREQ_PM     => {
+    NAME             => 'CPANPLUS::Dist::Gentoo',
+    AUTHOR           => 'Vincent Pit <perl@profvince.com>',
+    LICENSE          => 'perl',
+    VERSION_FROM     => 'lib/CPANPLUS/Dist/Gentoo.pm',
+    ABSTRACT_FROM    => 'lib/CPANPLUS/Dist/Gentoo.pm',
+    PL_FILES         => {},
+    PREREQ_PM        => {
         'Carp'                  => 0,
         'CPANPLUS'              => 0,
         'Cwd'                   => 0,
@@ -35,10 +38,13 @@ WriteMakefile(
         'File::Spec::Functions' => 0,
         'IPC::Cmd'              => 0,
     },
-    dist          => {
-        PREOP      => 'pod2text lib/CPANPLUS/Dist/Gentoo.pm > $(DISTVNAME)/README; '
-                      . build_req,
+    MIN_PERL_VERSION => 5.006,
+    META_MERGE       => \%META,
+    dist             => {
+        PREOP      => 'pod2text lib/CPANPLUS/Dist/Gentoo.pm > $(DISTVNAME)/README',
         COMPRESS   => 'gzip -9f', SUFFIX => 'gz'
     },
-    clean         => { FILES => 'CPANPLUS-Dist-Gentoo-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt' },
+    clean            => {
+        FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt"
+    },
 );