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

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index d5a7b79..ef52fe8 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Cwd        ();
-use List::Util qw/reduce/;
+use List::Util qw<reduce>;
 use File::Copy ();
 use File::Path ();
 use File::Spec;
@@ -14,7 +14,7 @@ use Parse::CPAN::Meta ();
 
 use CPANPLUS::Error ();
 
-use base qw/CPANPLUS::Dist::Base/;
+use base qw<CPANPLUS::Dist::Base>;
 
 use CPANPLUS::Dist::Gentoo::Atom;
 use CPANPLUS::Dist::Gentoo::Guard;
@@ -26,98 +26,171 @@ CPANPLUS::Dist::Gentoo - CPANPLUS backend generating Gentoo ebuilds.
 
 =head1 VERSION
 
-Version 0.10
+Version 0.11
 
 =cut
 
-our $VERSION = '0.10';
+our $VERSION = '0.11';
 
 =head1 SYNOPSIS
 
+    # Using default values from your make.conf
+    cpan2dist --format=CPANPLUS::Dist::Gentoo --buildprereq Some::Module
+
+    # Specifying your own options
     cpan2dist --format=CPANPLUS::Dist::Gentoo \
               --dist-opts overlay=/usr/local/portage \
               --dist-opts distdir=/usr/portage/distfiles \
               --dist-opts manifest=yes \
               --dist-opts keywords=x86 \
-              --dist-opts header="# Copyright 1999-2008 Gentoo Foundation" \
+              --dist-opts header="# Begin" \
               --dist-opts footer="# End" \
               Any::Module You::Like
 
-=head1 DESCRPITON
+=head1 DESCRIPTION
 
-This module is a CPANPLUS backend that recursively generates Gentoo ebuilds for a given package in the specified overlay (defaults to F</usr/local/portage>), updates the manifest, and even emerges it (together with its dependencies) if the user requires it.
-You need write permissions on the directory where Gentoo fetches its source files (usually F</usr/portage/distfiles>).
-The valid C<KEYWORDS> for the generated ebuilds are by default those given in C<ACCEPT_KEYWORDS>, but you can specify your own with the C<keywords> dist-option.
+This module is a CPANPLUS backend that recursively generates Gentoo ebuilds for a given package in the default overlay, updates the manifest, and even emerges it (together with its dependencies) if the user requires it.
 
 The generated ebuilds are placed into the C<perl-gcpanp> category.
 They favour depending on a C<virtual>, on C<perl-core>, C<dev-perl> or C<perl-gcpan> (in that order) rather than C<perl-gcpanp>.
+Existing ebuilds will be searched into the main C<PORTDIR> portage tree and then into the overlays listed in C<PORTDIR_OVERLAY>.
 
-=head1 INSTALLATION
+=head1 OPTIONS
 
-Before installing this module, you should append C<perl-gcpanp> to your F</etc/portage/categories> file.
+You can pass specific options to L<cpan2dist> by using the C<--dist-opts> command-line argument followed by a C<key=value> pair, where C<key> is the option name and C<value> is what it is set to.
+C<--dist-opts> can be used several times.
 
-You have two ways for installing this module :
+The valid option C<key>s are :
 
 =over 4
 
 =item *
 
-Use the perl overlay located at L<http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git>.
-It contains an ebuild for L<CPANPLUS::Dist::Gentoo>.
+C<manifest>
+
+A boolean that indicates whether the F<Manifest> file should be generated by running C<ebuild manifest> onto the generated ebuilds.
+
+Defaults to C<yes>.
 
 =item *
 
-Bootstrap an ebuild for L<CPANPLUS::Dist::Gentoo> using itself.
-Note that if your Gentoo system C<perl> is C<5.8.x>, L<CPANPLUS> and its dependencies are not installed and not even available in the main portage tree.
-So you need to bootstrap them as well.
+C<overlay>
 
-First, fetch tarballs for L<CPANPLUS> and L<CPANPLUS::Dist::Gentoo> :
+The path of the overlay in which the generated ebuilds will be written.
 
-    $ 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.10.tar.gz
+Defaults to the first overlay listed in C<PORTDIR_OVERLAY> (as returned by C<emerge --info>) or F</usr/local/portage> if this variable is empty.
 
-Log in as root and unpack them in e.g. your home directory :
+=item *
 
