From: Vincent Pit <vince@profvince.com>
Date: Fri, 17 Dec 2010 13:45:59 +0000 (+0100)
Subject: Make 'overlay' default to the first overlay listed in PORTDIR_OVERLAY
X-Git-Tag: v0.12~16
X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=ca7d672a00d3f27fe2b037efb4e0bca692b3f800;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git

Make 'overlay' default to the first overlay listed in PORTDIR_OVERLAY

Also properly state the default values for the dist options.
---

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index 032d46e..ef52fe8 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -53,6 +53,7 @@ This module is a CPANPLUS backend that recursively generates Gentoo ebuilds for
 
 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 OPTIONS
 
@@ -75,9 +76,9 @@ Defaults to C<yes>.
 
 C<overlay>
 
-A string formatted as a space-delimited sequence of paths, that lists the different overlays in which existent ebuilds will be looked for.
+The path of the overlay in which the generated ebuilds will be written.
 
-Defaults to the value of C<PORTDIR_OVERLAY> as returned by C<emerge --info> (usually F</usr/local/portage>).
+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.
 
 =item *
 
@@ -86,7 +87,7 @@ C<distdir>
 The directory where C<ebuild> expects to find the source tarballs.
 You need write permissions on this directory.
 
-Defaults to the value of C<DISTDIR> as returned by C<emerge --info> (usually F</usr/portage/distfiles>).
+Defaults to the value of C<DISTDIR> (as returned by C<emerge --info>) or F</usr/portage/distfiles> if this variable is empty.
 
 =item *
 
@@ -94,7 +95,7 @@ C<keywords>
 
 The valid C<KEYWORDS> for the generated ebuilds.
 
-Defaults to the value of C<ACCEPT_KEYWORDS> as returned by C<emerge --info>.
+Defaults to the value of C<ACCEPT_KEYWORDS> (as returned by C<emerge --info>) or C<'x86'> if this variable is empty.
 
 =item *
 
@@ -360,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};