X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=6c6ef13715fbca7886ec6a20d63a4c7cf72d745c;hb=b43c3fc0fe6291fc7aa4c97c48fe0e29d312c071;hp=051378af22226fcda52b862b53782350bb7cc7e8;hpb=35a371dbbbb9ba8cd3d67c4b1763a93ac0572006;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index 051378a..6c6ef13 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -289,7 +289,7 @@ sub prepare {
 
  $stat->distribution($name . '-' . $version);
 
- $stat->ebuild_version(CPANPLUS::Dist::Gentoo::Maps::version_c2g($version));
+ $stat->ebuild_version(CPANPLUS::Dist::Gentoo::Maps::version_c2g($name, $version));
 
  $stat->ebuild_name(CPANPLUS::Dist::Gentoo::Maps::name_c2g($name));
 
@@ -364,8 +364,9 @@ sub prepare {
  }
  $stat->requires(\@requires);
 
+ my $meta = $self->meta;
  $stat->min_perl(CPANPLUS::Dist::Gentoo::Maps::perl_version_c2g(
-  eval { $self->meta->{requires}->{perl} }
+  $meta->{requires}->{perl},
  ));
 
  return $OK->();
@@ -391,6 +392,7 @@ sub meta {
   my $meta_file = File::Spec->catdir($extract_dir, $name);
   next unless -e $meta_file;
 
+  local $@;
   my $meta = eval { Parse::CPAN::Meta::LoadFile($meta_file) };
   if (defined $meta) {
    $stat->meta($meta);
@@ -426,7 +428,8 @@ sub intuit_license {
   return \@licenses if @licenses;
  }
 
- my $license = $self->meta->{license};
+ my $meta    = $self->meta;
+ my $license = $meta->{license};
  if (defined $license) {
   my @licenses = CPANPLUS::Dist::Gentoo::Maps::license_c2g($license);
   return \@licenses if @licenses;
@@ -592,10 +595,10 @@ sub ebuild_source {
 }
 
 sub _cpan2portage {
- my ($self, $name, $version) = @_;
+ my ($self, $dist_name, $dist_version) = @_;
 
- $name    = CPANPLUS::Dist::Gentoo::Maps::name_c2g($name);
- $version = CPANPLUS::Dist::Gentoo::Maps::version_c2g($version);
+ my $name    = CPANPLUS::Dist::Gentoo::Maps::name_c2g($dist_name);
+ my $version = CPANPLUS::Dist::Gentoo::Maps::version_c2g($dist_name, $dist_version);
 
  my @portdirs = ($main_portdir, @{$self->status->portdir_overlay});