-is vc2g('1_.1_2'), '1_p1.2', "version_c2g('1_.1_2')";
-is vc2g('1_.1_.2'), '1_p1.2', "version_c2g('1_.1_.2')";
+is vc2g('1_.1_2'), '1_p12', "version_c2g('1_.1_2')";
+is vc2g('1_.1_.2'), '1_p12', "version_c2g('1_.1_.2')";
+
+for my $test ([ '0.12' => '0.12' ], [ '0.1234' => '0.12.34' ]) {
+ my @dists = qw/
+ ExtUtils-CBuilder
+ ExtUtils-ParseXS
+ Module-Build
+ Time-HiRes
+ Time-Local
+ /;
+ for my $dist (@dists) {
+ is vc2g($dist, $test->[0]), $test->[1], "'version_c2g('$dist', '$test->[0]')";
+ }
+}
+
+*pvc2g = \&CPANPLUS::Dist::Gentoo::Maps::perl_version_c2g;
+
+is pvc2g('5'), '5', "perl_version_c2g('5')";
+is pvc2g('5.1'), '5.1', "perl_version_c2g('5.1')";
+is pvc2g('5.01'), '5.10', "perl_version_c2g('5.01')";
+is pvc2g('5.10'), '5.10', "perl_version_c2g('5.10')";
+is pvc2g('5.1.2'), '5.1.2', "perl_version_c2g('5.1.2')";
+is pvc2g('5.01.2'), '5.1.2', "perl_version_c2g('5.01.2')";
+is pvc2g('5.01002'), '5.10.20', "perl_version_c2g('5.01002')";