X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=3dff39c1e37a3c0c2376c55876d6eeaa471de513;hb=272791de2540093957736d2b0a248a2b9e689e43;hp=7f138049d1e21dc72a317d52e20a18292c729d9a;hpb=02fbb17472e55a0862fea51d8f4e530a9af9153c;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index 7f13804..3dff39c 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -39,7 +39,7 @@ our $VERSION = '0.04';
 
 =head1 DESCRPITON
 
-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>). You also need to specify the correct keyword for your architecture if it differs from the default C<x86>.
+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.
 
 The generated ebuilds are placed into the C<perl-gcpanp> category. They favour depending on C<perl-core>, C<dev-perl> or C<perl-gcpan> (in that order) rather than C<perl-gcpanp>.
 
@@ -56,6 +56,15 @@ All the methods are inherited from L<CPANPLUS::Dist::Base>. Please refer to its
 use constant CATEGORY => 'perl-gcpanp';
 
 my $overlays;
+my $default_keywords;
+my $default_distdir;
+
+sub _unquote {
+ my $s = shift;
+ $s =~ s/^["']*//;
+ $s =~ s/["']*$//;
+ return $s;
+}
 
 sub format_available {
  for my $prog (qw/emerge ebuild/) {
@@ -71,10 +80,13 @@ sub format_available {
   if ($success) {
    for (@{$output || []}) {
     if (/^PORTDIR_OVERLAY=(.*)$/m) {
-     my $o = $1;
-     $o =~ s/^["']*//;
-     $o =~ s/["']*$//;
-     $overlays = [ map abs_path($_), grep length, split /:/, $o ];
+     $overlays = [ map abs_path($_), split ' ', _unquote($1) ];
+    }
+    if (/^ACCEPT_KEYWORDS=(.*)$/m) {
+     $default_keywords = [ split ' ', _unquote($1) ];
+    }
+    if (/^DISTDIR=(.*)$/m) {
+     $default_distdir = abs_path(_unquote($1));
     }
    }
   } else {
@@ -82,6 +94,9 @@ sub format_available {
   }
  }
 
+ $default_keywords = [ 'x86' ] unless defined $default_keywords;
+ $default_distdir  = '/usr/portage/distfiles' unless defined $default_distdir;
+
  return 1;
 }
 
@@ -90,7 +105,7 @@ 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
+ $stat->mk_accessors(qw/name version author distribution desc uri license
                         deps eb_name eb_version eb_dir eb_file fetched_arch
                         portdir_overlay
                         overlay distdir keywords do_manifest header footer
@@ -102,7 +117,7 @@ sub init {
  return 1;
 }
 
-my %gentooism = (
+our %gentooism = (
  'ANSIColor'               => 'Term-ANSIColor',
  'Audio-CD'                => 'Audio-CD-disc-cover',
  'CGI-Simple'              => 'Cgi-Simple',
@@ -188,8 +203,11 @@ sub prepare {
  $stat->prepared(0);
 
  my $keywords = delete $opts{'keywords'};
- $keywords = 'x86' unless defined $keywords;
- $keywords = [ split ' ', $keywords ];
+ if (defined $keywords) {
+  $keywords = [ split ' ', $keywords ];
+ } else {
+  $keywords = $default_keywords;
+ }
  $stat->keywords($keywords);
 
  my $manifest = delete $opts{'manifest'};
@@ -219,7 +237,7 @@ sub prepare {
  $stat->overlay($overlay);
 
  my $distdir = delete $opts{'distdir'};
- $distdir = (defined $distdir) ? abs_path $distdir : '/usr/portage/distfiles';
+ $distdir = (defined $distdir) ? abs_path $distdir : $default_distdir;
  $stat->distdir($distdir);
 
  if ($stat->do_manifest && !-w $stat->distdir) {
@@ -232,11 +250,11 @@ sub prepare {
  my $portdir_overlay;
  for (@$overlays) {
   if ($_ eq $overlay or File::Spec::Functions::abs2rel($overlay, $_) eq $cur) {
-   $portdir_overlay = join ':', @$overlays;
+   $portdir_overlay = join ' ', @$overlays;
    last;
   }
  }
- $portdir_overlay = join ':', @$overlays, $overlay
+ $portdir_overlay = join ' ', @$overlays, $overlay
                                                 unless defined $portdir_overlay;
  $stat->portdir_overlay($portdir_overlay);
 
@@ -300,13 +318,6 @@ sub prepare {
 
  $stat->uri('http://search.cpan.org/dist/' . $name);
 
- unless ($author =~ /^(.)(.)/) {
-  error 'Wrong author name -- aborting';
-  return 0;
- }
- $stat->src("mirror://cpan/modules/by-authors/id/$1/$1$2/$author/"
-            . $mod->package);
-
  $stat->license([ qw/Artistic GPL-2/ ]);
 
  my $prereqs = $mod->status->prereqs;
@@ -374,10 +385,8 @@ sub create {
  my $d = $stat->header;
  $d   .= "# Generated by CPANPLUS::Dist::Gentoo version $VERSION\n\n";
  $d   .= 'MODULE_AUTHOR="' . $stat->author . "\"\ninherit perl-module\n\n";
- $d   .= 'S="${WORKDIR}/' . $stat->distribution . "\"\n";
  $d   .= 'DESCRIPTION="' . $stat->desc . "\"\n";
- $d   .= 'HOMEPAGE="' . $stat->uri . "\"\n";
- $d   .= 'SRC_URI="' . $stat->src . "\"\n";
+ $d   .= 'HOMEPAGE="' . $stat->uri . "\"\n\n";
  $d   .= "SLOT=\"0\"\n";
  $d   .= 'LICENSE="|| ( ' . join(' ', sort @{$stat->license}) . " )\"\n";
  $d   .= 'KEYWORDS="' . join(' ', sort @{$stat->keywords}) . "\"\n";