Merge branch 'check_conflicts'

check_conflicts:
Port to Module::Install::CheckConflicts.
Create branch check_conflicts

Conflicts:
Makefile.PL

diff --combined Makefile.PL
index 1162175,4f551ca..4068be1
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -45,8 -45,8 +45,8 @@@ test_requires 'Test::Exception'
  
  # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
  if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.35_05')) {
 -    test_requires('Test::Aggregate', '0.35_05');
 -    test_requires('Test::Simple', '0.88');
 +    author_requires('Test::Aggregate', '0.35_05');
 +    author_requires('Test::Simple', '0.88');
  }
  else {
      tests join q{ },
@@@ -54,7 -54,7 +54,7 @@@
          map  { glob } qw[t/*.t t/aggregate/*.t];
  }
  
 -my @force_build_requires_if_author = qw(
 +author_requires($_) for qw(
    Test::NoTabs
    Test::Pod
    Test::Pod::Coverage
@@@ -62,6 -62,9 +62,6 @@@
  );
  
  if ($Module::Install::AUTHOR) {
 -    foreach my $module (@force_build_requires_if_author) {
 -        build_requires $module;
 -    }
      darwin_check_no_resource_forks();
  }
  
@@@ -70,6 -73,11 +70,6 @@@ auto_install
  WriteAll;
  
  if ($Module::Install::AUTHOR) {
 -
 -  # Strip out the author only build_requires from META.yml
 -  # Need to do this _after_ WriteAll else it looses track of them
 -  strip_author_only_build_requires(@force_build_requires_if_author, 'Test::Aggregate');
 -
    Meta->{values}{resources} = [
      [ 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ],
      [ 'IRC'         => 'irc://irc.perl.org/#catalyst' ],
@@@ -93,7 -101,7 +93,7 @@@ print <<"EOF"
          perl -MCPANPLUS -e 'install Catalyst::Devel' # or
          perl -MCPAN -e 'install Catalyst::Devel'
  
--    To get some commonly used plugins, as well as the TT view and DBIC 
++    To get some commonly used plugins, as well as the TT view and DBIC
      model, install Task::Catalyst in the same way.
  
   Have fun!
@@@ -146,43 -154,17 +146,3 @@@ sub darwin_check_no_resource_forks 
                                            ' echo "to avoid getting resource forks in your dist."; exit 255; fi' });
          }
  }
--
- sub check_conflicts {
-     my %conflicts = @_;
- 
-     my %conflicts_found;
-     for my $mod ( sort keys %conflicts ) {
-         eval "require($mod)";
-         next if $@;
- 
-         my $installed = $mod->VERSION();
-         $conflicts_found{$mod} = $installed if ( $installed le $conflicts{$mod} );
-     }
- 
-     return unless scalar keys %conflicts_found;
- 
-     print <<"EOF";
- 
-  WARNING:
- 
-     This version of Catalyst conflicts with the versions of
-     some components you have installed.
- 
-     You will need to upgrade these modules after installing
-     this version of Catalyst.
- 
-     List of the conflicting components and their installed versions:
- 
- EOF
- 
-     foreach my $mod (keys %conflicts_found) {
-         print sprintf("    %s => %s\n", $mod, $conflicts_found{$mod});
-     }
-     print "\n";
- 
-     # More or less copied from Module::Build, via Moose
-     return if $ENV{PERL_MM_USE_DEFAULT};
-     return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
- 
-     sleep 4;
- }
 -sub strip_author_only_build_requires {
 -    my @build_requires_to_strip = @_;
 -    Meta->{values}{build_requires} = [ grep {
 -      my $ok = 1;
 -      foreach my $module (@build_requires_to_strip) {
 -        if ($_->[0] =~ /$module/) {
 -          $ok = 0;
 -          last;
 -        }
 -      }
 -      $ok;
 -    } @{Meta->{values}{build_requires}} ];
 -}