Relink prerequisites with gentooisms

[perl/modules/CPANPLUS-Dist-Gentoo.git] / lib / CPANPLUS / Dist / Gentoo.pm

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index f68181943547ccc654ec6b60092be09d01f95a23..962d60f7ff31b9d7ed8637429ba15ddd89aa0e9f 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -147,6 +147,7 @@ sub prepare {
  $stat->license([ qw/Artistic GPL-2/ ]);
 
  my $prereqs = $mod->status->prereqs;
+ $prereqs = { map { ($gentooism{$_} || $_) => $prereqs->{$_} } keys %$prereqs };
  my @depends;
  for my $prereq (sort keys %$prereqs) {
   next if $prereq =~ /^perl(?:-|\z)/;
@@ -176,6 +177,7 @@ sub prepare {
 sub create {
  my $self = shift;
  my $stat = $self->status;
+ my $conf = $self->parent->parent->configure_object;
 
  unless ($stat->prepared) {
   error 'Can\'t create ' . $stat->dist . ' since it was never prepared -- aborting';
@@ -237,8 +239,16 @@ sub create {
   }
 
   msg 'Adding Manifest entry for ' . $stat->dist;
-  unless (scalar run command => [ 'ebuild', $file, 'manifest' ], verbose => 0) {
-   error 'ebuild manifest failed -- aborting';
+  my ($success, $errmsg, $output) = run
+                                     command => [ 'ebuild', $file, 'manifest' ],
+                                     verbose => 0;
+  unless ($success) {
+   error "$errmsg -- aborting";
+   if (defined $output and $conf->get_conf('verbose')) {
+    my $msg = join '', @$output;
+    1 while chomp $msg;
+    error $msg;
+   }
    1 while unlink $file;
    return 0;
   }
@@ -256,8 +266,10 @@ sub install {
  my @cmd = ('emerge', '=' . $stat->eb_name . '-' . $stat->eb_version);
  unshift @cmd, $sudo if $sudo;
 
- unless (run command => \@cmd, verbose => 1) {
-  error 'emerge failed -- aborting';
+ my ($success, $errmsg) = run command => \@cmd,
+                              verbose => 1;
+ unless ($success) {
+  error "$errmsg -- aborting";
   return 0;
  }
 
@@ -273,8 +285,10 @@ sub uninstall {
  my @cmd = ('emerge', '-C', '=' . $stat->eb_name . '-' . $stat->eb_version);
  unshift @cmd, $sudo if $sudo;
 
- unless (run command => \@cmd, verbose => 1) {
-  error 'emerge -C failed -- aborting';
+ my ($success, $errmsg) = run command => \@cmd,
+                              verbose => 1;
+ unless ($success) {
+  error "$errmsg -- aborting";
   return 0;
  }