Re: [PATCH] Version tango

Message-ID: <oUp88gzkgy+T092yn@efn.org>

p4raw-id: //depot/perl@16822

11 files changed, 20 insertions, 5 deletions

diff --git a/ext/Devel/Peek/Peek.pm b/ext/Devel/Peek/Peek.pm
index 3b4b845be5..37e01a4644 100644
--- a/ext/Devel/Peek/Peek.pm
+++ b/ext/Devel/Peek/Peek.pm
@@ -5,6 +5,8 @@ package Devel::Peek;
 
 # Underscore to allow older Perls to access older version from CPAN
 $VERSION = '1.00_03';
+$XS_VERSION = $VERSION;
+$VERSION = eval $VERSION;
 
 require Exporter;
 use XSLoader ();
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
index e4f756e5ee..41560d5672 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
@@ -287,6 +287,7 @@ use strict;
 	die "Errno architecture ($Config{'archname'}-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
 
 \$VERSION = "$VERSION";
+\$VERSION = eval \$VERSION;
 \@ISA = qw(Exporter);
 
 EDQ
diff --git a/ext/IO/lib/IO/Dir.pm b/ext/IO/lib/IO/Dir.pm
index 4ac2638066..ccae4f0076 100644
--- a/ext/IO/lib/IO/Dir.pm
+++ b/ext/IO/lib/IO/Dir.pm
@@ -20,6 +20,7 @@ use File::Spec;
 
 @ISA = qw(Tie::Hash Exporter);
 $VERSION = "1.03_00";
+$VERSION = eval $VERSION;
 @EXPORT_OK = qw(DIR_UNLINK);
 
 sub DIR_UNLINK () { 1 }
diff --git a/ext/IO/lib/IO/Handle.pm b/ext/IO/lib/IO/Handle.pm
index 74f9b21edd..81bec5a6c1 100644
--- a/ext/IO/lib/IO/Handle.pm
+++ b/ext/IO/lib/IO/Handle.pm
@@ -259,6 +259,7 @@ require Exporter;
 @ISA = qw(Exporter);
 
 $VERSION = "1.21_00";
+$VERSION = eval $VERSION;
 
 @EXPORT_OK = qw(
     autoflush
diff --git a/ext/IO/lib/IO/Seekable.pm b/ext/IO/lib/IO/Seekable.pm
index 684b8bc70d..2ddee4d53c 100644
--- a/ext/IO/lib/IO/Seekable.pm
+++ b/ext/IO/lib/IO/Seekable.pm
@@ -108,6 +108,7 @@ require Exporter;
 @ISA = qw(Exporter);
 
 $VERSION = "1.08_00";
+$VERSION = eval $VERSION;
 
 sub seek {
     @_ == 3 or croak 'usage: $io->seek(POS, WHENCE)';
diff --git a/ext/IO/lib/IO/Socket/UNIX.pm b/ext/IO/lib/IO/Socket/UNIX.pm
index f9651cb9b8..bbc2a448c7 100644
--- a/ext/IO/lib/IO/Socket/UNIX.pm
+++ b/ext/IO/lib/IO/Socket/UNIX.pm
@@ -14,6 +14,7 @@ use Carp;
 
 @ISA = qw(IO::Socket);
 $VERSION = "1.20_00";
+$VERSION = eval $VERSION;
 
 IO::Socket::UNIX->register_domain( AF_UNIX );
 
diff --git a/ext/IPC/SysV/Msg.pm b/ext/IPC/SysV/Msg.pm
index 59d44b5f7a..c92eb558f0 100644
--- a/ext/IPC/SysV/Msg.pm
+++ b/ext/IPC/SysV/Msg.pm
@@ -12,6 +12,7 @@ use vars qw($VERSION);
 use Carp;
 
 $VERSION = "1.00_00";
+$VERSION = eval $VERSION;
 
 {
     package IPC::Msg::stat;
diff --git a/ext/IPC/SysV/Semaphore.pm b/ext/IPC/SysV/Semaphore.pm
index 3c71ad9636..cdbfb77790 100644
--- a/ext/IPC/SysV/Semaphore.pm
+++ b/ext/IPC/SysV/Semaphore.pm
@@ -13,6 +13,7 @@ use vars qw($VERSION);
 use Carp;
 
 $VERSION = "1.00_00";
+$VERSION = eval $VERSION;
 
 {
     package IPC::Semaphore::stat;
diff --git a/ext/IPC/SysV/SysV.pm b/ext/IPC/SysV/SysV.pm
index 9b62bbf4a2..d4c51af497 100644
--- a/ext/IPC/SysV/SysV.pm
+++ b/ext/IPC/SysV/SysV.pm
@@ -7,7 +7,7 @@
 package IPC::SysV;
 
 use strict;
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
+use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION $XS_VERSION);
 use Carp;
 use Config;
 
@@ -15,6 +15,8 @@ require Exporter;
 @ISA = qw(Exporter);
 
 $VERSION = "1.03_00";
+$XS_VERSION = $VERSION;
+$VERSION = eval $VERSION;
 
 @EXPORT_OK = qw(
 	GETALL GETNCNT GETPID GETVAL GETZCNT
@@ -53,7 +55,7 @@ BOOT_XS: {
 
     do {
 	__PACKAGE__->can('bootstrap') || \&DynaLoader::bootstrap
-    }->(__PACKAGE__, $VERSION);
+    }->(__PACKAGE__, $XS_VERSION);
 }
 
 1;
diff --git a/ext/List/Util/lib/List/Util.pm b/ext/List/Util/lib/List/Util.pm
index 1843873e5e..7686ffe82c 100644
--- a/ext/List/Util/lib/List/Util.pm
+++ b/ext/List/Util/lib/List/Util.pm
@@ -12,8 +12,10 @@ require DynaLoader;
 our @ISA       = qw(Exporter DynaLoader);
 our @EXPORT_OK = qw(first min max minstr maxstr reduce sum shuffle);
 our $VERSION   = "1.07_00";
+our $XS_VERSION = $VERSION;
+$VERSION = eval $VERSION;
 
-bootstrap List::Util $VERSION;
+bootstrap List::Util $XS_VERSION;
 
 1;
 
diff --git a/ext/Time/HiRes/HiRes.pm b/ext/Time/HiRes/HiRes.pm
index 455775f781..6337532040 100644
--- a/ext/Time/HiRes/HiRes.pm
+++ b/ext/Time/HiRes/HiRes.pm
@@ -1,7 +1,7 @@
 package Time::HiRes;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
+use vars qw($VERSION $XS_VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 
 require Exporter;
 use XSLoader;
@@ -13,6 +13,8 @@ use XSLoader;
 		 getitimer setitimer ITIMER_REAL ITIMER_VIRTUAL ITIMER_PROF);
 
 $VERSION = '1.20_00';
+$XS_VERSION = $VERSION;
+$VERSION = eval $VERSION;
 
 sub AUTOLOAD {
     my $constname;
@@ -29,7 +31,7 @@ sub AUTOLOAD {
     goto &$AUTOLOAD;
 }
 
-XSLoader::load 'Time::HiRes', $VERSION;
+XSLoader::load 'Time::HiRes', $XS_VERSION;
 
 # Preloaded methods go here.