X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=89756240b6b7cef05d052fc4a07c1e4d401ad576;hb=3d960decb0a513ec1f0bb62296285a0f74a32e0e;hp=1fe2d5837a446aa0736e9031cfc3432b7a455950;hpb=90e2f623a906899129db73b9c7ef02493a0c619b;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index 1fe2d58..8975624 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -3,6 +3,7 @@ package CPANPLUS::Dist::Gentoo;
 use strict;
 use warnings;
 
+use Cwd qw/abs_path/;
 use File::Copy qw/copy/;
 use File::Path qw/mkpath/;
 use File::Spec::Functions qw/catdir catfile/;
@@ -19,11 +20,11 @@ CPANPLUS::Dist::Gentoo - CPANPLUS backend generating Gentoo ebuilds.
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 SYNOPSIS
 
@@ -81,13 +82,16 @@ sub init {
 }
 
 my %gentooism = (
+ 'Crypt-RSA'         => 'crypt-rsa',
  'Digest'            => 'digest-base',
  'Locale-Maketext'   => 'locale-maketext',
+ 'Math-Pari'         => 'math-pari',
  'Net-Ping'          => 'net-ping',
  'PathTools'         => 'File-Spec',
  'PodParser'         => 'Pod-Parser',
  'Set-Scalar'        => 'set-scalar',
  'Tie-EncryptedHash' => 'tie-encryptedhash',
+ 'YAML'              => 'yaml',
 );
 
 sub prepare {
@@ -99,6 +103,8 @@ sub prepare {
 
  my %opts = @_;
 
+ $stat->prepared(0);
+
  my $keywords = delete $opts{'keywords'};
  $keywords = 'x86' unless defined $keywords;
  $keywords = [ split ' ', $keywords ];
@@ -126,9 +132,13 @@ sub prepare {
  }
  $stat->footer($footer);
 
- $stat->overlay(delete($opts{'overlay'}) || '/usr/local/portage');
+ my $overlay = delete $opts{'overlay'};
+ $overlay = (defined $overlay) ? abs_path $overlay : '/usr/local/portage';
+ $stat->overlay($overlay);
 
- $stat->distdir(delete($opts{'distdir'}) || '/usr/portage/distfiles');
+ my $distdir = delete $opts{'distdir'};
+ $distdir = (defined $distdir) ? abs_path $distdir : '/usr/portage/distfiles';
+ $stat->distdir($distdir);
 
  if ($stat->do_manifest && !-w $stat->distdir) {
   error 'distdir isn\'t writable -- aborting';
@@ -202,7 +212,6 @@ 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)/;
@@ -226,6 +235,7 @@ sub prepare {
  }
  $stat->deps(\@depends);
 
+ $stat->prepared(1);
  return 1;
 }
 
@@ -235,6 +245,7 @@ sub create {
 
  unless ($stat->prepared) {
   error 'Can\'t create ' . $stat->dist . ' since it was never prepared -- aborting';
+  $stat->created(0);
   return 0;
  }
 
@@ -243,6 +254,8 @@ sub create {
   return 1;
  }
 
+ $stat->created(0);
+
  $self->SUPER::create(@_);
 
  my $dir = $stat->eb_dir;
@@ -268,6 +281,7 @@ sub create {
   'dev-lang/perl',
   map {
    my $a = $_->[0]->package_name;
+   $a = $gentooism{$a} || $a;
    my $x = '';
    if (defined $_->[1]) {
     $x  = '>=';
@@ -303,6 +317,7 @@ sub create {
   }
  }
 
+ $stat->created(1);
  return 1;
 }
 
@@ -315,7 +330,10 @@ sub install {
  my @cmd = ('emerge', '=' . $stat->eb_name . '-' . $stat->eb_version);
  unshift @cmd, $sudo if $sudo;
 
- return $self->_run(\@cmd, 1);
+ my $success = $self->_run(\@cmd, 1);
+ $stat->installed($success);
+
+ return $success;
 }
 
 sub uninstall {
@@ -327,7 +345,10 @@ sub uninstall {
  my @cmd = ('emerge', '-C', '=' . $stat->eb_name . '-' . $stat->eb_version);
  unshift @cmd, $sudo if $sudo;
 
- return $self->_run(\@cmd, 1);
+ my $success = $self->_run(\@cmd, 1);
+ $stat->uninstalled($success);
+
+ return $success;
 }
 
 sub _run {
@@ -358,7 +379,7 @@ Gentoo (L<http://gentoo.org>).
 
 L<CPANPLUS>, L<IPC::Cmd> (core modules since 5.9.5).
 
-L<File::Path> (since 5.001), L<File::Copy> (5.002), L<File::Spec::Functions> (5.00504).
+L<Cwd> (since perl 5) L<File::Path> (5.001), L<File::Copy> (5.002), L<File::Spec::Functions> (5.00504).
 
 =head1 SEE ALSO