Revert #32197, should not be needed anymore since the upgrade

[p5sagit/p5-mst-13.2.git] / lib / Module / Build / Version.pm

diff --git a/lib/Module/Build/Version.pm b/lib/Module/Build/Version.pm
index 2299946..5ba357b 100644 (file)
--- a/lib/Module/Build/Version.pm
+++ b/lib/Module/Build/Version.pm
@@ -1,7 +1,10 @@
 package Module::Build::Version;
 use strict;
 
-eval "use version 0.70";
+use vars qw($VERSION);
+$VERSION = 0.7203;
+
+eval "use version $VERSION";
 if ($@) { # can't locate version files, use our own
 
     # Avoid redefined warnings if an old version.pm was available
@@ -35,28 +38,6 @@ if ($@) { # can't locate version files, use our own
 use vars qw(@ISA);
 @ISA = qw(version);
 
-use overload (
-    '""' => \&stringify,
-);
-
-sub new {
-    my ($class, $value) = @_;
-    my $self = $class->SUPER::new($value);
-    $self->original($value);
-    return $self;
-}
-
-sub original {
-    my $self = shift;
-    $self->{original} = shift if @_;
-    return $self->{original};
-}
-
-sub stringify {
-    my $self = shift;
-    return $self->original;
-}
-
 1;
 __DATA__
 # stub version module to make everything else happy
@@ -94,7 +75,7 @@ use strict;
 
 use locale;
 use vars qw ($VERSION @ISA @REGEXS);
-$VERSION = 0.71;
+$VERSION = 0.7203;
 
 push @REGEXS, qr/
        ^v?     # optional leading 'v'
@@ -116,6 +97,16 @@ sub new
 {
        my ($class, $value) = @_;
        my $self = bless ({}, ref ($class) || $class);
+       
+       if ( ref($value) && eval("$value->isa('version')") ) {
+           # Can copy the elements directly
+           $self->{version} = [ @{$value->{version} } ];
+           $self->{qv} = 1 if $value->{qv};
+           $self->{alpha} = 1 if $value->{alpha};
+           $self->{original} = ''.$value->{original};
+           return $self;
+       }
+
        require POSIX;
        my $currlocale = POSIX::setlocale(&POSIX::LC_ALL);
        my $radix_comma = ( POSIX::localeconv()->{decimal_point} eq ',' );
@@ -124,6 +115,7 @@ sub new
            # RT #19517 - special case for undef comparison
            # or someone forgot to pass a value
            push @{$self->{version}}, 0;
+           $self->{original} = "0";
            return ($self);
        }
 
@@ -312,6 +304,9 @@ sub new
                 "ignoring: '".substr($value,$pos)."'";
        }
 
+       # cache the original value for use when stringification
+       $self->{original} = substr($value,0,$pos);
+
        return ($self);
 }
 
@@ -399,12 +394,7 @@ sub stringify
        require Carp;
        Carp::croak("Invalid version object");
     }
-    if ( exists $self->{qv} ) {
-       return $self->normal;
-    }
-    else {
-       return $self->numify;
-    }
+    return $self->{original};
 }
 
 sub vcmp
@@ -495,8 +485,9 @@ sub qv {
     my ($value) = @_;
 
     $value = _un_vstring($value);
-    $value = 'v'.$value unless $value =~ /^v/;
-    return version->new($value); # always use base class
+    $value = 'v'.$value unless $value =~ /(^v|\d+\.\d+\.\d)/;
+    my $version = version->new($value); # always use base class
+    return $version;
 }
 
 sub is_qv {
@@ -522,8 +513,8 @@ sub _un_vstring {
     my $value = shift;
     # may be a v-string
     if ( $] >= 5.006_000 && length($value) >= 3 && $value !~ /[._]/ ) {
-       my $tvalue = sprintf("%vd",$value);
-       if ( $tvalue =~ /^\d+\.\d+\.\d+$/ ) {
+       my $tvalue = sprintf("v%vd",$value);
+       if ( $tvalue =~ /^v\d+\.\d+\.\d+$/ ) {
            # must be a v-string
            $value = $tvalue;
        }
@@ -585,13 +576,13 @@ sub _un_vstring {
                    Carp::croak( 
                        sprintf ("%s version %s required--".
                            "this is only version %s", $class,
-                           $req->numify, $version->numify)
+                           $req->stringify, $version->stringify)
                    );
                }
            }
        }
 
-       return defined $version ? $version->numify : undef;
+       return defined $version ? $version->stringify : undef;
     };
 }