use base qw/CPANPLUS::Dist::Base/;
+use CPANPLUS::Dist::Gentoo::Atom;
use CPANPLUS::Dist::Gentoo::Maps;
=head1 NAME
my $conf = $self->parent->parent->configure_object;
$stat->mk_accessors(qw/name version author distribution desc uri src license
- fetched_arch deps
+ fetched_arch requires
ebuild_name ebuild_version ebuild_dir ebuild_file
portdir_overlay
overlay distdir keywords do_manifest header footer
1 while unlink $file;
}
} else {
- if (my @match = $self->_cpan2portage($name, $version)) {
- $stat->dist($match[1]);
+ if (my $atom = $self->_cpan2portage($name, $version)) {
+ $stat->dist($atom->ebuild);
return $SKIP->('Ebuild already generated for', $stat->distribution);
}
}
$stat->license($self->intuit_license);
- my $prereqs = $mod->status->prereqs;
- my @depends;
+ my $prereqs = $mod->status->requires;
+ my @requires;
for my $prereq (sort keys %$prereqs) {
next if $prereq =~ /^perl(?:-|\z)/;
my $obj = $int->module_tree($prereq);
$version = $obj->package_version;
}
}
- push @depends, [ $obj->package_name, $version ];
+ push @requires, [ $obj->package_name, $version ];
}
}
- $stat->deps(\@depends);
+ $stat->requires(\@requires);
return $OK->();
}
# 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) {
+ my @requires;
+ for (@{$stat->requires}) {
+ my $atom = $self->_cpan2portage(@$_);
+ unless (defined $atom) {
$self->_abort(
"Couldn't find an appropriate ebuild for $_->[0] in the portage tree"
);
return;
}
- push @deps, $dep;
+ push @requires, $atom;
}
- @deps = do { my %seen; sort grep !$seen{$_}++, 'dev-lang/perl', @deps };
+ my $perl = CPANPLUS::Dist::Gentoo::Atom->new(
+ category => 'dev-lang',
+ name => 'perl',
+ );
+ @requires = CPANPLUS::Dist::Gentoo::Atom->fold($perl, @requires);
my $d = $stat->header;
$d .= "# Generated by CPANPLUS::Dist::Gentoo version $VERSION\n\n";
$d .= "SLOT=\"0\"\n";
$d .= 'LICENSE="|| ( ' . join(' ', sort @{$stat->license}) . " )\"\n";
$d .= 'KEYWORDS="' . join(' ', sort @{$stat->keywords}) . "\"\n";
- $d .= 'RDEPEND="' . join("\n", @deps) . "\"\n";
+ $d .= 'RDEPEND="' . join("\n", sort @requires) . "\"\n";
$d .= "DEPEND=\"\${RDEPEND}\"\n";
$d .= "SRC_TEST=\"do\"\n";
$d .= $stat->footer;
sub _cpan2portage {
my ($self, $name, $version) = @_;
- $name = CPANPLUS::Dist::Gentoo::Maps::name_c2g($name);
- my $ver;
- $ver = CPANPLUS::Dist::Gentoo::Maps::version_c2g($version) if defined $version;
+ $name = CPANPLUS::Dist::Gentoo::Maps::name_c2g($name);
+ $version = CPANPLUS::Dist::Gentoo::Maps::version_c2g($version);
my @portdirs = ($main_portdir, @{$self->status->portdir_overlay});
for my $category (qw/virtual perl-core dev-perl perl-gcpan/, CATEGORY) {
- my $atom = ($category eq 'virtual' ? 'perl-' : '') . $name;
+ my $name = ($category eq 'virtual' ? 'perl-' : '') . $name;
for my $portdir (@portdirs) {
my @ebuilds = glob File::Spec->catfile(
$portdir,
$category,
- $atom,
- "$atom-*.ebuild",
+ $name,
+ "$name-*.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
- next unless
- CPANPLUS::Dist::Gentoo::Maps::version_gcmp($last->[1], $ver) >= 0;
- $dep = ">=$category/$atom-$ver";
- } else {
- $dep = "$category/$atom";
- }
+ my @atoms = map CPANPLUS::Dist::Gentoo::Atom->new(
+ defined $version ? (
+ ebuild => $_,
+ range => '>=',
+ ) : (
+ category => $category,
+ name => $name,
+ ),
+ ), @ebuilds;
+
+ my $atom = reduce { $a < $b ? $b : $a } @atoms; # handles overloading
+ next if defined $version and $atom < $version;
- return wantarray ? ($dep, $last->[0]) : $dep;
+ return $atom;
}
}