[scripts/lib] Tidy up hand-coded exception map

1 files changed, 57 insertions, 60 deletions

diff --git a/scripts/lib/deptools.pm b/scripts/lib/deptools.pm
index 29f29976e..9f525beae 100644
--- a/scripts/lib/deptools.pm
+++ b/scripts/lib/deptools.pm
@@ -19,57 +19,61 @@ sub _vmap_langs {
 # ::gentoo virtual/core things
 sub _vmap_perl_native {
   return (
-    'Archive-Tar',          'Attribute-Handlers',      'AutoLoader',        'autodie',                'CGI',
-    'Class-ISA',            'Compress-Raw-Bzip2',      'Compress-Raw-Zlib', 'CPAN-Meta',              'CPAN-Meta-Requirements',
-    'CPAN-Meta-YAML',       'Data-Dumper',             'DB_File',           'Digest-MD5',             'Digest-SHA',
-    'Encode',               'ExtUtils-CBuilder',       'ExtUtils-Command',  'ExtUtils-Install',       'ExtUtils-MakeMaker',
-    'ExtUtils-Manifest',    'ExtUtils-ParseXS',        'File-Path',         'File-Temp',              'Filter',
-    'Getopt-Long',          'i18n-langtags',           'IO',                'IO-Compress',            'IO-Zlib',
-    'IPC-Cmd',              'JSON-PP',                 'libnet',            'Locale-MakeText-Simple', 'Math-BigInt',
-    'Math-BigInt-FastCalc', 'Memoize',                 'MIME-Base64',       'Module-Build',           'Module-CoreList',
-    'Module-Load',          'Module-Load-Conditional', 'Module-Loaded',     'Module-Metadata',        'Module-Pluggable',
-    'Package-Constants',    'Params-Check',            'parent',            'Parse-CPAN-Meta',        'Perl-OSType',
-    'Pod-Escapes',          'podlators',               'Pod-Simple',        'Safe',                   'Scalar-List-Utils',
-    'Storable',             'Switch',                  'Sys-Syslog',        'Term-ANSIColor',         'Test',
-    'Test-Harness',         'Test-Simple',             'Text-Balanced',     'Text-ParseWords',        'Text-Tabs+Wrap',
-    'Thread-Queue',         'threads',                 'Thread-Semaphore',  'threads-shared',         'Time-HiRes',
-    'Time-Local',           'Time-Piece',              'version',           'Version-Requirements',   'XSLoader',
+    'Archive-Tar',             'Attribute-Handlers',   'AutoLoader',         'autodie',
+    'B-Debug',                 'Carp',                 'CGI',                'Compress-Raw-Bzip2',
+    'Compress-Raw-Zlib',       'CPAN',                 'CPAN-Meta',          'CPAN-Meta-Requirements',
+    'CPAN-Meta-YAML',          'Data-Dumper',          'DB_File',            'Digest',
+    'Digest-MD5',              'Digest-SHA',           'Devel-PPPort',       'Dumpvalue',
+    'Encode',                  'Exporter',             'ExtUtils-CBuilder',  'ExtUtils-Command',
+    'ExtUtils-Constant',       'ExtUtils-Install',     'ExtUtils-MakeMaker', 'ExtUtils-Manifest',
+    'ExtUtils-ParseXS',        'I18N-LangTags',        'IO',                 'File-Path',
+    'File-Temp',               'Filter-Simple',        'Getopt-Long',        'HTTP-Tiny',
+    'if',                      'IO-Compress',          'IO-Zlib',            'IPC-Cmd',
+    'JSON-PP',                 'libnet',               'Locale-Maketext',    'Locale-MakeText-Simple',
+    'Math-BigInt',             'Math-BigInt-FastCalc', 'Math-Complex',       'Memoize',
+    'MIME-Base64',             'Module-Build',         'Module-CoreList',    'Module-Load',
+    'Module-Load-Conditional', 'Module-Loaded',        'Module-Metadata',    'Module-Pluggable',
+    'Net-Ping',                'Package-Constants',    'Params-Check',       'parent',
+    'Parse-CPAN-Meta',         'Perl-OSType',          'Pod-Escapes',        'podlators',
+    'Pod-Parser',              'Pod-Simple',           'Safe',               'Scalar-List-Utils',
+    'Socket',                  'Storable',             'Switch',             'Sys-Syslog',
+    'Term-ANSIColor',          'Test',                 'Test-Harness',       'Test-Simple',
+    'Text-Balanced',           'Text-ParseWords',      'Text-Tabs+Wrap',     'Thread-Queue',
+    'threads',                 'Thread-Semaphore',     'threads-shared',     'Time-HiRes',
+    'Time-Local',              'Time-Piece',           'version',            'Version-Requirements',
+    'XSLoader',
   );
 }
 
 # ::gentoo Exceptions
 sub _vmap_perl_strange {
   return (
-    'App-SVN-Bisect'   => 'dev-util/App-SVN-Bisect',
-    'Autodia'          => 'dev-utils/autodia',
-    'BioPerl'          => 'sci-biology/bioperl',
-    'BioPerl-DB'       => 'sci-biology/bioperl-db',
-    'BioPerl-Network'  => 'sci-biology/bioperl-network',
-    'BioPerl-Run'      => 'sci-biology/bioperl-run',
-    'CGI-Simple'       => perl 'Cgi-Simple',
-    'Config-General'   => perl 'config-general',
-    'Crypt-CBC'        => perl 'crypt-cbc',
-    'Date-Manip'       => perl 'DateManip',
-    'Digest'           => virtual 'digest-base',
-    'ExtUtils-Depends' => perl 'extutils-depends',
-    'GBrowse'          => 'sci-biology/GBrowse',
-    'Glib'             => perl 'glib-perl',
-    'I18N-LangTags'    => virtual 'i18n-langtags',
-    'Image-ExifTool'   => 'media-libs/exiftool',
-    'Locale-Maketext'  => virtual 'locale-maketext',
-    'Net-Ping'         => virtual 'net-ping',
-    'Net-Server'       => perl 'net-server',
-    'Padre'            => 'app-editors/padre',
-    'PathTools'        => virtual 'File-Spec',
-    'Perl-Tidy'        => perl 'perltidy',
-    'Pod-Parser'       => virtual 'PodParser',
-    'SVK'              => 'dev-vcs/svk',
-    'Set-Scalar'       => perl 'set-scalar',
-    'Snapback2'        => 'app-backup/snapback2',
-    'Text-Template'    => perl 'text-template',
-    'XML-XSH2'         => 'app-editors/XML-XSH2',
-    'YAML'             => perl 'yaml',
-    'ack'              => 'sys-apps/ack',
+    'App-SVN-Bisect'     => 'dev-util/App-SVN-Bisect',
+    'Autodia'            => 'dev-utils/autodia',
+    'BioPerl'            => 'sci-biology/bioperl',
+    'BioPerl-DB'         => 'sci-biology/bioperl-db',
+    'BioPerl-Network'    => 'sci-biology/bioperl-network',
+    'BioPerl-Run'        => 'sci-biology/bioperl-run',
+    'CGI-Simple'         => perl 'Cgi-Simple',
+    'Config-General'     => perl 'config-general',
+    'Crypt-CBC'          => perl 'crypt-cbc',
+    'Date-Manip'         => perl 'DateManip',
+    'ExtUtils-Depends'   => perl 'extutils-depends',
+    'ExtUtils-PkgConfig' => perl 'extutils-pkgconfig',
+    'GBrowse'            => 'sci-biology/GBrowse',
+    'Glib'               => perl 'glib-perl',
+    'Image-ExifTool'     => 'media-libs/exiftool',
+    'Net-Server'         => perl 'net-server',
+    'Padre'              => 'app-editors/padre',
+    'PathTools'          => virtual 'File-Spec',
+    'Perl-Tidy'          => perl 'perltidy',
+    'SVK'                => 'dev-vcs/svk',
+    'Set-Scalar'         => perl 'set-scalar',
+    'Snapback2'          => 'app-backup/snapback2',
+    'Text-Template'      => perl 'text-template',
+    'XML-XSH2'           => 'app-editors/XML-XSH2',
+    'YAML'               => perl 'yaml',
+    'ack'                => 'sys-apps/ack',
   );
 }
 
@@ -77,26 +81,19 @@ sub _vmap_perl_strange {
 sub _vmap_overlay_native {
   return (
     (
-      'Archive-Extract',        'base',        'B-Debug',            'B-Lint',
-      'constant',               'Carp',        'CPAN',               'CPANPLUS',
-      'CPANPLUS-Dist-Build',    'Devel-DProf', 'Devel-PPPort',       'Devel-SelfStubber',
-      'Dumpvalue',              'Exporter',    'ExtUtils-Constant',  'ExtUtils-MakeMaker',
-      'Env',                    'File-Fetch',  'Filter-Simple',      'HTTP-Tiny',
-      'i18n-langtags',          'if',          'IPC-SysV',           'lib',
-      'Locale-Maketext-Simple', 'Log-Message', 'Log-Message-Simple', 'Math-Complex',
-      'Module-CoreList',        'NEXT',        'Object-Accessor',    'Pod-Checker',
-      'Pod-LaTeX',              'Pod-Perldoc', 'Pod-Plainer',        'Pod-Usage',
-      'Socket',                 'SelfLoader',  'Term-UI',            'Unicode-Collate',
-      'Unicode-Normalize',
+      'Archive-Extract', 'base',                'B-Lint',             'constant',
+      'CPANPLUS',        'CPANPLUS-Dist-Build', 'Devel-DProf',        'Devel-SelfStubber',
+      'Env',             'File-Fetch',          'i18n-langtags',      'IPC-SysV',
+      'lib',             'Log-Message',         'Log-Message-Simple', 'NEXT',
+      'Object-Accessor', 'Pod-Checker',         'Pod-LaTeX',          'Pod-Perldoc',
+      'Pod-Plainer',     'Pod-Usage',           'SelfLoader',         'Term-UI',
+      'Unicode-Collate', 'Unicode-Normalize',
     ),
   );
 }
 
 sub _vmap_overlay_strange {
-  return (
-    'ExtUtils-Depends'   => perl 'extutils-depends',
-    'ExtUtils-PkgConfig' => perl 'extutils-pkgconfig',
-  );
+  return ();
 }
 
 sub _vmap {