X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=7febab9097f0f6e5e07d16b2e78db498f0f5b029;hb=7278013a1296d32f2f2b4dc61d4463dc1ba30812;hp=af542eed5f6858177d1ba180674f78595ad7ab55;hpb=a631ba02aecb81e70e9c60d6d37ce554c7f707c2;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm index af542ee..7febab9 100644 --- a/lib/CPANPLUS/Dist/Gentoo.pm +++ b/lib/CPANPLUS/Dist/Gentoo.pm @@ -4,11 +4,13 @@ use strict; use warnings; use Cwd qw/abs_path/; +use List::Util qw/reduce/; use File::Copy (); use File::Path (); use File::Spec; use IPC::Cmd qw/run can_run/; +use Parse::CPAN::Meta (); use CPANPLUS::Error (); @@ -22,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 @@ -41,9 +43,12 @@ our $VERSION = '0.07'; =head1 DESCRPITON -This module is a CPANPLUS backend that recursively generates Gentoo ebuilds for a given package in the specified overlay (defaults to F), 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). The valid C for the generated ebuilds are by default those given in C, but you can specify your own with the C dist-option. +This module is a CPANPLUS backend that recursively generates Gentoo ebuilds for a given package in the specified overlay (defaults to F), 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). +The valid C for the generated ebuilds are by default those given in C, but you can specify your own with the C dist-option. -The generated ebuilds are placed into the C category. They favour depending on a C, on C, C or C (in that order) rather than C. +The generated ebuilds are placed into the C category. +They favour depending on a C, on C, C or C (in that order) rather than C. =head1 INSTALLATION @@ -51,7 +56,8 @@ After installing this module, you should append C to your F. Please refer to its documentation for precise information on what's done at each step. +This module inherits all the methods from L. +Please refer to its documentation for precise information on what's done at each step. =cut @@ -118,7 +124,8 @@ sub init { my $conf = $self->parent->parent->configure_object; $stat->mk_accessors(qw/name version author distribution desc uri src license - deps eb_name eb_version eb_dir eb_file fetched_arch + fetched_arch deps + ebuild_name ebuild_version ebuild_dir ebuild_file portdir_overlay overlay distdir keywords do_manifest header footer force verbose/); @@ -140,8 +147,9 @@ 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'}; + my $keywords = delete $opts{keywords}; if (defined $keywords) { $keywords = [ split ' ', $keywords ]; } else { @@ -149,12 +157,12 @@ sub prepare { } $stat->keywords($keywords); - my $manifest = delete $opts{'manifest'}; + my $manifest = delete $opts{manifest}; $manifest = 1 unless defined $manifest; $manifest = 0 if $manifest =~ /^\s*no?\s*$/i; $stat->do_manifest($manifest); - my $header = delete $opts{'header'}; + my $header = delete $opts{header}; if (defined $header) { 1 while chomp $header; $header .= "\n\n"; @@ -163,7 +171,7 @@ sub prepare { } $stat->header($header); - my $footer = delete $opts{'footer'}; + my $footer = delete $opts{footer}; if (defined $footer) { $footer = "\n" . $footer; } else { @@ -171,17 +179,16 @@ sub prepare { } $stat->footer($footer); - my $overlay = delete $opts{'overlay'}; + my $overlay = delete $opts{overlay}; $overlay = (defined $overlay) ? abs_path $overlay : '/usr/local/portage'; $stat->overlay($overlay); - my $distdir = delete $opts{'distdir'}; + my $distdir = delete $opts{distdir}; $distdir = (defined $distdir) ? abs_path $distdir : $default_distdir; $stat->distdir($distdir); - if ($stat->do_manifest && !-w $stat->distdir) { - return $FAIL->('distdir isn\'t writable'); - } + return $FAIL->("distdir isn't writable") if $stat->do_manifest && !-w $distdir; + $stat->fetched_arch($mod->status->fetch); my $cur = File::Spec->curdir(); @@ -206,46 +213,48 @@ sub prepare { $stat->distribution($name . '-' . $version); - $stat->eb_version(CPANPLUS::Dist::Gentoo::Maps::version_c2g($version)); + $stat->ebuild_version(CPANPLUS::Dist::Gentoo::Maps::version_c2g($version)); - $stat->eb_name(CPANPLUS::Dist::Gentoo::Maps::name_c2g($name)); + $stat->ebuild_name(CPANPLUS::Dist::Gentoo::Maps::name_c2g($name)); - $stat->eb_dir(File::Spec->catdir( + $stat->ebuild_dir(File::Spec->catdir( $stat->overlay, CATEGORY, - $stat->eb_name, + $stat->ebuild_name, )); my $file = File::Spec->catfile( - $stat->eb_dir, - $stat->eb_name . '-' . $stat->eb_version . '.ebuild', + $stat->ebuild_dir, + $stat->ebuild_name . '-' . $stat->ebuild_version . '.ebuild', ); - $stat->eb_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"); + $stat->ebuild_file($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); } } + $stat->prepared(0); + $self->SUPER::prepare(%opts); - $stat->prepared(0); + return $FAIL->() unless $stat->prepared; my $desc = $mod->description; ($desc = $name) =~ s/-+/::/g unless $desc; @@ -253,20 +262,17 @@ sub prepare { $stat->uri('http://search.cpan.org/dist/' . $name); - unless ($author =~ /^(.)(.)/) { - return $FAIL->('Wrong author name'); - } - $stat->src("mirror://cpan/modules/by-authors/id/$1/$1$2/$author/" - . $mod->package); + $author =~ /^(.)(.)/ or return $FAIL->('Wrong author name'); + $stat->src("mirror://cpan/modules/by-authors/id/$1/$1$2/$author/" . $mod->package); - $stat->license([ qw/Artistic GPL-2/ ]); + $stat->license($self->intuit_license); my $prereqs = $mod->status->prereqs; my @depends; for my $prereq (sort keys %$prereqs) { next if $prereq =~ /^perl(?:-|\z)/; my $obj = $int->module_tree($prereq); - return $FAIL->('Wrong module object') unless $obj; + next unless $obj; # Not in the module tree (e.g. Config) next if $obj->package_is_perl_core; { my $version; @@ -285,12 +291,71 @@ sub prepare { return $OK->(); } +=head2 C + +Returns an array reference to a list of Gentoo licences identifiers under which the current distribution is released. + +=cut + +my %dslip_license = ( + p => 'perl', + g => 'gpl', + l => 'lgpl', + b => 'bsd', + a => 'artistic', + 2 => 'artistic_2', +); + +sub intuit_license { + my $self = shift; + my $mod = $self->parent; + + my $dslip = $mod->dslip; + if (defined $dslip and $dslip =~ /\S{4}(\S)/) { + my @licenses = CPANPLUS::Dist::Gentoo::Maps::license_c2g($dslip_license{$1}); + return \@licenses if @licenses; + } + + my $extract_dir = $mod->status->extract; + + for my $meta_file (qw/META.json META.yml/) { + my $meta = eval { + Parse::CPAN::Meta::LoadFile(File::Spec->catdir( + $extract_dir, + $meta_file, + )); + } or next; + my $license = $meta->{license}; + if (defined $license) { + my @licenses = CPANPLUS::Dist::Gentoo::Maps::license_c2g($license); + return \@licenses if @licenses; + } + } + + return [ CPANPLUS::Dist::Gentoo::Maps::license_c2g('perl') ]; +} + sub create { my $self = shift; my $stat = $self->status; - my $OK = sub { $stat->created(1); $stat->dist($stat->eb_file); 1 }; - my $FAIL = sub { $stat->created(0); $stat->dist(undef); $self->_abort(@_) if @_; 0 }; + my $file; + + my $OK = sub { + $stat->created(1); + $stat->dist($file) if defined $file; + 1; + }; + + my $FAIL = sub { + $stat->created(0); + $stat->dist(undef); + $self->_abort(@_) if @_; + if (defined $file and -f $file) { + 1 while unlink $file; + } + 0; + }; unless ($stat->prepared) { return $FAIL->( @@ -300,55 +365,46 @@ sub create { if ($stat->created) { $self->_skip($stat->distribution, 'was already created'); + $file = $stat->dist; # Keep the existing one. return $OK->(); } - my $dir = $stat->eb_dir; + my $dir = $stat->ebuild_dir; unless (-d $dir) { eval { File::Path::mkpath($dir) }; return $FAIL->("mkpath($dir): $@") if $@; } - my %seen; + $file = $stat->ebuild_file; - 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 .= "SLOT=\"0\"\n"; - $d .= 'LICENSE="|| ( ' . join(' ', sort @{$stat->license}) . " )\"\n"; - $d .= 'KEYWORDS="' . join(' ', sort @{$stat->keywords}) . "\"\n"; - $d .= 'DEPEND="' . join("\n", - sort grep !$seen{$_}++, 'dev-lang/perl', - map $self->_cpan2portage(@$_), @{$stat->deps} - ) . "\"\n"; - $d .= "SRC_TEST=\"do\"\n"; - $d .= $stat->footer; - - my $file = $stat->eb_file; - open my $eb, '>', $file or return $FAIL->("open($file): $!"); - print $eb $d; - close $eb; + # Create a placeholder ebuild to prevent recursion with circular dependencies. + { + open my $eb, '>', $file or return $FAIL->("open($file): $!"); + print $eb "PLACEHOLDER\n"; + } $stat->created(0); $stat->dist(undef); $self->SUPER::create(@_); - if ($stat->do_manifest and not $self->update_manifest) { - 1 while unlink $file; - return $FAIL->(); + return $FAIL->() unless $stat->created; + + { + open my $eb, '>', $file or return $FAIL->("open($file): $!"); + my $source = $self->ebuild_source; + return $FAIL->() unless defined $source; + print $eb $source; } + return $FAIL->() if $stat->do_manifest and not $self->update_manifest; + return $OK->(); } =head2 C -Update the F file for the ebuild associated to the current dist object. +Updates the F file for the ebuild associated to the current dist object. =cut @@ -356,7 +412,7 @@ sub update_manifest { my $self = shift; my $stat = $self->status; - my $file = $stat->eb_file; + my $file = $stat->ebuild_file; unless ($file and -e $file) { return $self->_abort('The ebuild file is invalid or does not exist'); } @@ -367,7 +423,51 @@ sub update_manifest { $self->_notify('Adding Manifest entry for', $stat->distribution); - return $self->_run([ 'ebuild', $stat->eb_file, 'manifest' ], 0); + return $self->_run([ 'ebuild', $stat->ebuild_file, 'manifest' ], 0); +} + +=head2 C + +Returns the source of the ebuild for the current dist object, or C when one of the dependencies couldn't be mapped to an existing ebuild. + +=cut + +sub ebuild_source { + my $self = shift; + my $stat = $self->status; + + # 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 @deps; + for (@{$stat->deps}) { + my $dep = $self->_cpan2portage(@$_); + unless (defined $dep) { + $self->_abort( + "Couldn't find an appropriate ebuild for $_->[0] in the portage tree" + ); + return; + } + push @deps, $dep; + } + + @deps = do { my %seen; sort grep !$seen{$_}++, 'dev-lang/perl', @deps }; + + 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 .= "SLOT=\"0\"\n"; + $d .= 'LICENSE="|| ( ' . join(' ', sort @{$stat->license}) . " )\"\n"; + $d .= 'KEYWORDS="' . join(' ', sort @{$stat->keywords}) . "\"\n"; + $d .= 'DEPEND="' . join("\n", @deps) . "\"\n"; + $d .= "SRC_TEST=\"do\"\n"; + $d .= $stat->footer; + + return $d; } sub _cpan2portage { @@ -390,26 +490,25 @@ 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->_skip( - "Couldn't find an appropriate ebuild for $name in the portage tree" - ); - - return ''; + return; } sub install { @@ -418,7 +517,7 @@ sub install { my $conf = $self->parent->parent->configure_object; my $sudo = $conf->get_program('sudo'); - my @cmd = ('emerge', '=' . $stat->eb_name . '-' . $stat->eb_version); + my @cmd = ('emerge', '=' . $stat->ebuild_name . '-' . $stat->ebuild_version); unshift @cmd, $sudo if $sudo; my $success = $self->_run(\@cmd, 1); @@ -433,7 +532,7 @@ sub uninstall { my $conf = $self->parent->parent->configure_object; my $sudo = $conf->get_program('sudo'); - my @cmd = ('emerge', '-C', '=' . $stat->eb_name . '-' . $stat->eb_version); + my @cmd = ('emerge', '-C', '=' . $stat->ebuild_name . '-' . $stat->ebuild_version); unshift @cmd, $sudo if $sudo; my $success = $self->_run(\@cmd, 1); @@ -486,9 +585,9 @@ sub _skip { shift->_notify(@_, '-- skipping') } Gentoo (L). -L, L (core modules since 5.9.5). +L, L (core modules since 5.9.5), L (since 5.10.1). -L, L (since perl 5), L (5.001), L (5.002), L (5.00405). +L, L (since perl 5), L (5.001), L (5.002), L (5.00405), L (5.007003). =head1 SEE ALSO @@ -504,7 +603,8 @@ You can contact me by mail or on C (vincent). =head1 BUGS -Please report any bugs or feature requests to C, or through the web interface at L. I will be notified, and then you'll automatically be notified of progress on your bug as I make changes. +Please report any bugs or feature requests to C, or through the web interface at L. +I will be notified, and then you'll automatically be notified of progress on your bug as I make changes. =head1 SUPPORT @@ -514,7 +614,7 @@ You can find documentation for this module with the perldoc command. =head1 ACKNOWLEDGEMENTS -The module is to some extend cargo-culted from L and L. +The module was inspired by L and L. Kent Fredric, for testing and suggesting improvements.