Move version from lib/ to cpan/

Whilst there are still several differences between what's in core and what's
in the CPAN tarball, moving the files in core to their own directory with
the same layout as the CPAN distribution simplifies things.

Somewhat surprisingly, none of the toolchain modules C<use version;> so
there's no need to add to lib/buildcustomize.pl

20 files changed, 17 insertions, 24 deletions

diff --git a/MANIFEST b/MANIFEST
index de8c16f4b8..f0aef1b0f5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2770,6 +2770,17 @@ cpan/Unicode-Normalize/t/proto.t	Unicode::Normalize
 cpan/Unicode-Normalize/t/split.t	Unicode::Normalize
 cpan/Unicode-Normalize/t/test.t		Unicode::Normalize
 cpan/Unicode-Normalize/t/tie.t		Unicode::Normalize
+cpan/version/lib/version/Internals.pod	Description of the internals of version objects
+cpan/version/lib/version.pm		Support for version objects
+cpan/version/lib/version.pod		Documentation of the version module
+cpan/version/t/01base.t			Tests for version objects`
+cpan/version/t/02derived.t		Tests for version objects
+cpan/version/t/03require.t		Tests for version objects
+cpan/version/t/04strict_lax.t		Tests for version objects
+cpan/version/t/05sigdie.t		Tests for version objects
+cpan/version/t/06noop.t			Tests for version objects
+cpan/version/t/07locale.t		Tests for version objects
+cpan/version/t/coretests.pm		Tests for version objects
 cpan/Win32API-File/buffers.h	Win32API::File extension
 cpan/Win32API-File/cFile.h	Win32API::File extension
 cpan/Win32API-File/cFile.pc	Win32API::File extension
@@ -4297,17 +4308,6 @@ lib/utf8.t			See if utf8 operations work
 lib/vars_carp.t			See if "use vars" doesn't load Carp.pm per default
 lib/vars.pm			Declare pseudo-imported global variables
 lib/vars.t			See if "use vars" works
-lib/version/Internals.pod	Description of the internals of version objects
-lib/version.pm			Support for version objects
-lib/version.pod			Documentation of the version module
-lib/version/t/01base.t		Tests for version objects`
-lib/version/t/02derived.t	Tests for version objects
-lib/version/t/03require.t	Tests for version objects
-lib/version/t/04strict_lax.t	Tests for version objects
-lib/version/t/05sigdie.t	Tests for version objects
-lib/version/t/06noop.t		Tests for version objects
-lib/version/t/07locale.t	Tests for version objects
-lib/version/t/coretests.pm	Tests for version objects
 lib/vmsish.pm			Control VMS-specific behavior of Perl core
 lib/vmsish.t			Tests for vmsish.pm
 lib/warnings.pm			For "use warnings"
diff --git a/META.json b/META.json
index 810aeee966..b1a91fdf8f 100644
--- a/META.json
+++ b/META.json
@@ -57,7 +57,6 @@
          "dist/threads-shared",
          "dist/Tie-File",
          "dist/XSLoader",
-         "lib/version",
          "mad",
          "win32"
       ],
@@ -107,8 +106,6 @@
          "dist/lib/Makefile.PL",
          "dist/lib/t/01lib.t",
          "lib/unicore/mktables",
-         "lib/version.pm",
-         "lib/version.pod",
          "pod/perlfilter.pod",
          "pod/perlpodstyle.pod",
          "Porting/Maintainers.pm",
diff --git a/META.yml b/META.yml
index 6268d5b3b7..1dfd9f01a7 100644
--- a/META.yml
+++ b/META.yml
@@ -55,7 +55,6 @@ no_index:
     - dist/threads-shared
     - dist/Tie-File
     - dist/XSLoader
-    - lib/version
     - mad
     - win32
   file:
@@ -104,8 +103,6 @@ no_index:
     - dist/lib/Makefile.PL
     - dist/lib/t/01lib.t
     - lib/unicore/mktables
-    - lib/version.pm
-    - lib/version.pod
     - pod/perlfilter.pod
     - pod/perlpodstyle.pod
     - Porting/Maintainers.pm
diff --git a/Makefile.SH b/Makefile.SH
index ef304795df..3ec2a88e6c 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1270,7 +1270,7 @@ _cleaner2:
 	-rmdir lib/Sys lib/Scalar/Util lib/Scalar
 	-rmdir lib/Term/UI lib/Thread lib/Tie/Hash
 	-rmdir lib/Test/Builder/Tester lib/Test/Builder lib/Test
-	-rmdir lib/Unicode/Collate
+	-rmdir lib/Unicode/Collate lib/version
 	-rmdir lib/XS/APItest lib/XS
 	-rmdir lib/inc/latest lib/inc
 	-rmdir lib/autodie/exception lib/autodie lib/encoding lib/threads
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index f536ef1cb8..084d72e04c 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1917,7 +1917,7 @@ use File::Glob qw(:case);
     'version' => {
         'MAINTAINER'   => 'jpeacock',
         'DISTRIBUTION' => 'JPEACOCK/version-0.9902.tar.gz',
-        'FILES'        => q[lib/version.pm lib/version.pod lib/version],
+        'FILES'        => q[cpan/version],
         'EXCLUDED' => [
             qr{^t/.*\.t$},
             qr{^vutil/},
@@ -1925,10 +1925,6 @@ use File::Glob qw(:case);
             't/survey_locales',
             'vperl/vpp.pm',
         ],
-        'MAP' => {
-            'lib/'           => 'lib/',
-            't/'             => 'lib/version/t/'
-        },
         'UPSTREAM' => undef,
     },
 