-    # cd
-    # tar xzf /tmp/CPANPLUS-0.9003.tar.gz
-    # tar xzf /tmp/CPANPLUS-Dist-Gentoo-0.10.tar.gz
+C<distdir>
 
-Set up environment variables so that the toolchain is temporarily available :
+The directory where C<ebuild> expects to find the source tarballs.
+You need write permissions on this directory.
 
-    # export OLDPATH=$PATH
-    # export PATH=/root/CPANPLUS-0.9003/bin:$PATH
-    # export PERL5LIB=/root/CPANPLUS-Dist-Gentoo-0.10/blib/lib:/root/CPANPLUS-0.9003/lib:/root/CPANPLUS-0.9003/inc/bundle
+Defaults to the value of C<DISTDIR> (as returned by C<emerge --info>) or F</usr/portage/distfiles> if this variable is empty.
 
-Make sure you don't have an old C<.cpanplus> configuration visible :
+=item *
 
-    # [ -d /root/.cpanplus ] && mv /root/.cpanplus{,.bak}
+C<keywords>
 
-Bootstrap L<CPANPLUS> :
+The valid C<KEYWORDS> for the generated ebuilds.
 
-    # cd /root/CPANPLUS-Dist-Gentoo-0.10
-    # samples/g-cpanp CPANPLUS
+Defaults to the value of C<ACCEPT_KEYWORDS> (as returned by C<emerge --info>) or C<'x86'> if this variable is empty.
 
-Reset the environment :
+=item *
+
+C<header>
+
+A chunk of text that is prepended to every ebuild.
 
-    # export PATH=$OLDPATH
-    # unset PERL5LIB OLDPATH
+Defaults to the generic Gentoo Foundation header.
 
-Emerge L<CPANPLUS> with the ebuilds you've just generated :
+=item *
+
+C<footer>
 
-    # emerge -tv CPANPLUS
+A chunk of text that is appended to every ebuild.
 
-As of september 2009, C<podlators> and C<ExtUtils-MakeMaker> may fail to emerge due to collisions.
-You can work around this by disabling the C<protect-owned> C<FEATURE> for them :
+Defaults to nothing.
 
-    # FEATURES="-protect-owned" emerge podlators
-    # FEATURES="-protect-owned" emerge ExtUtils-MakeMaker
+=back
+
+L<cpan2dist> itself takes other options, most notably :
+
+=over 4
+
+=item *
 
-You may need to run each of these commands two times for them to succeed.
+C<--buildprereq> generates an ebuild for every dependency, even for those that are already up-to-date.
+Setting this option is recommended.
 
-At this point, you can bootstrap L<CPANPLUS::Dist::Gentoo> using the system L<CPANPLUS> :
+=item *
+
+C<--force> forcefully regenerates ebuilds even if they already exist.
+
+=item *
+
+C<--install> installs the ebuilds after generating them.
+
+=item *
+
+C<--skiptest> skips tests while building, which speeds up the building process.
+
+=item *
+
+C<--verbose> shows a lot more information.
+
+=back
+
+Please refer to L<cpan2dist> documentation for a complete coverage of its abilities.
+
+=head1 INSTALLATION
+
+Before installing this module, you should append C<perl-gcpanp> to your F</etc/portage/categories> file.
+
+You have two ways for installing this module :
+
+=over 4
+
+=item *
+
+Use the perl overlay located at L<http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git>.
+It contains an ebuild for L<CPANPLUS::Dist::Gentoo> which will most likely be up-to-date given the reactivity of Gentoo's Perl herd.
+
+=item *
+
+Bootstrap an ebuild for L<CPANPLUS::Dist::Gentoo> using itself.
+
+First, make sure your system C<perl> is C<5.10> or greater, so that the L<CPANPLUS> toolchain is available.
+
+    $ perl -v
+    This is perl 5, version 12, subversion 2 (v5.12.2)...
+
+C<perl> C<5.12> is the current stable Perl version in Gentoo.
+If you still have C<perl> C<5.8.x>, you can upgrade it by running the following commands as root :
+
+    # emerge -tv ">=dev-lang/perl-5.10"
+    # perl-cleaner --all
+
+Then, fetch the L<CPANPLUS::Dist::Gentoo> tarball :
+
+    $ cd /tmp
+    $ wget http://search.cpan.org/CPAN/authors/id/V/VP/VPIT/CPANPLUS-Dist-Gentoo-0.11.tar.gz
+
+Log in as root and unpack it in e.g. your home directory :
+
+    # cd
+    # tar xzf /tmp/CPANPLUS-Dist-Gentoo-0.11.tar.gz
+    # cd CPANPLUS-Dist-Gentoo-0.11
+
+Bootstrap L<CPANPLUS::Dist::Gentoo> using the bundled shell script C<g-cpanp> :
+
+    # perl Makefile.PL
+    # make
+    # PERL5LIB=blib/lib samples/g-cpanp CPANPLUS::Dist::Gentoo
+
+Finally, emerge the C<CPANPLUS-Dist-Gentoo> ebuild you've just generated :
 
