X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=7febab9097f0f6e5e07d16b2e78db498f0f5b029;hb=7278013a1296d32f2f2b4dc61d4463dc1ba30812;hp=70fc27be2dd3797501ea363e526f1261048a5e35;hpb=3770352fb8ffd4eb59c6310ed899b62b785696a0;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index 70fc27b..7febab9 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use Cwd qw/abs_path/;
+use List::Util qw/reduce/;
 use File::Copy ();
 use File::Path ();
 use File::Spec;
@@ -23,11 +24,11 @@ CPANPLUS::Dist::Gentoo - CPANPLUS backend generating Gentoo ebuilds.
 
 =head1 VERSION
 
-Version 0.07
+Version 0.08
 
 =cut
 
-our $VERSION = '0.07';
+our $VERSION = '0.08';
 
 =head1 SYNOPSIS
 
@@ -146,6 +147,7 @@ sub prepare {
 
  my $OK   = sub { $stat->prepared(1); 1 };
  my $FAIL = sub { $stat->prepared(0); $self->_abort(@_) if @_; 0 };
+ my $SKIP = sub { $stat->prepared(1); $stat->created(1); $self->_skip(@_) if @_; 1 };
 
  my $keywords = delete $opts{keywords};
  if (defined $keywords) {
@@ -227,24 +229,24 @@ sub prepare {
  );
  $stat->ebuild_file($file);
 
- if (-e $file) {
-  my $skip = 1;
-  if ($stat->force and not $forced{$file}) {
-   if (-w $file) {
-    1 while unlink $file;
-    $forced{$file} = 1;
-    $skip = 0;
-   } else {
-    $self->_skip("Can't force rewriting of $file");
+ if ($stat->force) {
+  # Always generate an ebuild in our category when forcing
+  if ($forced{$file}) {
+   $stat->dist($file);
+   return $SKIP->('Ebuild already forced for', $stat->distribution);
+  }
+  ++$forced{$file};
+  if (-e $file) {
+   unless (-w $file) {
+    $stat->dist($file);
+    return $SKIP->("Can't force rewriting of $file");
    }
-  } else {
-   $self->_skip('Ebuild already generated for', $stat->distribution);
+   1 while unlink $file;
   }
-  if ($skip) {
-   $stat->prepared(1);
-   $stat->created(1);
-   $stat->dist($file);
-   return 1;
+ } else {
+  if (my @match = $self->_cpan2portage($name, $version)) {
+   $stat->dist($match[1]);
+   return $SKIP->('Ebuild already generated for', $stat->distribution);
   }
  }
 
@@ -341,7 +343,7 @@ sub create {
 
  my $OK   = sub {
   $stat->created(1);
-  $stat->dist($file);
+  $stat->dist($file) if defined $file;
   1;
  };
 
@@ -349,7 +351,7 @@ sub create {
   $stat->created(0);
   $stat->dist(undef);
   $self->_abort(@_) if @_;
-  if ($file and -f $file) {
+  if (defined $file and -f $file) {
    1 while unlink $file;
   }
   0;
@@ -363,6 +365,7 @@ sub create {
 
  if ($stat->created) {
   $self->_skip($stat->distribution, 'was already created');
+  $file = $stat->dist; # Keep the existing one.
   return $OK->();
  }
 
@@ -439,7 +442,12 @@ sub ebuild_source {
  my @deps;
  for (@{$stat->deps}) {
   my $dep = $self->_cpan2portage(@$_);
-  return unless defined $dep;
+  unless (defined $dep) {
+   $self->_abort(
+    "Couldn't find an appropriate ebuild for $_->[0] in the portage tree"
+   );
+   return;
+  }
   push @deps, $dep;
  }
 
@@ -482,25 +490,24 @@ sub _cpan2portage {
     "$atom-*.ebuild",
    ) or next;
 
+   my $last = reduce {
+    CPANPLUS::Dist::Gentoo::Maps::version_gcmp($b->[1], $a->[1]) >= 0 ? $b : $a
+   } map [ $_, /\Q$atom\E-v?([\d._pr-]+).*?\.ebuild$/ ? $1 : 0 ], @ebuilds;
+
+   my $dep;
    if (defined $ver) { # implies that $version is defined
-    for (@ebuilds) {
-     my ($eb_ver) = /\Q$atom\E-v?([\d._pr-]+).*?\.ebuild$/;
-     return ">=$category/$atom-$ver"
-            if  defined $eb_ver
-            and CPANPLUS::Dist::Gentoo::Maps::version_gcmp($eb_ver, $ver) >= 0;
-    }
+    next unless
+              CPANPLUS::Dist::Gentoo::Maps::version_gcmp($last->[1], $ver) >= 0;
+    $dep = ">=$category/$atom-$ver";
    } else {
-    return "$category/$atom";
+    $dep = "$category/$atom";
    }
 
+   return wantarray ? ($dep, $last->[0]) : $dep;
   }
 
  }
 
- $self->_abort(
-  "Couldn't find an appropriate ebuild for $name in the portage tree"
- );
-
  return;
 }
 
@@ -580,7 +587,7 @@ Gentoo (L<http://gentoo.org>).
 
 L<CPANPLUS>, L<IPC::Cmd> (core modules since 5.9.5), L<Parse::CPAN::Meta> (since 5.10.1).
 
-L<Cwd>, L<Carp> (since perl 5), L<File::Path> (5.001), L<File::Copy> (5.002), L<File::Spec> (5.00405).
+L<Cwd>, L<Carp> (since perl 5), L<File::Path> (5.001), L<File::Copy> (5.002), L<File::Spec> (5.00405), L<List::Util> (5.007003).
 
 =head1 SEE ALSO