X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=d5a7b79dd375add110e358c90717d0217ad8268c;hb=5af07d69e53872ebe1bdea02e0e880141eacd862;hp=16164495321fe7be9a6074d9a3fb6de56f8c7ff8;hpb=ac86d926fe1f232054032ab4f36c301b8e5eccaa;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index 1616449..d5a7b79 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -17,6 +17,7 @@ use CPANPLUS::Error ();
 use base qw/CPANPLUS::Dist::Base/;
 
 use CPANPLUS::Dist::Gentoo::Atom;
+use CPANPLUS::Dist::Gentoo::Guard;
 use CPANPLUS::Dist::Gentoo::Maps;
 
 =head1 NAME
@@ -25,11 +26,11 @@ CPANPLUS::Dist::Gentoo - CPANPLUS backend generating Gentoo ebuilds.
 
 =head1 VERSION
 
-Version 0.09
+Version 0.10
 
 =cut
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 =head1 SYNOPSIS
 
@@ -74,19 +75,19 @@ First, fetch tarballs for L<CPANPLUS> and L<CPANPLUS::Dist::Gentoo> :
 
     $ cd /tmp
     $ wget http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/CPANPLUS-0.9003.tar.gz
-    $ wget http://search.cpan.org/CPAN/authors/id/V/VP/VPIT/CPANPLUS-Dist-Gentoo-0.09.tar.gz
+    $ wget http://search.cpan.org/CPAN/authors/id/V/VP/VPIT/CPANPLUS-Dist-Gentoo-0.10.tar.gz
 
 Log in as root and unpack them in e.g. your home directory :
 
     # cd
     # tar xzf /tmp/CPANPLUS-0.9003.tar.gz
-    # tar xzf /tmp/CPANPLUS-Dist-Gentoo-0.09.tar.gz
+    # tar xzf /tmp/CPANPLUS-Dist-Gentoo-0.10.tar.gz
 
 Set up environment variables so that the toolchain is temporarily available :
 
     # export OLDPATH=$PATH
     # export PATH=/root/CPANPLUS-0.9003/bin:$PATH
-    # export PERL5LIB=/root/CPANPLUS-Dist-Gentoo-0.09/blib/lib:/root/CPANPLUS-0.9003/lib:/root/CPANPLUS-0.9003/inc/bundle
+    # export PERL5LIB=/root/CPANPLUS-Dist-Gentoo-0.10/blib/lib:/root/CPANPLUS-0.9003/lib:/root/CPANPLUS-0.9003/inc/bundle
 
 Make sure you don't have an old C<.cpanplus> configuration visible :
 
@@ -94,7 +95,7 @@ Make sure you don't have an old C<.cpanplus> configuration visible :
 
 Bootstrap L<CPANPLUS> :
 
-    # cd /root/CPANPLUS-Dist-Gentoo-0.09
+    # cd /root/CPANPLUS-Dist-Gentoo-0.10
     # samples/g-cpanp CPANPLUS
 
 Reset the environment :
@@ -116,7 +117,7 @@ You may need to run each of these commands two times for them to succeed.
 
 At this point, you can bootstrap L<CPANPLUS::Dist::Gentoo> using the system L<CPANPLUS> :
 
-    # PERL5LIB=/root/CPANPLUS-Dist-Gentoo-0.09/blib/lib samples/g-cpanp CPANPLUS::Dist::Gentoo
+    # PERL5LIB=/root/CPANPLUS-Dist-Gentoo-0.10/blib/lib samples/g-cpanp CPANPLUS::Dist::Gentoo
     # emerge -tv CPANPLUS-Dist-Gentoo
 
 =back
