--- CPAN.pm	2007-06-29 10:28:22.000000000 +0200
+++ CPAN.pm	2007-06-29 10:35:17.000000000 +0200
@@ -199,6 +199,7 @@
     # While we're at it, get the ${S} dir for the ebuld ;)
     $self->{'cpan'}{ lc($module_name) }{'portage_sdir'} = $pack->{build_dir};
     $self->{'cpan'}{ lc($module_name) }{'portage_sdir'} =~ s{.*/}{}xmsg;
+    $self->{'cpan'}{ lc($module_name) }{'portage_sdir'} =~ s{(-[\d._]+)-\w+$}{$1};
     # If name is bundle::, then scan the bundle's deps, otherwise findep it
     if (lc($module_name) =~ m{^bundle\::})
     {