X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=5c4dd8e752bdf458bab49b21f85b7c10ceff46d7;hb=ddbd1a23657ebbcc14b2fc408dbe3807d29bc122;hp=e6dcb369b57ef8e64914f06b0491a45ca553548c;hpb=ae79a81243e280b798ce0c7c6a482d5f4ad78df0;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm index e6dcb36..5c4dd8e 100644 --- a/lib/CPANPLUS/Dist/Gentoo.pm +++ b/lib/CPANPLUS/Dist/Gentoo.pm @@ -4,9 +4,9 @@ use strict; use warnings; use Cwd qw/abs_path/; -use File::Copy qw/copy/; -use File::Path qw/mkpath/; -use File::Spec::Functions qw/catdir catfile/; +use File::Copy (); +use File::Path (); +use File::Spec; use IPC::Cmd qw/run can_run/; @@ -64,12 +64,12 @@ my $main_portdir; my %forced; -sub _unquote { +my $unquote = sub { my $s = shift; $s =~ s/^["']*//; $s =~ s/["']*$//; return $s; -} +}; my $format_available; @@ -84,22 +84,22 @@ sub format_available { } if (IPC::Cmd->can_capture_buffer) { - my ($success, $errmsg, $output) = run command => [ qw/emerge --info/ ], - verbose => 0; + my $buffers; + my ($success, $errmsg) = run command => [ qw/emerge --info/ ], + verbose => 0, + buffer => \$buffers; if ($success) { - for (@{$output || []}) { - if (/^PORTDIR_OVERLAY=(.*)$/m) { - $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)); - } - if (/^PORTDIR=(.*)$/m) { - $main_portdir = abs_path(_unquote($1)); - } + if ($buffers =~ /^PORTDIR_OVERLAY=(.*)$/m) { + $overlays = [ map abs_path($_), split ' ', $unquote->($1) ]; + } + if ($buffers =~ /^ACCEPT_KEYWORDS=(.*)$/m) { + $default_keywords = [ split ' ', $unquote->($1) ]; + } + if ($buffers =~ /^DISTDIR=(.*)$/m) { + $default_distdir = abs_path($unquote->($1)); + } + if ($buffers =~ /^PORTDIR=(.*)$/m) { + $main_portdir = abs_path($unquote->($1)); } } else { error $errmsg; @@ -184,10 +184,10 @@ sub prepare { } $stat->fetched_arch($mod->status->fetch); - my $cur = File::Spec::Functions::curdir(); + my $cur = File::Spec->curdir(); my $portdir_overlay; for (@$overlays) { - if ($_ eq $overlay or File::Spec::Functions::abs2rel($overlay, $_) eq $cur) { + if ($_ eq $overlay or File::Spec->abs2rel($overlay, $_) eq $cur) { $portdir_overlay = [ @$overlays ]; last; } @@ -210,10 +210,16 @@ sub prepare { $stat->eb_name(CPANPLUS::Dist::Gentoo::Maps::name_c2g($name)); - $stat->eb_dir(catdir($stat->overlay, CATEGORY, $stat->eb_name)); + $stat->eb_dir(File::Spec->catdir( + $stat->overlay, + CATEGORY, + $stat->eb_name, + )); - my $file = catfile($stat->eb_dir, - $stat->eb_name . '-' . $stat->eb_version . '.ebuild'); + my $file = File::Spec->catfile( + $stat->eb_dir, + $stat->eb_name . '-' . $stat->eb_version . '.ebuild', + ); $stat->eb_file($file); if (-e $file) { @@ -303,7 +309,7 @@ sub create { my $dir = $stat->eb_dir; unless (-d $dir) { - eval { mkpath $dir }; + eval { File::Path::mkpath($dir) }; if ($@) { error "mkpath($dir): $@"; return 0; @@ -346,7 +352,7 @@ sub create { $stat->dist(undef); if ($stat->do_manifest) { - unless (copy $stat->fetched_arch, $stat->distdir) { + unless (File::Copy::copy($stat->fetched_arch => $stat->distdir)) { error "Couldn\'t copy the distribution file to distdir ($!) -- aborting"; 1 while unlink $file; return 0; @@ -377,8 +383,12 @@ sub _cpan2portage { my $atom = ($category eq 'virtual' ? 'perl-' : '') . $name; for my $portdir (@portdirs) { - my @ebuilds = glob catfile($portdir, $category, $atom,"$atom-*.ebuild"); - next unless @ebuilds; + my @ebuilds = glob File::Spec->catfile( + $portdir, + $category, + $atom, + "$atom-*.ebuild", + ) or next; if (defined $ver) { # implies that $version is defined for (@ebuilds) { @@ -457,7 +467,7 @@ Gentoo (L). L, L (core modules since 5.9.5). -L, L (since perl 5), L (5.001), L (5.002), L (5.00504). +L, L (since perl 5), L (5.001), L (5.002), L (5.00405). =head1 SEE ALSO