@@ -194,7 +195,7 @@ sub init {
 
  $stat->mk_accessors(qw/name version author distribution desc uri src license
                         meta min_perl
-                        fetched_arch requires
+                        fetched_arch requires configure_requires
                         ebuild_name ebuild_version ebuild_dir ebuild_file
                         portdir_overlay
                         overlay distdir keywords do_manifest header footer
@@ -206,6 +207,32 @@ sub init {
  return 1;
 }
 
+my $filter_prereqs = sub {
+ my ($int, $prereqs) = @_;
+
+ my @requires;
+ for my $prereq (sort keys %$prereqs) {
+  next if $prereq =~ /^perl(?:-|\z)/;
+
+  my $obj = $int->module_tree($prereq);
+  next unless $obj; # Not in the module tree (e.g. Config)
+  next if $obj->package_is_perl_core;
+
+  my $version;
+  if ($prereqs->{$prereq}) {
+   if ($obj->installed_version && $obj->installed_version < $obj->version) {
+    $version = $obj->installed_version;
+   } else {
+    $version = $obj->package_version;
+   }
+  }
+
+  push @requires, [ $obj->package_name, $version ];
+ }
+
+ return \@requires;
+};
+
 sub prepare {
  my $self = shift;
  my $mod  = $self->parent;
@@ -288,7 +315,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));
 
@@ -342,29 +369,13 @@ sub prepare {
 
  $stat->license($self->intuit_license);
 
- my $prereqs = $mod->status->requires;
- my @requires;
- for my $prereq (sort keys %$prereqs) {
-  next if $prereq =~ /^perl(?:-|\z)/;
-  my $obj = $int->module_tree($prereq);
-  next unless $obj; # Not in the module tree (e.g. Config)
-  next if $obj->package_is_perl_core;
-  {
-   my $version;
-   if ($prereqs->{$prereq}) {
-    if ($obj->installed_version && $obj->installed_version < $obj->version) {
-     $version = $obj->installed_version;
-    } else {
-     $version = $obj->package_version;
-    }
-   }
-   push @requires, [ $obj->package_name, $version ];
-  }
- }
- $stat->requires(\@requires);
+ my $mstat = $mod->status;
+ $stat->configure_requires($int->$filter_prereqs($mstat->configure_requires));
+ $stat->requires($int->$filter_prereqs($mstat->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->();
@@ -390,6 +401,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);
@@ -425,7 +437,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;
@@ -440,7 +453,24 @@ sub create {
 
  my $file;
 
+ my $guard = CPANPLUS::Dist::Gentoo::Guard->new(sub {
+  if (defined $file and -e $file and -w _) {
+   1 while unlink $file;
+  }
+ });
+
+ my $SIG_INT = $SIG{INT};
+ local $SIG{INT} = sub {
+  if ($SIG_INT) {
+   local $@;
+   eval { $SIG_INT->() };
+   die $@ if $@;
+  }
+  die 'Caught SIGINT';
+ };
+
  my $OK   = sub {
+  $guard->unarm;
   $stat->created(1);
   $stat->dist($file) if defined $file;
   1;
@@ -450,9 +480,6 @@ sub create {
   $stat->created(0);
   $stat->dist(undef);
   $self->_abort(@_) if @_;
-  if (defined $file and -f $file) {
-   1 while unlink $file;
-  }
   0;
  };
 
@@ -538,26 +565,37 @@ sub ebuild_source {
  # We must resolve the deps now and not inside prepare because _cpan2portage
  # has to see the ebuilds already generated for the dependencies of the current
  # dist.
- my @requires;
- for (@{$stat->requires}) {
-  my $atom = $self->_cpan2portage(@$_);
-  unless (defined $atom) {
-   $self->_abort(
-    "Couldn't find an appropriate ebuild for $_->[0] in the portage tree"
-   );
-   return;
-  }
-  push @requires, $atom;
- }
 
- my $min_perl = $stat->min_perl;
- my $perl = CPANPLUS::Dist::Gentoo::Atom->new(
+ my (@configure_requires, @requires);
+
+ my @phases = (
+  [ configure_requires => \@configure_requires ],
+  [ requires           => \@requires           ],
+ );
+
+ push @requires, CPANPLUS::Dist::Gentoo::Atom->new(
   category => 'dev-lang',
   name     => 'perl',
-  (defined $min_perl ? (version => $min_perl, range => '>=') : ()),
+  version  => $stat->min_perl,
  );
 
- @requires = CPANPLUS::Dist::Gentoo::Atom->fold($perl, @requires);
+ for (@phases) {
+  my ($phase, $list) = @$_;
+
+  for (@{ $stat->$phase }) {
+   my $atom = $self->_cpan2portage(@$_);
+   unless (defined $atom) {
+    $self->_abort(
+     "Couldn't find an appropriate ebuild for $_->[0] in the portage tree"
+    );
+    return;
+   }
+
+   push @$list, $atom;
+  }
+
+  @$list = CPANPLUS::Dist::Gentoo::Atom->fold(@$list);
+ }
 
  my $d = $stat->header;
  $d   .= "# Generated by CPANPLUS::Dist::Gentoo version $VERSION\n\n";
@@ -570,7 +608,7 @@ sub ebuild_source {
  $d   .= 'LICENSE="|| ( ' . join(' ', sort @{$stat->license}) . " )\"\n";
  $d   .= 'KEYWORDS="' . join(' ', sort @{$stat->keywords}) . "\"\n";
  $d   .= 'RDEPEND="' . join("\n", sort @requires) . "\"\n";
- $d   .= "DEPEND=\"\${RDEPEND}\"\n";
+ $d   .= 'DEPEND="' . join("\n", '${RDEPEND}', sort @configure_requires) . "\"\n";
  $d   .= "SRC_TEST=\"do\"\n";
  $d   .= $stat->footer;
 
@@ -578,10 +616,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});
 
@@ -604,7 +642,7 @@ sub _cpan2portage {
    return CPANPLUS::Dist::Gentoo::Atom->new(
     category => $last->category,
     name     => $last->name,
-    (defined $version ? (version => $version, range => '>=') : ()),
+    version  => $version,
     ebuild   => $last->ebuild,
    );
   }