X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git;a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo%2FAtom.pm;h=543693e5ab7b8471dfdf10d1f73870fea153074c;hp=002b349be48a31dc5ff532f80760a49bf5456df6;hb=4e0c9cad73c65d6c469d35afebbef746ab15ce89;hpb=e8b4c54d60a1bab156b8bc270df2d95327ddd4e1 diff --git a/lib/CPANPLUS/Dist/Gentoo/Atom.pm b/lib/CPANPLUS/Dist/Gentoo/Atom.pm index 002b349..543693e 100644 --- a/lib/CPANPLUS/Dist/Gentoo/Atom.pm +++ b/lib/CPANPLUS/Dist/Gentoo/Atom.pm @@ -34,11 +34,6 @@ sub new { $atom =~ m{^([\w-]+)/([\w-]+)-v?($version_rx)$} or Carp::confess('Invalid atom'); ($category, $name, $version) = ($1, $2, $3); - } elsif (defined $args{ebuild}) { - my $ebuild = $args{ebuild}; - $ebuild =~ m{/([\w-]+)/([\w-]+)/\2-v?($version_rx)\.ebuild$} - or Carp::confess('Invalid ebuild'); - ($category, $name, $version) = ($1, $2, $3); } else { Carp::confess('Not enough information for building an atom object'); } @@ -72,6 +67,25 @@ sub new { }, $class; } +sub new_from_ebuild { + my $class = shift; + $class = ref($class) || $class; + + my $ebuild = shift; + $ebuild = '' unless defined $ebuild; + + $ebuild =~ m{/([\w-]+)/([\w-]+)/\2-v?($version_rx)\.ebuild$} + or Carp::confess('Invalid ebuild'); + my ($category, $name, $version) = ($1, $2, $3); + + return $class->new( + category => $category, + name => $name, + version => $version, + ebuild => $ebuild, + ); +} + BEGIN { eval "sub $_ { \$_[0]->{$_} }" for qw/category name version range ebuild/; }