-    # PERL5LIB=/root/CPANPLUS-Dist-Gentoo-0.10/blib/lib samples/g-cpanp CPANPLUS::Dist::Gentoo
     # emerge -tv CPANPLUS-Dist-Gentoo
 
 =back
@@ -136,6 +209,7 @@ my $default_keywords;
 my $default_distdir;
 my $main_portdir;
 
+my %dependencies;
 my %forced;
 
 my $unquote = sub {
@@ -150,17 +224,26 @@ my $format_available;
 sub format_available {
  return $format_available if defined $format_available;
 
- for my $prog (qw/emerge ebuild/) {
+ unless (IPC::Cmd->can_capture_buffer) {
+  my $msg = 'IPC::Cmd must be able to capture buffers.';
+  unless (do { local $@; eval { require IPC::Run; 1 } }) {
+   $msg  .= ' Try installing IPC::Run (dev-perl/IPC-Run on Gentoo).';
+  }
+  __PACKAGE__->_abort($msg);
+  return $format_available = 0;
+ }
+
+ for my $prog (qw<emerge ebuild>) {
   unless (IPC::Cmd::can_run($prog)) {
    __PACKAGE__->_abort("$prog is required to write ebuilds");
    return $format_available = 0;
   }
  }
 
- if (IPC::Cmd->can_capture_buffer) {
+ {
   my $buffers;
   my ($success, $errmsg) = IPC::Cmd::run(
-   command => [ qw/emerge --info/ ],
+   command => [ qw<emerge --info> ],
    verbose => 0,
    buffer  => \$buffers,
   );
@@ -179,6 +262,7 @@ sub format_available {
    }
   } else {
    __PACKAGE__->_abort($errmsg);
+   return $format_available = 0;
   }
  }
 
@@ -193,13 +277,15 @@ sub init {
  my $stat = $self->status;
  my $conf = $self->parent->parent->configure_object;
 
- $stat->mk_accessors(qw/name version author distribution desc uri src license
-                        meta min_perl
-                        fetched_arch requires configure_requires
-                        ebuild_name ebuild_version ebuild_dir ebuild_file
-                        portdir_overlay
-                        overlay distdir keywords do_manifest header footer
-                        force verbose/);
+ $stat->mk_accessors(qw<
+  name version author distribution desc uri src license
+  meta min_perl
+  fetched_arch
+  requires configure_requires recursive_requires
+  ebuild_name ebuild_version ebuild_dir ebuild_file
+  portdir_overlay overlay distdir keywords do_manifest header footer
+  force verbose
+ >);
 
  $stat->force($conf->get_conf('force'));
  $stat->verbose($conf->get_conf('verbose'));
@@ -218,14 +304,7 @@ my $filter_prereqs = sub {
   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;
-   }
-  }
+  my $version = $prereqs->{$prereq} || undef;
 
   push @requires, [ $obj->package_name, $version ];
  }
@@ -282,7 +361,12 @@ sub prepare {
  $stat->footer($footer);
 
  my $overlay = delete $opts{overlay};
- $overlay = (defined $overlay) ? Cwd::abs_path($overlay) : '/usr/local/portage';
+ if (defined $overlay) {
+  $overlay   = Cwd::abs_path($overlay);
+ } else {
+  $overlay   = $overlays->[0];
+  $overlay   = '/usr/local/portage' unless defined $overlay;
+ }
  $stat->overlay($overlay);
 
  my $distdir = delete $opts{distdir};
@@ -359,7 +443,10 @@ sub prepare {
  return $FAIL->() unless $stat->prepared;
 
  my $desc = $mod->description;
- ($desc = $name) =~ s/-+/::/g unless $desc;
+ $desc    = $mod->comment                unless $desc;
+ $desc    = "$name Perl distribution (provides " . $mod->module . ')'
+                                         unless $desc;
+ $desc    = substr($desc, 0, 77) . '...' if length $desc > 80;
  $stat->desc($desc);
 
  $stat->uri('http://search.cpan.org/dist/' . $name);
@@ -372,6 +459,9 @@ sub prepare {
  my $mstat = $mod->status;
  $stat->configure_requires($int->$filter_prereqs($mstat->configure_requires));
  $stat->requires($int->$filter_prereqs($mstat->requires));
+ $stat->recursive_requires([ ]);
+
+ $dependencies{$name} = [ map $_->[0], @{ $stat->requires } ];
 
  my $meta = $self->meta;
  $stat->min_perl(CPANPLUS::Dist::Gentoo::Maps::perl_version_c2g(
@@ -397,7 +487,7 @@ sub meta {
 
  my $extract_dir = $mod->status->extract;
 
- for my $name (qw/META.json META.yml/) {
+ for my $name (qw<META.json META.yml>) {
   my $meta_file = File::Spec->catdir($extract_dir, $name);
   next unless -e $meta_file;
 
@@ -558,19 +648,58 @@ Returns the source of the ebuild for the current dist object, or C<undef> when o
 
 =cut
 
+my $dep_tree_contains;
+{
+ my %seen;
+
+ $dep_tree_contains = sub {
+  my ($dist, $target) = @_;
+
+  return 0 if $seen{$dist};
+  local $seen{$dist} = 1;
+
+  for my $kid (@{ $dependencies{$dist} }) {
+   return 1 if $kid eq $target
+            or $dep_tree_contains->($kid, $target);
+  }
+
+  return 0;
+ }
+}
+
 sub ebuild_source {
  my $self = shift;
  my $stat = $self->status;
 
+ {
+  my $name = $stat->name;
+  my %recursive_kids = map { $_ => 1 }
+                        grep $dep_tree_contains->($_, $name),
+                         @{ $dependencies{$name} };
+  if (%recursive_kids) {
+   my (@requires, @recursive_requires);
+   for (@{ $stat->requires }) {
+    if ($recursive_kids{$_->[0]}) {
+     push @recursive_requires, $_;
+    } else {
+     push @requires, $_;
+    }
+   }
+   $stat->requires(\@requires);
+   $stat->recursive_requires(\@recursive_requires);
+  }
+ }
+
  # 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 (@configure_requires, @requires);
+ my (@configure_requires, @requires, @recursive_requires);
 
  my @phases = (
   [ configure_requires => \@configure_requires ],
   [ requires           => \@requires           ],
+  [ recursive_requires => \@recursive_requires ],
  );
 
  push @requires, CPANPLUS::Dist::Gentoo::Atom->new(
@@ -607,7 +736,9 @@ sub ebuild_source {
  $d   .= "SLOT=\"0\"\n";
  $d   .= 'LICENSE="|| ( ' . join(' ', sort @{$stat->license}) . " )\"\n";
  $d   .= 'KEYWORDS="' . join(' ', sort @{$stat->keywords}) . "\"\n";
- $d   .= 'RDEPEND="' . join("\n", sort @requires) . "\"\n";
+ $d   .= 'RDEPEND="' . join("\n", sort @requires) . "\"\n" if @requires;
+ $d   .= 'PDEPEND="' . join("\n", sort @recursive_requires) . "\"\n"
+                                                         if @recursive_requires;
  $d   .= 'DEPEND="' . join("\n", '${RDEPEND}', sort @configure_requires) . "\"\n";
  $d   .= "SRC_TEST=\"do\"\n";
  $d   .= $stat->footer;
@@ -623,7 +754,7 @@ sub _cpan2portage {
 
  my @portdirs = ($main_portdir, @{$self->status->portdir_overlay});
 
- for my $category (qw/virtual perl-core dev-perl perl-gcpan/, CATEGORY) {
+ for my $category (qw<virtual perl-core dev-perl perl-gcpan>, CATEGORY) {
   my $name = ($category eq 'virtual' ? 'perl-' : '') . $name;
 
   for my $portdir (@portdirs) {