X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=ee6c6129386951200413a8c96b260e1f9fabd863;hb=1ec3b5093e827a15cfd2cf15562affc9f0c28654;hp=e5c40fb979a59ba935d60050dc8b38caa01e54a2;hpb=3286fff39f46385facc4e2523166a94d981de471;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index e5c40fb..ee6c612 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -19,11 +19,11 @@ CPANPLUS::Dist::Gentoo - CPANPLUS backend generating Gentoo ebuilds.
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 SYNOPSIS
 
@@ -32,6 +32,8 @@ our $VERSION = '0.03';
               --dist-opts distdir=/usr/portage/distfiles \
               --dist-opts manifest=yes \
               --dist-opts keywords=x86 \
+              --dist-opts header="# Copyright 1999-2008 Gentoo Foundation" \
+              --dist-opts footer="# End" \
               Any::Module You::Like
 
 =head1 DESCRPITON
@@ -67,9 +69,9 @@ sub init {
  my $stat = $self->status;
  my $conf = $self->parent->parent->configure_object;
 
- $stat->mk_accessors(qw/name version dist desc uri src license deps
+ $stat->mk_accessors(qw/name version author dist desc uri src license deps
                         eb_name eb_version eb_dir eb_file fetched_arch
-                        overlay distdir keywords do_manifest
+                        overlay distdir keywords do_manifest header footer
                         force verbose/);
 
  $stat->force($conf->get_conf('force'));
@@ -107,6 +109,23 @@ sub prepare {
  $manifest = 0 if $manifest =~ /^\s*no?\s*$/i;
  $stat->do_manifest($manifest);
 
+ my $header = delete $opts{'header'};
+ if (defined $header) {
+  1 while chomp $header;
+  $header .= "\n\n";
+ } else {
+  $header = '';
+ }
+ $stat->header($header);
+
+ my $footer = delete $opts{'footer'};
+ if (defined $footer) {
+  $footer = "\n" . $footer;
+ } else {
+  $footer = '';
+ }
+ $stat->footer($footer);
+
  $stat->overlay(delete($opts{'overlay'}) || '/usr/local/portage');
 
  $stat->distdir(delete($opts{'distdir'}) || '/usr/portage/distfiles');
@@ -123,6 +142,9 @@ sub prepare {
  my $version = $mod->package_version;
  $stat->version($version);
 
+ my $author = $mod->author->cpanid;
+ $stat->author($author);
+
  $stat->dist($name . '-' . $version);
 
  $version =~ s/[^\d._]+//g;
@@ -170,11 +192,12 @@ sub prepare {
 
  $stat->uri('http://search.cpan.org/dist/' . $name);
 
- unless ($name =~ /^([^-]+)/) {
-  error 'Wrong distribution name -- aborting';
+ unless ($author =~ /^(.)(.)/) {
+  error 'Wrong author name -- aborting';
   return 0;
  }
- $stat->src('mirror://cpan/modules/by-module/' . $1 . '/' . $mod->package);
+ $stat->src("mirror://cpan/modules/by-authors/id/$1/$1$2/$author/"
+            . $mod->package);
 
  $stat->license([ qw/Artistic GPL-2/ ]);
 
@@ -231,7 +254,9 @@ sub create {
   }
  }
 
- my $d = "# Generated by CPANPLUS::Dist::Gentoo\n\ninherit perl-module\n\n";
+ 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->dist . "\"\n";
  $d   .= 'DESCRIPTION="' . $stat->desc . "\"\n";
  $d   .= 'HOMEPAGE="' . $stat->uri . "\"\n";
@@ -253,6 +278,8 @@ sub create {
            . ' )';
   } @{$stat->deps};
  $d   .= "\"\n";
+ $d   .= "SRC_TEST=\"do\"\n";
+ $d   .= $stat->footer;
 
  my $file = $stat->eb_file;
  open my $eb, '>', $file or do {
@@ -359,6 +386,8 @@ You can find documentation for this module with the perldoc command.
 
 The module is to some extend cargo-culted from L<CPANPLUS::Dist::Deb> and L<CPANPLUS::Dist::Mdv>.
 
+Kent Fredric, for testing and suggesting improvements.
+
 =head1 COPYRIGHT & LICENSE
 
 Copyright 2008 Vincent Pit, all rights reserved.