use IPC::Cmd qw/run can_run/;
-use CPANPLUS::Error;
+use CPANPLUS::Error ();
use base qw/CPANPLUS::Dist::Base/;
for my $prog (qw/emerge ebuild/) {
unless (can_run($prog)) {
- error "$prog is required to write ebuilds -- aborting";
+ __PACKAGE__->_abort("$prog is required to write ebuilds");
return $format_available = 0;
}
}
$main_portdir = abs_path($unquote->($1));
}
} else {
- error $errmsg;
+ __PACKAGE__->_abort($errmsg);
}
}
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/);
my %opts = @_;
my $OK = sub { $stat->prepared(1); 1 };
- my $FAIL = sub { $stat->prepared(0); 0 };
+ my $FAIL = sub { $stat->prepared(0); $self->_abort(@_) if @_; 0 };
my $keywords = delete $opts{'keywords'};
if (defined $keywords) {
$stat->distdir($distdir);
if ($stat->do_manifest && !-w $stat->distdir) {
- error 'distdir isn\'t writable -- aborting';
- return $FAIL->();
+ return $FAIL->('distdir isn\'t writable');
}
$stat->fetched_arch($mod->status->fetch);
$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);
+ $stat->ebuild_file($file);
if (-e $file) {
my $skip = 1;
$forced{$file} = 1;
$skip = 0;
} else {
- error "Can't force rewriting of $file -- skipping";
+ $self->_skip("Can't force rewriting of $file");
}
} else {
- msg 'Ebuild already generated for ' . $stat->distribution . ' -- skipping';
+ $self->_skip('Ebuild already generated for', $stat->distribution);
}
if ($skip) {
$stat->prepared(1);
$stat->uri('http://search.cpan.org/dist/' . $name);
unless ($author =~ /^(.)(.)/) {
- error 'Wrong author name -- aborting';
- return $FAIL->();
+ return $FAIL->('Wrong author name');
}
$stat->src("mirror://cpan/modules/by-authors/id/$1/$1$2/$author/"
. $mod->package);
for my $prereq (sort keys %$prereqs) {
next if $prereq =~ /^perl(?:-|\z)/;
my $obj = $int->module_tree($prereq);
- unless ($obj) {
- error 'Wrong module object -- aborting';
- return $FAIL->();
- }
+ return $FAIL->('Wrong module object') unless $obj;
next if $obj->package_is_perl_core;
{
my $version;
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); 0 };
+ my $OK = sub { $stat->created(1); $stat->dist($stat->ebuild_file); 1 };
+ my $FAIL = sub { $stat->created(0); $stat->dist(undef); $self->_abort(@_) if @_; 0 };
unless ($stat->prepared) {
- error 'Can\'t create ' . $stat->distribution . ' since it was never prepared -- aborting';
- return $FAIL->();
+ return $FAIL->(
+ 'Can\'t create', $stat->distribution, 'since it was never prepared'
+ );
}
if ($stat->created) {
- msg $stat->distribution . ' was already created -- skipping';
+ $self->_skip($stat->distribution, 'was already created');
return $OK->();
}
- my $dir = $stat->eb_dir;
+ my $dir = $stat->ebuild_dir;
unless (-d $dir) {
eval { File::Path::mkpath($dir) };
- if ($@) {
- error "mkpath($dir): $@";
- return $FAIL->();
- }
+ return $FAIL->("mkpath($dir): $@") if $@;
}
- my %seen;
-
- 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 do {
- error "open($file): $! -- aborting";
- return $FAIL->();
- };
- print $eb $d;
+ my $file = $stat->ebuild_file;
+ open my $eb, '>', $file or return $FAIL->("open($file): $!");
+ print $eb $self->ebuild_source;
close $eb;
$stat->created(0);
my $self = shift;
my $stat = $self->status;
- my $file = $stat->eb_file;
+ my $file = $stat->ebuild_file;
unless ($file and -e $file) {
- error 'The ebuild file is invalid or does not exist -- aborting';
- return 0;
+ return $self->_abort('The ebuild file is invalid or does not exist');
}
unless (File::Copy::copy($stat->fetched_arch => $stat->distdir)) {
- error "Couldn\'t copy the distribution file to distdir ($!) -- aborting";
- return 0;
+ return $self->_abort("Couldn\'t copy the distribution file to distdir ($!)");
}
- msg 'Adding Manifest entry for ' . $stat->distribution;
- return $self->_run([ 'ebuild', $stat->eb_file, 'manifest' ], 0);
+ $self->_notify('Adding Manifest entry for', $stat->distribution);
+
+ return $self->_run([ 'ebuild', $stat->ebuild_file, 'manifest' ], 0);
+}
+
+=head2 C<ebuild_source>
+
+Returns the source of the ebuild for the current dist object.
+
+=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 = do {
+ my %seen;
+ sort grep !$seen{$_}++, 'dev-lang/perl',
+ map $self->_cpan2portage(@$_), @{$stat->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 {
}
- error "Couldn't find an appropriate ebuild for $name in the portage tree -- skipping";
+ $self->_skip(
+ "Couldn't find an appropriate ebuild for $name in the portage tree"
+ );
+
return '';
}
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);
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);
};
unless ($success) {
- error "$errmsg -- aborting";
+ $self->_abort($errmsg);
if (not $verbose and defined $output and $stat->verbose) {
my $msg = join '', @$output;
1 while chomp $msg;
- error $msg;
+ CPANPLUS::Error::error($msg);
}
}
return $success;
}
+sub _abort {
+ my $self = shift;
+
+ CPANPLUS::Error::error("@_ -- aborting");
+
+ return 0;
+}
+
+sub _notify {
+ my $self = shift;
+
+ CPANPLUS::Error::msg("@_");
+
+ return 1;
+}
+
+sub _skip { shift->_notify(@_, '-- skipping') }
+
=head1 DEPENDENCIES
Gentoo (L<http://gentoo.org>).
projects / perl / modules / CPANPLUS-Dist-Gentoo.git / blobdiff