Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 669912
Collapse All | Expand All

(-)a/bin/g-cpan (-1 / +2 lines)
Lines 553-558 Link Here
553
        spinner_start();
553
        spinner_start();
554
        $gcpan_run->{cpan}{lc($ebuild_wanted)}{portage_name}    = $gcpan_run->transformCPAN($gcpan_run->{cpan}{lc($ebuild_wanted)}{src_uri}, 'n');
554
        $gcpan_run->{cpan}{lc($ebuild_wanted)}{portage_name}    = $gcpan_run->transformCPAN($gcpan_run->{cpan}{lc($ebuild_wanted)}{src_uri}, 'n');
555
        $gcpan_run->{cpan}{lc($ebuild_wanted)}{portage_version} = $gcpan_run->transformCPAN($gcpan_run->{cpan}{lc($ebuild_wanted)}{src_uri}, 'v');
555
        $gcpan_run->{cpan}{lc($ebuild_wanted)}{portage_version} = $gcpan_run->transformCPAN($gcpan_run->{cpan}{lc($ebuild_wanted)}{src_uri}, 'v');
556
        $gcpan_run->{cpan}{lc($ebuild_wanted)}{module_version} = $gcpan_run->transformCPAN($gcpan_run->{cpan}{lc($ebuild_wanted)}{src_uri}, 'mv');
556
        spinner_stop();
557
        spinner_stop();
557
    }
558
    }
558
    else
559
    else
Lines 686-692 Link Here
686
                            }
687
                            }
687
                        }
688
                        }
688
689
689
                        my $module_version = $gcpan_run->{cpan}{ lc($original_ebuild) }{portage_version};
690
                        my $module_version = $gcpan_run->{cpan}{ lc($original_ebuild) }{module_version};
690
                        my $description = $gcpan_run->{'cpan'}{ lc($original_ebuild) }{'description'};
691
                        my $description = $gcpan_run->{'cpan'}{ lc($original_ebuild) }{'description'};
691
                        $description =~ s/"/\\"/g;
692
                        $description =~ s/"/\\"/g;
692
693
(-)a/lib/Gentoo/CPAN.pm (-2 / +2 lines)
Lines 462-468 Link Here
462
    $filenamever =~ s/([0-9.]+)-([0-9.]+)$/$1\.$2/;
462
    $filenamever =~ s/([0-9.]+)-([0-9.]+)$/$1\.$2/;
463
463
464
    # Remove leading v's - happens on occasion
464
    # Remove leading v's - happens on occasion
465
    $filenamever =~ s{^v}{}i;
465
    $filenamever =~ s{^v}{}i if $req ne 'mv';
466
466
467
    # Some modules don't use the /\d\.\d\d/ convention, and portage goes
467
    # Some modules don't use the /\d\.\d\d/ convention, and portage goes
468
    # berserk if the ebuild is called ebulldname-.02.ebuild -- so we treat
468
    # berserk if the ebuild is called ebulldname-.02.ebuild -- so we treat
Lines 471-477 Link Here
471
        $filenamever = 0 . $filenamever;
471
        $filenamever = 0 . $filenamever;
472
    }
472
    }
473
473
474
    return ( $req eq 'v' ) ? $filenamever : $filename;
474
    return ( $req eq 'v' || $req eq 'mv' ) ? $filenamever : $filename;
475
}
475
}
476
476
477
sub makeCPANstub {
477
sub makeCPANstub {

Return to bug 669912