diff --git a/lib/version.pm b/cpan/version/lib/version.pm
index 27774bd9c2..27774bd9c2 100644
--- a/lib/version.pm
+++ b/cpan/version/lib/version.pm
diff --git a/lib/version.pod b/cpan/version/lib/version.pod
index 40ceee2063..40ceee2063 100644
--- a/lib/version.pod
+++ b/cpan/version/lib/version.pod
diff --git a/lib/version/Internals.pod b/cpan/version/lib/version/Internals.pod
index d0b2c13da4..d0b2c13da4 100644
--- a/lib/version/Internals.pod
+++ b/cpan/version/lib/version/Internals.pod
diff --git a/lib/version/t/01base.t b/cpan/version/t/01base.t
index 9aa8052a30..9aa8052a30 100644
--- a/lib/version/t/01base.t
+++ b/cpan/version/t/01base.t
diff --git a/lib/version/t/02derived.t b/cpan/version/t/02derived.t
index c7afe0f9af..c7afe0f9af 100644
--- a/lib/version/t/02derived.t
+++ b/cpan/version/t/02derived.t
diff --git a/lib/version/t/03require.t b/cpan/version/t/03require.t
index 66c6bd3a85..66c6bd3a85 100644
--- a/lib/version/t/03require.t
+++ b/cpan/version/t/03require.t
diff --git a/lib/version/t/04strict_lax.t b/cpan/version/t/04strict_lax.t
index 24a7215409..24a7215409 100644
--- a/lib/version/t/04strict_lax.t
+++ b/cpan/version/t/04strict_lax.t
diff --git a/lib/version/t/05sigdie.t b/cpan/version/t/05sigdie.t
index 188f185587..188f185587 100644
--- a/lib/version/t/05sigdie.t
+++ b/cpan/version/t/05sigdie.t
diff --git a/lib/version/t/06noop.t b/cpan/version/t/06noop.t
index 9d113ed6e4..9d113ed6e4 100644
--- a/lib/version/t/06noop.t
+++ b/cpan/version/t/06noop.t
diff --git a/lib/version/t/07locale.t b/cpan/version/t/07locale.t
index 784bc116b7..784bc116b7 100644
--- a/lib/version/t/07locale.t
+++ b/cpan/version/t/07locale.t
diff --git a/lib/version/t/coretests.pm b/cpan/version/t/coretests.pm
index 15a1f1ff8c..15a1f1ff8c 100644
--- a/lib/version/t/coretests.pm
+++ b/cpan/version/t/coretests.pm
diff --git a/lib/.gitignore b/lib/.gitignore
index c9f8bb6a05..fa2567650d 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -363,3 +363,5 @@ unicore/TestProp.pl
 /unicore/To
 /unicore/UCD.pl
 /unicore/lib
+/version.pm
+/version/
diff --git a/t/porting/known_pod_issues.dat b/t/porting/known_pod_issues.dat
index 06ff301bd7..cdd5971ecf 100644
--- a/t/porting/known_pod_issues.dat
+++ b/t/porting/known_pod_issues.dat
@@ -275,4 +275,3 @@ lib/config.pod	? Should you be using L<...> instead of	-1
 lib/extutils/embed.pm	Verbatim line length including indents exceeds 79 by	2
 lib/perl5db.pl	? Should you be using L<...> instead of	1
 lib/pod/text/overstrike.pm	Verbatim line length including indents exceeds 79 by	1
-lib/version/internals.pod	Verbatim line length including indents exceeds 79 by	1
diff --git a/win32/Makefile b/win32/Makefile
index eb686fdcfe..55b3d6e28b 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1236,6 +1236,7 @@ distclean: realclean
 	-if exist $(LIBDIR)\threads rmdir /s /q $(LIBDIR)\threads
 	-if exist $(LIBDIR)\Tie\Hash rmdir /s /q $(LIBDIR)\Tie\Hash
 	-if exist $(LIBDIR)\Unicode\Collate rmdir /s /q $(LIBDIR)\Unicode\Collate
+	-if exist $(LIBDIR)\version rmdir /s /q $(LIBDIR)\version
 	-if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
 	-if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API
 	-cd $(PODDIR) && del /f *.html *.bat roffitall \
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 77da22ca04..e03291a8eb 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1414,6 +1414,7 @@ distclean: realclean
 	-if exist $(LIBDIR)\threads rmdir /s /q $(LIBDIR)\threads
 	-if exist $(LIBDIR)\Tie\Hash rmdir /s /q $(LIBDIR)\Tie\Hash
 	-if exist $(LIBDIR)\Unicode\Collate rmdir /s /q $(LIBDIR)\Unicode\Collate
+	-if exist $(LIBDIR)\version rmdir /s /q $(LIBDIR)\version
 	-if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
 	-if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API
 	-cd $(PODDIR) && del /f *.html *.bat roffitall \