Rather than list all of the CPAN dists in cpan/ not to index, make use of the fact that noindex is path based and just list cpan/

2 files changed, 2 insertions, 87 deletions

diff --git a/META.yml b/META.yml
index 508d842870..2a9c45980d 100644
--- a/META.yml
+++ b/META.yml
@@ -11,92 +11,7 @@ distribution_type: core
 generated_by: Porting/makemeta
 no_index:
   directory:
-    - cpan/Archive-Extract
-    - cpan/Archive-Tar
-    - cpan/autodie
-    - cpan/AutoLoader
-    - cpan/B-Debug
-    - cpan/B-Lint
-    - cpan/bignum
-    - cpan/CGI
-    - cpan/Class-ISA
-    - cpan/Compress-Raw-Bzip2
-    - cpan/Compress-Raw-Zlib
-    - cpan/CPAN
-    - cpan/CPANPLUS
-    - cpan/CPANPLUS-Dist-Build
-    - cpan/Cwd
-    - cpan/DB_File
-    - cpan/Devel-PPPort
-    - cpan/Digest
-    - cpan/Digest-MD5
-    - cpan/Digest-SHA
-    - cpan/Encode
-    - cpan/encoding-warnings
-    - cpan/ExtUtils-CBuilder
-    - cpan/ExtUtils-Command
-    - cpan/ExtUtils-Constant
-    - cpan/ExtUtils-MakeMaker
-    - cpan/ExtUtils-Manifest
-    - cpan/ExtUtils-ParseXS
-    - cpan/File-Fetch
-    - cpan/File-Path
-    - cpan/File-Temp
-    - cpan/Filter-Util-Call
-    - cpan/Getopt-Long
-    - cpan/if
-    - cpan/IO-Zlib
-    - cpan/IPC-Cmd
-    - cpan/IPC-SysV
-    - cpan/libnet
-    - cpan/List-Util
-    - cpan/Locale-Codes
-    - cpan/Locale-Maketext-Simple
-    - cpan/Log-Message
-    - cpan/Log-Message-Simple
-    - cpan/Math-BigInt
-    - cpan/Math-BigInt-FastCalc
-    - cpan/Math-BigRat
-    - cpan/Math-Complex
-    - cpan/Memoize
-    - cpan/MIME-Base64
-    - cpan/Module-Build
-    - cpan/Module-Load
-    - cpan/Module-Load-Conditional
-    - cpan/Module-Loaded
-    - cpan/Module-Pluggable
-    - cpan/NEXT
-    - cpan/Object-Accessor
-    - cpan/Package-Constants
-    - cpan/Params-Check
-    - cpan/parent
-    - cpan/Parse-CPAN-Meta
-    - cpan/PerlIO-via-QuotedPrint
-    - cpan/Pod-Escapes
-    - cpan/Pod-LaTeX
-    - cpan/Pod-Parser
-    - cpan/Pod-Simple
-    - cpan/podlators
-    - cpan/Shell
-    - cpan/Sys-Syslog
-    - cpan/Term-ANSIColor
-    - cpan/Term-Cap
-    - cpan/Term-UI
-    - cpan/Test
-    - cpan/Test-Harness
-    - cpan/Test-Simple
-    - cpan/Text-Balanced
-    - cpan/Text-ParseWords
-    - cpan/Text-Soundex
-    - cpan/Text-Tabs
-    - cpan/Tie-File
-    - cpan/Tie-RefHash
-    - cpan/Time-HiRes
-    - cpan/Time-Piece
-    - cpan/Unicode-Collate
-    - cpan/Unicode-Normalize
-    - cpan/Win32
-    - cpan/Win32API-File
+    - cpan
     - dist/Attribute-Handlers
     - dist/base
     - dist/constant
diff --git a/Porting/makemeta b/Porting/makemeta
index 167209ab6f..7e9eff776e 100644
--- a/Porting/makemeta
+++ b/Porting/makemeta
@@ -17,7 +17,7 @@ use Maintainers qw(%Modules get_module_files get_module_pat);
 
 my @CPAN  = grep { $Modules{$_}{CPAN} } keys %Modules;
 my @files = map { get_module_files($_) } @CPAN;
-my @dirs  = grep { -d $_ } map { get_module_pat($_) } @CPAN;
+my @dirs  = ('cpan', grep { -d $_ && $_  !~ /^cpan/ } map { get_module_pat($_) } @CPAN);
 
 my %dirs;
 @dirs{@dirs} = ();