Infer the right category and name when creating an atom from an ebuild or a string

diff --git a/lib/CPANPLUS/Dist/Gentoo/Atom.pm b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
index bd0febde15cb6d1085d649c8bb00b2e2be1a05f4..ebe6a4e64d8e393c58c5af2ae3c7d6608becf8d0 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo/Atom.pm
+++ b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
@@ -23,21 +23,21 @@ sub new {
 
  my %args = @_;
 
- my ($name, $category, $version);
+ my ($category, $name, $version);
  if (defined $args{name}) {
-  ($name, $category, $version) = @args{qw/name category version/};
+  ($category, $name, $version) = @args{qw/category name version/};
   Carp::confess('Category unspecified') unless defined $category;
   /[^\w-]/ and Carp::confess('Invalid argument') for $name, $category;
  } elsif (defined $args{atom}) {
   my $atom = $args{atom};
   $atom =~ m{^([\w-]+)/([\w-]+)-v?($version_rx)$}
                                                or Carp::confess('Invalid atom');
-  ($name, $category, $version) = ($1, $2, $3);
+  ($category, $name, $version) = ($1, $2, $3);
  } elsif (defined $args{ebuild}) {
   my $ebuild = $args{ebuild};
-  $ebuild =~ m{/([\w-]+)/([\w-]+)-v?($version_rx)\.ebuild$}
+  $ebuild =~ m{/([\w-]+)/([\w-]+)/\2-v?($version_rx)\.ebuild$}
                                              or Carp::confess('Invalid ebuild');
-  ($name, $category, $version) = ($1, $2, $3);
+  ($category, $name, $version) = ($1, $2, $3);
  } else {
   Carp::confess('Not enough information for building an atom object');
  }