Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Torsten Veller" <tove@g.o>
Subject: proj/perl-overlay:master commit in: dev-perl/Module-CPANTS-Analyse/, dev-perl/CGI-Application-Plugin-Stash/, ...
Date: Sun, 24 Jun 2012 15:25:41 +0000 (UTC)
commit:     ca54d918cda761565cae1386b4064b432603aeae
Author:     Torsten Veller <tove <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 15:23:10 2012 +0000
Commit:     Torsten Veller <tove <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 15:23:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=commit;h=ca54d918

Update CPAN upstream info

(Portage version: 2.2.0_alpha112/git/Linux x86_64, signed Manifest commit with key 0x4E046AEC)

---
 dev-perl/Acme-Damn/metadata.xml                    |    4 +-
 dev-perl/Adam/metadata.xml                         |    2 +-
 dev-perl/Algorithm-Diff-XS/metadata.xml            |    2 +-
 dev-perl/Algorithm-IncludeExclude/metadata.xml     |    2 +-
 dev-perl/Algorithm-Merge/metadata.xml              |    2 +-
 dev-perl/Amazon-S3/metadata.xml                    |    2 +-
 dev-perl/Apache-Htpasswd/metadata.xml              |    2 +-
 dev-perl/App-Asciio/metadata.xml                   |    4 +-
 dev-perl/App-Cache/metadata.xml                    |    2 +-
 dev-perl/App-Cmd/metadata.xml                      |    4 +-
 dev-perl/App-cpanminus/metadata.xml                |    2 +-
 dev-perl/App-cpanoutdated/metadata.xml             |    2 +-
 dev-perl/App-mymeta_requires/metadata.xml          |    4 +-
 dev-perl/App-perlbrew/metadata.xml                 |    2 +-
 dev-perl/Archive-Any/metadata.xml                  |    4 +-
 dev-perl/Archive-Peek/metadata.xml                 |    2 +-
 dev-perl/Array-Diff/metadata.xml                   |   10 ++--
 dev-perl/Audio-Extract-PCM/metadata.xml            |    2 +-
 dev-perl/Audio-MPD-Common/metadata.xml             |    4 +-
 dev-perl/Audio-MPD/metadata.xml                    |    2 +-
 dev-perl/Audio-Musepack/metadata.xml               |    4 +-
 dev-perl/Audio-Ofa-Util/metadata.xml               |    2 +-
 dev-perl/Audio-Ofa/metadata.xml                    |    2 +-
 dev-perl/Audio-SndFile/metadata.xml                |    2 +-
 dev-perl/Audio-WMA/metadata.xml                    |    4 +-
 dev-perl/Authen-DecHpwd/metadata.xml               |   10 ++--
 dev-perl/Authen-Passphrase/metadata.xml            |    2 +-
 dev-perl/B-Hooks-OP-Annotation/metadata.xml        |    2 +-
 .../B-Hooks-OP-Check-EntersubForCV/metadata.xml    |    2 +-
 dev-perl/B-Hooks-OP-Check-StashChange/metadata.xml |    2 +-
 dev-perl/B-Hooks-OP-PPAddr/metadata.xml            |    2 +-
 dev-perl/B-RecDeparse/metadata.xml                 |    2 +-
 dev-perl/BZ-Client/metadata.xml                    |    4 +-
 dev-perl/BackPAN-Index/metadata.xml                |    2 +-
 dev-perl/Beanstalk-Client/metadata.xml             |    2 +-
 dev-perl/BerkeleyDB-Manager/metadata.xml           |    2 +-
 dev-perl/Best/metadata.xml                         |    2 +-
 dev-perl/Bundle-CPAN/metadata.xml                  |    2 +-
 dev-perl/Business-CreditCard/metadata.xml          |    2 +-
 dev-perl/Business-PayPal-API/metadata.xml          |    2 +-
 dev-perl/Business-Tax-VAT-Validation/metadata.xml  |    2 +-
 dev-perl/CGI-Ajax/metadata.xml                     |    4 +-
 dev-perl/CGI-Application-Dispatch/metadata.xml     |    2 +-
 dev-perl/CGI-Application-FastCGI/metadata.xml      |    2 +-
 .../metadata.xml                                   |   10 ++--
 .../metadata.xml                                   |    2 +-
 .../CGI-Application-Plugin-Config-Any/metadata.xml |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/CGI-Application-Plugin-JSON/metadata.xml  |    2 +-
 .../metadata.xml                                   |    2 +-
 .../CGI-Application-Plugin-Redirect/metadata.xml   |    2 +-
 .../CGI-Application-Plugin-Session/metadata.xml    |    2 +-
 dev-perl/CGI-Application-Plugin-Stash/metadata.xml |    2 +-
 dev-perl/CGI-Application-Plugin-TT/metadata.xml    |    2 +-
 dev-perl/CGI-Application/metadata.xml              |   10 ++--
 dev-perl/CGI-Cache/metadata.xml                    |    4 +-
 dev-perl/CGI-Cookie-XS/metadata.xml                |    2 +-
 dev-perl/CGI-FormBuilder-Source-Perl/metadata.xml  |    2 +-
 dev-perl/CGI-Untaint-email/metadata.xml            |    2 +-
 dev-perl/CGI-Untaint-telephone/metadata.xml        |    2 +-
 dev-perl/CGI-Untaint/metadata.xml                  |    2 +-
 dev-perl/CLASS/metadata.xml                        |    2 +-
 dev-perl/CPAN-Changes/metadata.xml                 |    2 +-
 dev-perl/CPAN-DistnameInfo/metadata.xml            |    4 +-
 dev-perl/CPAN-Inject/metadata.xml                  |    2 +-
 dev-perl/CPAN-Meta-Check/metadata.xml              |    2 +-
 dev-perl/CPAN-Perl-Releases/metadata.xml           |    2 +-
 dev-perl/CPAN-Reporter/metadata.xml                |    2 +-
 dev-perl/CPAN-Uploader/metadata.xml                |    4 +-
 dev-perl/CPANPLUS-Dist-Gentoo/metadata.xml         |    2 +-
 dev-perl/CSS-Packer/metadata.xml                   |    4 +-
 dev-perl/CSS-Tiny/metadata.xml                     |    2 +-
 dev-perl/Cache-FastMmap/metadata.xml               |    2 +-
 dev-perl/Cache-Memcached-Managed/metadata.xml      |    2 +-
 dev-perl/Cache-Ref/metadata.xml                    |    2 +-
 dev-perl/Cairo-GObject/metadata.xml                |    2 +-
 dev-perl/Captcha-reCAPTCHA/metadata.xml            |    2 +-
 dev-perl/Carp-Always/metadata.xml                  |    4 +-
 dev-perl/Carp-Clan-Share/metadata.xml              |    4 +-
 dev-perl/Carp-REPL/metadata.xml                    |    2 +-
 dev-perl/Catalyst-Action-REST/metadata.xml         |   14 +++---
 dev-perl/Catalyst-Action-RenderView/metadata.xml   |    2 +-
 dev-perl/Catalyst-ActionRole-ACL/metadata.xml      |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Catalyst-Controller-ActionRole/metadata.xml    |    2 +-
 dev-perl/Catalyst-Controller-BindLex/metadata.xml  |    2 +-
 .../Catalyst-Controller-FormBuilder/metadata.xml   |    2 +-
 .../Catalyst-Controller-HTML-FormFu/metadata.xml   |    2 +-
 .../Catalyst-Controller-RequestToken/metadata.xml  |    2 +-
 dev-perl/Catalyst-Devel/metadata.xml               |    2 +-
 dev-perl/Catalyst-Engine-Apache/metadata.xml       |    2 +-
 dev-perl/Catalyst-Engine-HTTP-Prefork/metadata.xml |    2 +-
 dev-perl/Catalyst-Engine-PSGI/metadata.xml         |    2 +-
 dev-perl/Catalyst-Log-Log4perl/metadata.xml        |    2 +-
 dev-perl/Catalyst-Manual/metadata.xml              |    2 +-
 dev-perl/Catalyst-Model-Adaptor/metadata.xml       |    2 +-
 dev-perl/Catalyst-Model-CDBI/metadata.xml          |    2 +-
 dev-perl/Catalyst-Model-DBI/metadata.xml           |    2 +-
 dev-perl/Catalyst-Model-DBIC-Plain/metadata.xml    |    2 +-
 dev-perl/Catalyst-Model-DBIC-Schema/metadata.xml   |    8 ++--
 dev-perl/Catalyst-Model-EVDB/metadata.xml          |    2 +-
 dev-perl/Catalyst-Model-File/metadata.xml          |    2 +-
 dev-perl/Catalyst-Model-HTML-FormFu/metadata.xml   |    2 +-
 dev-perl/Catalyst-Model-KiokuDB/metadata.xml       |    2 +-
 dev-perl/Catalyst-Model-LDAP/metadata.xml          |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Catalyst-Plugin-Authentication/metadata.xml    |    2 +-
 .../Catalyst-Plugin-Authorization-ACL/metadata.xml |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Catalyst-Plugin-C3/metadata.xml           |    2 +-
 dev-perl/Catalyst-Plugin-CGI-Untaint/metadata.xml  |    2 +-
 dev-perl/Catalyst-Plugin-Cache/metadata.xml        |    2 +-
 .../Catalyst-Plugin-Compress-Zlib/metadata.xml     |    2 +-
 dev-perl/Catalyst-Plugin-Compress/metadata.xml     |    2 +-
 dev-perl/Catalyst-Plugin-ConfigLoader/metadata.xml |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Catalyst-Plugin-Email/metadata.xml        |    2 +-
 dev-perl/Catalyst-Plugin-ErrorCatcher/metadata.xml |    2 +-
 dev-perl/Catalyst-Plugin-Facebook/metadata.xml     |    2 +-
 dev-perl/Catalyst-Plugin-FillInForm/metadata.xml   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Catalyst-Plugin-FormValidator/metadata.xml     |    2 +-
 dev-perl/Catalyst-Plugin-I18N/metadata.xml         |    2 +-
 dev-perl/Catalyst-Plugin-Images/metadata.xml       |    2 +-
 dev-perl/Catalyst-Plugin-Log-Dispatch/metadata.xml |    2 +-
 dev-perl/Catalyst-Plugin-Message/metadata.xml      |    2 +-
 .../Catalyst-Plugin-MortalForward/metadata.xml     |    2 +-
 dev-perl/Catalyst-Plugin-PageCache/metadata.xml    |    2 +-
 .../Catalyst-Plugin-Params-Demoronize/metadata.xml |    2 +-
 dev-perl/Catalyst-Plugin-Prototype/metadata.xml    |    2 +-
 dev-perl/Catalyst-Plugin-Scheduler/metadata.xml    |    2 +-
 dev-perl/Catalyst-Plugin-Server/metadata.xml       |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Catalyst-Plugin-Session-PerUser/metadata.xml   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Catalyst-Plugin-Session-State-URI/metadata.xml |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Catalyst-Plugin-Session-Store-DBI/metadata.xml |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Catalyst-Plugin-Session/metadata.xml      |    2 +-
 dev-perl/Catalyst-Plugin-Setenv/metadata.xml       |    2 +-
 dev-perl/Catalyst-Plugin-Singleton/metadata.xml    |    2 +-
 dev-perl/Catalyst-Plugin-StackTrace/metadata.xml   |    2 +-
 .../Catalyst-Plugin-Static-Simple/metadata.xml     |    2 +-
 dev-perl/Catalyst-Plugin-SubRequest/metadata.xml   |    2 +-
 dev-perl/Catalyst-Plugin-SuperForm/metadata.xml    |    2 +-
 .../Catalyst-Plugin-Unicode-Encoding/metadata.xml  |    2 +-
 dev-perl/Catalyst-Plugin-Unicode/metadata.xml      |    2 +-
 .../Catalyst-Plugin-UploadProgress/metadata.xml    |    2 +-
 dev-perl/Catalyst-Plugin-XMLRPC/metadata.xml       |    2 +-
 dev-perl/Catalyst-Runtime/metadata.xml             |    2 +-
 .../metadata.xml                                   |    4 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Catalyst-View-Download/metadata.xml       |    2 +-
 dev-perl/Catalyst-View-Email/metadata.xml          |    2 +-
 .../Catalyst-View-Excel-Template-Plus/metadata.xml |    2 +-
 dev-perl/Catalyst-View-GD-Barcode/metadata.xml     |    2 +-
 dev-perl/Catalyst-View-JSON/metadata.xml           |    2 +-
 dev-perl/Catalyst-View-Mason/metadata.xml          |    2 +-
 .../Catalyst-View-TT-ControllerLocal/metadata.xml  |    2 +-
 dev-perl/Catalyst-View-TT/metadata.xml             |    2 +-
 dev-perl/Catalyst-View-Wkhtmltopdf/metadata.xml    |    2 +-
 dev-perl/Catalyst-View-vCard/metadata.xml          |    2 +-
 dev-perl/CatalystX-Component-Traits/metadata.xml   |    2 +-
 dev-perl/CatalystX-Declare/metadata.xml            |    2 +-
 dev-perl/CatalystX-InjectComponent/metadata.xml    |    2 +-
 dev-perl/CatalystX-LeakChecker/metadata.xml        |    2 +-
 dev-perl/CatalystX-Profile/metadata.xml            |    2 +-
 dev-perl/CatalystX-REPL/metadata.xml               |    2 +-
 dev-perl/CatalystX-SimpleLogin/metadata.xml        |    2 +-
 dev-perl/Cave-Wrapper/metadata.xml                 |    2 +-
 dev-perl/Check-ISA/metadata.xml                    |    4 +-
 dev-perl/Child/metadata.xml                        |    2 +-
 dev-perl/Class-C3-Adopt-NEXT/metadata.xml          |    4 +-
 dev-perl/Class-DBI-AsForm/metadata.xml             |    2 +-
 dev-perl/Class-DBI-Loader/metadata.xml             |    2 +-
 dev-perl/Class-DBI-Pager/metadata.xml              |    2 +-
 dev-perl/Class-DBI-SQLite/metadata.xml             |    2 +-
 dev-perl/Class-Discover/metadata.xml               |    2 +-
 dev-perl/Class-Fields/metadata.xml                 |    2 +-
 dev-perl/Class-InsideOut/metadata.xml              |    4 +-
 dev-perl/Class-Mix/metadata.xml                    |    2 +-
 dev-perl/Class-Throwable/metadata.xml              |    2 +-
 dev-perl/Color-Calc/metadata.xml                   |   10 ++--
 dev-perl/Config-AutoConf/metadata.xml              |    4 +-
 dev-perl/Config-General-Match/metadata.xml         |    2 +-
 dev-perl/Config-GitLike/metadata.xml               |    2 +-
 dev-perl/Config-INI/metadata.xml                   |    4 +-
 dev-perl/Config-JFDI/metadata.xml                  |    2 +-
 dev-perl/Config-JSON/metadata.xml                  |    4 +-
 dev-perl/Config-MVP-Reader-INI/metadata.xml        |    2 +-
 dev-perl/Config-MVP/metadata.xml                   |    2 +-
 dev-perl/Cookie-XS/metadata.xml                    |    2 +-
 dev-perl/Crypt-Eksblowfish/metadata.xml            |    2 +-
 dev-perl/Crypt-MySQL/metadata.xml                  |    2 +-
 dev-perl/Crypt-Skip32-Base32Crockford/metadata.xml |    2 +-
 dev-perl/Crypt-Skip32-XS/metadata.xml              |    2 +-
 dev-perl/Crypt-Skip32/metadata.xml                 |   10 ++--
 dev-perl/Crypt-UnixCrypt_XS/metadata.xml           |    2 +-
 dev-perl/Crypt-Util/metadata.xml                   |    2 +-
 dev-perl/DBIx-Class-Cursor-Cached/metadata.xml     |    2 +-
 dev-perl/DBIx-Class-DateTime-Epoch/metadata.xml    |    2 +-
 dev-perl/DBIx-Class-DigestColumns/metadata.xml     |    2 +-
 dev-perl/DBIx-Class-EncodedColumn/metadata.xml     |   16 ++++----
 dev-perl/DBIx-Class-HTML-FormFu/metadata.xml       |    4 +-
 dev-perl/DBIx-Class-IntrospectableM2M/metadata.xml |    4 +-
 dev-perl/DBIx-Class-QueryLog/metadata.xml          |    2 +-
 dev-perl/DBIx-Class-Schema-Loader/metadata.xml     |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/DBIx-Class-TimeStamp/metadata.xml         |    4 +-
 dev-perl/DBIx-Class-Tree/metadata.xml              |    2 +-
 dev-perl/DBIx-Class-UUIDColumns/metadata.xml       |    2 +-
 dev-perl/DBIx-Class-Validation/metadata.xml        |    2 +-
 dev-perl/DBIx-Connector/metadata.xml               |    2 +-
 dev-perl/DBIx-Simple/metadata.xml                  |    2 +-
 dev-perl/Dancer/metadata.xml                       |    2 +-
 dev-perl/Data-Alias/metadata.xml                   |    2 +-
 dev-perl/Data-Clone/metadata.xml                   |    2 +-
 dev-perl/Data-Currency/metadata.xml                |    2 +-
 dev-perl/Data-Dumper-Names/metadata.xml            |    2 +-
 dev-perl/Data-Entropy/metadata.xml                 |    2 +-
 dev-perl/Data-Float/metadata.xml                   |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Data-GUID/metadata.xml                    |    2 +-
 dev-perl/Data-Integer/metadata.xml                 |    2 +-
 dev-perl/Data-Pond/metadata.xml                    |   10 ++--
 dev-perl/Data-PowerSet/metadata.xml                |    2 +-
 dev-perl/Data-Random-String/metadata.xml           |    2 +-
 dev-perl/Data-Rx/metadata.xml                      |    2 +-
 dev-perl/Data-Section/metadata.xml                 |    4 +-
 dev-perl/Data-Serializer/metadata.xml              |    2 +-
 dev-perl/Data-Taxi/metadata.xml                    |    2 +-
 dev-perl/Data-Transformer/metadata.xml             |    2 +-
 dev-perl/Data-TreeDumper-Renderer-GTK/metadata.xml |    4 +-
 dev-perl/Data-TreeDumper/metadata.xml              |    4 +-
 dev-perl/Date-ISO8601/metadata.xml                 |    2 +-
 dev-perl/Date-JD/metadata.xml                      |    2 +-
 dev-perl/Date-Tiny/metadata.xml                    |    2 +-
 dev-perl/DateTime-Event-Cron/metadata.xml          |    2 +-
 dev-perl/DateTime-Format-DB2/metadata.xml          |    2 +-
 dev-perl/DateTime-Format-Duration/metadata.xml     |    2 +-
 dev-perl/DateTime-Format-Epoch/metadata.xml        |    2 +-
 dev-perl/DateTime-Format-Excel/metadata.xml        |    2 +-
 dev-perl/DateTime-Format-MySQL/metadata.xml        |    2 +-
 dev-perl/DateTime-Format-Pg/metadata.xml           |    2 +-
 dev-perl/DateTime-TimeZone-SystemV/metadata.xml    |    2 +-
 dev-perl/DateTime-TimeZone-Tzfile/metadata.xml     |    2 +-
 dev-perl/DateTime-Tiny/metadata.xml                |    2 +-
 dev-perl/Debug-ShowStuff/metadata.xml              |    2 +-
 dev-perl/Devel-Autoflush/metadata.xml              |    2 +-
 dev-perl/Devel-BeginLift/metadata.xml              |    2 +-
 dev-perl/Devel-Cover/metadata.xml                  |   10 +++--
 dev-perl/Devel-Leak-Object/metadata.xml            |    2 +-
 dev-perl/Devel-PartialDump/metadata.xml            |    2 +-
 dev-perl/Devel-PatchPerl/metadata.xml              |    2 +-
 dev-perl/Devel-Pragma/metadata.xml                 |    2 +-
 dev-perl/Devel-SimpleTrace/metadata.xml            |    2 +-
 .../Devel-StackTrace-WithLexicals/metadata.xml     |    2 +-
 dev-perl/Digest-Whirlpool/metadata.xml             |    2 +-
 dev-perl/Dir-Self/metadata.xml                     |    4 +-
 dev-perl/Directory-Scratch-Structured/metadata.xml |    4 +-
 dev-perl/Directory-Scratch/metadata.xml            |    4 +-
 dev-perl/Dist-Metadata/metadata.xml                |    4 +-
 dev-perl/Dist-Zilla-App-Command-cover/metadata.xml |    2 +-
 .../Dist-Zilla-App-Command-dumpphases/metadata.xml |    2 +-
 dev-perl/Dist-Zilla-Plugin-Authority/metadata.xml  |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Dist-Zilla-Plugin-Bootstrap-lib/metadata.xml   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Dist-Zilla-Plugin-CheckExtraTests/metadata.xml |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Dist-Zilla-Plugin-EOLTests/metadata.xml   |    2 +-
 dev-perl/Dist-Zilla-Plugin-Git/metadata.xml        |    2 +-
 dev-perl/Dist-Zilla-Plugin-GithubMeta/metadata.xml |    1 +
 .../metadata.xml                                   |    2 +
 .../metadata.xml                                   |   10 ++--
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |   12 +++---
 .../Dist-Zilla-Plugin-MetaProvides/metadata.xml    |   16 ++++----
 .../Dist-Zilla-Plugin-MinimumPerl/metadata.xml     |    2 +-
 .../Dist-Zilla-Plugin-ModuleInstall/metadata.xml   |    2 +-
 dev-perl/Dist-Zilla-Plugin-PerlTidy/metadata.xml   |    2 +-
 dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml  |    2 +-
 .../Dist-Zilla-Plugin-ReadmeFromPod/metadata.xml   |    4 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Dist-Zilla-Plugin-Repository/metadata.xml |    4 +-
 dev-perl/Dist-Zilla-Plugin-TaskWeaver/metadata.xml |    2 +-
 .../metadata.xml                                   |    2 +-
 .../Dist-Zilla-Plugin-Test-Compile/metadata.xml    |    2 +-
 .../Dist-Zilla-Plugin-Test-Kwalitee/metadata.xml   |    2 +-
 .../metadata.xml                                   |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Dist-Zilla-Plugin-Twitter/metadata.xml    |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Dist-Zilla-PluginBundle-RJBS/metadata.xml |    4 +-
 dev-perl/Dist-Zilla-Role-Tempdir/metadata.xml      |    2 +-
 dev-perl/Dist-Zilla-Util-EmulatePhase/metadata.xml |    2 +-
 dev-perl/Dist-Zilla-Util-Test-KENTNL/metadata.xml  |    2 +-
 dev-perl/Dist-Zilla/metadata.xml                   |    2 +-
 dev-perl/EVDB-API/metadata.xml                     |    2 +-
 dev-perl/Email-MIME-Kit/metadata.xml               |    2 +-
 dev-perl/Email-Valid-Loose/metadata.xml            |    2 +-
 dev-perl/Encode-Base32-Crockford/metadata.xml      |    2 +-
 dev-perl/Encode-ZapCP1252/metadata.xml             |    2 +-
 dev-perl/Eval-Context/metadata.xml                 |    4 +-
 dev-perl/Excel-Template-Plus/metadata.xml          |    2 +-
 dev-perl/Excel-Template/metadata.xml               |    2 +-
 dev-perl/Exception-Class-TryCatch/metadata.xml     |    2 +-
 dev-perl/Expect-Simple/metadata.xml                |    2 +-
 dev-perl/Exporter-Declare/metadata.xml             |    2 +-
 dev-perl/ExtUtils-CChecker/metadata.xml            |    4 +-
 dev-perl/ExtUtils-LibBuilder/metadata.xml          |    4 +-
 dev-perl/Fennec-Lite/metadata.xml                  |    2 +-
 dev-perl/File-ChangeNotify/metadata.xml            |    9 ++--
 dev-perl/File-Find-Rule-Perl/metadata.xml          |    4 +-
 dev-perl/File-Find-Rule-VCS/metadata.xml           |    4 +-
 dev-perl/File-Modified/metadata.xml                |    2 +-
 dev-perl/File-Path-Tiny/metadata.xml               |    2 +-
 dev-perl/File-ShareDir-Install/metadata.xml        |    2 +-
 dev-perl/File-ShareDir-PAR/metadata.xml            |    4 +-
 dev-perl/File-ShareDir-PathClass/metadata.xml      |    2 +-
 dev-perl/File-Spec-Native/metadata.xml             |    4 +-
 dev-perl/File-Type-WebImages/metadata.xml          |    4 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Find-Lib/metadata.xml                     |    4 +-
 dev-perl/FindBin-Real/metadata.xml                 |    2 +-
 dev-perl/FindBin-libs/metadata.xml                 |    4 +-
 dev-perl/FormValidator-Simple/metadata.xml         |    2 +-
 dev-perl/Gentoo-MirrorList/metadata.xml            |    2 +-
 dev-perl/Gentoo-Overlay-Group-INI/metadata.xml     |    4 ++
 dev-perl/Gentoo-Overlay-Group/metadata.xml         |    1 +
 dev-perl/Gentoo-Overlay/metadata.xml               |    2 +-
 dev-perl/Getopt-Euclid/metadata.xml                |    4 +-
 dev-perl/Getopt-Lucid/metadata.xml                 |    2 +-
 dev-perl/Getopt-Usaginator/metadata.xml            |    4 +-
 dev-perl/Git-CPAN-Patch/metadata.xml               |    2 +-
 dev-perl/Git-PurePerl/metadata.xml                 |    4 +-
 dev-perl/Git-Repository/metadata.xml               |    4 +-
 dev-perl/Git-Wrapper/metadata.xml                  |    2 +-
 dev-perl/Gitalist/metadata.xml                     |    4 +-
 dev-perl/Glib-Object-Introspection/metadata.xml    |    2 +-
 dev-perl/Graphics-ColorNames-WWW/metadata.xml      |    2 +-
 dev-perl/Gtk3/metadata.xml                         |    2 +-
 dev-perl/HTML-Defang/metadata.xml                  |    2 +-
 dev-perl/HTML-FormFu-Model-DBIC/metadata.xml       |    2 +-
 dev-perl/HTML-FormFu/metadata.xml                  |    2 +-
 dev-perl/HTML-FormHandler/metadata.xml             |    4 +-
 dev-perl/HTML-GenToc/metadata.xml                  |    2 +-
 dev-perl/HTML-Highlight/metadata.xml               |    4 +-
 dev-perl/HTML-LinkList/metadata.xml                |    2 +-
 dev-perl/HTML-Packer/metadata.xml                  |    4 +-
 dev-perl/HTML-Prototype/metadata.xml               |    2 +-
 dev-perl/HTML-Selector-XPath/metadata.xml          |    4 +-
 dev-perl/HTML-SuperForm/metadata.xml               |    2 +-
 dev-perl/HTML-TagCloud/metadata.xml                |    2 +-
 dev-perl/HTML-TagFilter/metadata.xml               |    4 +-
 dev-perl/HTML-Template-Pro/metadata.xml            |    2 +-
 dev-perl/HTML-Tiny/metadata.xml                    |    2 +-
 dev-perl/HTML-Toc/metadata.xml                     |    2 +-
 dev-perl/HTML-TreeBuilder-LibXML/metadata.xml      |    4 +-
 dev-perl/HTML-TreeBuilder-XPath/metadata.xml       |    4 +-
 dev-perl/HTML-Widget/metadata.xml                  |    2 +-
 dev-perl/HTML-Zoom/metadata.xml                    |    2 +-
 dev-perl/HTTP-Exception/metadata.xml               |    2 +-
 dev-perl/HTTP-HeaderParser-XS/metadata.xml         |    2 +-
 dev-perl/HTTP-Lite/metadata.xml                    |    2 +-
 dev-perl/HTTP-Parser-XS/metadata.xml               |    2 +-
 dev-perl/HTTP-Proxy/metadata.xml                   |    2 +-
 dev-perl/HTTP-Request-AsCGI/metadata.xml           |    2 +-
 dev-perl/HTTP-Server-Simple-PSGI/metadata.xml      |    2 +-
 dev-perl/Handel/metadata.xml                       |    8 ++--
 dev-perl/Hash-FieldHash/metadata.xml               |    2 +-
 dev-perl/Hash-Flatten/metadata.xml                 |    2 +-
 dev-perl/Hash-Merge-Simple/metadata.xml            |    2 +-
 dev-perl/Hash-Util-FieldHash-Compat/metadata.xml   |    4 +-
 dev-perl/IO-CaptureOutput/metadata.xml             |    2 +-
 dev-perl/IO-Interactive/metadata.xml               |    2 +-
 dev-perl/IO-Stty/metadata.xml                      |    4 +-
 dev-perl/IO-TieCombine/metadata.xml                |    4 +-
 dev-perl/IPTables-ChainMgr/metadata.xml            |    2 +-
 dev-perl/IPTables-Parse/metadata.xml               |    2 +-
 dev-perl/IRC-Utils/metadata.xml                    |    2 +-
 dev-perl/Image-Math-Constrain/metadata.xml         |    2 +-
 dev-perl/Image-Resize/metadata.xml                 |    2 +-
 dev-perl/Imager/metadata.xml                       |    2 +-
 dev-perl/Internals/metadata.xml                    |    4 +-
 dev-perl/JavaScript-Minifier-XS/metadata.xml       |    2 +-
 dev-perl/JavaScript-Packer/metadata.xml            |    4 +-
 dev-perl/Jemplate/metadata.xml                     |    2 +-
 dev-perl/KinoSearch/metadata.xml                   |    2 +-
 dev-perl/KinoSearch1/metadata.xml                  |    2 +-
 dev-perl/KiokuDB-Backend-DBI/metadata.xml          |    2 +-
 dev-perl/KiokuDB/metadata.xml                      |    2 +-
 dev-perl/KiokuX-Model/metadata.xml                 |    2 +-
 dev-perl/KiokuX-User/metadata.xml                  |    2 +-
 dev-perl/LWP-Online/metadata.xml                   |    2 +-
 dev-perl/Language-Functional/metadata.xml          |    2 +-
 dev-perl/Lexical-Types/metadata.xml                |    4 +-
 dev-perl/Lingua-EN-Inflect-Number/metadata.xml     |    2 +-
 dev-perl/Lingua-EN-Inflect-Phrase/metadata.xml     |    4 +-
 dev-perl/Lingua-EN-Tagger/metadata.xml             |    4 +-
 dev-perl/Lingua-Stem-Snowball/metadata.xml         |    2 +-
 dev-perl/Lingua-StopWords/metadata.xml             |    2 +-
 dev-perl/Linux-DVB/metadata.xml                    |    4 +-
 dev-perl/List-Compare/metadata.xml                 |    2 +-
 dev-perl/Locale-Codes/metadata.xml                 |    2 +-
 dev-perl/Locale-Currency-Format/metadata.xml       |    2 +-
 dev-perl/Log-Any-Adapter-Dispatch/metadata.xml     |    2 +-
 dev-perl/Log-Any-Adapter/metadata.xml              |    2 +-
 dev-perl/Log-Contextual/metadata.xml               |    2 +-
 dev-perl/Log-Dispatch-Array/metadata.xml           |    4 +-
 dev-perl/Log-Dispatch-Config/metadata.xml          |    4 +-
 dev-perl/Log-Dispatchouli/metadata.xml             |    4 +-
 dev-perl/Log-Trace/metadata.xml                    |    4 +-
 dev-perl/MKDoc-XML/metadata.xml                    |    2 +-
 dev-perl/MP4-Info/metadata.xml                     |    4 +-
 dev-perl/Mason/metadata.xml                        |    4 +-
 dev-perl/Math-BaseCnv/metadata.xml                 |    4 +-
 dev-perl/Math-Combinatorics/metadata.xml           |    2 +-
 dev-perl/Math-Factor-XS/metadata.xml               |    4 +-
 dev-perl/MemHandle/metadata.xml                    |    2 +-
 dev-perl/Memoize-ExpireLRU/metadata.xml            |    4 +-
 dev-perl/Meta-Builder/metadata.xml                 |    2 +-
 dev-perl/MetaCPAN-API/metadata.xml                 |    2 +-
 dev-perl/Method-Signatures-Simple/metadata.xml     |    2 +-
 dev-perl/Method-Signatures/metadata.xml            |    2 +-
 dev-perl/Mixin-ExtraFields-Param/metadata.xml      |    4 +-
 dev-perl/Mixin-ExtraFields/metadata.xml            |    4 +-
 dev-perl/Mixin-Linewise/metadata.xml               |    4 +-
 dev-perl/ModPerl-VersionUtil/metadata.xml          |    4 +-
 dev-perl/Modern-Perl/metadata.xml                  |    2 +-
 dev-perl/Module-CPANTS-Analyse/metadata.xml        |    2 +-
 dev-perl/Module-Compile-TT/metadata.xml            |    2 +-
 dev-perl/Module-Compile/metadata.xml               |    2 +-
 dev-perl/Module-Extract-Namespaces/metadata.xml    |    4 +-
 dev-perl/Module-Extract-VERSION/metadata.xml       |    4 +-
 dev-perl/Module-Extract/metadata.xml               |    4 +-
 dev-perl/Module-ExtractUse/metadata.xml            |    2 +-
 dev-perl/Module-Inspector/metadata.xml             |    4 +-
 dev-perl/Module-Install-AuthorTests/metadata.xml   |    2 +-
 dev-perl/Module-Install-ProvidesClass/metadata.xml |    4 +-
 dev-perl/Module-Install-ReadmeFromPod/metadata.xml |    2 +-
 dev-perl/Module-Math-Depends/metadata.xml          |    4 +-
 dev-perl/Module-Pluggable-Fast/metadata.xml        |    2 +-
 dev-perl/Module-Pluggable-Ordered/metadata.xml     |    2 +-
 dev-perl/MojoMojo/metadata.xml                     |    2 +-
 dev-perl/MojoX-Renderer-TT/metadata.xml            |    4 +-
 .../Mojolicious-Plugin-Authentication/metadata.xml |    4 +-
 dev-perl/Mojolicious-Plugin-Database/metadata.xml  |    4 +-
 dev-perl/Mojolicious/metadata.xml                  |    2 +-
 dev-perl/Moose-Autobox/metadata.xml                |    2 +-
 dev-perl/MooseX-App-Cmd/metadata.xml               |    2 +-
 dev-perl/MooseX-Async/metadata.xml                 |    2 +-
 dev-perl/MooseX-Attribute-Chained/metadata.xml     |    2 +-
 dev-perl/MooseX-AttributeIndexes/metadata.xml      |    2 +-
 dev-perl/MooseX-AttributeShortcuts/metadata.xml    |    2 +-
 dev-perl/MooseX-AuthorizedMethods/metadata.xml     |    2 +-
 dev-perl/MooseX-Blessed-Reconstruct/metadata.xml   |    2 +-
 dev-perl/MooseX-ChainedAccessors/metadata.xml      |    2 +-
 dev-perl/MooseX-Clone/metadata.xml                 |    4 +-
 dev-perl/MooseX-ConfigFromFile/metadata.xml        |    2 +-
 dev-perl/MooseX-Daemonize/metadata.xml             |    2 +-
 dev-perl/MooseX-Declare/metadata.xml               |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/MooseX-Has-Options/metadata.xml           |    2 +-
 dev-perl/MooseX-Has-Sugar/metadata.xml             |    4 +-
 dev-perl/MooseX-HasDefaults/metadata.xml           |    4 +-
 dev-perl/MooseX-InsideOut/metadata.xml             |    2 +-
 dev-perl/MooseX-Iterator/metadata.xml              |    2 +-
 dev-perl/MooseX-LazyLogDispatch/metadata.xml       |    2 +-
 dev-perl/MooseX-LazyRequire/metadata.xml           |    2 +-
 dev-perl/MooseX-Lexical-Types/metadata.xml         |    4 +-
 dev-perl/MooseX-Log-Log4perl/metadata.xml          |    2 +-
 dev-perl/MooseX-LogDispatch/metadata.xml           |    2 +-
 dev-perl/MooseX-MarkAsMethods/metadata.xml         |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/MooseX-Method-Signatures/metadata.xml     |    2 +-
 dev-perl/MooseX-Method/metadata.xml                |    2 +-
 dev-perl/MooseX-MethodAttributes/metadata.xml      |    2 +-
 dev-perl/MooseX-MultiMethods/metadata.xml          |    4 +-
 dev-perl/MooseX-NonMoose/metadata.xml              |    2 +-
 dev-perl/MooseX-OneArgNew/metadata.xml             |    2 +-
 dev-perl/MooseX-POE/metadata.xml                   |    2 +-
 dev-perl/MooseX-Param/metadata.xml                 |    2 +-
 dev-perl/MooseX-Params-Validate/metadata.xml       |    2 +-
 dev-perl/MooseX-RelatedClassRoles/metadata.xml     |    2 +-
 dev-perl/MooseX-Role-Cmd/metadata.xml              |    2 +-
 dev-perl/MooseX-Role-Restricted/metadata.xml       |    2 +-
 dev-perl/MooseX-Role-TraitConstructor/metadata.xml |    2 +-
 dev-perl/MooseX-Role-WithOverloading/metadata.xml  |    2 +-
 .../MooseX-SemiAffordanceAccessor/metadata.xml     |    2 +-
 dev-perl/MooseX-SetOnce/metadata.xml               |    2 +-
 dev-perl/MooseX-SimpleConfig/metadata.xml          |    2 +-
 dev-perl/MooseX-Singleton/metadata.xml             |    2 +-
 dev-perl/MooseX-Storage/metadata.xml               |   19 +++------
 dev-perl/MooseX-Traits-Pluggable/metadata.xml      |    2 +-
 dev-perl/MooseX-Traits/metadata.xml                |    2 +-
 dev-perl/MooseX-TransactionalMethods/metadata.xml  |    2 +-
 .../MooseX-Types-Authen-Passphrase/metadata.xml    |    2 +-
 dev-perl/MooseX-Types-Common/metadata.xml          |    2 +-
 dev-perl/MooseX-Types-ISO8601/metadata.xml         |    4 +-
 dev-perl/MooseX-Types-LoadableClass/metadata.xml   |    2 +-
 dev-perl/MooseX-Types-Perl/metadata.xml            |    2 +-
 dev-perl/MooseX-Types-Set-Object/metadata.xml      |    4 +-
 dev-perl/MooseX-Types-Structured/metadata.xml      |    2 +-
 dev-perl/MooseX-Types-URI/metadata.xml             |    2 +-
 dev-perl/MooseX-Types-VariantTable/metadata.xml    |    4 +-
 dev-perl/MooseX-Workers/metadata.xml               |    2 +-
 dev-perl/MooseX-YAML/metadata.xml                  |    2 +-
 dev-perl/Net-API-RPX/metadata.xml                  |    2 +-
 dev-perl/Net-ARP/metadata.xml                      |    4 +-
 dev-perl/Net-IP-Minimal/metadata.xml               |    2 +-
 dev-perl/Net-IPv4Addr/metadata.xml                 |    4 +-
 dev-perl/Net-LDAP-Server-Test/metadata.xml         |    4 +-
 dev-perl/Net-LDAP-Server/metadata.xml              |    4 +-
 dev-perl/Net-Server-SS-PreFork/metadata.xml        |    2 +-
 dev-perl/Net-UPS/metadata.xml                      |    2 +-
 dev-perl/Number-Bytes-Human/metadata.xml           |    2 +-
 dev-perl/Number-Tolerant/metadata.xml              |    2 +-
 dev-perl/Object-ID/metadata.xml                    |   10 +++--
 dev-perl/Object-MultiType/metadata.xml             |    4 +-
 dev-perl/Object-Pluggable/metadata.xml             |    2 +-
 dev-perl/Object-Signature/metadata.xml             |    2 +-
 dev-perl/Object-Tiny/metadata.xml                  |    4 +-
 dev-perl/Ogg-Vorbis-Decoder/metadata.xml           |    2 +-
 dev-perl/POE-Component-Client-DNS/metadata.xml     |    4 +-
 .../POE-Component-Client-Keepalive/metadata.xml    |    4 +-
 dev-perl/POE-Component-IRC/metadata.xml            |    2 +-
 dev-perl/POE-Component-Resolver/metadata.xml       |    4 +-
 dev-perl/POE-Component-Syndicator/metadata.xml     |    2 +-
 dev-perl/POE-Filter-IRCD/metadata.xml              |    2 +-
 dev-perl/PPI-HTML/metadata.xml                     |    2 +-
 dev-perl/PPI-XS/metadata.xml                       |    4 +-
 dev-perl/PSGI/metadata.xml                         |    2 +-
 dev-perl/Package-Generator/metadata.xml            |    4 +-
 dev-perl/Package-Pkg/metadata.xml                  |    4 +-
 dev-perl/Padre-Plugin-Autoformat/metadata.xml      |    4 +-
 dev-perl/Padre-Plugin-PerlCritic/metadata.xml      |    4 +-
 dev-perl/Padre-Plugin-PerlTidy/metadata.xml        |    4 +-
 dev-perl/Padre-Plugin-Vi/metadata.xml              |    4 +-
 dev-perl/Padre-Plugin-XML/metadata.xml             |    4 +-
 dev-perl/Parallel-Iterator/metadata.xml            |    2 +-
 dev-perl/Parse-BACKPAN-Packages/metadata.xml       |   10 ++--
 dev-perl/Parse-CPAN-Distributions/metadata.xml     |    4 +-
 dev-perl/Parse-CPAN-Packages/metadata.xml          |    2 +-
 dev-perl/Parse-Method-Signatures/metadata.xml      |    2 +-
 dev-perl/Path-Abstract/metadata.xml                |    2 +-
 dev-perl/Path-Class-Rule/metadata.xml              |    2 +-
 dev-perl/Perl-MinimumVersion/metadata.xml          |    2 +-
 dev-perl/Perl-PrereqScanner/metadata.xml           |    2 +-
 dev-perl/Perl-Version/metadata.xml                 |    4 +-
 dev-perl/Perl6-Caller/metadata.xml                 |    2 +-
 dev-perl/Petal/metadata.xml                        |    2 +-
 dev-perl/Plack-Middleware-ForceEnv/metadata.xml    |    2 +-
 .../Plack-Middleware-ReverseProxy/metadata.xml     |    2 +-
 dev-perl/Plack-Test-ExternalServer/metadata.xml    |    2 +-
 dev-perl/Pod-Coverage-Moose/metadata.xml           |    2 +-
 dev-perl/Pod-Coverage-TrustPod/metadata.xml        |    4 +-
 dev-perl/Pod-Elemental-PerlMunger/metadata.xml     |    2 +-
 .../Pod-Elemental-Transformer-List/metadata.xml    |    2 +-
 .../Pod-Elemental-Transformer-WikiDoc/metadata.xml |    2 +-
 dev-perl/Pod-Elemental/metadata.xml                |    2 +-
 dev-perl/Pod-Eventual/metadata.xml                 |    4 +-
 dev-perl/Pod-ProjectDocs/metadata.xml              |    4 +-
 dev-perl/Pod-PseudoPod/metadata.xml                |    4 +-
 dev-perl/Pod-Strip/metadata.xml                    |    2 +-
 dev-perl/Pod-Weaver-Plugin-Encoding/metadata.xml   |    2 +-
 dev-perl/Pod-Weaver/metadata.xml                   |    2 +-
 dev-perl/Pod-WikiDoc/metadata.xml                  |    2 +-
 dev-perl/Regexp-Assemble/metadata.xml              |    2 +-
 dev-perl/Regexp-Copy/metadata.xml                  |    2 +-
 dev-perl/Regexp-Grammars/metadata.xml              |    2 +-
 dev-perl/Regexp-RegGrp/metadata.xml                |    2 +-
 dev-perl/Role-HasMessage/metadata.xml              |    2 +-
 dev-perl/Role-HasPayload/metadata.xml              |    2 +-
 dev-perl/Role-Identifiable/metadata.xml            |    2 +-
 dev-perl/SWF-Chart/metadata.xml                    |    2 +-
 dev-perl/Scalar-String/metadata.xml                |    2 +-
 dev-perl/Scope-Upper/metadata.xml                  |    2 +-
 .../metadata.xml                                   |    2 +-
 dev-perl/Search-GIN/metadata.xml                   |    2 +-
 dev-perl/Search-Sitemap/metadata.xml               |    2 +-
 dev-perl/Set-Crontab/metadata.xml                  |    2 +-
 dev-perl/Smart-Comments/metadata.xml               |    2 +-
 dev-perl/Socket-GetAddrInfo/metadata.xml           |    4 +-
 dev-perl/Software-License/metadata.xml             |    4 +-
 .../Spreadsheet-ParseExcel-Simple/metadata.xml     |    2 +-
 .../Spreadsheet-WriteExcel-Simple/metadata.xml     |    2 +-
 dev-perl/Starman/metadata.xml                      |   10 ++--
 dev-perl/String-CamelCase/metadata.xml             |    4 +-
 dev-perl/String-CodiceFiscale/metadata.xml         |    2 +-
 dev-perl/String-Diff/metadata.xml                  |    2 +-
 dev-perl/String-Errf/metadata.xml                  |    2 +-
 dev-perl/String-Escape/metadata.xml                |    2 +-
 dev-perl/String-Flogger/metadata.xml               |    4 +-
 dev-perl/String-Formatter/metadata.xml             |    2 +-
 dev-perl/String-MkPasswd/metadata.xml              |    2 +-
 dev-perl/String-Random/metadata.xml                |    2 +-
 dev-perl/String-ToIdentifier-EN/metadata.xml       |    4 +-
 dev-perl/String-Truncate/metadata.xml              |    2 +-
 dev-perl/Sub-Compose/metadata.xml                  |    2 +-
 dev-perl/Sub-Current/metadata.xml                  |    2 +-
 dev-perl/Sub-Curried/metadata.xml                  |    2 +-
 dev-perl/Sub-Exporter-ForMethods/metadata.xml      |    2 +-
 dev-perl/Sub-Exporter-GlobExporter/metadata.xml    |    2 +-
 dev-perl/Syntax-Highlight-Engine-Kate/metadata.xml |    2 +-
 dev-perl/System-Command/metadata.xml               |    4 +-
 dev-perl/Taint-Util/metadata.xml                   |    2 +-
 dev-perl/Task-Catalyst/metadata.xml                |    2 +-
 dev-perl/Task-Kensho-Async/metadata.xml            |   10 ++--
 dev-perl/Task-Kensho-CLI/metadata.xml              |   18 ++++----
 dev-perl/Task-Kensho-Config/metadata.xml           |   12 +++---
 dev-perl/Task-Kensho-DBDev/metadata.xml            |   18 ++++----
 dev-perl/Task-Kensho-Dates/metadata.xml            |   19 ++++-----
 dev-perl/Task-Kensho-Email/metadata.xml            |   16 ++++----
 dev-perl/Task-Kensho-ExcelCSV/metadata.xml         |   14 +++---
 dev-perl/Task-Kensho-Exceptions/metadata.xml       |   12 +++---
 dev-perl/Task-Kensho-Hackery/metadata.xml          |   14 +++---
 dev-perl/Task-Kensho-Logging/metadata.xml          |   14 +++---
 dev-perl/Task-Kensho-ModuleDev/metadata.xml        |   30 +++++++-------
 dev-perl/Task-Kensho-OOP/metadata.xml              |   10 ++--
 dev-perl/Task-Kensho-Scalability/metadata.xml      |   10 ++--
 dev-perl/Task-Kensho-Testing/metadata.xml          |   22 +++++-----
 dev-perl/Task-Kensho-Toolchain/metadata.xml        |   14 +++---
 dev-perl/Task-Kensho-WebCrawling/metadata.xml      |   16 ++++----
 dev-perl/Task-Kensho-WebDev/metadata.xml           |   24 +++++------
 dev-perl/Task-Kensho-XML/metadata.xml              |   18 ++++----
 dev-perl/Task-Kensho/metadata.xml                  |   42 ++++++++++----------
 dev-perl/Task-Moose/metadata.xml                   |   30 +++++++-------
 dev-perl/Tee/metadata.xml                          |    2 +-
 dev-perl/Template-Alloy/metadata.xml               |    2 +-
 dev-perl/Template-Plugin-CSV-Escape/metadata.xml   |    2 +-
 dev-perl/Template-Plugin-Class/metadata.xml        |    2 +-
 dev-perl/Template-Plugin-Cycle/metadata.xml        |    4 +-
 dev-perl/Template-Plugin-HTML-Strip/metadata.xml   |    2 +-
 dev-perl/Template-Plugin-JSON/metadata.xml         |    2 +-
 dev-perl/Template-Plugin-JavaScript/metadata.xml   |    2 +-
 dev-perl/Template-Plugin-Textile2/metadata.xml     |    2 +-
 dev-perl/Template-Plugin-UTF8Decode/metadata.xml   |    2 +-
 dev-perl/Template-Provider-DBIC/metadata.xml       |    2 +-
 dev-perl/Template-Provider-Encoding/metadata.xml   |    4 +-
 dev-perl/Template-Timer/metadata.xml               |    2 +-
 dev-perl/Tenjin/metadata.xml                       |    2 +-
 dev-perl/Term-ProgressBar-Quiet/metadata.xml       |    2 +-
 dev-perl/Term-ProgressBar-Simple/metadata.xml      |    2 +-
 dev-perl/Term-Prompt/metadata.xml                  |    2 +-
 dev-perl/Term-Size/metadata.xml                    |    4 +-
 dev-perl/Test-Assertions/metadata.xml              |    4 +-
 dev-perl/Test-Block/metadata.xml                   |    4 +-
 dev-perl/Test-CPAN-Meta-YAML/metadata.xml          |    2 +-
 dev-perl/Test-CPAN-Meta/metadata.xml               |    4 +-
 dev-perl/Test-CheckDeps/metadata.xml               |    2 +-
 dev-perl/Test-Class-Most/metadata.xml              |    4 +-
 dev-perl/Test-Compile/metadata.xml                 |    4 +-
 dev-perl/Test-Corpus-Audio-MPD/metadata.xml        |    2 +-
 dev-perl/Test-EOL/metadata.xml                     |    2 +-
 dev-perl/Test-Expect/metadata.xml                  |    2 +-
 dev-perl/Test-File-ShareDir/metadata.xml           |    2 +-
 dev-perl/Test-InDistDir/metadata.xml               |    2 +-
 dev-perl/Test-JSON/metadata.xml                    |    2 +-
 dev-perl/Test-Kwalitee/metadata.xml                |    2 +-
 dev-perl/Test-Lazy/metadata.xml                    |    2 +-
 dev-perl/Test-LeakTrace/metadata.xml               |    2 +-
 dev-perl/Test-Log-Dispatch/metadata.xml            |    2 +-
 dev-perl/Test-MinimumVersion/metadata.xml          |    2 +-
 dev-perl/Test-Mock-LWP/metadata.xml                |    2 +-
 dev-perl/Test-MockModule/metadata.xml              |    2 +-
 dev-perl/Test-Regression/metadata.xml              |    2 +-
 dev-perl/Test-Reporter/metadata.xml                |    2 +-
 dev-perl/Test-Spec/metadata.xml                    |    4 +-
 dev-perl/Test-Strict/metadata.xml                  |    4 +-
 dev-perl/Test-TempDir/metadata.xml                 |    2 +-
 dev-perl/Test-TinyMocker/metadata.xml              |    4 +-
 dev-perl/Test-UseAllModules/metadata.xml           |    2 +-
 dev-perl/Test-WWW-Mechanize-Catalyst/metadata.xml  |    2 +-
 dev-perl/Test-WWW-Mechanize-PSGI/metadata.xml      |    2 +-
 dev-perl/Test-Without-Module/metadata.xml          |    2 +-
 dev-perl/Test-YAML-Meta/metadata.xml               |    2 +-
 dev-perl/Test-YAML-Valid/metadata.xml              |   12 +++---
 dev-perl/Test-utf8/metadata.xml                    |    2 +-
 dev-perl/Text-Context-EitherSide/metadata.xml      |    2 +-
 dev-perl/Text-Context/metadata.xml                 |    2 +-
 dev-perl/Text-Diff-Parser/metadata.xml             |    2 +-
 dev-perl/Text-Emoticon-MSN/metadata.xml            |    2 +-
 dev-perl/Text-Emoticon/metadata.xml                |    2 +-
 dev-perl/Text-MultiMarkdown/metadata.xml           |    2 +-
 dev-perl/Text-SimpleTable/metadata.xml             |    2 +-
 dev-perl/Text-Textile/metadata.xml                 |    2 +-
 dev-perl/Text-vCard/metadata.xml                   |    2 +-
 dev-perl/Throwable-X/metadata.xml                  |    2 +-
 dev-perl/Tie-CPHash/metadata.xml                   |    4 +-
 dev-perl/Tie-RefHash-Weak/metadata.xml             |    4 +-
 dev-perl/Tie-RefHash/metadata.xml                  |    4 +-
 dev-perl/Tie-Restore/metadata.xml                  |    4 +-
 dev-perl/Tie-Trace/metadata.xml                    |    2 +-
 dev-perl/Time-Format/metadata.xml                  |    4 +-
 dev-perl/Time-Tiny/metadata.xml                    |    2 +-
 dev-perl/Time-Warp/metadata.xml                    |    4 +-
 dev-perl/Time-y2038/metadata.xml                   |    4 +-
 dev-perl/Travel-Routing-DE-VRR/metadata.xml        |    4 +-
 dev-perl/Tree-Simple-VisitorFactory/metadata.xml   |    2 +-
 dev-perl/Tree-Trie/metadata.xml                    |    2 +-
 dev-perl/TryCatch/metadata.xml                     |    2 +-
 dev-perl/URI-FromHash/metadata.xml                 |    2 +-
 dev-perl/UUID/metadata.xml                         |    4 +-
 dev-perl/User/metadata.xml                         |    2 +-
 dev-perl/V/metadata.xml                            |    4 +-
 dev-perl/VCI/metadata.xml                          |   14 +++---
 dev-perl/Version-Next/metadata.xml                 |    2 +-
 dev-perl/WWW-Facebook-API/metadata.xml             |    2 +-
 dev-perl/WWW-Mechanize-Cached/metadata.xml         |    2 +-
 dev-perl/WWW-Mechanize-TreeBuilder/metadata.xml    |    2 +-
 dev-perl/WWW-Search-PubMed/metadata.xml            |    2 +-
 dev-perl/WWW-Search/metadata.xml                   |    2 +-
 dev-perl/WWW-Shorten-Simple/metadata.xml           |    2 +-
 dev-perl/Weather-Com/metadata.xml                  |    4 +-
 dev-perl/Web-Scraper/metadata.xml                  |    4 +-
 dev-perl/XML-Clean/metadata.xml                    |    2 +-
 dev-perl/XML-FeedPP/metadata.xml                   |    4 +-
 dev-perl/XML-Generator-PerlData/metadata.xml       |    2 +-
 dev-perl/XML-Smart/metadata.xml                    |    4 +-
 dev-perl/XML-Tidy/metadata.xml                     |    4 +-
 dev-perl/XML-TreePP/metadata.xml                   |    4 +-
 dev-perl/XXX/metadata.xml                          |    2 +-
 dev-perl/aliased/metadata.xml                      |    2 +-
 dev-perl/autobox-Core/metadata.xml                 |    2 +-
 dev-perl/autobox-List-Util/metadata.xml            |    2 +-
 dev-perl/autobox-dump/metadata.xml                 |    2 +-
 dev-perl/autobox/metadata.xml                      |    2 +-
 dev-perl/autodie/metadata.xml                      |   25 ++++++------
 dev-perl/autovivification/metadata.xml             |    2 +-
 dev-perl/local-lib/metadata.xml                    |    2 +-
 dev-perl/mocked/metadata.xml                       |    2 +-
 dev-perl/perl5i/metadata.xml                       |   37 +++++++++++++++++
 dev-perl/pip/metadata.xml                          |    2 +-
 dev-perl/pod2pdf/metadata.xml                      |    4 +-
 dev-perl/signatures/metadata.xml                   |    2 +-
 dev-perl/true/metadata.xml                         |    2 +-
 dev-perl/utf8-all/metadata.xml                     |    2 +-
 747 files changed, 1214 insertions(+), 1173 deletions(-)

diff --git a/dev-perl/Acme-Damn/metadata.xml b/dev-perl/Acme-Damn/metadata.xml
index 1ea1283..9f5cc95 100644
--- a/dev-perl/Acme-Damn/metadata.xml
+++ b/dev-perl/Acme-Damn/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Acme::Damn</remote-id>
                 <remote-id type="cpan">Acme-Damn</remote-id>
+                <remote-id type="cpan-module">Acme::Damn</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Adam/metadata.xml b/dev-perl/Adam/metadata.xml
index 4060d1b..0a7ecb1 100644
--- a/dev-perl/Adam/metadata.xml
+++ b/dev-perl/Adam/metadata.xml
@@ -7,10 +7,10 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpan">Adam</remote-id>
 		<remote-id type="cpan-module">Moses::Declare</remote-id>
 		<remote-id type="cpan-module">Moses::Declare::Syntax::BotKeyword</remote-id>
 		<remote-id type="cpan-module">Moses::Declare::Syntax::EventKeyword</remote-id>
 		<remote-id type="cpan-module">Moses::Declare::Syntax::PluginKeyword</remote-id>
-		<remote-id type="cpan">Adam</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Algorithm-Diff-XS/metadata.xml b/dev-perl/Algorithm-Diff-XS/metadata.xml
index 16d254e..e49bae6 100644
--- a/dev-perl/Algorithm-Diff-XS/metadata.xml
+++ b/dev-perl/Algorithm-Diff-XS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Algorithm::Diff::XS</remote-id>
         <remote-id type="cpan">Algorithm-Diff-XS</remote-id>
+        <remote-id type="cpan-module">Algorithm::Diff::XS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Algorithm-IncludeExclude/metadata.xml b/dev-perl/Algorithm-IncludeExclude/metadata.xml
index 1e0fde5..ee869e9 100644
--- a/dev-perl/Algorithm-IncludeExclude/metadata.xml
+++ b/dev-perl/Algorithm-IncludeExclude/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Algorithm::IncludeExclude</remote-id>
         <remote-id type="cpan">Algorithm-IncludeExclude</remote-id>
+        <remote-id type="cpan-module">Algorithm::IncludeExclude</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Algorithm-Merge/metadata.xml b/dev-perl/Algorithm-Merge/metadata.xml
index 160ce7d..20d5aaf 100644
--- a/dev-perl/Algorithm-Merge/metadata.xml
+++ b/dev-perl/Algorithm-Merge/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Algorithm::Merge</remote-id>
         <remote-id type="cpan">Algorithm-Merge</remote-id>
+        <remote-id type="cpan-module">Algorithm::Merge</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Amazon-S3/metadata.xml b/dev-perl/Amazon-S3/metadata.xml
index f4cdc67..3b3aebe 100644
--- a/dev-perl/Amazon-S3/metadata.xml
+++ b/dev-perl/Amazon-S3/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Amazon-S3</remote-id>
         <remote-id type="cpan-module">Amazon::S3</remote-id>
         <remote-id type="cpan-module">Amazon::S3::Bucket</remote-id>
-        <remote-id type="cpan">Amazon-S3</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Apache-Htpasswd/metadata.xml b/dev-perl/Apache-Htpasswd/metadata.xml
index d857470..a200fea 100644
--- a/dev-perl/Apache-Htpasswd/metadata.xml
+++ b/dev-perl/Apache-Htpasswd/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Apache::Htpasswd</remote-id>
         <remote-id type="cpan">Apache-Htpasswd</remote-id>
+        <remote-id type="cpan-module">Apache::Htpasswd</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/App-Asciio/metadata.xml b/dev-perl/App-Asciio/metadata.xml
index 8481f11..e975d2b 100644
--- a/dev-perl/App-Asciio/metadata.xml
+++ b/dev-perl/App-Asciio/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">App-Asciio</remote-id>
                 <remote-id type="cpan-module">App::Asciio</remote-id>
                 <remote-id type="cpan-module">App::Asciio::stripes::editable_arrow2</remote-id>
                 <remote-id type="cpan-module">App::Asciio::stripes::editable_box2</remote-id>
@@ -12,6 +13,5 @@
                 <remote-id type="cpan-module">App::Asciio::stripes::single_stripe</remote-id>
                 <remote-id type="cpan-module">App::Asciio::stripes::stripes</remote-id>
                 <remote-id type="cpan-module">App::Asciio::stripes::wirl_arrow</remote-id>
-                <remote-id type="cpan">App-Asciio</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/App-Cache/metadata.xml b/dev-perl/App-Cache/metadata.xml
index 582ca11..eb10a95 100644
--- a/dev-perl/App-Cache/metadata.xml
+++ b/dev-perl/App-Cache/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">App::Cache</remote-id>
         <remote-id type="cpan">App-Cache</remote-id>
+        <remote-id type="cpan-module">App::Cache</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/App-Cmd/metadata.xml b/dev-perl/App-Cmd/metadata.xml
index d67b4d6..e5bd2c1 100644
--- a/dev-perl/App-Cmd/metadata.xml
+++ b/dev-perl/App-Cmd/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">App-Cmd</remote-id>
         <remote-id type="cpan-module">App::Cmd</remote-id>
         <remote-id type="cpan-module">App::Cmd::ArgProcessor</remote-id>
         <remote-id type="cpan-module">App::Cmd::Command</remote-id>
@@ -21,6 +22,5 @@
         <remote-id type="cpan-module">App::Cmd::Tester::CaptureExternal</remote-id>
         <remote-id type="cpan-module">App::Cmd::Tester::Exited</remote-id>
         <remote-id type="cpan-module">App::Cmd::Tester::Result</remote-id>
-        <remote-id type="cpan">App-Cmd</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/App-cpanminus/metadata.xml b/dev-perl/App-cpanminus/metadata.xml
index 1adc829..1da692f 100644
--- a/dev-perl/App-cpanminus/metadata.xml
+++ b/dev-perl/App-cpanminus/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">App::cpanminus</remote-id>
         <remote-id type="cpan">App-cpanminus</remote-id>
+        <remote-id type="cpan-module">App::cpanminus</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/App-cpanoutdated/metadata.xml b/dev-perl/App-cpanoutdated/metadata.xml
index de8c619..212ec5a 100644
--- a/dev-perl/App-cpanoutdated/metadata.xml
+++ b/dev-perl/App-cpanoutdated/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">App::cpanoutdated</remote-id>
         <remote-id type="cpan">App-cpanoutdated</remote-id>
+        <remote-id type="cpan-module">App::cpanoutdated</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/App-mymeta_requires/metadata.xml b/dev-perl/App-mymeta_requires/metadata.xml
index 125f3d4..05b0e73 100644
--- a/dev-perl/App-mymeta_requires/metadata.xml
+++ b/dev-perl/App-mymeta_requires/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">App::mymeta_requires</remote-id>
                 <remote-id type="cpan">App-mymeta_requires</remote-id>
+                <remote-id type="cpan-module">App::mymeta_requires</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/App-perlbrew/metadata.xml b/dev-perl/App-perlbrew/metadata.xml
index a51115d..16af9b8 100644
--- a/dev-perl/App-perlbrew/metadata.xml
+++ b/dev-perl/App-perlbrew/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">App::perlbrew</remote-id>
         <remote-id type="cpan">App-perlbrew</remote-id>
+        <remote-id type="cpan-module">App::perlbrew</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Archive-Any/metadata.xml b/dev-perl/Archive-Any/metadata.xml
index 245f4a4..49accdd 100644
--- a/dev-perl/Archive-Any/metadata.xml
+++ b/dev-perl/Archive-Any/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Archive-Any</remote-id>
                 <remote-id type="cpan-module">Archive::Any</remote-id>
                 <remote-id type="cpan-module">Archive::Any::Plugin</remote-id>
                 <remote-id type="cpan-module">Archive::Any::Plugin::Tar</remote-id>
                 <remote-id type="cpan-module">Archive::Any::Plugin::Zip</remote-id>
-                <remote-id type="cpan">Archive-Any</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Archive-Peek/metadata.xml b/dev-perl/Archive-Peek/metadata.xml
index 416d180..23e92f9 100644
--- a/dev-perl/Archive-Peek/metadata.xml
+++ b/dev-perl/Archive-Peek/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Archive-Peek</remote-id>
         <remote-id type="cpan-module">Archive::Peek</remote-id>
         <remote-id type="cpan-module">Archive::Peek::Tar</remote-id>
         <remote-id type="cpan-module">Archive::Peek::Zip</remote-id>
-        <remote-id type="cpan">Archive-Peek</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Array-Diff/metadata.xml b/dev-perl/Array-Diff/metadata.xml
index d9e5365..9b6a0de 100644
--- a/dev-perl/Array-Diff/metadata.xml
+++ b/dev-perl/Array-Diff/metadata.xml
@@ -5,12 +5,12 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="xs">Install Recommended XS dependencies for speed</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="xs">Install Recommended XS dependencies for speed</flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Array::Diff</remote-id>
         <remote-id type="cpan">Array-Diff</remote-id>
+        <remote-id type="cpan-module">Array::Diff</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Audio-Extract-PCM/metadata.xml b/dev-perl/Audio-Extract-PCM/metadata.xml
index 4448da9..ce30f4e 100644
--- a/dev-perl/Audio-Extract-PCM/metadata.xml
+++ b/dev-perl/Audio-Extract-PCM/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Audio::Extract::PCM</remote-id>
         <remote-id type="cpan">Audio-Extract-PCM</remote-id>
+        <remote-id type="cpan-module">Audio::Extract::PCM</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Audio-MPD-Common/metadata.xml b/dev-perl/Audio-MPD-Common/metadata.xml
index dbd784f..1af6947 100644
--- a/dev-perl/Audio-MPD-Common/metadata.xml
+++ b/dev-perl/Audio-MPD-Common/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Audio-MPD-Common</remote-id>
         <remote-id type="cpan-module">Audio::MPD::Common</remote-id>
         <remote-id type="cpan-module">Audio::MPD::Common::Item</remote-id>
         <remote-id type="cpan-module">Audio::MPD::Common::Item::Directory</remote-id>
@@ -17,6 +18,5 @@
         <remote-id type="cpan-module">Audio::MPD::Common::Status</remote-id>
         <remote-id type="cpan-module">Audio::MPD::Common::Time</remote-id>
         <remote-id type="cpan-module">Audio::MPD::Common::Types</remote-id>
-        <remote-id type="cpan">Audio-MPD-Common</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Audio-MPD/metadata.xml b/dev-perl/Audio-MPD/metadata.xml
index 0c8ada2..98d2318 100644
--- a/dev-perl/Audio-MPD/metadata.xml
+++ b/dev-perl/Audio-MPD/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Audio-MPD</remote-id>
         <remote-id type="cpan-module">Audio::MPD</remote-id>
         <remote-id type="cpan-module">Audio::MPD::Collection</remote-id>
         <remote-id type="cpan-module">Audio::MPD::Playlist</remote-id>
         <remote-id type="cpan-module">Audio::MPD::Types</remote-id>
-        <remote-id type="cpan">Audio-MPD</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Audio-Musepack/metadata.xml b/dev-perl/Audio-Musepack/metadata.xml
index 0c8c7f8..06f7c46 100644
--- a/dev-perl/Audio-Musepack/metadata.xml
+++ b/dev-perl/Audio-Musepack/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Audio-Musepack</remote-id>
                 <remote-id type="cpan-module">Audio::APE</remote-id>
                 <remote-id type="cpan-module">Audio::APETags</remote-id>
                 <remote-id type="cpan-module">Audio::Musepack</remote-id>
-                <remote-id type="cpan">Audio-Musepack</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Audio-Ofa-Util/metadata.xml b/dev-perl/Audio-Ofa-Util/metadata.xml
index 6f0ec77..942c139 100644
--- a/dev-perl/Audio-Ofa-Util/metadata.xml
+++ b/dev-perl/Audio-Ofa-Util/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Audio::Ofa::Util</remote-id>
         <remote-id type="cpan">Audio-Ofa-Util</remote-id>
+        <remote-id type="cpan-module">Audio::Ofa::Util</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Audio-Ofa/metadata.xml b/dev-perl/Audio-Ofa/metadata.xml
index 7e161bd..8a14d8c 100644
--- a/dev-perl/Audio-Ofa/metadata.xml
+++ b/dev-perl/Audio-Ofa/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Audio::Ofa</remote-id>
         <remote-id type="cpan">Audio-Ofa</remote-id>
+        <remote-id type="cpan-module">Audio::Ofa</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Audio-SndFile/metadata.xml b/dev-perl/Audio-SndFile/metadata.xml
index 7256065..185ac9a 100644
--- a/dev-perl/Audio-SndFile/metadata.xml
+++ b/dev-perl/Audio-SndFile/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Audio-SndFile</remote-id>
         <remote-id type="cpan-module">Audio::SndFile</remote-id>
         <remote-id type="cpan-module">Audio::SndFile::Constants</remote-id>
         <remote-id type="cpan-module">Audio::SndFile::Info</remote-id>
-        <remote-id type="cpan">Audio-SndFile</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Audio-WMA/metadata.xml b/dev-perl/Audio-WMA/metadata.xml
index 1b104fd..662b889 100644
--- a/dev-perl/Audio-WMA/metadata.xml
+++ b/dev-perl/Audio-WMA/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Audio::WMA</remote-id>
                 <remote-id type="cpan">Audio-WMA</remote-id>
+                <remote-id type="cpan-module">Audio::WMA</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Authen-DecHpwd/metadata.xml b/dev-perl/Authen-DecHpwd/metadata.xml
index 1635b38..c672cbe 100644
--- a/dev-perl/Authen-DecHpwd/metadata.xml
+++ b/dev-perl/Authen-DecHpwd/metadata.xml
@@ -5,13 +5,13 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="recommended">Pull in recommended dependencies to ensure XS
+    </maintainer>
+    <use>
+        <flag name="recommended">Pull in recommended dependencies to ensure XS
 			Modules are built</flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Authen::DecHpwd</remote-id>
         <remote-id type="cpan">Authen-DecHpwd</remote-id>
+        <remote-id type="cpan-module">Authen::DecHpwd</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Authen-Passphrase/metadata.xml b/dev-perl/Authen-Passphrase/metadata.xml
index 4073574..eb125ac 100644
--- a/dev-perl/Authen-Passphrase/metadata.xml
+++ b/dev-perl/Authen-Passphrase/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Authen-Passphrase</remote-id>
         <remote-id type="cpan-module">Authen::Passphrase</remote-id>
         <remote-id type="cpan-module">Authen::Passphrase::AcceptAll</remote-id>
         <remote-id type="cpan-module">Authen::Passphrase::BigCrypt</remote-id>
@@ -26,6 +27,5 @@
         <remote-id type="cpan-module">Authen::Passphrase::RejectAll</remote-id>
         <remote-id type="cpan-module">Authen::Passphrase::SaltedDigest</remote-id>
         <remote-id type="cpan-module">Authen::Passphrase::VMSPurdy</remote-id>
-        <remote-id type="cpan">Authen-Passphrase</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/B-Hooks-OP-Annotation/metadata.xml b/dev-perl/B-Hooks-OP-Annotation/metadata.xml
index 745586f..1a477ee 100644
--- a/dev-perl/B-Hooks-OP-Annotation/metadata.xml
+++ b/dev-perl/B-Hooks-OP-Annotation/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">B::Hooks::OP::Annotation</remote-id>
         <remote-id type="cpan">B-Hooks-OP-Annotation</remote-id>
+        <remote-id type="cpan-module">B::Hooks::OP::Annotation</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/B-Hooks-OP-Check-EntersubForCV/metadata.xml b/dev-perl/B-Hooks-OP-Check-EntersubForCV/metadata.xml
index 38490f7..ece419b 100644
--- a/dev-perl/B-Hooks-OP-Check-EntersubForCV/metadata.xml
+++ b/dev-perl/B-Hooks-OP-Check-EntersubForCV/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">B::Hooks::OP::Check::EntersubForCV</remote-id>
         <remote-id type="cpan">B-Hooks-OP-Check-EntersubForCV</remote-id>
+        <remote-id type="cpan-module">B::Hooks::OP::Check::EntersubForCV</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/B-Hooks-OP-Check-StashChange/metadata.xml b/dev-perl/B-Hooks-OP-Check-StashChange/metadata.xml
index 1b71384..96686c6 100644
--- a/dev-perl/B-Hooks-OP-Check-StashChange/metadata.xml
+++ b/dev-perl/B-Hooks-OP-Check-StashChange/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">B::Hooks::OP::Check::StashChange</remote-id>
         <remote-id type="cpan">B-Hooks-OP-Check-StashChange</remote-id>
+        <remote-id type="cpan-module">B::Hooks::OP::Check::StashChange</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/B-Hooks-OP-PPAddr/metadata.xml b/dev-perl/B-Hooks-OP-PPAddr/metadata.xml
index 14f5b2c..783e8a1 100644
--- a/dev-perl/B-Hooks-OP-PPAddr/metadata.xml
+++ b/dev-perl/B-Hooks-OP-PPAddr/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">B::Hooks::OP::PPAddr</remote-id>
         <remote-id type="cpan">B-Hooks-OP-PPAddr</remote-id>
+        <remote-id type="cpan-module">B::Hooks::OP::PPAddr</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/B-RecDeparse/metadata.xml b/dev-perl/B-RecDeparse/metadata.xml
index 9c948f5..8229269 100644
--- a/dev-perl/B-RecDeparse/metadata.xml
+++ b/dev-perl/B-RecDeparse/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">B::RecDeparse</remote-id>
         <remote-id type="cpan">B-RecDeparse</remote-id>
+        <remote-id type="cpan-module">B::RecDeparse</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/BZ-Client/metadata.xml b/dev-perl/BZ-Client/metadata.xml
index 4f9d576..8da60d0 100644
--- a/dev-perl/BZ-Client/metadata.xml
+++ b/dev-perl/BZ-Client/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">BZ-Client</remote-id>
                 <remote-id type="cpan-module">BZ::Client</remote-id>
                 <remote-id type="cpan-module">BZ::Client::API</remote-id>
                 <remote-id type="cpan-module">BZ::Client::Bug</remote-id>
@@ -20,6 +21,5 @@
                 <remote-id type="cpan-module">BZ::Client::XMLRPC::boolean</remote-id>
                 <remote-id type="cpan-module">BZ::Client::XMLRPC::double</remote-id>
                 <remote-id type="cpan-module">BZ::Client::XMLRPC::int</remote-id>
-                <remote-id type="cpan">BZ-Client</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/BackPAN-Index/metadata.xml b/dev-perl/BackPAN-Index/metadata.xml
index 7a67f1b..3443369 100644
--- a/dev-perl/BackPAN-Index/metadata.xml
+++ b/dev-perl/BackPAN-Index/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">BackPAN-Index</remote-id>
         <remote-id type="cpan-module">BackPAN::Index</remote-id>
         <remote-id type="cpan-module">BackPAN::Index::Dist</remote-id>
         <remote-id type="cpan-module">BackPAN::Index::File</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">BackPAN::Index::Role::AsHash</remote-id>
         <remote-id type="cpan-module">BackPAN::Index::Schema</remote-id>
         <remote-id type="cpan-module">Parse::BACKPAN::Packages</remote-id>
-        <remote-id type="cpan">BackPAN-Index</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Beanstalk-Client/metadata.xml b/dev-perl/Beanstalk-Client/metadata.xml
index 11903c8..75bbafa 100644
--- a/dev-perl/Beanstalk-Client/metadata.xml
+++ b/dev-perl/Beanstalk-Client/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Beanstalk-Client</remote-id>
         <remote-id type="cpan-module">Beanstalk::Client</remote-id>
         <remote-id type="cpan-module">Beanstalk::Job</remote-id>
         <remote-id type="cpan-module">Beanstalk::Stats</remote-id>
-        <remote-id type="cpan">Beanstalk-Client</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/BerkeleyDB-Manager/metadata.xml b/dev-perl/BerkeleyDB-Manager/metadata.xml
index 395ea1f..1704fc5 100644
--- a/dev-perl/BerkeleyDB-Manager/metadata.xml
+++ b/dev-perl/BerkeleyDB-Manager/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">BerkeleyDB::Manager</remote-id>
         <remote-id type="cpan">BerkeleyDB-Manager</remote-id>
+        <remote-id type="cpan-module">BerkeleyDB::Manager</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Best/metadata.xml b/dev-perl/Best/metadata.xml
index fa454c7..0cc50af 100644
--- a/dev-perl/Best/metadata.xml
+++ b/dev-perl/Best/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Best</remote-id>
         <remote-id type="cpan">Best</remote-id>
+        <remote-id type="cpan-module">Best</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Bundle-CPAN/metadata.xml b/dev-perl/Bundle-CPAN/metadata.xml
index 9980637..2020a3d 100644
--- a/dev-perl/Bundle-CPAN/metadata.xml
+++ b/dev-perl/Bundle-CPAN/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Bundle-CPAN</remote-id>
         <remote-id type="cpan-module">Bundle::CPAN</remote-id>
         <remote-id type="cpan-module">Bundle::CPANxxl</remote-id>
-        <remote-id type="cpan">Bundle-CPAN</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Business-CreditCard/metadata.xml b/dev-perl/Business-CreditCard/metadata.xml
index 8789365..e8a414f 100644
--- a/dev-perl/Business-CreditCard/metadata.xml
+++ b/dev-perl/Business-CreditCard/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Business::CreditCard</remote-id>
         <remote-id type="cpan">Business-CreditCard</remote-id>
+        <remote-id type="cpan-module">Business::CreditCard</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Business-PayPal-API/metadata.xml b/dev-perl/Business-PayPal-API/metadata.xml
index eb8b29a..d18149d 100644
--- a/dev-perl/Business-PayPal-API/metadata.xml
+++ b/dev-perl/Business-PayPal-API/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Business-PayPal-API</remote-id>
         <remote-id type="cpan-module">Business::PayPal::API</remote-id>
         <remote-id type="cpan-module">Business::PayPal::API::AuthorizationRequest</remote-id>
         <remote-id type="cpan-module">Business::PayPal::API::CaptureRequest</remote-id>
@@ -19,6 +20,5 @@
         <remote-id type="cpan-module">Business::PayPal::API::RefundTransaction</remote-id>
         <remote-id type="cpan-module">Business::PayPal::API::TransactionSearch</remote-id>
         <remote-id type="cpan-module">Business::PayPal::API::VoidRequest</remote-id>
-        <remote-id type="cpan">Business-PayPal-API</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Business-Tax-VAT-Validation/metadata.xml b/dev-perl/Business-Tax-VAT-Validation/metadata.xml
index d83adde..27f90ec 100644
--- a/dev-perl/Business-Tax-VAT-Validation/metadata.xml
+++ b/dev-perl/Business-Tax-VAT-Validation/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Business::Tax::VAT::Validation</remote-id>
         <remote-id type="cpan">Business-Tax-VAT-Validation</remote-id>
+        <remote-id type="cpan-module">Business::Tax::VAT::Validation</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Ajax/metadata.xml b/dev-perl/CGI-Ajax/metadata.xml
index 70d6c0b..73be92b 100644
--- a/dev-perl/CGI-Ajax/metadata.xml
+++ b/dev-perl/CGI-Ajax/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">CGI::Ajax</remote-id>
                 <remote-id type="cpan">CGI-Ajax</remote-id>
+                <remote-id type="cpan-module">CGI::Ajax</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Dispatch/metadata.xml b/dev-perl/CGI-Application-Dispatch/metadata.xml
index c8074c2..748bae6 100644
--- a/dev-perl/CGI-Application-Dispatch/metadata.xml
+++ b/dev-perl/CGI-Application-Dispatch/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CGI-Application-Dispatch</remote-id>
         <remote-id type="cpan-module">CGI::Application::Dispatch</remote-id>
         <remote-id type="cpan-module">CGI::Application::Dispatch::PSGI</remote-id>
         <remote-id type="cpan-module">CGI::Application::Dispatch::Regexp</remote-id>
-        <remote-id type="cpan">CGI-Application-Dispatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-FastCGI/metadata.xml b/dev-perl/CGI-Application-FastCGI/metadata.xml
index e17cb32..c5fbe75 100644
--- a/dev-perl/CGI-Application-FastCGI/metadata.xml
+++ b/dev-perl/CGI-Application-FastCGI/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::FastCGI</remote-id>
         <remote-id type="cpan">CGI-Application-FastCGI</remote-id>
+        <remote-id type="cpan-module">CGI::Application::FastCGI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-Authentication/metadata.xml b/dev-perl/CGI-Application-Plugin-Authentication/metadata.xml
index 6feeebc..20b8e44 100644
--- a/dev-perl/CGI-Application-Plugin-Authentication/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-Authentication/metadata.xml
@@ -5,11 +5,12 @@
     <maintainer>
         <email>mb@...</email>
         <name>Michele Beltrame</name>
-	</maintainer>
-	<use>
-		<flag name="recommended">Install recommended extras</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="recommended">Install recommended extras</flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">CGI-Application-Plugin-Authentication</remote-id>
         <remote-id type="cpan-module">CGI::Application::Plugin::Authentication</remote-id>
         <remote-id type="cpan-module">CGI::Application::Plugin::Authentication::Display</remote-id>
         <remote-id type="cpan-module">CGI::Application::Plugin::Authentication::Display::Basic</remote-id>
@@ -29,6 +30,5 @@
         <remote-id type="cpan-module">CGI::Application::Plugin::Authentication::Store</remote-id>
         <remote-id type="cpan-module">CGI::Application::Plugin::Authentication::Store::Cookie</remote-id>
         <remote-id type="cpan-module">CGI::Application::Plugin::Authentication::Store::Session</remote-id>
-        <remote-id type="cpan">CGI-Application-Plugin-Authentication</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-AutoRunmode/metadata.xml b/dev-perl/CGI-Application-Plugin-AutoRunmode/metadata.xml
index f23dd1b..b24403f 100644
--- a/dev-perl/CGI-Application-Plugin-AutoRunmode/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-AutoRunmode/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CGI-Application-Plugin-AutoRunmode</remote-id>
         <remote-id type="cpan-module">CGI::Application::Plugin::AutoRunmode</remote-id>
         <remote-id type="cpan-module">CGI::Application::Plugin::AutoRunmode::FileDelegate</remote-id>
-        <remote-id type="cpan">CGI-Application-Plugin-AutoRunmode</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-Config-Any/metadata.xml b/dev-perl/CGI-Application-Plugin-Config-Any/metadata.xml
index 2ff9871..0e6d0d4 100644
--- a/dev-perl/CGI-Application-Plugin-Config-Any/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-Config-Any/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::Plugin::Config::Any</remote-id>
         <remote-id type="cpan">CGI-Application-Plugin-Config-Any</remote-id>
+        <remote-id type="cpan-module">CGI::Application::Plugin::Config::Any</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-Config-General/metadata.xml b/dev-perl/CGI-Application-Plugin-Config-General/metadata.xml
index fbe6617..22fcd1e 100644
--- a/dev-perl/CGI-Application-Plugin-Config-General/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-Config-General/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::Plugin::Config::General</remote-id>
         <remote-id type="cpan">CGI-Application-Plugin-Config-General</remote-id>
+        <remote-id type="cpan-module">CGI::Application::Plugin::Config::General</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-JSON/metadata.xml b/dev-perl/CGI-Application-Plugin-JSON/metadata.xml
index 0cf17a5..9a6a98c 100644
--- a/dev-perl/CGI-Application-Plugin-JSON/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-JSON/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::Plugin::JSON</remote-id>
         <remote-id type="cpan">CGI-Application-Plugin-JSON</remote-id>
+        <remote-id type="cpan-module">CGI::Application::Plugin::JSON</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-LogDispatch/metadata.xml b/dev-perl/CGI-Application-Plugin-LogDispatch/metadata.xml
index 95cae2e..be07ad2 100644
--- a/dev-perl/CGI-Application-Plugin-LogDispatch/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-LogDispatch/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::Plugin::LogDispatch</remote-id>
         <remote-id type="cpan">CGI-Application-Plugin-LogDispatch</remote-id>
+        <remote-id type="cpan-module">CGI::Application::Plugin::LogDispatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-Redirect/metadata.xml b/dev-perl/CGI-Application-Plugin-Redirect/metadata.xml
index b65bb4a..e0e149e 100644
--- a/dev-perl/CGI-Application-Plugin-Redirect/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-Redirect/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::Plugin::Redirect</remote-id>
         <remote-id type="cpan">CGI-Application-Plugin-Redirect</remote-id>
+        <remote-id type="cpan-module">CGI::Application::Plugin::Redirect</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-Session/metadata.xml b/dev-perl/CGI-Application-Plugin-Session/metadata.xml
index b21b257..66421af 100644
--- a/dev-perl/CGI-Application-Plugin-Session/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-Session/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::Plugin::Session</remote-id>
         <remote-id type="cpan">CGI-Application-Plugin-Session</remote-id>
+        <remote-id type="cpan-module">CGI::Application::Plugin::Session</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-Stash/metadata.xml b/dev-perl/CGI-Application-Plugin-Stash/metadata.xml
index 70000e6..eaa4ed5 100644
--- a/dev-perl/CGI-Application-Plugin-Stash/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-Stash/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::Plugin::Stash</remote-id>
         <remote-id type="cpan">CGI-Application-Plugin-Stash</remote-id>
+        <remote-id type="cpan-module">CGI::Application::Plugin::Stash</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application-Plugin-TT/metadata.xml b/dev-perl/CGI-Application-Plugin-TT/metadata.xml
index 7ec7538..86ebe11 100644
--- a/dev-perl/CGI-Application-Plugin-TT/metadata.xml
+++ b/dev-perl/CGI-Application-Plugin-TT/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Application::Plugin::TT</remote-id>
         <remote-id type="cpan">CGI-Application-Plugin-TT</remote-id>
+        <remote-id type="cpan-module">CGI::Application::Plugin::TT</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Application/metadata.xml b/dev-perl/CGI-Application/metadata.xml
index 3bee816..e6fb0d2 100644
--- a/dev-perl/CGI-Application/metadata.xml
+++ b/dev-perl/CGI-Application/metadata.xml
@@ -5,13 +5,13 @@
     <maintainer>
         <email>mb@...</email>
         <name>Michele Beltrame</name>
-	</maintainer>
-	<use>
-		<flag name="recommended">Install recommended support for PSGI with <pkg>dev-perl/CGI-PSGI</pkg></flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="recommended">Install recommended support for PSGI with <pkg>dev-perl/CGI-PSGI</pkg></flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">CGI-Application</remote-id>
         <remote-id type="cpan-module">CGI::Application</remote-id>
         <remote-id type="cpan-module">CGI::Application::Mailform</remote-id>
-        <remote-id type="cpan">CGI-Application</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Cache/metadata.xml b/dev-perl/CGI-Cache/metadata.xml
index 84f1727..8a45496 100644
--- a/dev-perl/CGI-Cache/metadata.xml
+++ b/dev-perl/CGI-Cache/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">CGI-Cache</remote-id>
                 <remote-id type="cpan-module">CGI::Cache</remote-id>
                 <remote-id type="cpan-module">CGI::Cache::CatchSTDOUT</remote-id>
                 <remote-id type="cpan-module">CGI::Cache::MonitorSTDERR</remote-id>
-                <remote-id type="cpan">CGI-Cache</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Cookie-XS/metadata.xml b/dev-perl/CGI-Cookie-XS/metadata.xml
index a502dce..be3af98 100644
--- a/dev-perl/CGI-Cookie-XS/metadata.xml
+++ b/dev-perl/CGI-Cookie-XS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Cookie::XS</remote-id>
         <remote-id type="cpan">CGI-Cookie-XS</remote-id>
+        <remote-id type="cpan-module">CGI::Cookie::XS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-FormBuilder-Source-Perl/metadata.xml b/dev-perl/CGI-FormBuilder-Source-Perl/metadata.xml
index 396f1c2..0ef447b 100644
--- a/dev-perl/CGI-FormBuilder-Source-Perl/metadata.xml
+++ b/dev-perl/CGI-FormBuilder-Source-Perl/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::FormBuilder::Source::Perl</remote-id>
         <remote-id type="cpan">CGI-FormBuilder-Source-Perl</remote-id>
+        <remote-id type="cpan-module">CGI::FormBuilder::Source::Perl</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Untaint-email/metadata.xml b/dev-perl/CGI-Untaint-email/metadata.xml
index 98756e6..85edca6 100644
--- a/dev-perl/CGI-Untaint-email/metadata.xml
+++ b/dev-perl/CGI-Untaint-email/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CGI-Untaint-email</remote-id>
         <remote-id type="cpan-module">CGI::Untaint::email</remote-id>
         <remote-id type="cpan-module">Mail::Address::overload</remote-id>
-        <remote-id type="cpan">CGI-Untaint-email</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Untaint-telephone/metadata.xml b/dev-perl/CGI-Untaint-telephone/metadata.xml
index de8d537..e1368bd 100644
--- a/dev-perl/CGI-Untaint-telephone/metadata.xml
+++ b/dev-perl/CGI-Untaint-telephone/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CGI::Untaint::telephone</remote-id>
         <remote-id type="cpan">CGI-Untaint-telephone</remote-id>
+        <remote-id type="cpan-module">CGI::Untaint::telephone</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CGI-Untaint/metadata.xml b/dev-perl/CGI-Untaint/metadata.xml
index 51e50ec..e1dd846 100644
--- a/dev-perl/CGI-Untaint/metadata.xml
+++ b/dev-perl/CGI-Untaint/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CGI-Untaint</remote-id>
         <remote-id type="cpan-module">CGI::Untaint</remote-id>
         <remote-id type="cpan-module">CGI::Untaint::hex</remote-id>
         <remote-id type="cpan-module">CGI::Untaint::integer</remote-id>
         <remote-id type="cpan-module">CGI::Untaint::object</remote-id>
         <remote-id type="cpan-module">CGI::Untaint::printable</remote-id>
-        <remote-id type="cpan">CGI-Untaint</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CLASS/metadata.xml b/dev-perl/CLASS/metadata.xml
index a8ed442..b7200b3 100644
--- a/dev-perl/CLASS/metadata.xml
+++ b/dev-perl/CLASS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CLASS</remote-id>
         <remote-id type="cpan">CLASS</remote-id>
+        <remote-id type="cpan-module">CLASS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CPAN-Changes/metadata.xml b/dev-perl/CPAN-Changes/metadata.xml
index 46801dd..b4d320e 100644
--- a/dev-perl/CPAN-Changes/metadata.xml
+++ b/dev-perl/CPAN-Changes/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CPAN-Changes</remote-id>
         <remote-id type="cpan-module">CPAN::Changes</remote-id>
         <remote-id type="cpan-module">CPAN::Changes::Release</remote-id>
         <remote-id type="cpan-module">Test::CPAN::Changes</remote-id>
-        <remote-id type="cpan">CPAN-Changes</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CPAN-DistnameInfo/metadata.xml b/dev-perl/CPAN-DistnameInfo/metadata.xml
index d0fd797..5918285 100644
--- a/dev-perl/CPAN-DistnameInfo/metadata.xml
+++ b/dev-perl/CPAN-DistnameInfo/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CPAN::DistnameInfo</remote-id>
         <remote-id type="cpan">CPAN-DistnameInfo</remote-id>
+        <remote-id type="cpan-module">CPAN::DistnameInfo</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/CPAN-Inject/metadata.xml b/dev-perl/CPAN-Inject/metadata.xml
index afdae23..e430de6 100644
--- a/dev-perl/CPAN-Inject/metadata.xml
+++ b/dev-perl/CPAN-Inject/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CPAN::Inject</remote-id>
         <remote-id type="cpan">CPAN-Inject</remote-id>
+        <remote-id type="cpan-module">CPAN::Inject</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CPAN-Meta-Check/metadata.xml b/dev-perl/CPAN-Meta-Check/metadata.xml
index 8dd0d38..f63cd67 100644
--- a/dev-perl/CPAN-Meta-Check/metadata.xml
+++ b/dev-perl/CPAN-Meta-Check/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">CPAN::Meta::Check</remote-id>
 		<remote-id type="cpan">CPAN-Meta-Check</remote-id>
+		<remote-id type="cpan-module">CPAN::Meta::Check</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/CPAN-Perl-Releases/metadata.xml b/dev-perl/CPAN-Perl-Releases/metadata.xml
index 94d16de..c6e90d7 100644
--- a/dev-perl/CPAN-Perl-Releases/metadata.xml
+++ b/dev-perl/CPAN-Perl-Releases/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CPAN::Perl::Releases</remote-id>
         <remote-id type="cpan">CPAN-Perl-Releases</remote-id>
+        <remote-id type="cpan-module">CPAN::Perl::Releases</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CPAN-Reporter/metadata.xml b/dev-perl/CPAN-Reporter/metadata.xml
index 0ce35ec..01362b7 100644
--- a/dev-perl/CPAN-Reporter/metadata.xml
+++ b/dev-perl/CPAN-Reporter/metadata.xml
@@ -7,12 +7,12 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CPAN-Reporter</remote-id>
         <remote-id type="cpan-module">CPAN::Reporter</remote-id>
         <remote-id type="cpan-module">CPAN::Reporter::API</remote-id>
         <remote-id type="cpan-module">CPAN::Reporter::Config</remote-id>
         <remote-id type="cpan-module">CPAN::Reporter::FAQ</remote-id>
         <remote-id type="cpan-module">CPAN::Reporter::History</remote-id>
         <remote-id type="cpan-module">CPAN::Reporter::PrereqCheck</remote-id>
-        <remote-id type="cpan">CPAN-Reporter</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CPAN-Uploader/metadata.xml b/dev-perl/CPAN-Uploader/metadata.xml
index e6ad65e..271c367 100644
--- a/dev-perl/CPAN-Uploader/metadata.xml
+++ b/dev-perl/CPAN-Uploader/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CPAN::Uploader</remote-id>
         <remote-id type="cpan">CPAN-Uploader</remote-id>
+        <remote-id type="cpan-module">CPAN::Uploader</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/CPANPLUS-Dist-Gentoo/metadata.xml b/dev-perl/CPANPLUS-Dist-Gentoo/metadata.xml
index 5f7f6bc..e8623db 100644
--- a/dev-perl/CPANPLUS-Dist-Gentoo/metadata.xml
+++ b/dev-perl/CPANPLUS-Dist-Gentoo/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CPANPLUS-Dist-Gentoo</remote-id>
         <remote-id type="cpan-module">CPANPLUS::Dist::Gentoo</remote-id>
         <remote-id type="cpan-module">CPANPLUS::Dist::Gentoo::Atom</remote-id>
         <remote-id type="cpan-module">CPANPLUS::Dist::Gentoo::Guard</remote-id>
         <remote-id type="cpan-module">CPANPLUS::Dist::Gentoo::Maps</remote-id>
         <remote-id type="cpan-module">CPANPLUS::Dist::Gentoo::Version</remote-id>
-        <remote-id type="cpan">CPANPLUS-Dist-Gentoo</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CSS-Packer/metadata.xml b/dev-perl/CSS-Packer/metadata.xml
index 2909bd2..a6a5dc6 100644
--- a/dev-perl/CSS-Packer/metadata.xml
+++ b/dev-perl/CSS-Packer/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">CSS::Packer</remote-id>
                 <remote-id type="cpan">CSS-Packer</remote-id>
+                <remote-id type="cpan-module">CSS::Packer</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CSS-Tiny/metadata.xml b/dev-perl/CSS-Tiny/metadata.xml
index 8c4076d..8b8cc7b 100644
--- a/dev-perl/CSS-Tiny/metadata.xml
+++ b/dev-perl/CSS-Tiny/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CSS::Tiny</remote-id>
         <remote-id type="cpan">CSS-Tiny</remote-id>
+        <remote-id type="cpan-module">CSS::Tiny</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Cache-FastMmap/metadata.xml b/dev-perl/Cache-FastMmap/metadata.xml
index 8163296..2b9fd38 100644
--- a/dev-perl/Cache-FastMmap/metadata.xml
+++ b/dev-perl/Cache-FastMmap/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Cache-FastMmap</remote-id>
         <remote-id type="cpan-module">Cache::FastMmap</remote-id>
         <remote-id type="cpan-module">Cache::FastMmap::OnLeave</remote-id>
-        <remote-id type="cpan">Cache-FastMmap</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Cache-Memcached-Managed/metadata.xml b/dev-perl/Cache-Memcached-Managed/metadata.xml
index ff97f46..739eaf8 100644
--- a/dev-perl/Cache-Memcached-Managed/metadata.xml
+++ b/dev-perl/Cache-Memcached-Managed/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Cache-Memcached-Managed</remote-id>
         <remote-id type="cpan-module">Cache::Memcached::Managed</remote-id>
         <remote-id type="cpan-module">Cache::Memcached::Managed::Inactive</remote-id>
         <remote-id type="cpan-module">Cache::Memcached::Managed::Multi</remote-id>
-        <remote-id type="cpan">Cache-Memcached-Managed</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Cache-Ref/metadata.xml b/dev-perl/Cache-Ref/metadata.xml
index 7d014e1..3d4bec5 100644
--- a/dev-perl/Cache-Ref/metadata.xml
+++ b/dev-perl/Cache-Ref/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Cache-Ref</remote-id>
         <remote-id type="cpan-module">Cache::Ref</remote-id>
         <remote-id type="cpan-module">Cache::Ref::CAR</remote-id>
         <remote-id type="cpan-module">Cache::Ref::CAR::Base</remote-id>
@@ -25,6 +26,5 @@
         <remote-id type="cpan-module">Cache::Ref::Util::LRU::API</remote-id>
         <remote-id type="cpan-module">Cache::Ref::Util::LRU::Array</remote-id>
         <remote-id type="cpan-module">Cache::Ref::Util::LRU::List</remote-id>
-        <remote-id type="cpan">Cache-Ref</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Cairo-GObject/metadata.xml b/dev-perl/Cairo-GObject/metadata.xml
index 429e744..5e514c8 100644
--- a/dev-perl/Cairo-GObject/metadata.xml
+++ b/dev-perl/Cairo-GObject/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>perl</herd>
   <upstream>
-    <remote-id type="cpan-module">Cairo::GObject</remote-id>
     <remote-id type="cpan">Cairo-GObject</remote-id>
+    <remote-id type="cpan-module">Cairo::GObject</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Captcha-reCAPTCHA/metadata.xml b/dev-perl/Captcha-reCAPTCHA/metadata.xml
index 6c08e73..06264fd 100644
--- a/dev-perl/Captcha-reCAPTCHA/metadata.xml
+++ b/dev-perl/Captcha-reCAPTCHA/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Captcha::reCAPTCHA</remote-id>
         <remote-id type="cpan">Captcha-reCAPTCHA</remote-id>
+        <remote-id type="cpan-module">Captcha::reCAPTCHA</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Carp-Always/metadata.xml b/dev-perl/Carp-Always/metadata.xml
index c2789b3..532ec65 100644
--- a/dev-perl/Carp-Always/metadata.xml
+++ b/dev-perl/Carp-Always/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Carp::Always</remote-id>
         <remote-id type="cpan">Carp-Always</remote-id>
+        <remote-id type="cpan-module">Carp::Always</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Carp-Clan-Share/metadata.xml b/dev-perl/Carp-Clan-Share/metadata.xml
index 45a660b..7eed133 100644
--- a/dev-perl/Carp-Clan-Share/metadata.xml
+++ b/dev-perl/Carp-Clan-Share/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Carp::Clan::Share</remote-id>
                 <remote-id type="cpan">Carp-Clan-Share</remote-id>
+                <remote-id type="cpan-module">Carp::Clan::Share</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Carp-REPL/metadata.xml b/dev-perl/Carp-REPL/metadata.xml
index a1438ef..7d85669 100644
--- a/dev-perl/Carp-REPL/metadata.xml
+++ b/dev-perl/Carp-REPL/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Carp-REPL</remote-id>
         <remote-id type="cpan-module">Carp::REPL</remote-id>
         <remote-id type="cpan-module">Devel::REPL::Plugin::Carp::REPL</remote-id>
-        <remote-id type="cpan">Carp-REPL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Action-REST/metadata.xml b/dev-perl/Catalyst-Action-REST/metadata.xml
index 79b7a02..c2d770b 100644
--- a/dev-perl/Catalyst-Action-REST/metadata.xml
+++ b/dev-perl/Catalyst-Action-REST/metadata.xml
@@ -6,13 +6,14 @@
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
     </maintainer>
-	<use>
-		<flag name="json">JSON (application/json) support</flag>
-		<flag name="data-taxi">Data::Taxi (text/x-data-taxi) support</flag>
-		<flag name="config-general">Config::General (text/x-config-general)	support</flag>
-		<flag name="freezethaw">FreezeThaw (application/x-freezethaw) support</flag>
-	</use>
+    <use>
+        <flag name="json">JSON (application/json) support</flag>
+        <flag name="data-taxi">Data::Taxi (text/x-data-taxi) support</flag>
+        <flag name="config-general">Config::General (text/x-config-general)	support</flag>
+        <flag name="freezethaw">FreezeThaw (application/x-freezethaw) support</flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">Catalyst-Action-REST</remote-id>
         <remote-id type="cpan-module">Catalyst::Action::Deserialize</remote-id>
         <remote-id type="cpan-module">Catalyst::Action::Deserialize::Callback</remote-id>
         <remote-id type="cpan-module">Catalyst::Action::Deserialize::Data::Serializer</remote-id>
@@ -40,6 +41,5 @@
         <remote-id type="cpan-module">Catalyst::Request::REST::ForBrowsers</remote-id>
         <remote-id type="cpan-module">Catalyst::TraitFor::Request::REST</remote-id>
         <remote-id type="cpan-module">Catalyst::TraitFor::Request::REST::ForBrowsers</remote-id>
-        <remote-id type="cpan">Catalyst-Action-REST</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Action-RenderView/metadata.xml b/dev-perl/Catalyst-Action-RenderView/metadata.xml
index 286431f..3c264dc 100644
--- a/dev-perl/Catalyst-Action-RenderView/metadata.xml
+++ b/dev-perl/Catalyst-Action-RenderView/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Action::RenderView</remote-id>
         <remote-id type="cpan">Catalyst-Action-RenderView</remote-id>
+        <remote-id type="cpan-module">Catalyst::Action::RenderView</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-ActionRole-ACL/metadata.xml b/dev-perl/Catalyst-ActionRole-ACL/metadata.xml
index ae895c2..4d0e71c 100644
--- a/dev-perl/Catalyst-ActionRole-ACL/metadata.xml
+++ b/dev-perl/Catalyst-ActionRole-ACL/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-ActionRole-ACL</remote-id>
         <remote-id type="cpan-module">Catalyst::Action::Role::ACL</remote-id>
         <remote-id type="cpan-module">Catalyst::ActionRole::ACL</remote-id>
-        <remote-id type="cpan">Catalyst-ActionRole-ACL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Authentication-Credential-HTTP/metadata.xml b/dev-perl/Catalyst-Authentication-Credential-HTTP/metadata.xml
index 9f03804..64ec87d 100644
--- a/dev-perl/Catalyst-Authentication-Credential-HTTP/metadata.xml
+++ b/dev-perl/Catalyst-Authentication-Credential-HTTP/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Authentication-Credential-HTTP</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Credential::HTTP</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Credential::HTTP::Nonce</remote-id>
-        <remote-id type="cpan">Catalyst-Authentication-Credential-HTTP</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Authentication-Store-DBIx-Class/metadata.xml b/dev-perl/Catalyst-Authentication-Store-DBIx-Class/metadata.xml
index 4992670..3c843ec 100644
--- a/dev-perl/Catalyst-Authentication-Store-DBIx-Class/metadata.xml
+++ b/dev-perl/Catalyst-Authentication-Store-DBIx-Class/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Authentication-Store-DBIx-Class</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Realm::SimpleDB</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::DBIx::Class</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::DBIx::Class::User</remote-id>
-        <remote-id type="cpan">Catalyst-Authentication-Store-DBIx-Class</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Authentication-Store-Htpasswd/metadata.xml b/dev-perl/Catalyst-Authentication-Store-Htpasswd/metadata.xml
index 482be50..974b182 100644
--- a/dev-perl/Catalyst-Authentication-Store-Htpasswd/metadata.xml
+++ b/dev-perl/Catalyst-Authentication-Store-Htpasswd/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Authentication-Store-Htpasswd</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::Htpasswd</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::Htpasswd::User</remote-id>
-        <remote-id type="cpan">Catalyst-Authentication-Store-Htpasswd</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Authentication-Store-LDAP/metadata.xml b/dev-perl/Catalyst-Authentication-Store-LDAP/metadata.xml
index 547e320..01da366 100644
--- a/dev-perl/Catalyst-Authentication-Store-LDAP/metadata.xml
+++ b/dev-perl/Catalyst-Authentication-Store-LDAP/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Authentication-Store-LDAP</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::LDAP</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::LDAP::Backend</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::LDAP::User</remote-id>
-        <remote-id type="cpan">Catalyst-Authentication-Store-LDAP</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Component-InstancePerContext/metadata.xml b/dev-perl/Catalyst-Component-InstancePerContext/metadata.xml
index efc9f83..e9b5430 100644
--- a/dev-perl/Catalyst-Component-InstancePerContext/metadata.xml
+++ b/dev-perl/Catalyst-Component-InstancePerContext/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Component::InstancePerContext</remote-id>
         <remote-id type="cpan">Catalyst-Component-InstancePerContext</remote-id>
+        <remote-id type="cpan-module">Catalyst::Component::InstancePerContext</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Controller-ActionRole/metadata.xml b/dev-perl/Catalyst-Controller-ActionRole/metadata.xml
index c20a683..b210a94 100644
--- a/dev-perl/Catalyst-Controller-ActionRole/metadata.xml
+++ b/dev-perl/Catalyst-Controller-ActionRole/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Controller::ActionRole</remote-id>
         <remote-id type="cpan">Catalyst-Controller-ActionRole</remote-id>
+        <remote-id type="cpan-module">Catalyst::Controller::ActionRole</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Controller-BindLex/metadata.xml b/dev-perl/Catalyst-Controller-BindLex/metadata.xml
index 5481df0..29f3310 100644
--- a/dev-perl/Catalyst-Controller-BindLex/metadata.xml
+++ b/dev-perl/Catalyst-Controller-BindLex/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Controller::BindLex</remote-id>
         <remote-id type="cpan">Catalyst-Controller-BindLex</remote-id>
+        <remote-id type="cpan-module">Catalyst::Controller::BindLex</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Controller-FormBuilder/metadata.xml b/dev-perl/Catalyst-Controller-FormBuilder/metadata.xml
index 1584326..bda02a6 100644
--- a/dev-perl/Catalyst-Controller-FormBuilder/metadata.xml
+++ b/dev-perl/Catalyst-Controller-FormBuilder/metadata.xml
@@ -11,11 +11,11 @@
         <pkg>dev-perl/Catalyst-View-TT</pkg></flag>
     </use>
     <upstream>
+        <remote-id type="cpan">Catalyst-Controller-FormBuilder</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::FormBuilder</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::FormBuilder::Action</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::FormBuilder::Action::HTML::Template</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::FormBuilder::Action::Mason</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::FormBuilder::Action::TT</remote-id>
-        <remote-id type="cpan">Catalyst-Controller-FormBuilder</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Controller-HTML-FormFu/metadata.xml b/dev-perl/Catalyst-Controller-HTML-FormFu/metadata.xml
index 53d8033..bd557e7 100644
--- a/dev-perl/Catalyst-Controller-HTML-FormFu/metadata.xml
+++ b/dev-perl/Catalyst-Controller-HTML-FormFu/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Controller-HTML-FormFu</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::HTML::FormFu</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::HTML::FormFu::Action::Form</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::HTML::FormFu::Action::FormConfig</remote-id>
@@ -19,6 +20,5 @@
         <remote-id type="cpan-module">HTML::FormFu::Constraint::RequestToken</remote-id>
         <remote-id type="cpan-module">HTML::FormFu::Element::RequestToken</remote-id>
         <remote-id type="cpan-module">HTML::FormFu::Plugin::RequestToken</remote-id>
-        <remote-id type="cpan">Catalyst-Controller-HTML-FormFu</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Controller-RequestToken/metadata.xml b/dev-perl/Catalyst-Controller-RequestToken/metadata.xml
index 3f038dd..f542ad5 100644
--- a/dev-perl/Catalyst-Controller-RequestToken/metadata.xml
+++ b/dev-perl/Catalyst-Controller-RequestToken/metadata.xml
@@ -7,10 +7,10 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Controller-RequestToken</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::RequestToken</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::RequestToken::Action::CreateToken</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::RequestToken::Action::RemoveToken</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::RequestToken::Action::ValidateToken</remote-id>
-        <remote-id type="cpan">Catalyst-Controller-RequestToken</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Devel/metadata.xml b/dev-perl/Catalyst-Devel/metadata.xml
index 707acc8..37f5cca 100644
--- a/dev-perl/Catalyst-Devel/metadata.xml
+++ b/dev-perl/Catalyst-Devel/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Devel</remote-id>
         <remote-id type="cpan-module">Catalyst::Devel</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper</remote-id>
         <remote-id type="cpan-module">Catalyst::Module::Install</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">Catalyst::Restarter::Forking</remote-id>
         <remote-id type="cpan-module">Catalyst::Restarter::Win32</remote-id>
         <remote-id type="cpan-module">Module::Install::Catalyst</remote-id>
-        <remote-id type="cpan">Catalyst-Devel</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Engine-Apache/metadata.xml b/dev-perl/Catalyst-Engine-Apache/metadata.xml
index fe4032f..23b527c 100644
--- a/dev-perl/Catalyst-Engine-Apache/metadata.xml
+++ b/dev-perl/Catalyst-Engine-Apache/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Engine-Apache</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::Apache</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::Apache2</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::Apache2::MP19</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::Apache2::MP20</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::Apache::MP13</remote-id>
-        <remote-id type="cpan">Catalyst-Engine-Apache</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Engine-HTTP-Prefork/metadata.xml b/dev-perl/Catalyst-Engine-HTTP-Prefork/metadata.xml
index 61f9178..0fa0a5b 100644
--- a/dev-perl/Catalyst-Engine-HTTP-Prefork/metadata.xml
+++ b/dev-perl/Catalyst-Engine-HTTP-Prefork/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Engine-HTTP-Prefork</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::HTTP::Prefork</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::HTTP::Prefork::Handler</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::HTTP::Prefork::Restarter</remote-id>
-        <remote-id type="cpan">Catalyst-Engine-HTTP-Prefork</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Engine-PSGI/metadata.xml b/dev-perl/Catalyst-Engine-PSGI/metadata.xml
index 0db5c4a..e8978d2 100644
--- a/dev-perl/Catalyst-Engine-PSGI/metadata.xml
+++ b/dev-perl/Catalyst-Engine-PSGI/metadata.xml
@@ -7,10 +7,10 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Engine-PSGI</remote-id>
         <remote-id type="cpan-module">Catalyst::Controller::Metal</remote-id>
         <remote-id type="cpan-module">Catalyst::Engine::PSGI</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::PSGI</remote-id>
         <remote-id type="cpan-module">Plack::Test::Adopt::Catalyst</remote-id>
-        <remote-id type="cpan">Catalyst-Engine-PSGI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Log-Log4perl/metadata.xml b/dev-perl/Catalyst-Log-Log4perl/metadata.xml
index 8673aa8..76a22eb 100644
--- a/dev-perl/Catalyst-Log-Log4perl/metadata.xml
+++ b/dev-perl/Catalyst-Log-Log4perl/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Log::Log4perl</remote-id>
         <remote-id type="cpan">Catalyst-Log-Log4perl</remote-id>
+        <remote-id type="cpan-module">Catalyst::Log::Log4perl</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Manual/metadata.xml b/dev-perl/Catalyst-Manual/metadata.xml
index fd56911..a708ef3 100644
--- a/dev-perl/Catalyst-Manual/metadata.xml
+++ b/dev-perl/Catalyst-Manual/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Manual</remote-id>
         <remote-id type="cpan">Catalyst-Manual</remote-id>
+        <remote-id type="cpan-module">Catalyst::Manual</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-Adaptor/metadata.xml b/dev-perl/Catalyst-Model-Adaptor/metadata.xml
index 0281463..8962227 100644
--- a/dev-perl/Catalyst-Model-Adaptor/metadata.xml
+++ b/dev-perl/Catalyst-Model-Adaptor/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-Adaptor</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::Adaptor</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::Factory</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::Factory::PerRequest</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">Catalyst::Model::Adaptor::Base</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::Factory</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::Factory::PerRequest</remote-id>
-        <remote-id type="cpan">Catalyst-Model-Adaptor</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-CDBI/metadata.xml b/dev-perl/Catalyst-Model-CDBI/metadata.xml
index 81e034a..37fb550 100644
--- a/dev-perl/Catalyst-Model-CDBI/metadata.xml
+++ b/dev-perl/Catalyst-Model-CDBI/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-CDBI</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::CDBI</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::CDBI</remote-id>
-        <remote-id type="cpan">Catalyst-Model-CDBI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-DBI/metadata.xml b/dev-perl/Catalyst-Model-DBI/metadata.xml
index 7ae2d52..d73dd80 100644
--- a/dev-perl/Catalyst-Model-DBI/metadata.xml
+++ b/dev-perl/Catalyst-Model-DBI/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-DBI</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::DBI</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::DBI</remote-id>
-        <remote-id type="cpan">Catalyst-Model-DBI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-DBIC-Plain/metadata.xml b/dev-perl/Catalyst-Model-DBIC-Plain/metadata.xml
index 9a5b9ce..fa65362 100644
--- a/dev-perl/Catalyst-Model-DBIC-Plain/metadata.xml
+++ b/dev-perl/Catalyst-Model-DBIC-Plain/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-DBIC-Plain</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::DBIC::Plain</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::DBIC::Plain</remote-id>
-        <remote-id type="cpan">Catalyst-Model-DBIC-Plain</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-DBIC-Schema/metadata.xml b/dev-perl/Catalyst-Model-DBIC-Schema/metadata.xml
index 3f0036c..dc630e7 100644
--- a/dev-perl/Catalyst-Model-DBIC-Schema/metadata.xml
+++ b/dev-perl/Catalyst-Model-DBIC-Schema/metadata.xml
@@ -7,17 +7,17 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <use>
-      <flag name="catalyst_helper">Catalyst::Helper support</flag>
-      <flag name="caching">Caching support</flag>
-      <flag name="replication">Replication support</flag>
+        <flag name="catalyst_helper">Catalyst::Helper support</flag>
+        <flag name="caching">Caching support</flag>
+        <flag name="replication">Replication support</flag>
     </use>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-DBIC-Schema</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::DBIC::Schema</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::DBIC::Schema</remote-id>
         <remote-id type="cpan-module">Catalyst::TraitFor::Model::DBIC::Schema::Caching</remote-id>
         <remote-id type="cpan-module">Catalyst::TraitFor::Model::DBIC::Schema::PerRequestSchema</remote-id>
         <remote-id type="cpan-module">Catalyst::TraitFor::Model::DBIC::Schema::Replicated</remote-id>
         <remote-id type="cpan-module">Catalyst::TraitFor::Model::DBIC::Schema::SchemaProxy</remote-id>
-        <remote-id type="cpan">Catalyst-Model-DBIC-Schema</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-EVDB/metadata.xml b/dev-perl/Catalyst-Model-EVDB/metadata.xml
index 3cb45f4..a474456 100644
--- a/dev-perl/Catalyst-Model-EVDB/metadata.xml
+++ b/dev-perl/Catalyst-Model-EVDB/metadata.xml
@@ -7,8 +7,8 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-EVDB</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::EVDB</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::EVDB</remote-id>
-        <remote-id type="cpan">Catalyst-Model-EVDB</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-File/metadata.xml b/dev-perl/Catalyst-Model-File/metadata.xml
index 6c46b0c..1236884 100644
--- a/dev-perl/Catalyst-Model-File/metadata.xml
+++ b/dev-perl/Catalyst-Model-File/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-File</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::File</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::File</remote-id>
-        <remote-id type="cpan">Catalyst-Model-File</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-HTML-FormFu/metadata.xml b/dev-perl/Catalyst-Model-HTML-FormFu/metadata.xml
index 43494fc..461ae99 100644
--- a/dev-perl/Catalyst-Model-HTML-FormFu/metadata.xml
+++ b/dev-perl/Catalyst-Model-HTML-FormFu/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-HTML-FormFu</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::HTML::FormFu</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::HTML::FormFu</remote-id>
-        <remote-id type="cpan">Catalyst-Model-HTML-FormFu</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-KiokuDB/metadata.xml b/dev-perl/Catalyst-Model-KiokuDB/metadata.xml
index 5123510..ca4fa5b 100644
--- a/dev-perl/Catalyst-Model-KiokuDB/metadata.xml
+++ b/dev-perl/Catalyst-Model-KiokuDB/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-KiokuDB</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::Model::KiokuDB</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Store::Model::KiokuDB::UserWrapper</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::KiokuDB</remote-id>
-        <remote-id type="cpan">Catalyst-Model-KiokuDB</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Model-LDAP/metadata.xml b/dev-perl/Catalyst-Model-LDAP/metadata.xml
index 9a5872a..61accb0 100644
--- a/dev-perl/Catalyst-Model-LDAP/metadata.xml
+++ b/dev-perl/Catalyst-Model-LDAP/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Model-LDAP</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::Model::LDAP</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::LDAP</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::LDAP::Connection</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::LDAP::Entry</remote-id>
         <remote-id type="cpan-module">Catalyst::Model::LDAP::Search</remote-id>
-        <remote-id type="cpan">Catalyst-Model-LDAP</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Authentication-Credential-CHAP/metadata.xml b/dev-perl/Catalyst-Plugin-Authentication-Credential-CHAP/metadata.xml
index 9596b8f..ad2f07c 100644
--- a/dev-perl/Catalyst-Plugin-Authentication-Credential-CHAP/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Authentication-Credential-CHAP/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Authentication::Credential::CHAP</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Authentication-Credential-CHAP</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Authentication::Credential::CHAP</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Authentication/metadata.xml b/dev-perl/Catalyst-Plugin-Authentication/metadata.xml
index 565fefc..d71ea97 100644
--- a/dev-perl/Catalyst-Plugin-Authentication/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Authentication/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-Authentication</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Credential::Password</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Credential::Remote</remote-id>
         <remote-id type="cpan-module">Catalyst::Authentication::Realm</remote-id>
@@ -21,6 +22,5 @@
         <remote-id type="cpan-module">Catalyst::Plugin::Authentication::Store::Minimal</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Authentication::User</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Authentication::User::Hash</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-Authentication</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Authorization-ACL/metadata.xml b/dev-perl/Catalyst-Plugin-Authorization-ACL/metadata.xml
index aa8debb..45e01e9 100644
--- a/dev-perl/Catalyst-Plugin-Authorization-ACL/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Authorization-ACL/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-Authorization-ACL</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Authorization::ACL</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Authorization::ACL::Engine</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-Authorization-ACL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Authorization-Roles/metadata.xml b/dev-perl/Catalyst-Plugin-Authorization-Roles/metadata.xml
index 12a1016..e445d93 100644
--- a/dev-perl/Catalyst-Plugin-Authorization-Roles/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Authorization-Roles/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Authorization::Roles</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Authorization-Roles</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Authorization::Roles</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-C3/metadata.xml b/dev-perl/Catalyst-Plugin-C3/metadata.xml
index 44259d5..8318efe 100644
--- a/dev-perl/Catalyst-Plugin-C3/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-C3/metadata.xml
@@ -7,7 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::C3</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-C3</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::C3</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-CGI-Untaint/metadata.xml b/dev-perl/Catalyst-Plugin-CGI-Untaint/metadata.xml
index e2d81f0..6b2154c 100644
--- a/dev-perl/Catalyst-Plugin-CGI-Untaint/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-CGI-Untaint/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::CGI::Untaint</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-CGI-Untaint</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::CGI::Untaint</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Cache/metadata.xml b/dev-perl/Catalyst-Plugin-Cache/metadata.xml
index 0ab92d5..6abcd3a 100644
--- a/dev-perl/Catalyst-Plugin-Cache/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Cache/metadata.xml
@@ -7,12 +7,12 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-Cache</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Cache</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Cache::Backend</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Cache::Backend::Memory</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Cache::Choose::KeyRegexes</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Cache::Curried</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Cache::Store::Memory</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-Cache</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Compress-Zlib/metadata.xml b/dev-perl/Catalyst-Plugin-Compress-Zlib/metadata.xml
index efd6c23..c941720 100644
--- a/dev-perl/Catalyst-Plugin-Compress-Zlib/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Compress-Zlib/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-Compress-Zlib</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Compress::Deflate</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Compress::Gzip</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Compress::Zlib</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-Compress-Zlib</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Compress/metadata.xml b/dev-perl/Catalyst-Plugin-Compress/metadata.xml
index 2e74b47..b561197 100644
--- a/dev-perl/Catalyst-Plugin-Compress/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Compress/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Compress</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Compress</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Compress</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-ConfigLoader/metadata.xml b/dev-perl/Catalyst-Plugin-ConfigLoader/metadata.xml
index e291e3b..dd13198 100644
--- a/dev-perl/Catalyst-Plugin-ConfigLoader/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-ConfigLoader/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::ConfigLoader</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-ConfigLoader</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::ConfigLoader</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Devel-ModuleVersions/metadata.xml b/dev-perl/Catalyst-Plugin-Devel-ModuleVersions/metadata.xml
index 0dba032..987577e 100644
--- a/dev-perl/Catalyst-Plugin-Devel-ModuleVersions/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Devel-ModuleVersions/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Devel::ModuleVersions</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Devel-ModuleVersions</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Devel::ModuleVersions</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Email/metadata.xml b/dev-perl/Catalyst-Plugin-Email/metadata.xml
index 9842bd5..e5a9aba 100644
--- a/dev-perl/Catalyst-Plugin-Email/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Email/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Email</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Email</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Email</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-ErrorCatcher/metadata.xml b/dev-perl/Catalyst-Plugin-ErrorCatcher/metadata.xml
index a2e313f..ec1c44c 100644
--- a/dev-perl/Catalyst-Plugin-ErrorCatcher/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-ErrorCatcher/metadata.xml
@@ -7,6 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-ErrorCatcher</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::ErrorCatcher</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::ErrorCatcher::Email</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::ErrorCatcher::File</remote-id>
@@ -15,6 +16,5 @@
         <remote-id type="cpan-module">Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::MissingColumn</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::TransactionAborted</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::TxnDo</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-ErrorCatcher</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Facebook/metadata.xml b/dev-perl/Catalyst-Plugin-Facebook/metadata.xml
index d9e722a..067a4a9 100644
--- a/dev-perl/Catalyst-Plugin-Facebook/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Facebook/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Facebook</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Facebook</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Facebook</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-FillInForm/metadata.xml b/dev-perl/Catalyst-Plugin-FillInForm/metadata.xml
index 0fee070..a945df0 100644
--- a/dev-perl/Catalyst-Plugin-FillInForm/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-FillInForm/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::FillInForm</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-FillInForm</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::FillInForm</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-FormValidator-Simple/metadata.xml b/dev-perl/Catalyst-Plugin-FormValidator-Simple/metadata.xml
index 9ea4338..4ba0a2a 100644
--- a/dev-perl/Catalyst-Plugin-FormValidator-Simple/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-FormValidator-Simple/metadata.xml
@@ -7,7 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::FormValidator::Simple</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-FormValidator-Simple</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::FormValidator::Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-FormValidator/metadata.xml b/dev-perl/Catalyst-Plugin-FormValidator/metadata.xml
index 57acff1..8666e41 100644
--- a/dev-perl/Catalyst-Plugin-FormValidator/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-FormValidator/metadata.xml
@@ -7,7 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::FormValidator</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-FormValidator</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::FormValidator</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-I18N/metadata.xml b/dev-perl/Catalyst-Plugin-I18N/metadata.xml
index cf3ca60..5c52426 100644
--- a/dev-perl/Catalyst-Plugin-I18N/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-I18N/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::I18N</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-I18N</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::I18N</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Images/metadata.xml b/dev-perl/Catalyst-Plugin-Images/metadata.xml
index 10aacd8..bdba383 100644
--- a/dev-perl/Catalyst-Plugin-Images/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Images/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Images</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Images</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Images</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Log-Dispatch/metadata.xml b/dev-perl/Catalyst-Plugin-Log-Dispatch/metadata.xml
index a2cf333..eaf7334 100644
--- a/dev-perl/Catalyst-Plugin-Log-Dispatch/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Log-Dispatch/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-Log-Dispatch</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Log::Dispatch</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Log::Dispatch::Backend</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-Log-Dispatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Message/metadata.xml b/dev-perl/Catalyst-Plugin-Message/metadata.xml
index 7d89e7b..90d5364 100644
--- a/dev-perl/Catalyst-Plugin-Message/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Message/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Message</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Message</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Message</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-MortalForward/metadata.xml b/dev-perl/Catalyst-Plugin-MortalForward/metadata.xml
index 966e67d..0e8bf59 100644
--- a/dev-perl/Catalyst-Plugin-MortalForward/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-MortalForward/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::MortalForward</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-MortalForward</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::MortalForward</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-PageCache/metadata.xml b/dev-perl/Catalyst-Plugin-PageCache/metadata.xml
index 57353f4..61a8cb6 100644
--- a/dev-perl/Catalyst-Plugin-PageCache/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-PageCache/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::PageCache</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-PageCache</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::PageCache</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Params-Demoronize/metadata.xml b/dev-perl/Catalyst-Plugin-Params-Demoronize/metadata.xml
index 038cb63..e8c6fb4 100644
--- a/dev-perl/Catalyst-Plugin-Params-Demoronize/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Params-Demoronize/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Params::Demoronize</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Params-Demoronize</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Params::Demoronize</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Prototype/metadata.xml b/dev-perl/Catalyst-Plugin-Prototype/metadata.xml
index bff0e7e..e9c412d 100644
--- a/dev-perl/Catalyst-Plugin-Prototype/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Prototype/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Prototype</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Prototype</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Prototype</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Scheduler/metadata.xml b/dev-perl/Catalyst-Plugin-Scheduler/metadata.xml
index 5fa956b..88ee8b7 100644
--- a/dev-perl/Catalyst-Plugin-Scheduler/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Scheduler/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Scheduler</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Scheduler</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Scheduler</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Server/metadata.xml b/dev-perl/Catalyst-Plugin-Server/metadata.xml
index e57cae2..17cb7d8 100644
--- a/dev-perl/Catalyst-Plugin-Server/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Server/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-Server</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Server</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Server::Backend</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Server::Request</remote-id>
@@ -16,6 +17,5 @@
         <remote-id type="cpan-module">Catalyst::Plugin::Server::XMLRPC::DispatchType::XMLRPCPath</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Server::XMLRPC::DispatchType::XMLRPCRegex</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Server::XMLRPC::Request</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-Server</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-DynamicExpiry/metadata.xml b/dev-perl/Catalyst-Plugin-Session-DynamicExpiry/metadata.xml
index 45ea490..1de02de 100644
--- a/dev-perl/Catalyst-Plugin-Session-DynamicExpiry/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-DynamicExpiry/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::DynamicExpiry</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-DynamicExpiry</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::DynamicExpiry</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-PerUser/metadata.xml b/dev-perl/Catalyst-Plugin-Session-PerUser/metadata.xml
index 9e697da..05d3510 100644
--- a/dev-perl/Catalyst-Plugin-Session-PerUser/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-PerUser/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::PerUser</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-PerUser</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::PerUser</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-State-Cookie/metadata.xml b/dev-perl/Catalyst-Plugin-Session-State-Cookie/metadata.xml
index c737d78..b7cb272 100644
--- a/dev-perl/Catalyst-Plugin-Session-State-Cookie/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-State-Cookie/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::State::Cookie</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-State-Cookie</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::State::Cookie</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-State-URI/metadata.xml b/dev-perl/Catalyst-Plugin-Session-State-URI/metadata.xml
index 5b6572b..64efbe9 100644
--- a/dev-perl/Catalyst-Plugin-Session-State-URI/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-State-URI/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::State::URI</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-State-URI</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::State::URI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-Store-BerkeleyDB/metadata.xml b/dev-perl/Catalyst-Plugin-Session-Store-BerkeleyDB/metadata.xml
index 29f6e05..8336265 100644
--- a/dev-perl/Catalyst-Plugin-Session-Store-BerkeleyDB/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-Store-BerkeleyDB/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::BerkeleyDB</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-Store-BerkeleyDB</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::BerkeleyDB</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-Store-Cache/metadata.xml b/dev-perl/Catalyst-Plugin-Session-Store-Cache/metadata.xml
index c04d4a3..956ab3a 100644
--- a/dev-perl/Catalyst-Plugin-Session-Store-Cache/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-Store-Cache/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::Cache</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-Store-Cache</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::Cache</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-Store-DBI/metadata.xml b/dev-perl/Catalyst-Plugin-Session-Store-DBI/metadata.xml
index c4e727f..dbe2121 100644
--- a/dev-perl/Catalyst-Plugin-Session-Store-DBI/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-Store-DBI/metadata.xml
@@ -7,7 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::DBI</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-Store-DBI</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::DBI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-Store-DBIC/metadata.xml b/dev-perl/Catalyst-Plugin-Session-Store-DBIC/metadata.xml
index 401e78f..7fa3b32 100644
--- a/dev-perl/Catalyst-Plugin-Session-Store-DBIC/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-Store-DBIC/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-Session-Store-DBIC</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::DBIC</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::DBIC::Delegate</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-Session-Store-DBIC</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-Store-Delegate/metadata.xml b/dev-perl/Catalyst-Plugin-Session-Store-Delegate/metadata.xml
index 2cb8c91..c630bc6 100644
--- a/dev-perl/Catalyst-Plugin-Session-Store-Delegate/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-Store-Delegate/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::Delegate</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-Store-Delegate</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::Delegate</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-Store-FastMmap/metadata.xml b/dev-perl/Catalyst-Plugin-Session-Store-FastMmap/metadata.xml
index b47a937..9fffe33 100644
--- a/dev-perl/Catalyst-Plugin-Session-Store-FastMmap/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-Store-FastMmap/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::FastMmap</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-Store-FastMmap</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::FastMmap</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session-Store-File/metadata.xml b/dev-perl/Catalyst-Plugin-Session-Store-File/metadata.xml
index bc1120f..2b54e2e 100644
--- a/dev-perl/Catalyst-Plugin-Session-Store-File/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session-Store-File/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::File</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Session-Store-File</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::File</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Session/metadata.xml b/dev-perl/Catalyst-Plugin-Session/metadata.xml
index 09706c4..7804d24 100644
--- a/dev-perl/Catalyst-Plugin-Session/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Session/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-Session</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Session</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Session::State</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Session::Store</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Session::Store::Dummy</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::Session::Test::Store</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-Session</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Setenv/metadata.xml b/dev-perl/Catalyst-Plugin-Setenv/metadata.xml
index e3f96d1..4c0884c 100644
--- a/dev-perl/Catalyst-Plugin-Setenv/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Setenv/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Setenv</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Setenv</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Setenv</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Singleton/metadata.xml b/dev-perl/Catalyst-Plugin-Singleton/metadata.xml
index 122576b..183320c 100644
--- a/dev-perl/Catalyst-Plugin-Singleton/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Singleton/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Singleton</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Singleton</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Singleton</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-StackTrace/metadata.xml b/dev-perl/Catalyst-Plugin-StackTrace/metadata.xml
index 4bdeae7..0a05d3e 100644
--- a/dev-perl/Catalyst-Plugin-StackTrace/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-StackTrace/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::StackTrace</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-StackTrace</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::StackTrace</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Static-Simple/metadata.xml b/dev-perl/Catalyst-Plugin-Static-Simple/metadata.xml
index 9091624..d08b53e 100644
--- a/dev-perl/Catalyst-Plugin-Static-Simple/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Static-Simple/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Static::Simple</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Static-Simple</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Static::Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-SubRequest/metadata.xml b/dev-perl/Catalyst-Plugin-SubRequest/metadata.xml
index 60ab640..3e4d29e 100644
--- a/dev-perl/Catalyst-Plugin-SubRequest/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-SubRequest/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::SubRequest</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-SubRequest</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::SubRequest</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-SuperForm/metadata.xml b/dev-perl/Catalyst-Plugin-SuperForm/metadata.xml
index d5988ba..5ce884f 100644
--- a/dev-perl/Catalyst-Plugin-SuperForm/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-SuperForm/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::SuperForm</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-SuperForm</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::SuperForm</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Unicode-Encoding/metadata.xml b/dev-perl/Catalyst-Plugin-Unicode-Encoding/metadata.xml
index 63555d5..f5ee363 100644
--- a/dev-perl/Catalyst-Plugin-Unicode-Encoding/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Unicode-Encoding/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Unicode::Encoding</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Unicode-Encoding</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Unicode::Encoding</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-Unicode/metadata.xml b/dev-perl/Catalyst-Plugin-Unicode/metadata.xml
index 28ca857..26632c2 100644
--- a/dev-perl/Catalyst-Plugin-Unicode/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-Unicode/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::Plugin::Unicode</remote-id>
         <remote-id type="cpan">Catalyst-Plugin-Unicode</remote-id>
+        <remote-id type="cpan-module">Catalyst::Plugin::Unicode</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-UploadProgress/metadata.xml b/dev-perl/Catalyst-Plugin-UploadProgress/metadata.xml
index 8d13b89..0cbb4fc 100644
--- a/dev-perl/Catalyst-Plugin-UploadProgress/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-UploadProgress/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-UploadProgress</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::UploadProgress</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::UploadProgress::Static</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-UploadProgress</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Plugin-XMLRPC/metadata.xml b/dev-perl/Catalyst-Plugin-XMLRPC/metadata.xml
index 2944349..97314e0 100644
--- a/dev-perl/Catalyst-Plugin-XMLRPC/metadata.xml
+++ b/dev-perl/Catalyst-Plugin-XMLRPC/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Plugin-XMLRPC</remote-id>
         <remote-id type="cpan-module">Catalyst::Action::XMLRPC</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::XMLRPC</remote-id>
         <remote-id type="cpan-module">Catalyst::Plugin::XMLRPC::DispatchType::XMLRPC</remote-id>
-        <remote-id type="cpan">Catalyst-Plugin-XMLRPC</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-Runtime/metadata.xml b/dev-perl/Catalyst-Runtime/metadata.xml
index c618b9b..b038fef 100644
--- a/dev-perl/Catalyst-Runtime/metadata.xml
+++ b/dev-perl/Catalyst-Runtime/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-Runtime</remote-id>
         <remote-id type="cpan-module">Catalyst</remote-id>
         <remote-id type="cpan-module">Catalyst::Action</remote-id>
         <remote-id type="cpan-module">Catalyst::ActionChain</remote-id>
@@ -49,6 +50,5 @@
         <remote-id type="cpan-module">Catalyst::Test</remote-id>
         <remote-id type="cpan-module">Catalyst::Utils</remote-id>
         <remote-id type="cpan-module">Catalyst::View</remote-id>
-        <remote-id type="cpan">Catalyst-Runtime</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-Component-SubInclude/metadata.xml b/dev-perl/Catalyst-View-Component-SubInclude/metadata.xml
index 995ed9b..1b0035f 100644
--- a/dev-perl/Catalyst-View-Component-SubInclude/metadata.xml
+++ b/dev-perl/Catalyst-View-Component-SubInclude/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Catalyst-View-Component-SubInclude</remote-id>
                 <remote-id type="cpan-module">Catalyst::View::Component::SubInclude</remote-id>
                 <remote-id type="cpan-module">Catalyst::View::Component::SubInclude::ESI</remote-id>
                 <remote-id type="cpan-module">Catalyst::View::Component::SubInclude::HTTP</remote-id>
                 <remote-id type="cpan-module">Catalyst::View::Component::SubInclude::SSI</remote-id>
                 <remote-id type="cpan-module">Catalyst::View::Component::SubInclude::SubRequest</remote-id>
                 <remote-id type="cpan-module">Catalyst::View::Component::SubInclude::Visit</remote-id>
-                <remote-id type="cpan">Catalyst-View-Component-SubInclude</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-ContentNegotiation-XHTML/metadata.xml b/dev-perl/Catalyst-View-ContentNegotiation-XHTML/metadata.xml
index 75589ba..fb915ef 100644
--- a/dev-perl/Catalyst-View-ContentNegotiation-XHTML/metadata.xml
+++ b/dev-perl/Catalyst-View-ContentNegotiation-XHTML/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-ContentNegotiation-XHTML</remote-id>
         <remote-id type="cpan-module">Catalyst::View::ContentNegotiation::XHTML</remote-id>
         <remote-id type="cpan-module">Catalyst::View::TT::XHTML</remote-id>
-        <remote-id type="cpan">Catalyst-View-ContentNegotiation-XHTML</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-Download/metadata.xml b/dev-perl/Catalyst-View-Download/metadata.xml
index a7c672b..3149875 100644
--- a/dev-perl/Catalyst-View-Download/metadata.xml
+++ b/dev-perl/Catalyst-View-Download/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-Download</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Download</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Download::CSV</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Download::HTML</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Download::Plain</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Download::XML</remote-id>
-        <remote-id type="cpan">Catalyst-View-Download</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-Email/metadata.xml b/dev-perl/Catalyst-View-Email/metadata.xml
index 17cbad5..59e09ec 100644
--- a/dev-perl/Catalyst-View-Email/metadata.xml
+++ b/dev-perl/Catalyst-View-Email/metadata.xml
@@ -7,10 +7,10 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-Email</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::Email</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::Email::Template</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Email</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Email::Template</remote-id>
-        <remote-id type="cpan">Catalyst-View-Email</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-Excel-Template-Plus/metadata.xml b/dev-perl/Catalyst-View-Excel-Template-Plus/metadata.xml
index f464657..31aa758 100644
--- a/dev-perl/Catalyst-View-Excel-Template-Plus/metadata.xml
+++ b/dev-perl/Catalyst-View-Excel-Template-Plus/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-Excel-Template-Plus</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::Excel::Template::Plus</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Excel::Template::Plus</remote-id>
-        <remote-id type="cpan">Catalyst-View-Excel-Template-Plus</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-GD-Barcode/metadata.xml b/dev-perl/Catalyst-View-GD-Barcode/metadata.xml
index 73a1fab..dd3e1f9 100644
--- a/dev-perl/Catalyst-View-GD-Barcode/metadata.xml
+++ b/dev-perl/Catalyst-View-GD-Barcode/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::View::GD::Barcode</remote-id>
         <remote-id type="cpan">Catalyst-View-GD-Barcode</remote-id>
+        <remote-id type="cpan-module">Catalyst::View::GD::Barcode</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-JSON/metadata.xml b/dev-perl/Catalyst-View-JSON/metadata.xml
index 595dfca..634c929 100644
--- a/dev-perl/Catalyst-View-JSON/metadata.xml
+++ b/dev-perl/Catalyst-View-JSON/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-JSON</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::JSON</remote-id>
         <remote-id type="cpan-module">Catalyst::View::JSON</remote-id>
-        <remote-id type="cpan">Catalyst-View-JSON</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-Mason/metadata.xml b/dev-perl/Catalyst-View-Mason/metadata.xml
index 035beda..27f27f2 100644
--- a/dev-perl/Catalyst-View-Mason/metadata.xml
+++ b/dev-perl/Catalyst-View-Mason/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-Mason</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::Mason</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Mason</remote-id>
-        <remote-id type="cpan">Catalyst-View-Mason</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-TT-ControllerLocal/metadata.xml b/dev-perl/Catalyst-View-TT-ControllerLocal/metadata.xml
index be7aeb4..b336165 100644
--- a/dev-perl/Catalyst-View-TT-ControllerLocal/metadata.xml
+++ b/dev-perl/Catalyst-View-TT-ControllerLocal/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-TT-ControllerLocal</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::TTControllerLocal</remote-id>
         <remote-id type="cpan-module">Catalyst::View::TT::ControllerLocal</remote-id>
-        <remote-id type="cpan">Catalyst-View-TT-ControllerLocal</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-TT/metadata.xml b/dev-perl/Catalyst-View-TT/metadata.xml
index e869e4a..fd16778 100644
--- a/dev-perl/Catalyst-View-TT/metadata.xml
+++ b/dev-perl/Catalyst-View-TT/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-TT</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::TT</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::TTSite</remote-id>
         <remote-id type="cpan-module">Catalyst::View::TT</remote-id>
-        <remote-id type="cpan">Catalyst-View-TT</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-Wkhtmltopdf/metadata.xml b/dev-perl/Catalyst-View-Wkhtmltopdf/metadata.xml
index 923b2e8..8917a51 100644
--- a/dev-perl/Catalyst-View-Wkhtmltopdf/metadata.xml
+++ b/dev-perl/Catalyst-View-Wkhtmltopdf/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Catalyst-View-Wkhtmltopdf</remote-id>
         <remote-id type="cpan-module">Catalyst::Helper::View::Wkhtmltopdf</remote-id>
         <remote-id type="cpan-module">Catalyst::View::Wkhtmltopdf</remote-id>
-        <remote-id type="cpan">Catalyst-View-Wkhtmltopdf</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Catalyst-View-vCard/metadata.xml b/dev-perl/Catalyst-View-vCard/metadata.xml
index ed52ab0..c3c7d03 100644
--- a/dev-perl/Catalyst-View-vCard/metadata.xml
+++ b/dev-perl/Catalyst-View-vCard/metadata.xml
@@ -7,7 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Catalyst::View::vCard</remote-id>
         <remote-id type="cpan">Catalyst-View-vCard</remote-id>
+        <remote-id type="cpan-module">Catalyst::View::vCard</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CatalystX-Component-Traits/metadata.xml b/dev-perl/CatalystX-Component-Traits/metadata.xml
index b88ea60..544c642 100644
--- a/dev-perl/CatalystX-Component-Traits/metadata.xml
+++ b/dev-perl/CatalystX-Component-Traits/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CatalystX::Component::Traits</remote-id>
         <remote-id type="cpan">CatalystX-Component-Traits</remote-id>
+        <remote-id type="cpan-module">CatalystX::Component::Traits</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CatalystX-Declare/metadata.xml b/dev-perl/CatalystX-Declare/metadata.xml
index 01184fd..61628ce 100644
--- a/dev-perl/CatalystX-Declare/metadata.xml
+++ b/dev-perl/CatalystX-Declare/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CatalystX-Declare</remote-id>
         <remote-id type="cpan-module">CatalystX::Declare</remote-id>
         <remote-id type="cpan-module">CatalystX::Declare::Action::CatchValidationError</remote-id>
         <remote-id type="cpan-module">CatalystX::Declare::Context::AppSetup</remote-id>
@@ -24,6 +25,5 @@
         <remote-id type="cpan-module">CatalystX::Declare::Keyword::Model</remote-id>
         <remote-id type="cpan-module">CatalystX::Declare::Keyword::Role</remote-id>
         <remote-id type="cpan-module">CatalystX::Declare::Keyword::View</remote-id>
-        <remote-id type="cpan">CatalystX-Declare</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CatalystX-InjectComponent/metadata.xml b/dev-perl/CatalystX-InjectComponent/metadata.xml
index b01f61b..d24c497 100644
--- a/dev-perl/CatalystX-InjectComponent/metadata.xml
+++ b/dev-perl/CatalystX-InjectComponent/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CatalystX::InjectComponent</remote-id>
         <remote-id type="cpan">CatalystX-InjectComponent</remote-id>
+        <remote-id type="cpan-module">CatalystX::InjectComponent</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CatalystX-LeakChecker/metadata.xml b/dev-perl/CatalystX-LeakChecker/metadata.xml
index 598f213..6d311af 100644
--- a/dev-perl/CatalystX-LeakChecker/metadata.xml
+++ b/dev-perl/CatalystX-LeakChecker/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CatalystX::LeakChecker</remote-id>
         <remote-id type="cpan">CatalystX-LeakChecker</remote-id>
+        <remote-id type="cpan-module">CatalystX::LeakChecker</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CatalystX-Profile/metadata.xml b/dev-perl/CatalystX-Profile/metadata.xml
index 2cfdeff..0bdc265 100644
--- a/dev-perl/CatalystX-Profile/metadata.xml
+++ b/dev-perl/CatalystX-Profile/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CatalystX-Profile</remote-id>
         <remote-id type="cpan-module">CatalystX::Profile</remote-id>
         <remote-id type="cpan-module">CatalystX::Profile::Controller::ControlProfiling</remote-id>
-        <remote-id type="cpan">CatalystX-Profile</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CatalystX-REPL/metadata.xml b/dev-perl/CatalystX-REPL/metadata.xml
index b88e6d3..ed9fe34 100644
--- a/dev-perl/CatalystX-REPL/metadata.xml
+++ b/dev-perl/CatalystX-REPL/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">CatalystX::REPL</remote-id>
         <remote-id type="cpan">CatalystX-REPL</remote-id>
+        <remote-id type="cpan-module">CatalystX::REPL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/CatalystX-SimpleLogin/metadata.xml b/dev-perl/CatalystX-SimpleLogin/metadata.xml
index d182881..0123c52 100644
--- a/dev-perl/CatalystX-SimpleLogin/metadata.xml
+++ b/dev-perl/CatalystX-SimpleLogin/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">CatalystX-SimpleLogin</remote-id>
         <remote-id type="cpan-module">Catalyst::ActionRole::NeedsLogin</remote-id>
         <remote-id type="cpan-module">CatalystX::SimpleLogin</remote-id>
         <remote-id type="cpan-module">CatalystX::SimpleLogin::Controller::Login</remote-id>
@@ -16,6 +17,5 @@
         <remote-id type="cpan-module">CatalystX::SimpleLogin::TraitFor::Controller::Login::OpenID</remote-id>
         <remote-id type="cpan-module">CatalystX::SimpleLogin::TraitFor::Controller::Login::RenderAsTTTemplate</remote-id>
         <remote-id type="cpan-module">CatalystX::SimpleLogin::TraitFor::Controller::Login::WithRedirect</remote-id>
-        <remote-id type="cpan">CatalystX-SimpleLogin</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Cave-Wrapper/metadata.xml b/dev-perl/Cave-Wrapper/metadata.xml
index 70892c5..3a38de1 100644
--- a/dev-perl/Cave-Wrapper/metadata.xml
+++ b/dev-perl/Cave-Wrapper/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Cave::Wrapper</remote-id>
         <remote-id type="cpan">Cave-Wrapper</remote-id>
+        <remote-id type="cpan-module">Cave::Wrapper</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Check-ISA/metadata.xml b/dev-perl/Check-ISA/metadata.xml
index 78e9574..d1b205a 100644
--- a/dev-perl/Check-ISA/metadata.xml
+++ b/dev-perl/Check-ISA/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Check::ISA</remote-id>
                 <remote-id type="cpan">Check-ISA</remote-id>
+                <remote-id type="cpan-module">Check::ISA</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Child/metadata.xml b/dev-perl/Child/metadata.xml
index 95778ea..3aa2b47 100644
--- a/dev-perl/Child/metadata.xml
+++ b/dev-perl/Child/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Child</remote-id>
         <remote-id type="cpan-module">Child</remote-id>
         <remote-id type="cpan-module">Child::IPC::Pipe</remote-id>
         <remote-id type="cpan-module">Child::Link</remote-id>
@@ -17,6 +18,5 @@
         <remote-id type="cpan-module">Child::Link::Parent</remote-id>
         <remote-id type="cpan-module">Child::Link::Proc</remote-id>
         <remote-id type="cpan-module">Child::Util</remote-id>
-        <remote-id type="cpan">Child</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-C3-Adopt-NEXT/metadata.xml b/dev-perl/Class-C3-Adopt-NEXT/metadata.xml
index 68f78c1..f01f56c 100644
--- a/dev-perl/Class-C3-Adopt-NEXT/metadata.xml
+++ b/dev-perl/Class-C3-Adopt-NEXT/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Class::C3::Adopt::NEXT</remote-id>
                 <remote-id type="cpan">Class-C3-Adopt-NEXT</remote-id>
+                <remote-id type="cpan-module">Class::C3::Adopt::NEXT</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-DBI-AsForm/metadata.xml b/dev-perl/Class-DBI-AsForm/metadata.xml
index 4eb114a..c2da93b 100644
--- a/dev-perl/Class-DBI-AsForm/metadata.xml
+++ b/dev-perl/Class-DBI-AsForm/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Class::DBI::AsForm</remote-id>
         <remote-id type="cpan">Class-DBI-AsForm</remote-id>
+        <remote-id type="cpan-module">Class::DBI::AsForm</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-DBI-Loader/metadata.xml b/dev-perl/Class-DBI-Loader/metadata.xml
index 7ded945..7acbfb2 100644
--- a/dev-perl/Class-DBI-Loader/metadata.xml
+++ b/dev-perl/Class-DBI-Loader/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Class-DBI-Loader</remote-id>
         <remote-id type="cpan-module">Class::DBI::Loader</remote-id>
         <remote-id type="cpan-module">Class::DBI::Loader::Generic</remote-id>
         <remote-id type="cpan-module">Class::DBI::Loader::Pg</remote-id>
         <remote-id type="cpan-module">Class::DBI::Loader::SQLite</remote-id>
         <remote-id type="cpan-module">Class::DBI::Loader::mysql</remote-id>
-        <remote-id type="cpan">Class-DBI-Loader</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-DBI-Pager/metadata.xml b/dev-perl/Class-DBI-Pager/metadata.xml
index a397c6c..9cbe8b2 100644
--- a/dev-perl/Class-DBI-Pager/metadata.xml
+++ b/dev-perl/Class-DBI-Pager/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Class::DBI::Pager</remote-id>
         <remote-id type="cpan">Class-DBI-Pager</remote-id>
+        <remote-id type="cpan-module">Class::DBI::Pager</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-DBI-SQLite/metadata.xml b/dev-perl/Class-DBI-SQLite/metadata.xml
index 30d9019..003f1fb 100644
--- a/dev-perl/Class-DBI-SQLite/metadata.xml
+++ b/dev-perl/Class-DBI-SQLite/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Class::DBI::SQLite</remote-id>
         <remote-id type="cpan">Class-DBI-SQLite</remote-id>
+        <remote-id type="cpan-module">Class::DBI::SQLite</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-Discover/metadata.xml b/dev-perl/Class-Discover/metadata.xml
index f29697e..3913a45 100644
--- a/dev-perl/Class-Discover/metadata.xml
+++ b/dev-perl/Class-Discover/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Class::Discover</remote-id>
         <remote-id type="cpan">Class-Discover</remote-id>
+        <remote-id type="cpan-module">Class::Discover</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-Fields/metadata.xml b/dev-perl/Class-Fields/metadata.xml
index e395ec8..aee34b0 100644
--- a/dev-perl/Class-Fields/metadata.xml
+++ b/dev-perl/Class-Fields/metadata.xml
@@ -7,6 +7,7 @@
         <name>Jason M. Mills</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Class-Fields</remote-id>
         <remote-id type="cpan-module">Class::Fields</remote-id>
         <remote-id type="cpan-module">Class::Fields::Attribs</remote-id>
         <remote-id type="cpan-module">Class::Fields::Fuxor</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">private</remote-id>
         <remote-id type="cpan-module">protected</remote-id>
         <remote-id type="cpan-module">public</remote-id>
-        <remote-id type="cpan">Class-Fields</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-InsideOut/metadata.xml b/dev-perl/Class-InsideOut/metadata.xml
index d790d4c..df2c11a 100644
--- a/dev-perl/Class-InsideOut/metadata.xml
+++ b/dev-perl/Class-InsideOut/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Class::InsideOut</remote-id>
                 <remote-id type="cpan">Class-InsideOut</remote-id>
+                <remote-id type="cpan-module">Class::InsideOut</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-Mix/metadata.xml b/dev-perl/Class-Mix/metadata.xml
index 6c5b57c..9f91bda 100644
--- a/dev-perl/Class-Mix/metadata.xml
+++ b/dev-perl/Class-Mix/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Class::Mix</remote-id>
         <remote-id type="cpan">Class-Mix</remote-id>
+        <remote-id type="cpan-module">Class::Mix</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Class-Throwable/metadata.xml b/dev-perl/Class-Throwable/metadata.xml
index b24ebfa..57b2629 100644
--- a/dev-perl/Class-Throwable/metadata.xml
+++ b/dev-perl/Class-Throwable/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Class-Throwable</remote-id>
         <remote-id type="cpan-module">Class::Throwable</remote-id>
         <remote-id type="cpan-module">DB</remote-id>
-        <remote-id type="cpan">Class-Throwable</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Color-Calc/metadata.xml b/dev-perl/Color-Calc/metadata.xml
index f1c8d06..8a55413 100644
--- a/dev-perl/Color-Calc/metadata.xml
+++ b/dev-perl/Color-Calc/metadata.xml
@@ -5,13 +5,13 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="colorobject">Install Graphics::ColorObject </flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="colorobject">Install Graphics::ColorObject </flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">Color-Calc</remote-id>
         <remote-id type="cpan-module">Color::Calc</remote-id>
         <remote-id type="cpan-module">Color::Calc::WWW</remote-id>
-        <remote-id type="cpan">Color-Calc</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Config-AutoConf/metadata.xml b/dev-perl/Config-AutoConf/metadata.xml
index 7430d27..ff017b2 100644
--- a/dev-perl/Config-AutoConf/metadata.xml
+++ b/dev-perl/Config-AutoConf/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Config::AutoConf</remote-id>
                 <remote-id type="cpan">Config-AutoConf</remote-id>
+                <remote-id type="cpan-module">Config::AutoConf</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Config-General-Match/metadata.xml b/dev-perl/Config-General-Match/metadata.xml
index 372bea0..65d893d 100644
--- a/dev-perl/Config-General-Match/metadata.xml
+++ b/dev-perl/Config-General-Match/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Config::General::Match</remote-id>
         <remote-id type="cpan">Config-General-Match</remote-id>
+        <remote-id type="cpan-module">Config::General::Match</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Config-GitLike/metadata.xml b/dev-perl/Config-GitLike/metadata.xml
index d08272e..88c7907 100644
--- a/dev-perl/Config-GitLike/metadata.xml
+++ b/dev-perl/Config-GitLike/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Config-GitLike</remote-id>
         <remote-id type="cpan-module">Config::GitLike</remote-id>
         <remote-id type="cpan-module">Config::GitLike::Cascaded</remote-id>
         <remote-id type="cpan-module">Config::GitLike::Git</remote-id>
-        <remote-id type="cpan">Config-GitLike</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Config-INI/metadata.xml b/dev-perl/Config-INI/metadata.xml
index 9b4f61d..e8a4e33 100644
--- a/dev-perl/Config-INI/metadata.xml
+++ b/dev-perl/Config-INI/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Config-INI</remote-id>
         <remote-id type="cpan-module">Config::INI</remote-id>
         <remote-id type="cpan-module">Config::INI::Reader</remote-id>
         <remote-id type="cpan-module">Config::INI::Writer</remote-id>
-        <remote-id type="cpan">Config-INI</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Config-JFDI/metadata.xml b/dev-perl/Config-JFDI/metadata.xml
index 86daa2b..ace7e49 100644
--- a/dev-perl/Config-JFDI/metadata.xml
+++ b/dev-perl/Config-JFDI/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Config-JFDI</remote-id>
         <remote-id type="cpan-module">Config::JFDI</remote-id>
         <remote-id type="cpan-module">Config::JFDI::Carp</remote-id>
         <remote-id type="cpan-module">Config::JFDI::Source::Loader</remote-id>
-        <remote-id type="cpan">Config-JFDI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Config-JSON/metadata.xml b/dev-perl/Config-JSON/metadata.xml
index e46270b..147900e 100644
--- a/dev-perl/Config-JSON/metadata.xml
+++ b/dev-perl/Config-JSON/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Config::JSON</remote-id>
                 <remote-id type="cpan">Config-JSON</remote-id>
+                <remote-id type="cpan-module">Config::JSON</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Config-MVP-Reader-INI/metadata.xml b/dev-perl/Config-MVP-Reader-INI/metadata.xml
index e70ac29..120ad42 100644
--- a/dev-perl/Config-MVP-Reader-INI/metadata.xml
+++ b/dev-perl/Config-MVP-Reader-INI/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Config::MVP::Reader::INI</remote-id>
         <remote-id type="cpan">Config-MVP-Reader-INI</remote-id>
+        <remote-id type="cpan-module">Config::MVP::Reader::INI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Config-MVP/metadata.xml b/dev-perl/Config-MVP/metadata.xml
index 44d080d..21421f0 100644
--- a/dev-perl/Config-MVP/metadata.xml
+++ b/dev-perl/Config-MVP/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Config-MVP</remote-id>
         <remote-id type="cpan-module">Config::MVP</remote-id>
         <remote-id type="cpan-module">Config::MVP::Assembler</remote-id>
         <remote-id type="cpan-module">Config::MVP::Assembler::WithBundles</remote-id>
@@ -18,6 +19,5 @@
         <remote-id type="cpan-module">Config::MVP::Reader::Hash</remote-id>
         <remote-id type="cpan-module">Config::MVP::Section</remote-id>
         <remote-id type="cpan-module">Config::MVP::Sequence</remote-id>
-        <remote-id type="cpan">Config-MVP</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Cookie-XS/metadata.xml b/dev-perl/Cookie-XS/metadata.xml
index 729d26e..d7e55ab 100644
--- a/dev-perl/Cookie-XS/metadata.xml
+++ b/dev-perl/Cookie-XS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Cookie::XS</remote-id>
         <remote-id type="cpan">Cookie-XS</remote-id>
+        <remote-id type="cpan-module">Cookie::XS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Crypt-Eksblowfish/metadata.xml b/dev-perl/Crypt-Eksblowfish/metadata.xml
index 33474af..abf8cc7 100644
--- a/dev-perl/Crypt-Eksblowfish/metadata.xml
+++ b/dev-perl/Crypt-Eksblowfish/metadata.xml
@@ -7,12 +7,12 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Crypt-Eksblowfish</remote-id>
         <remote-id type="cpan-module">Crypt::Eksblowfish</remote-id>
         <remote-id type="cpan-module">Crypt::Eksblowfish::Bcrypt</remote-id>
         <remote-id type="cpan-module">Crypt::Eksblowfish::Blowfish</remote-id>
         <remote-id type="cpan-module">Crypt::Eksblowfish::Family</remote-id>
         <remote-id type="cpan-module">Crypt::Eksblowfish::Subkeyed</remote-id>
         <remote-id type="cpan-module">Crypt::Eksblowfish::Uklblowfish</remote-id>
-        <remote-id type="cpan">Crypt-Eksblowfish</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Crypt-MySQL/metadata.xml b/dev-perl/Crypt-MySQL/metadata.xml
index be8c86f..3ecc821 100644
--- a/dev-perl/Crypt-MySQL/metadata.xml
+++ b/dev-perl/Crypt-MySQL/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Crypt::MySQL</remote-id>
         <remote-id type="cpan">Crypt-MySQL</remote-id>
+        <remote-id type="cpan-module">Crypt::MySQL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Crypt-Skip32-Base32Crockford/metadata.xml b/dev-perl/Crypt-Skip32-Base32Crockford/metadata.xml
index 1a87d50..1e62667 100644
--- a/dev-perl/Crypt-Skip32-Base32Crockford/metadata.xml
+++ b/dev-perl/Crypt-Skip32-Base32Crockford/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Crypt::Skip32::Base32Crockford</remote-id>
         <remote-id type="cpan">Crypt-Skip32-Base32Crockford</remote-id>
+        <remote-id type="cpan-module">Crypt::Skip32::Base32Crockford</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Crypt-Skip32-XS/metadata.xml b/dev-perl/Crypt-Skip32-XS/metadata.xml
index 0c180a3..1b02df9 100644
--- a/dev-perl/Crypt-Skip32-XS/metadata.xml
+++ b/dev-perl/Crypt-Skip32-XS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Crypt::Skip32::XS</remote-id>
         <remote-id type="cpan">Crypt-Skip32-XS</remote-id>
+        <remote-id type="cpan-module">Crypt::Skip32::XS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Crypt-Skip32/metadata.xml b/dev-perl/Crypt-Skip32/metadata.xml
index caeeede..10e0f24 100644
--- a/dev-perl/Crypt-Skip32/metadata.xml
+++ b/dev-perl/Crypt-Skip32/metadata.xml
@@ -5,12 +5,12 @@
     <maintainer>
         <email>mb@...</email>
         <name>Michele Beltrame</name>
-	</maintainer>
-	<use>
-		<flag name="recommended">Install dependencies recommended by upstream that may add functionality</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="recommended">Install dependencies recommended by upstream that may add functionality</flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Crypt::Skip32</remote-id>
         <remote-id type="cpan">Crypt-Skip32</remote-id>
+        <remote-id type="cpan-module">Crypt::Skip32</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Crypt-UnixCrypt_XS/metadata.xml b/dev-perl/Crypt-UnixCrypt_XS/metadata.xml
index aecb9fe..ae6c618 100644
--- a/dev-perl/Crypt-UnixCrypt_XS/metadata.xml
+++ b/dev-perl/Crypt-UnixCrypt_XS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Crypt::UnixCrypt_XS</remote-id>
         <remote-id type="cpan">Crypt-UnixCrypt_XS</remote-id>
+        <remote-id type="cpan-module">Crypt::UnixCrypt_XS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Crypt-Util/metadata.xml b/dev-perl/Crypt-Util/metadata.xml
index 290286c..ebba9f8 100644
--- a/dev-perl/Crypt-Util/metadata.xml
+++ b/dev-perl/Crypt-Util/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Crypt-Util</remote-id>
         <remote-id type="cpan-module">Crypt::Util</remote-id>
         <remote-id type="cpan-module">Digest::MoreFallbacks</remote-id>
         <remote-id type="cpan-module">Digest::MultiHash</remote-id>
-        <remote-id type="cpan">Crypt-Util</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-Cursor-Cached/metadata.xml b/dev-perl/DBIx-Class-Cursor-Cached/metadata.xml
index 882e005..2acb1ce 100644
--- a/dev-perl/DBIx-Class-Cursor-Cached/metadata.xml
+++ b/dev-perl/DBIx-Class-Cursor-Cached/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DBIx::Class::Cursor::Cached</remote-id>
         <remote-id type="cpan">DBIx-Class-Cursor-Cached</remote-id>
+        <remote-id type="cpan-module">DBIx::Class::Cursor::Cached</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-DateTime-Epoch/metadata.xml b/dev-perl/DBIx-Class-DateTime-Epoch/metadata.xml
index 2a5305f..1bbdbfa 100644
--- a/dev-perl/DBIx-Class-DateTime-Epoch/metadata.xml
+++ b/dev-perl/DBIx-Class-DateTime-Epoch/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DBIx::Class::DateTime::Epoch</remote-id>
         <remote-id type="cpan">DBIx-Class-DateTime-Epoch</remote-id>
+        <remote-id type="cpan-module">DBIx::Class::DateTime::Epoch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-DigestColumns/metadata.xml b/dev-perl/DBIx-Class-DigestColumns/metadata.xml
index e1057ce..7eb3587 100644
--- a/dev-perl/DBIx-Class-DigestColumns/metadata.xml
+++ b/dev-perl/DBIx-Class-DigestColumns/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DBIx::Class::DigestColumns</remote-id>
         <remote-id type="cpan">DBIx-Class-DigestColumns</remote-id>
+        <remote-id type="cpan-module">DBIx::Class::DigestColumns</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-EncodedColumn/metadata.xml b/dev-perl/DBIx-Class-EncodedColumn/metadata.xml
index 2505fdb..402a461 100644
--- a/dev-perl/DBIx-Class-EncodedColumn/metadata.xml
+++ b/dev-perl/DBIx-Class-EncodedColumn/metadata.xml
@@ -5,19 +5,19 @@
     <maintainer>
         <email>mb@...</email>
         <name>Michele Beltrame</name>
-	</maintainer>
-	<use>
-			<flag name="md5">Support for Digest::MD5.</flag>
-			<flag name="sha">Support for Digest::SHA.</flag>
-			<flag name="blowfish">Support for Crypt::Eksblowfish</flag>
-			<flag name="gpg">Support for OpenPGP Encryption</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="md5">Support for Digest::MD5.</flag>
+        <flag name="sha">Support for Digest::SHA.</flag>
+        <flag name="blowfish">Support for Crypt::Eksblowfish</flag>
+        <flag name="gpg">Support for OpenPGP Encryption</flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">DBIx-Class-EncodedColumn</remote-id>
         <remote-id type="cpan-module">DBIx::Class::EncodedColumn</remote-id>
         <remote-id type="cpan-module">DBIx::Class::EncodedColumn::Crypt</remote-id>
         <remote-id type="cpan-module">DBIx::Class::EncodedColumn::Crypt::Eksblowfish::Bcrypt</remote-id>
         <remote-id type="cpan-module">DBIx::Class::EncodedColumn::Crypt::OpenPGP</remote-id>
         <remote-id type="cpan-module">DBIx::Class::EncodedColumn::Digest</remote-id>
-        <remote-id type="cpan">DBIx-Class-EncodedColumn</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-HTML-FormFu/metadata.xml b/dev-perl/DBIx-Class-HTML-FormFu/metadata.xml
index 003bb5f..8c04528 100644
--- a/dev-perl/DBIx-Class-HTML-FormFu/metadata.xml
+++ b/dev-perl/DBIx-Class-HTML-FormFu/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">DBIx::Class::HTML::FormFu</remote-id>
                 <remote-id type="cpan">DBIx-Class-HTML-FormFu</remote-id>
+                <remote-id type="cpan-module">DBIx::Class::HTML::FormFu</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-IntrospectableM2M/metadata.xml b/dev-perl/DBIx-Class-IntrospectableM2M/metadata.xml
index 33def4b..3f5e715 100644
--- a/dev-perl/DBIx-Class-IntrospectableM2M/metadata.xml
+++ b/dev-perl/DBIx-Class-IntrospectableM2M/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DBIx::Class::IntrospectableM2M</remote-id>
         <remote-id type="cpan">DBIx-Class-IntrospectableM2M</remote-id>
+        <remote-id type="cpan-module">DBIx::Class::IntrospectableM2M</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/DBIx-Class-QueryLog/metadata.xml b/dev-perl/DBIx-Class-QueryLog/metadata.xml
index 51a6b4f..9149c19 100644
--- a/dev-perl/DBIx-Class-QueryLog/metadata.xml
+++ b/dev-perl/DBIx-Class-QueryLog/metadata.xml
@@ -7,10 +7,10 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">DBIx-Class-QueryLog</remote-id>
         <remote-id type="cpan-module">DBIx::Class::QueryLog</remote-id>
         <remote-id type="cpan-module">DBIx::Class::QueryLog::Analyzer</remote-id>
         <remote-id type="cpan-module">DBIx::Class::QueryLog::Query</remote-id>
         <remote-id type="cpan-module">DBIx::Class::QueryLog::Transaction</remote-id>
-        <remote-id type="cpan">DBIx-Class-QueryLog</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-Schema-Loader/metadata.xml b/dev-perl/DBIx-Class-Schema-Loader/metadata.xml
index b327f4d..1905013 100644
--- a/dev-perl/DBIx-Class-Schema-Loader/metadata.xml
+++ b/dev-perl/DBIx-Class-Schema-Loader/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">DBIx-Class-Schema-Loader</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::Loader</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::Loader::Base</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::Loader::DBI</remote-id>
@@ -45,6 +46,5 @@
         <remote-id type="cpan-module">DBIx::Class::Schema::Loader::Table</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::Loader::Table::Informix</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::Loader::Table::Sybase</remote-id>
-        <remote-id type="cpan">DBIx-Class-Schema-Loader</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-Schema-RestrictWithObject/metadata.xml b/dev-perl/DBIx-Class-Schema-RestrictWithObject/metadata.xml
index b6a3080..a958bc9 100644
--- a/dev-perl/DBIx-Class-Schema-RestrictWithObject/metadata.xml
+++ b/dev-perl/DBIx-Class-Schema-RestrictWithObject/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">DBIx-Class-Schema-RestrictWithObject</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::RestrictWithObject</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::RestrictWithObject::RestrictComp::Schema</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::RestrictWithObject::RestrictComp::Source</remote-id>
-        <remote-id type="cpan">DBIx-Class-Schema-RestrictWithObject</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-TimeStamp/metadata.xml b/dev-perl/DBIx-Class-TimeStamp/metadata.xml
index 9786d26..1b41757 100644
--- a/dev-perl/DBIx-Class-TimeStamp/metadata.xml
+++ b/dev-perl/DBIx-Class-TimeStamp/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DBIx::Class::TimeStamp</remote-id>
         <remote-id type="cpan">DBIx-Class-TimeStamp</remote-id>
+        <remote-id type="cpan-module">DBIx::Class::TimeStamp</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/DBIx-Class-Tree/metadata.xml b/dev-perl/DBIx-Class-Tree/metadata.xml
index 382132a..da5900e 100644
--- a/dev-perl/DBIx-Class-Tree/metadata.xml
+++ b/dev-perl/DBIx-Class-Tree/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">DBIx-Class-Tree</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Tree</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Tree::AdjacencyList</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Tree::AdjacencyList::Ordered</remote-id>
-        <remote-id type="cpan">DBIx-Class-Tree</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-UUIDColumns/metadata.xml b/dev-perl/DBIx-Class-UUIDColumns/metadata.xml
index c611642..4944b00 100644
--- a/dev-perl/DBIx-Class-UUIDColumns/metadata.xml
+++ b/dev-perl/DBIx-Class-UUIDColumns/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">DBIx-Class-UUIDColumns</remote-id>
         <remote-id type="cpan-module">DBIx::Class::UUIDColumns</remote-id>
         <remote-id type="cpan-module">DBIx::Class::UUIDColumns::UUIDMaker</remote-id>
         <remote-id type="cpan-module">DBIx::Class::UUIDColumns::UUIDMaker::APR::UUID</remote-id>
@@ -17,6 +18,5 @@
         <remote-id type="cpan-module">DBIx::Class::UUIDColumns::UUIDMaker::UUID::Random</remote-id>
         <remote-id type="cpan-module">DBIx::Class::UUIDColumns::UUIDMaker::Win32::Guidgen</remote-id>
         <remote-id type="cpan-module">DBIx::Class::UUIDColumns::UUIDMaker::Win32API::GUID</remote-id>
-        <remote-id type="cpan">DBIx-Class-UUIDColumns</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Class-Validation/metadata.xml b/dev-perl/DBIx-Class-Validation/metadata.xml
index 7e8d59a..0be1be7 100644
--- a/dev-perl/DBIx-Class-Validation/metadata.xml
+++ b/dev-perl/DBIx-Class-Validation/metadata.xml
@@ -10,7 +10,7 @@
         <flag name="recommended">Install recommended package <pkg>Data::FormValidator</pkg></flag>
     </use>
     <upstream>
-        <remote-id type="cpan-module">DBIx::Class::Validation</remote-id>
         <remote-id type="cpan">DBIx-Class-Validation</remote-id>
+        <remote-id type="cpan-module">DBIx::Class::Validation</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Connector/metadata.xml b/dev-perl/DBIx-Connector/metadata.xml
index 2ed581c..eece5c1 100644
--- a/dev-perl/DBIx-Connector/metadata.xml
+++ b/dev-perl/DBIx-Connector/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpan">DBIx-Connector</remote-id>
 		<remote-id type="cpan-module">DBIx::Connector</remote-id>
 		<remote-id type="cpan-module">DBIx::Connector::Driver</remote-id>
 		<remote-id type="cpan-module">DBIx::Connector::Driver::MSSQL</remote-id>
@@ -17,6 +18,5 @@
 		<remote-id type="cpan-module">DBIx::Connector::RollbackError</remote-id>
 		<remote-id type="cpan-module">DBIx::Connector::SvpRollbackError</remote-id>
 		<remote-id type="cpan-module">DBIx::Connector::TxnRollbackError</remote-id>
-		<remote-id type="cpan">DBIx-Connector</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/DBIx-Simple/metadata.xml b/dev-perl/DBIx-Simple/metadata.xml
index ae0382d..6e779c7 100644
--- a/dev-perl/DBIx-Simple/metadata.xml
+++ b/dev-perl/DBIx-Simple/metadata.xml
@@ -7,12 +7,12 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">DBIx-Simple</remote-id>
         <remote-id type="cpan-module">DBIx::Simple</remote-id>
         <remote-id type="cpan-module">DBIx::Simple::DeadObject</remote-id>
         <remote-id type="cpan-module">DBIx::Simple::Dummy</remote-id>
         <remote-id type="cpan-module">DBIx::Simple::Result</remote-id>
         <remote-id type="cpan-module">DBIx::Simple::Result::RowObject</remote-id>
         <remote-id type="cpan-module">DBIx::Simple::Statement</remote-id>
-        <remote-id type="cpan">DBIx-Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dancer/metadata.xml b/dev-perl/Dancer/metadata.xml
index f76a63f..d2cf3c3 100644
--- a/dev-perl/Dancer/metadata.xml
+++ b/dev-perl/Dancer/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dancer</remote-id>
         <remote-id type="cpan-module">Dancer</remote-id>
         <remote-id type="cpan-module">Dancer::App</remote-id>
         <remote-id type="cpan-module">Dancer::Config</remote-id>
@@ -76,6 +77,5 @@
         <remote-id type="cpan-module">Dancer::Template::TemplateToolkit</remote-id>
         <remote-id type="cpan-module">Dancer::Test</remote-id>
         <remote-id type="cpan-module">Dancer::Timer</remote-id>
-        <remote-id type="cpan">Dancer</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Alias/metadata.xml b/dev-perl/Data-Alias/metadata.xml
index c2e0478..640e41c 100644
--- a/dev-perl/Data-Alias/metadata.xml
+++ b/dev-perl/Data-Alias/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Data::Alias</remote-id>
 		<remote-id type="cpan">Data-Alias</remote-id>
+		<remote-id type="cpan-module">Data::Alias</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Clone/metadata.xml b/dev-perl/Data-Clone/metadata.xml
index ab693a5..184506f 100644
--- a/dev-perl/Data-Clone/metadata.xml
+++ b/dev-perl/Data-Clone/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Data::Clone</remote-id>
 		<remote-id type="cpan">Data-Clone</remote-id>
+		<remote-id type="cpan-module">Data::Clone</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Currency/metadata.xml b/dev-perl/Data-Currency/metadata.xml
index bb8dd11..fe1ab75 100644
--- a/dev-perl/Data-Currency/metadata.xml
+++ b/dev-perl/Data-Currency/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::Currency</remote-id>
         <remote-id type="cpan">Data-Currency</remote-id>
+        <remote-id type="cpan-module">Data::Currency</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Dumper-Names/metadata.xml b/dev-perl/Data-Dumper-Names/metadata.xml
index 4e803e6..7ad86bc 100644
--- a/dev-perl/Data-Dumper-Names/metadata.xml
+++ b/dev-perl/Data-Dumper-Names/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::Dumper::Names</remote-id>
         <remote-id type="cpan">Data-Dumper-Names</remote-id>
+        <remote-id type="cpan-module">Data::Dumper::Names</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Entropy/metadata.xml b/dev-perl/Data-Entropy/metadata.xml
index a3789fc..3769ea0 100644
--- a/dev-perl/Data-Entropy/metadata.xml
+++ b/dev-perl/Data-Entropy/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Data-Entropy</remote-id>
         <remote-id type="cpan-module">Data::Entropy</remote-id>
         <remote-id type="cpan-module">Data::Entropy::Algorithms</remote-id>
         <remote-id type="cpan-module">Data::Entropy::RawSource::CryptCounter</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">Data::Entropy::RawSource::RandomOrg</remote-id>
         <remote-id type="cpan-module">Data::Entropy::RawSource::RandomnumbersInfo</remote-id>
         <remote-id type="cpan-module">Data::Entropy::Source</remote-id>
-        <remote-id type="cpan">Data-Entropy</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Float/metadata.xml b/dev-perl/Data-Float/metadata.xml
index c0855be..d662fba 100644
--- a/dev-perl/Data-Float/metadata.xml
+++ b/dev-perl/Data-Float/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::Float</remote-id>
         <remote-id type="cpan">Data-Float</remote-id>
+        <remote-id type="cpan-module">Data::Float</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-FormValidator-Constraints-DateTime/metadata.xml b/dev-perl/Data-FormValidator-Constraints-DateTime/metadata.xml
index c852697..f7a8f23 100644
--- a/dev-perl/Data-FormValidator-Constraints-DateTime/metadata.xml
+++ b/dev-perl/Data-FormValidator-Constraints-DateTime/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::FormValidator::Constraints::DateTime</remote-id>
         <remote-id type="cpan">Data-FormValidator-Constraints-DateTime</remote-id>
+        <remote-id type="cpan-module">Data::FormValidator::Constraints::DateTime</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-GUID/metadata.xml b/dev-perl/Data-GUID/metadata.xml
index a1e271e..65fa6c5 100644
--- a/dev-perl/Data-GUID/metadata.xml
+++ b/dev-perl/Data-GUID/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::GUID</remote-id>
         <remote-id type="cpan">Data-GUID</remote-id>
+        <remote-id type="cpan-module">Data::GUID</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Integer/metadata.xml b/dev-perl/Data-Integer/metadata.xml
index 4ebe639..54cc7aa 100644
--- a/dev-perl/Data-Integer/metadata.xml
+++ b/dev-perl/Data-Integer/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::Integer</remote-id>
         <remote-id type="cpan">Data-Integer</remote-id>
+        <remote-id type="cpan-module">Data::Integer</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Pond/metadata.xml b/dev-perl/Data-Pond/metadata.xml
index cd900ab..dabb3f0 100644
--- a/dev-perl/Data-Pond/metadata.xml
+++ b/dev-perl/Data-Pond/metadata.xml
@@ -5,12 +5,12 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="xsmodule">Pull dependencies required for building XS Version of the Module.</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="xsmodule">Pull dependencies required for building XS Version of the Module.</flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Data::Pond</remote-id>
         <remote-id type="cpan">Data-Pond</remote-id>
+        <remote-id type="cpan-module">Data::Pond</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-PowerSet/metadata.xml b/dev-perl/Data-PowerSet/metadata.xml
index 5b4fbc6..8fa29ef 100644
--- a/dev-perl/Data-PowerSet/metadata.xml
+++ b/dev-perl/Data-PowerSet/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::PowerSet</remote-id>
         <remote-id type="cpan">Data-PowerSet</remote-id>
+        <remote-id type="cpan-module">Data::PowerSet</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Random-String/metadata.xml b/dev-perl/Data-Random-String/metadata.xml
index 8a2b021..27e99ad 100644
--- a/dev-perl/Data-Random-String/metadata.xml
+++ b/dev-perl/Data-Random-String/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::Random::String</remote-id>
         <remote-id type="cpan">Data-Random-String</remote-id>
+        <remote-id type="cpan-module">Data::Random::String</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Rx/metadata.xml b/dev-perl/Data-Rx/metadata.xml
index 7da03b0..825118c 100644
--- a/dev-perl/Data-Rx/metadata.xml
+++ b/dev-perl/Data-Rx/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Data-Rx</remote-id>
         <remote-id type="cpan-module">Data::Rx</remote-id>
         <remote-id type="cpan-module">Data::Rx::CoreType</remote-id>
         <remote-id type="cpan-module">Data::Rx::CoreType::all</remote-id>
@@ -26,6 +27,5 @@
         <remote-id type="cpan-module">Data::Rx::TypeBundle</remote-id>
         <remote-id type="cpan-module">Data::Rx::TypeBundle::Core</remote-id>
         <remote-id type="cpan-module">Data::Rx::Util</remote-id>
-        <remote-id type="cpan">Data-Rx</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Section/metadata.xml b/dev-perl/Data-Section/metadata.xml
index ca8531e..b7e6979 100644
--- a/dev-perl/Data-Section/metadata.xml
+++ b/dev-perl/Data-Section/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::Section</remote-id>
         <remote-id type="cpan">Data-Section</remote-id>
+        <remote-id type="cpan-module">Data::Section</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Data-Serializer/metadata.xml b/dev-perl/Data-Serializer/metadata.xml
index fd554c1..1e9f704 100644
--- a/dev-perl/Data-Serializer/metadata.xml
+++ b/dev-perl/Data-Serializer/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Data-Serializer</remote-id>
         <remote-id type="cpan-module">Data::Serializer</remote-id>
         <remote-id type="cpan-module">Data::Serializer::Bencode</remote-id>
         <remote-id type="cpan-module">Data::Serializer::Config::General</remote-id>
@@ -27,6 +28,5 @@
         <remote-id type="cpan-module">Data::Serializer::XML::Simple</remote-id>
         <remote-id type="cpan-module">Data::Serializer::YAML</remote-id>
         <remote-id type="cpan-module">Data::Serializer::YAML::Syck</remote-id>
-        <remote-id type="cpan">Data-Serializer</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Taxi/metadata.xml b/dev-perl/Data-Taxi/metadata.xml
index 223c3ac..0cbfaa7 100644
--- a/dev-perl/Data-Taxi/metadata.xml
+++ b/dev-perl/Data-Taxi/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::Taxi</remote-id>
         <remote-id type="cpan">Data-Taxi</remote-id>
+        <remote-id type="cpan-module">Data::Taxi</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-Transformer/metadata.xml b/dev-perl/Data-Transformer/metadata.xml
index 086dbd5..971427c 100644
--- a/dev-perl/Data-Transformer/metadata.xml
+++ b/dev-perl/Data-Transformer/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Data::Transformer</remote-id>
         <remote-id type="cpan">Data-Transformer</remote-id>
+        <remote-id type="cpan-module">Data::Transformer</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-TreeDumper-Renderer-GTK/metadata.xml b/dev-perl/Data-TreeDumper-Renderer-GTK/metadata.xml
index 5d65ab1..b2ec110 100644
--- a/dev-perl/Data-TreeDumper-Renderer-GTK/metadata.xml
+++ b/dev-perl/Data-TreeDumper-Renderer-GTK/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Data::TreeDumper::Renderer::GTK</remote-id>
                 <remote-id type="cpan">Data-TreeDumper-Renderer-GTK</remote-id>
+                <remote-id type="cpan-module">Data::TreeDumper::Renderer::GTK</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Data-TreeDumper/metadata.xml b/dev-perl/Data-TreeDumper/metadata.xml
index af3e98b..1b1815f 100644
--- a/dev-perl/Data-TreeDumper/metadata.xml
+++ b/dev-perl/Data-TreeDumper/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Data::TreeDumper</remote-id>
                 <remote-id type="cpan">Data-TreeDumper</remote-id>
+                <remote-id type="cpan-module">Data::TreeDumper</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Date-ISO8601/metadata.xml b/dev-perl/Date-ISO8601/metadata.xml
index 2416d79..95a18bb 100644
--- a/dev-perl/Date-ISO8601/metadata.xml
+++ b/dev-perl/Date-ISO8601/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Date::ISO8601</remote-id>
         <remote-id type="cpan">Date-ISO8601</remote-id>
+        <remote-id type="cpan-module">Date::ISO8601</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Date-JD/metadata.xml b/dev-perl/Date-JD/metadata.xml
index 9359bff..fe1c4b6 100644
--- a/dev-perl/Date-JD/metadata.xml
+++ b/dev-perl/Date-JD/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Date::JD</remote-id>
         <remote-id type="cpan">Date-JD</remote-id>
+        <remote-id type="cpan-module">Date::JD</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Date-Tiny/metadata.xml b/dev-perl/Date-Tiny/metadata.xml
index a67a017..f0a7c2c 100644
--- a/dev-perl/Date-Tiny/metadata.xml
+++ b/dev-perl/Date-Tiny/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Date::Tiny</remote-id>
         <remote-id type="cpan">Date-Tiny</remote-id>
+        <remote-id type="cpan-module">Date::Tiny</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-Event-Cron/metadata.xml b/dev-perl/DateTime-Event-Cron/metadata.xml
index 0f36323..24fa410 100644
--- a/dev-perl/DateTime-Event-Cron/metadata.xml
+++ b/dev-perl/DateTime-Event-Cron/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">DateTime-Event-Cron</remote-id>
         <remote-id type="cpan-module">DateTime::Event::Cron</remote-id>
         <remote-id type="cpan-module">DateTime::Event::Cron::IntegratedSet</remote-id>
         <remote-id type="cpan-module">DateTime::Event::Cron::OrderedSet</remote-id>
-        <remote-id type="cpan">DateTime-Event-Cron</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-Format-DB2/metadata.xml b/dev-perl/DateTime-Format-DB2/metadata.xml
index 6052c58..b55d250 100644
--- a/dev-perl/DateTime-Format-DB2/metadata.xml
+++ b/dev-perl/DateTime-Format-DB2/metadata.xml
@@ -7,7 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DateTime::Format::DB2</remote-id>
         <remote-id type="cpan">DateTime-Format-DB2</remote-id>
+        <remote-id type="cpan-module">DateTime::Format::DB2</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-Format-Duration/metadata.xml b/dev-perl/DateTime-Format-Duration/metadata.xml
index 3854cfd..b7b552b 100644
--- a/dev-perl/DateTime-Format-Duration/metadata.xml
+++ b/dev-perl/DateTime-Format-Duration/metadata.xml
@@ -7,7 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DateTime::Format::Duration</remote-id>
         <remote-id type="cpan">DateTime-Format-Duration</remote-id>
+        <remote-id type="cpan-module">DateTime::Format::Duration</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-Format-Epoch/metadata.xml b/dev-perl/DateTime-Format-Epoch/metadata.xml
index 44cd43c..14bd584 100644
--- a/dev-perl/DateTime-Format-Epoch/metadata.xml
+++ b/dev-perl/DateTime-Format-Epoch/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">DateTime-Format-Epoch</remote-id>
         <remote-id type="cpan-module">DateTime::Format::Epoch</remote-id>
         <remote-id type="cpan-module">DateTime::Format::Epoch::ActiveDirectory</remote-id>
         <remote-id type="cpan-module">DateTime::Format::Epoch::DotNet</remote-id>
@@ -19,6 +20,5 @@
         <remote-id type="cpan-module">DateTime::Format::Epoch::TAI64</remote-id>
         <remote-id type="cpan-module">DateTime::Format::Epoch::TJD</remote-id>
         <remote-id type="cpan-module">DateTime::Format::Epoch::Unix</remote-id>
-        <remote-id type="cpan">DateTime-Format-Epoch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-Format-Excel/metadata.xml b/dev-perl/DateTime-Format-Excel/metadata.xml
index 0866fa9..d56768e 100644
--- a/dev-perl/DateTime-Format-Excel/metadata.xml
+++ b/dev-perl/DateTime-Format-Excel/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DateTime::Format::Excel</remote-id>
         <remote-id type="cpan">DateTime-Format-Excel</remote-id>
+        <remote-id type="cpan-module">DateTime::Format::Excel</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-Format-MySQL/metadata.xml b/dev-perl/DateTime-Format-MySQL/metadata.xml
index 7077edc..b6a13df 100644
--- a/dev-perl/DateTime-Format-MySQL/metadata.xml
+++ b/dev-perl/DateTime-Format-MySQL/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DateTime::Format::MySQL</remote-id>
         <remote-id type="cpan">DateTime-Format-MySQL</remote-id>
+        <remote-id type="cpan-module">DateTime::Format::MySQL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-Format-Pg/metadata.xml b/dev-perl/DateTime-Format-Pg/metadata.xml
index a20daaf..b10cad1 100644
--- a/dev-perl/DateTime-Format-Pg/metadata.xml
+++ b/dev-perl/DateTime-Format-Pg/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DateTime::Format::Pg</remote-id>
         <remote-id type="cpan">DateTime-Format-Pg</remote-id>
+        <remote-id type="cpan-module">DateTime::Format::Pg</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-TimeZone-SystemV/metadata.xml b/dev-perl/DateTime-TimeZone-SystemV/metadata.xml
index 177aee8..e707f90 100644
--- a/dev-perl/DateTime-TimeZone-SystemV/metadata.xml
+++ b/dev-perl/DateTime-TimeZone-SystemV/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DateTime::TimeZone::SystemV</remote-id>
         <remote-id type="cpan">DateTime-TimeZone-SystemV</remote-id>
+        <remote-id type="cpan-module">DateTime::TimeZone::SystemV</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-TimeZone-Tzfile/metadata.xml b/dev-perl/DateTime-TimeZone-Tzfile/metadata.xml
index 975df30..37bb4d1 100644
--- a/dev-perl/DateTime-TimeZone-Tzfile/metadata.xml
+++ b/dev-perl/DateTime-TimeZone-Tzfile/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DateTime::TimeZone::Tzfile</remote-id>
         <remote-id type="cpan">DateTime-TimeZone-Tzfile</remote-id>
+        <remote-id type="cpan-module">DateTime::TimeZone::Tzfile</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/DateTime-Tiny/metadata.xml b/dev-perl/DateTime-Tiny/metadata.xml
index 3afdd1a..0a36cc4 100644
--- a/dev-perl/DateTime-Tiny/metadata.xml
+++ b/dev-perl/DateTime-Tiny/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">DateTime::Tiny</remote-id>
         <remote-id type="cpan">DateTime-Tiny</remote-id>
+        <remote-id type="cpan-module">DateTime::Tiny</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Debug-ShowStuff/metadata.xml b/dev-perl/Debug-ShowStuff/metadata.xml
index 82dadb7..c76ccfb 100644
--- a/dev-perl/Debug-ShowStuff/metadata.xml
+++ b/dev-perl/Debug-ShowStuff/metadata.xml
@@ -7,12 +7,12 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Debug-ShowStuff</remote-id>
         <remote-id type="cpan-module">Debug::ShowStuff</remote-id>
         <remote-id type="cpan-module">Debug::ShowStuff::CloseGlobalHandle</remote-id>
         <remote-id type="cpan-module">Debug::ShowStuff::Indent</remote-id>
         <remote-id type="cpan-module">Debug::ShowStuff::ShowStdErr</remote-id>
         <remote-id type="cpan-module">Debug::ShowStuff::ShowStdErr::HandleOb</remote-id>
         <remote-id type="cpan-module">Debug::ShowStuff::Timer</remote-id>
-        <remote-id type="cpan">Debug-ShowStuff</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-Autoflush/metadata.xml b/dev-perl/Devel-Autoflush/metadata.xml
index 9dec3ee..54ff3c4 100644
--- a/dev-perl/Devel-Autoflush/metadata.xml
+++ b/dev-perl/Devel-Autoflush/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Devel::Autoflush</remote-id>
         <remote-id type="cpan">Devel-Autoflush</remote-id>
+        <remote-id type="cpan-module">Devel::Autoflush</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-BeginLift/metadata.xml b/dev-perl/Devel-BeginLift/metadata.xml
index 249a9d5..1240f39 100644
--- a/dev-perl/Devel-BeginLift/metadata.xml
+++ b/dev-perl/Devel-BeginLift/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Devel::BeginLift</remote-id>
         <remote-id type="cpan">Devel-BeginLift</remote-id>
+        <remote-id type="cpan-module">Devel::BeginLift</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-Cover/metadata.xml b/dev-perl/Devel-Cover/metadata.xml
index f534c1a..88fc14d 100644
--- a/dev-perl/Devel-Cover/metadata.xml
+++ b/dev-perl/Devel-Cover/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<use>
-		<flag name="recommended">Install packages recommended by Upstream for maximum utility</flag></use>
+        <herd>perl</herd>
+        <use>
+                <flag name="recommended">Install packages recommended by Upstream for maximum utility</flag>
+        </use>
         <upstream>
+                <remote-id type="cpan">Devel-Cover</remote-id>
                 <remote-id type="cpan-module">Devel::Cover</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::Annotation::Git</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::Annotation::Random</remote-id>
@@ -26,6 +28,7 @@
                 <remote-id type="cpan-module">Devel::Cover::DB::IO::Storable</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::DB::Run</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::DB::Structure</remote-id>
+                <remote-id type="cpan-module">Devel::Cover::Html_Common</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::Op</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::Pod</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::Report::Compilation</remote-id>
@@ -47,6 +50,5 @@
                 <remote-id type="cpan-module">Devel::Cover::Truth_Table</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::Truth_Table::Row</remote-id>
                 <remote-id type="cpan-module">Devel::Cover::Web</remote-id>
-                <remote-id type="cpan">Devel-Cover</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-Leak-Object/metadata.xml b/dev-perl/Devel-Leak-Object/metadata.xml
index f394e3f..8aed15e 100644
--- a/dev-perl/Devel-Leak-Object/metadata.xml
+++ b/dev-perl/Devel-Leak-Object/metadata.xml
@@ -7,7 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Devel::Leak::Object</remote-id>
         <remote-id type="cpan">Devel-Leak-Object</remote-id>
+        <remote-id type="cpan-module">Devel::Leak::Object</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-PartialDump/metadata.xml b/dev-perl/Devel-PartialDump/metadata.xml
index 94e4e11..74badf1 100644
--- a/dev-perl/Devel-PartialDump/metadata.xml
+++ b/dev-perl/Devel-PartialDump/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Devel-PartialDump</remote-id>
         <remote-id type="cpan-module">DB</remote-id>
         <remote-id type="cpan-module">Devel::PartialDump</remote-id>
-        <remote-id type="cpan">Devel-PartialDump</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-PatchPerl/metadata.xml b/dev-perl/Devel-PatchPerl/metadata.xml
index fbc44d7..a86c135 100644
--- a/dev-perl/Devel-PatchPerl/metadata.xml
+++ b/dev-perl/Devel-PatchPerl/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Devel-PatchPerl</remote-id>
         <remote-id type="cpan-module">Devel::PatchPerl</remote-id>
         <remote-id type="cpan-module">Devel::PatchPerl::Hints</remote-id>
         <remote-id type="cpan-module">Devel::PatchPerl::Plugin</remote-id>
-        <remote-id type="cpan">Devel-PatchPerl</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-Pragma/metadata.xml b/dev-perl/Devel-Pragma/metadata.xml
index 5d310ce..7feaa12 100644
--- a/dev-perl/Devel-Pragma/metadata.xml
+++ b/dev-perl/Devel-Pragma/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Devel::Pragma</remote-id>
 		<remote-id type="cpan">Devel-Pragma</remote-id>
+		<remote-id type="cpan-module">Devel::Pragma</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-SimpleTrace/metadata.xml b/dev-perl/Devel-SimpleTrace/metadata.xml
index 7336335..e45d872 100644
--- a/dev-perl/Devel-SimpleTrace/metadata.xml
+++ b/dev-perl/Devel-SimpleTrace/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Devel::SimpleTrace</remote-id>
         <remote-id type="cpan">Devel-SimpleTrace</remote-id>
+        <remote-id type="cpan-module">Devel::SimpleTrace</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Devel-StackTrace-WithLexicals/metadata.xml b/dev-perl/Devel-StackTrace-WithLexicals/metadata.xml
index 70583fa..3082cc7 100644
--- a/dev-perl/Devel-StackTrace-WithLexicals/metadata.xml
+++ b/dev-perl/Devel-StackTrace-WithLexicals/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Devel-StackTrace-WithLexicals</remote-id>
         <remote-id type="cpan-module">Devel::StackTrace::WithLexicals</remote-id>
         <remote-id type="cpan-module">Devel::StackTrace::WithLexicals::Frame</remote-id>
-        <remote-id type="cpan">Devel-StackTrace-WithLexicals</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Digest-Whirlpool/metadata.xml b/dev-perl/Digest-Whirlpool/metadata.xml
index 0590659..9af37c1 100644
--- a/dev-perl/Digest-Whirlpool/metadata.xml
+++ b/dev-perl/Digest-Whirlpool/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Digest::Whirlpool</remote-id>
         <remote-id type="cpan">Digest-Whirlpool</remote-id>
+        <remote-id type="cpan-module">Digest::Whirlpool</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dir-Self/metadata.xml b/dev-perl/Dir-Self/metadata.xml
index e1aaafb..6a94c7d 100644
--- a/dev-perl/Dir-Self/metadata.xml
+++ b/dev-perl/Dir-Self/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Dir::Self</remote-id>
                 <remote-id type="cpan">Dir-Self</remote-id>
+                <remote-id type="cpan-module">Dir::Self</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Directory-Scratch-Structured/metadata.xml b/dev-perl/Directory-Scratch-Structured/metadata.xml
index 7616d3a..0f5c3bf 100644
--- a/dev-perl/Directory-Scratch-Structured/metadata.xml
+++ b/dev-perl/Directory-Scratch-Structured/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Directory::Scratch::Structured</remote-id>
                 <remote-id type="cpan">Directory-Scratch-Structured</remote-id>
+                <remote-id type="cpan-module">Directory::Scratch::Structured</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Directory-Scratch/metadata.xml b/dev-perl/Directory-Scratch/metadata.xml
index c431865..52887ec 100644
--- a/dev-perl/Directory-Scratch/metadata.xml
+++ b/dev-perl/Directory-Scratch/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Directory::Scratch</remote-id>
                 <remote-id type="cpan">Directory-Scratch</remote-id>
+                <remote-id type="cpan-module">Directory::Scratch</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Metadata/metadata.xml b/dev-perl/Dist-Metadata/metadata.xml
index 47c3cfb..adb0f6a 100644
--- a/dev-perl/Dist-Metadata/metadata.xml
+++ b/dev-perl/Dist-Metadata/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Dist-Metadata</remote-id>
                 <remote-id type="cpan-module">Dist::Metadata</remote-id>
                 <remote-id type="cpan-module">Dist::Metadata::Archive</remote-id>
                 <remote-id type="cpan-module">Dist::Metadata::Dir</remote-id>
@@ -10,6 +11,5 @@
                 <remote-id type="cpan-module">Dist::Metadata::Struct</remote-id>
                 <remote-id type="cpan-module">Dist::Metadata::Tar</remote-id>
                 <remote-id type="cpan-module">Dist::Metadata::Zip</remote-id>
-                <remote-id type="cpan">Dist-Metadata</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-App-Command-cover/metadata.xml b/dev-perl/Dist-Zilla-App-Command-cover/metadata.xml
index 7743266..27640e7 100644
--- a/dev-perl/Dist-Zilla-App-Command-cover/metadata.xml
+++ b/dev-perl/Dist-Zilla-App-Command-cover/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::App::Command::cover</remote-id>
         <remote-id type="cpan">Dist-Zilla-App-Command-cover</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::App::Command::cover</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-App-Command-dumpphases/metadata.xml b/dev-perl/Dist-Zilla-App-Command-dumpphases/metadata.xml
index 6f81dfc..dd552bb 100644
--- a/dev-perl/Dist-Zilla-App-Command-dumpphases/metadata.xml
+++ b/dev-perl/Dist-Zilla-App-Command-dumpphases/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::App::Command::dumpphases</remote-id>
         <remote-id type="cpan">Dist-Zilla-App-Command-dumpphases</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::App::Command::dumpphases</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Authority/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Authority/metadata.xml
index 2b6a2ae..324652a 100644
--- a/dev-perl/Dist-Zilla-Plugin-Authority/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Authority/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::Authority</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-Authority</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::Authority</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-AutoVersion-Relative/metadata.xml b/dev-perl/Dist-Zilla-Plugin-AutoVersion-Relative/metadata.xml
index a982452..4188683 100644
--- a/dev-perl/Dist-Zilla-Plugin-AutoVersion-Relative/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-AutoVersion-Relative/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::AutoVersion::Relative</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-AutoVersion-Relative</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::AutoVersion::Relative</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Bootstrap-lib/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Bootstrap-lib/metadata.xml
index 3b2cbc1..5666e3f 100644
--- a/dev-perl/Dist-Zilla-Plugin-Bootstrap-lib/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Bootstrap-lib/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::Bootstrap::lib</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-Bootstrap-lib</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::Bootstrap::lib</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-CPANChangesTests/metadata.xml b/dev-perl/Dist-Zilla-Plugin-CPANChangesTests/metadata.xml
index bceb401..109420c 100644
--- a/dev-perl/Dist-Zilla-Plugin-CPANChangesTests/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-CPANChangesTests/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::CPANChangesTests</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-CPANChangesTests</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::CPANChangesTests</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-CheckExtraTests/metadata.xml b/dev-perl/Dist-Zilla-Plugin-CheckExtraTests/metadata.xml
index c9d509d..373f572 100644
--- a/dev-perl/Dist-Zilla-Plugin-CheckExtraTests/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-CheckExtraTests/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Plugin-CheckExtraTests</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::App::Command::xtest</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::CheckExtraTests</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::RunExtraTests</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Plugin-CheckExtraTests</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-CheckPrereqsIndexed/metadata.xml b/dev-perl/Dist-Zilla-Plugin-CheckPrereqsIndexed/metadata.xml
index 0b28786..4fc7b00 100644
--- a/dev-perl/Dist-Zilla-Plugin-CheckPrereqsIndexed/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-CheckPrereqsIndexed/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::CheckPrereqsIndexed</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-CheckPrereqsIndexed</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::CheckPrereqsIndexed</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-EOLTests/metadata.xml b/dev-perl/Dist-Zilla-Plugin-EOLTests/metadata.xml
index 7f153ef..b88c224 100644
--- a/dev-perl/Dist-Zilla-Plugin-EOLTests/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-EOLTests/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::EOLTests</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-EOLTests</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::EOLTests</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Git/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Git/metadata.xml
index fed49fe..113fd51 100644
--- a/dev-perl/Dist-Zilla-Plugin-Git/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Git/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Plugin-Git</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::Git</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::Git::Check</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::Git::Commit</remote-id>
@@ -19,6 +20,5 @@
         <remote-id type="cpan-module">Dist::Zilla::PluginBundle::Git</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Role::Git::DirtyFiles</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Role::Git::Repo</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Plugin-Git</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-GithubMeta/metadata.xml b/dev-perl/Dist-Zilla-Plugin-GithubMeta/metadata.xml
index 858be6c..8d5c3c7 100644
--- a/dev-perl/Dist-Zilla-Plugin-GithubMeta/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-GithubMeta/metadata.xml
@@ -8,5 +8,6 @@
     </maintainer>
     <upstream>
         <remote-id type="cpan">Dist-Zilla-Plugin-GithubMeta</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::GithubMeta</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-MetaData-BuiltWith/metadata.xml b/dev-perl/Dist-Zilla-Plugin-MetaData-BuiltWith/metadata.xml
index a3d00eb..446c7fc 100644
--- a/dev-perl/Dist-Zilla-Plugin-MetaData-BuiltWith/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-MetaData-BuiltWith/metadata.xml
@@ -8,5 +8,7 @@
     </maintainer>
     <upstream>
         <remote-id type="cpan">Dist-Zilla-Plugin-MetaData-BuiltWith</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaData::BuiltWith</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaData::BuiltWith::All</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-MetaProvides-Class/metadata.xml b/dev-perl/Dist-Zilla-Plugin-MetaProvides-Class/metadata.xml
index 861d9e5..1fa9459 100644
--- a/dev-perl/Dist-Zilla-Plugin-MetaProvides-Class/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-MetaProvides-Class/metadata.xml
@@ -5,13 +5,13 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="metanoindex">Install support libraries for meta_no_index
+    </maintainer>
+    <use>
+        <flag name="metanoindex">Install support libraries for meta_no_index
 			feature</flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaProvides::Class</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-MetaProvides-Class</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaProvides::Class</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-MetaProvides-FromFile/metadata.xml b/dev-perl/Dist-Zilla-Plugin-MetaProvides-FromFile/metadata.xml
index 6d69371..6aace8d 100644
--- a/dev-perl/Dist-Zilla-Plugin-MetaProvides-FromFile/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-MetaProvides-FromFile/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaProvides::FromFile</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-MetaProvides-FromFile</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaProvides::FromFile</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-MetaProvides-Package/metadata.xml b/dev-perl/Dist-Zilla-Plugin-MetaProvides-Package/metadata.xml
index 9d15b30..28d8d81 100644
--- a/dev-perl/Dist-Zilla-Plugin-MetaProvides-Package/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-MetaProvides-Package/metadata.xml
@@ -4,14 +4,14 @@
     <herd>perl</herd>
     <maintainer>
         <email>kentfredric@...</email>
-		<name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="metanoindex">Install support libraries for meta_no_index
+        <name>Kent Fredric</name>
+    </maintainer>
+    <use>
+        <flag name="metanoindex">Install support libraries for meta_no_index
 			feature</flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaProvides::Package</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-MetaProvides-Package</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaProvides::Package</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-MetaProvides/metadata.xml b/dev-perl/Dist-Zilla-Plugin-MetaProvides/metadata.xml
index 64465d4..68d6529 100644
--- a/dev-perl/Dist-Zilla-Plugin-MetaProvides/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-MetaProvides/metadata.xml
@@ -5,22 +5,22 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="fromfile">Install recommended ::FromFile library for
+    </maintainer>
+    <use>
+        <flag name="fromfile">Install recommended ::FromFile library for
 			hand-crated metadata</flag>
-		<flag name="class">Install recommended ::Class to detect
+        <flag name="class">Install recommended ::Class to detect
 			MooseX::Declares 'class'</flag>
-		<flag name="package">Install recommended ::Package for detecting class
+        <flag name="package">Install recommended ::Package for detecting class
 			perl packages</flag>
-		<flag name="metanoindex">Install support libraries for meta_no_index
+        <flag name="metanoindex">Install support libraries for meta_no_index
 			feature</flag>
-	</use>
+    </use>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Plugin-MetaProvides</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::MetaProvides::ProvideRecord</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::MetaProvides::Types</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::MetaProvides</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Role::MetaProvider::Provider</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Plugin-MetaProvides</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-MinimumPerl/metadata.xml b/dev-perl/Dist-Zilla-Plugin-MinimumPerl/metadata.xml
index ac5005a..a46fbef 100644
--- a/dev-perl/Dist-Zilla-Plugin-MinimumPerl/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-MinimumPerl/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::MinimumPerl</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-MinimumPerl</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::MinimumPerl</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-ModuleInstall/metadata.xml b/dev-perl/Dist-Zilla-Plugin-ModuleInstall/metadata.xml
index 44054ae..1bd1e2b 100644
--- a/dev-perl/Dist-Zilla-Plugin-ModuleInstall/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-ModuleInstall/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::ModuleInstall</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-ModuleInstall</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::ModuleInstall</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-PerlTidy/metadata.xml b/dev-perl/Dist-Zilla-Plugin-PerlTidy/metadata.xml
index a953bf5..cc551c4 100644
--- a/dev-perl/Dist-Zilla-Plugin-PerlTidy/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-PerlTidy/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Plugin-PerlTidy</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::App::Command::perltidy</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::PerlTidy</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Plugin-PerlTidy</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml b/dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml
index 7d8f622..8f0995d 100644
--- a/dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::PodWeaver</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-PodWeaver</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::PodWeaver</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-ReadmeFromPod/metadata.xml b/dev-perl/Dist-Zilla-Plugin-ReadmeFromPod/metadata.xml
index 2c750b9..3ce956f 100644
--- a/dev-perl/Dist-Zilla-Plugin-ReadmeFromPod/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-ReadmeFromPod/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::ReadmeFromPod</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-ReadmeFromPod</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::ReadmeFromPod</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-ReportVersions-Tiny/metadata.xml b/dev-perl/Dist-Zilla-Plugin-ReportVersions-Tiny/metadata.xml
index d50073a..32871df 100644
--- a/dev-perl/Dist-Zilla-Plugin-ReportVersions-Tiny/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-ReportVersions-Tiny/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::ReportVersions::Tiny</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-ReportVersions-Tiny</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::ReportVersions::Tiny</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Repository/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Repository/metadata.xml
index 986a593..db4d326 100644
--- a/dev-perl/Dist-Zilla-Plugin-Repository/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Repository/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::Repository</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-Repository</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::Repository</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-TaskWeaver/metadata.xml b/dev-perl/Dist-Zilla-Plugin-TaskWeaver/metadata.xml
index 3fcbda9..81e1432 100644
--- a/dev-perl/Dist-Zilla-Plugin-TaskWeaver/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-TaskWeaver/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Plugin-TaskWeaver</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::TaskWeaver</remote-id>
         <remote-id type="cpan-module">Pod::Weaver::Plugin::TaskWeaver</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Plugin-TaskWeaver</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Test-CPAN-Changes/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Test-CPAN-Changes/metadata.xml
index 744b01b..7ca8ccd 100644
--- a/dev-perl/Dist-Zilla-Plugin-Test-CPAN-Changes/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Test-CPAN-Changes/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::Test::CPAN::Changes</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-Test-CPAN-Changes</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::Test::CPAN::Changes</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Test-Compile/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Test-Compile/metadata.xml
index 60c1680..7bd8b09 100644
--- a/dev-perl/Dist-Zilla-Plugin-Test-Compile/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Test-Compile/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Plugin-Test-Compile</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::CompileTests</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::Test::Compile</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Plugin-Test-Compile</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Test-Kwalitee/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Test-Kwalitee/metadata.xml
index e4e8352..6114172 100644
--- a/dev-perl/Dist-Zilla-Plugin-Test-Kwalitee/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Test-Kwalitee/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::Test::Kwalitee</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-Test-Kwalitee</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::Test::Kwalitee</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion/metadata.xml
index 02a43ff..fab6733 100644
--- a/dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Plugin-Test-MinimumVersion</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::MinimumVersionTests</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::Test::MinimumVersion</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Plugin-Test-MinimumVersion</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic/metadata.xml
index 8fc7d53..4470c76 100644
--- a/dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Plugin-Test-Perl-Critic</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::CriticTests</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::Test::Perl::Critic</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Plugin-Test-Perl-Critic</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Plugin-Twitter/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Twitter/metadata.xml
index 524a050..005a29f 100644
--- a/dev-perl/Dist-Zilla-Plugin-Twitter/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Twitter/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Plugin::Twitter</remote-id>
         <remote-id type="cpan">Dist-Zilla-Plugin-Twitter</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Plugin::Twitter</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-PluginBundle-Author-KENTNL/metadata.xml b/dev-perl/Dist-Zilla-PluginBundle-Author-KENTNL/metadata.xml
index 5a32205..124417b 100644
--- a/dev-perl/Dist-Zilla-PluginBundle-Author-KENTNL/metadata.xml
+++ b/dev-perl/Dist-Zilla-PluginBundle-Author-KENTNL/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-PluginBundle-Author-KENTNL</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::MintingProfile::Author::KENTNL</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::Author::KENTNL::DistINI</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Plugin::Author::KENTNL::MinimumPerl</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::PluginBundle::Author::KENTNL</remote-id>
-        <remote-id type="cpan">Dist-Zilla-PluginBundle-Author-KENTNL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-PluginBundle-RJBS/metadata.xml b/dev-perl/Dist-Zilla-PluginBundle-RJBS/metadata.xml
index 0c0f7b1..50f9b2c 100644
--- a/dev-perl/Dist-Zilla-PluginBundle-RJBS/metadata.xml
+++ b/dev-perl/Dist-Zilla-PluginBundle-RJBS/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-PluginBundle-RJBS</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::PluginBundle::RJBS</remote-id>
         <remote-id type="cpan-module">Pod::Weaver::PluginBundle::RJBS</remote-id>
-        <remote-id type="cpan">Dist-Zilla-PluginBundle-RJBS</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Role-Tempdir/metadata.xml b/dev-perl/Dist-Zilla-Role-Tempdir/metadata.xml
index 81b985c..19937dc 100644
--- a/dev-perl/Dist-Zilla-Role-Tempdir/metadata.xml
+++ b/dev-perl/Dist-Zilla-Role-Tempdir/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Role-Tempdir</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Role::Tempdir</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Tempdir::Item</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Role-Tempdir</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Util-EmulatePhase/metadata.xml b/dev-perl/Dist-Zilla-Util-EmulatePhase/metadata.xml
index da30e75..bf561b9 100644
--- a/dev-perl/Dist-Zilla-Util-EmulatePhase/metadata.xml
+++ b/dev-perl/Dist-Zilla-Util-EmulatePhase/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla-Util-EmulatePhase</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Util::EmulatePhase</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Util::EmulatePhase::PrereqCollector</remote-id>
-        <remote-id type="cpan">Dist-Zilla-Util-EmulatePhase</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla-Util-Test-KENTNL/metadata.xml b/dev-perl/Dist-Zilla-Util-Test-KENTNL/metadata.xml
index d560823..9b52bae 100644
--- a/dev-perl/Dist-Zilla-Util-Test-KENTNL/metadata.xml
+++ b/dev-perl/Dist-Zilla-Util-Test-KENTNL/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Dist::Zilla::Util::Test::KENTNL</remote-id>
         <remote-id type="cpan">Dist-Zilla-Util-Test-KENTNL</remote-id>
+        <remote-id type="cpan-module">Dist::Zilla::Util::Test::KENTNL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Dist-Zilla/metadata.xml b/dev-perl/Dist-Zilla/metadata.xml
index 8ea76c3..99b64ac 100644
--- a/dev-perl/Dist-Zilla/metadata.xml
+++ b/dev-perl/Dist-Zilla/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Dist-Zilla</remote-id>
         <remote-id type="cpan-module">Dist::Zilla</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::App</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::App::Command</remote-id>
@@ -140,6 +141,5 @@
         <remote-id type="cpan-module">Dist::Zilla::Util</remote-id>
         <remote-id type="cpan-module">Dist::Zilla::Util::AuthorDeps</remote-id>
         <remote-id type="cpan-module">Test::DZil</remote-id>
-        <remote-id type="cpan">Dist-Zilla</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/EVDB-API/metadata.xml b/dev-perl/EVDB-API/metadata.xml
index fcb038a..1d76793 100644
--- a/dev-perl/EVDB-API/metadata.xml
+++ b/dev-perl/EVDB-API/metadata.xml
@@ -7,10 +7,10 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">EVDB-API</remote-id>
         <remote-id type="cpan-module">EVDB::API</remote-id>
         <remote-id type="cpan-module">EVDB::API::JSON</remote-id>
         <remote-id type="cpan-module">EVDB::API::REST</remote-id>
         <remote-id type="cpan-module">EVDB::API::YAML</remote-id>
-        <remote-id type="cpan">EVDB-API</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Email-MIME-Kit/metadata.xml b/dev-perl/Email-MIME-Kit/metadata.xml
index 3ff4e60..19653f2 100644
--- a/dev-perl/Email-MIME-Kit/metadata.xml
+++ b/dev-perl/Email-MIME-Kit/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Email-MIME-Kit</remote-id>
         <remote-id type="cpan-module">Email::MIME::Kit</remote-id>
         <remote-id type="cpan-module">Email::MIME::Kit::Assembler::Standard</remote-id>
         <remote-id type="cpan-module">Email::MIME::Kit::KitReader::Dir</remote-id>
@@ -20,6 +21,5 @@
         <remote-id type="cpan-module">Email::MIME::Kit::Role::ManifestReader</remote-id>
         <remote-id type="cpan-module">Email::MIME::Kit::Role::Renderer</remote-id>
         <remote-id type="cpan-module">Email::MIME::Kit::Role::Validator</remote-id>
-        <remote-id type="cpan">Email-MIME-Kit</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Email-Valid-Loose/metadata.xml b/dev-perl/Email-Valid-Loose/metadata.xml
index 5f97adf..c1b6e73 100644
--- a/dev-perl/Email-Valid-Loose/metadata.xml
+++ b/dev-perl/Email-Valid-Loose/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Email::Valid::Loose</remote-id>
         <remote-id type="cpan">Email-Valid-Loose</remote-id>
+        <remote-id type="cpan-module">Email::Valid::Loose</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Encode-Base32-Crockford/metadata.xml b/dev-perl/Encode-Base32-Crockford/metadata.xml
index 7e245ea..0736a5f 100644
--- a/dev-perl/Encode-Base32-Crockford/metadata.xml
+++ b/dev-perl/Encode-Base32-Crockford/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Encode::Base32::Crockford</remote-id>
         <remote-id type="cpan">Encode-Base32-Crockford</remote-id>
+        <remote-id type="cpan-module">Encode::Base32::Crockford</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Encode-ZapCP1252/metadata.xml b/dev-perl/Encode-ZapCP1252/metadata.xml
index fe2875f..7f49550 100644
--- a/dev-perl/Encode-ZapCP1252/metadata.xml
+++ b/dev-perl/Encode-ZapCP1252/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Encode::ZapCP1252</remote-id>
         <remote-id type="cpan">Encode-ZapCP1252</remote-id>
+        <remote-id type="cpan-module">Encode::ZapCP1252</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Eval-Context/metadata.xml b/dev-perl/Eval-Context/metadata.xml
index 3eb2b1b..44bd671 100644
--- a/dev-perl/Eval-Context/metadata.xml
+++ b/dev-perl/Eval-Context/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Eval::Context</remote-id>
                 <remote-id type="cpan">Eval-Context</remote-id>
+                <remote-id type="cpan-module">Eval::Context</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Excel-Template-Plus/metadata.xml b/dev-perl/Excel-Template-Plus/metadata.xml
index a2afbb6..1356ec6 100644
--- a/dev-perl/Excel-Template-Plus/metadata.xml
+++ b/dev-perl/Excel-Template-Plus/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Excel-Template-Plus</remote-id>
         <remote-id type="cpan-module">Excel::Template::Plus</remote-id>
         <remote-id type="cpan-module">Excel::Template::Plus::TT</remote-id>
         <remote-id type="cpan-module">Test::Excel::Template::Plus</remote-id>
-        <remote-id type="cpan">Excel-Template-Plus</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Excel-Template/metadata.xml b/dev-perl/Excel-Template/metadata.xml
index 7405d75..1362a59 100644
--- a/dev-perl/Excel-Template/metadata.xml
+++ b/dev-perl/Excel-Template/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Excel-Template</remote-id>
         <remote-id type="cpan-module">Excel::Template</remote-id>
         <remote-id type="cpan-module">Excel::Template::Base</remote-id>
         <remote-id type="cpan-module">Excel::Template::Container</remote-id>
@@ -39,6 +40,5 @@
         <remote-id type="cpan-module">Excel::Template::Format</remote-id>
         <remote-id type="cpan-module">Excel::Template::Iterator</remote-id>
         <remote-id type="cpan-module">Excel::Template::TextObject</remote-id>
-        <remote-id type="cpan">Excel-Template</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Exception-Class-TryCatch/metadata.xml b/dev-perl/Exception-Class-TryCatch/metadata.xml
index 6ca00f6..e2eaa96 100644
--- a/dev-perl/Exception-Class-TryCatch/metadata.xml
+++ b/dev-perl/Exception-Class-TryCatch/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Exception::Class::TryCatch</remote-id>
         <remote-id type="cpan">Exception-Class-TryCatch</remote-id>
+        <remote-id type="cpan-module">Exception::Class::TryCatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Expect-Simple/metadata.xml b/dev-perl/Expect-Simple/metadata.xml
index 13af37d..9439134 100644
--- a/dev-perl/Expect-Simple/metadata.xml
+++ b/dev-perl/Expect-Simple/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Expect::Simple</remote-id>
         <remote-id type="cpan">Expect-Simple</remote-id>
+        <remote-id type="cpan-module">Expect::Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Exporter-Declare/metadata.xml b/dev-perl/Exporter-Declare/metadata.xml
index 1072b0d..af4850d 100644
--- a/dev-perl/Exporter-Declare/metadata.xml
+++ b/dev-perl/Exporter-Declare/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Exporter-Declare</remote-id>
         <remote-id type="cpan-module">Exporter::Declare</remote-id>
         <remote-id type="cpan-module">Exporter::Declare::Export</remote-id>
         <remote-id type="cpan-module">Exporter::Declare::Export::Alias</remote-id>
@@ -18,6 +19,5 @@
         <remote-id type="cpan-module">Exporter::Declare::Magic::Sub</remote-id>
         <remote-id type="cpan-module">Exporter::Declare::Meta</remote-id>
         <remote-id type="cpan-module">Exporter::Declare::Specs</remote-id>
-        <remote-id type="cpan">Exporter-Declare</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/ExtUtils-CChecker/metadata.xml b/dev-perl/ExtUtils-CChecker/metadata.xml
index 105ef16..1402f9d 100644
--- a/dev-perl/ExtUtils-CChecker/metadata.xml
+++ b/dev-perl/ExtUtils-CChecker/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">ExtUtils::CChecker</remote-id>
                 <remote-id type="cpan">ExtUtils-CChecker</remote-id>
+                <remote-id type="cpan-module">ExtUtils::CChecker</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/ExtUtils-LibBuilder/metadata.xml b/dev-perl/ExtUtils-LibBuilder/metadata.xml
index 3f91d9f..dbf37c2 100644
--- a/dev-perl/ExtUtils-LibBuilder/metadata.xml
+++ b/dev-perl/ExtUtils-LibBuilder/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">ExtUtils::LibBuilder</remote-id>
                 <remote-id type="cpan">ExtUtils-LibBuilder</remote-id>
+                <remote-id type="cpan-module">ExtUtils::LibBuilder</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Fennec-Lite/metadata.xml b/dev-perl/Fennec-Lite/metadata.xml
index 046e71b..a5ba699 100644
--- a/dev-perl/Fennec-Lite/metadata.xml
+++ b/dev-perl/Fennec-Lite/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Fennec::Lite</remote-id>
         <remote-id type="cpan">Fennec-Lite</remote-id>
+        <remote-id type="cpan-module">Fennec::Lite</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-ChangeNotify/metadata.xml b/dev-perl/File-ChangeNotify/metadata.xml
index 1d5a3be..6602b54 100644
--- a/dev-perl/File-ChangeNotify/metadata.xml
+++ b/dev-perl/File-ChangeNotify/metadata.xml
@@ -5,18 +5,17 @@
     <maintainer>
         <email>mb@...</email>
         <name>Michele Beltrame</name>
-	</maintainer>
-	<use>
-		<flag name="inotify">Pull in <pkg>dev-perl/Linux-Inotify2</pkg>
+    </maintainer>
+    <use><flag name="inotify">Pull in <pkg>dev-perl/Linux-Inotify2</pkg>
 			for linux Inotify Support</flag>
-	</use>
+    </use>
     <upstream>
+        <remote-id type="cpan">File-ChangeNotify</remote-id>
         <remote-id type="cpan-module">File::ChangeNotify</remote-id>
         <remote-id type="cpan-module">File::ChangeNotify::Event</remote-id>
         <remote-id type="cpan-module">File::ChangeNotify::Watcher</remote-id>
         <remote-id type="cpan-module">File::ChangeNotify::Watcher::Default</remote-id>
         <remote-id type="cpan-module">File::ChangeNotify::Watcher::Inotify</remote-id>
         <remote-id type="cpan-module">File::ChangeNotify::Watcher::KQueue</remote-id>
-        <remote-id type="cpan">File-ChangeNotify</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-Find-Rule-Perl/metadata.xml b/dev-perl/File-Find-Rule-Perl/metadata.xml
index 7e48a83..a44d0ba 100644
--- a/dev-perl/File-Find-Rule-Perl/metadata.xml
+++ b/dev-perl/File-Find-Rule-Perl/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">File::Find::Rule::Perl</remote-id>
                 <remote-id type="cpan">File-Find-Rule-Perl</remote-id>
+                <remote-id type="cpan-module">File::Find::Rule::Perl</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-Find-Rule-VCS/metadata.xml b/dev-perl/File-Find-Rule-VCS/metadata.xml
index aa38099..187c4c4 100644
--- a/dev-perl/File-Find-Rule-VCS/metadata.xml
+++ b/dev-perl/File-Find-Rule-VCS/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">File::Find::Rule::VCS</remote-id>
                 <remote-id type="cpan">File-Find-Rule-VCS</remote-id>
+                <remote-id type="cpan-module">File::Find::Rule::VCS</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-Modified/metadata.xml b/dev-perl/File-Modified/metadata.xml
index 0235d59..fa4220d 100644
--- a/dev-perl/File-Modified/metadata.xml
+++ b/dev-perl/File-Modified/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">File-Modified</remote-id>
         <remote-id type="cpan-module">File::Modified</remote-id>
         <remote-id type="cpan-module">File::Modified::Signature</remote-id>
         <remote-id type="cpan-module">File::Modified::Signature::Checksum</remote-id>
         <remote-id type="cpan-module">File::Modified::Signature::Digest</remote-id>
         <remote-id type="cpan-module">File::Modified::Signature::mtime</remote-id>
-        <remote-id type="cpan">File-Modified</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-Path-Tiny/metadata.xml b/dev-perl/File-Path-Tiny/metadata.xml
index 32c66ac..f0888e2 100644
--- a/dev-perl/File-Path-Tiny/metadata.xml
+++ b/dev-perl/File-Path-Tiny/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">File::Path::Tiny</remote-id>
         <remote-id type="cpan">File-Path-Tiny</remote-id>
+        <remote-id type="cpan-module">File::Path::Tiny</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-ShareDir-Install/metadata.xml b/dev-perl/File-ShareDir-Install/metadata.xml
index ba4e868..f3ed73d 100644
--- a/dev-perl/File-ShareDir-Install/metadata.xml
+++ b/dev-perl/File-ShareDir-Install/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">File::ShareDir::Install</remote-id>
         <remote-id type="cpan">File-ShareDir-Install</remote-id>
+        <remote-id type="cpan-module">File::ShareDir::Install</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-ShareDir-PAR/metadata.xml b/dev-perl/File-ShareDir-PAR/metadata.xml
index 026c5a7..601e56e 100644
--- a/dev-perl/File-ShareDir-PAR/metadata.xml
+++ b/dev-perl/File-ShareDir-PAR/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">File::ShareDir::PAR</remote-id>
                 <remote-id type="cpan">File-ShareDir-PAR</remote-id>
+                <remote-id type="cpan-module">File::ShareDir::PAR</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-ShareDir-PathClass/metadata.xml b/dev-perl/File-ShareDir-PathClass/metadata.xml
index ac8937d..f4945dc 100644
--- a/dev-perl/File-ShareDir-PathClass/metadata.xml
+++ b/dev-perl/File-ShareDir-PathClass/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">File::ShareDir::PathClass</remote-id>
         <remote-id type="cpan">File-ShareDir-PathClass</remote-id>
+        <remote-id type="cpan-module">File::ShareDir::PathClass</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-Spec-Native/metadata.xml b/dev-perl/File-Spec-Native/metadata.xml
index 6f2e6bf..9abdbb7 100644
--- a/dev-perl/File-Spec-Native/metadata.xml
+++ b/dev-perl/File-Spec-Native/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">File::Spec::Native</remote-id>
                 <remote-id type="cpan">File-Spec-Native</remote-id>
+                <remote-id type="cpan-module">File::Spec::Native</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/File-Type-WebImages/metadata.xml b/dev-perl/File-Type-WebImages/metadata.xml
index ff1e79b..dbe3cbb 100644
--- a/dev-perl/File-Type-WebImages/metadata.xml
+++ b/dev-perl/File-Type-WebImages/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">File::Type::WebImages</remote-id>
                 <remote-id type="cpan">File-Type-WebImages</remote-id>
+                <remote-id type="cpan-module">File::Type::WebImages</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Finance-Currency-Convert-WebserviceX/metadata.xml b/dev-perl/Finance-Currency-Convert-WebserviceX/metadata.xml
index 4139735..2a2e0c1 100644
--- a/dev-perl/Finance-Currency-Convert-WebserviceX/metadata.xml
+++ b/dev-perl/Finance-Currency-Convert-WebserviceX/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Finance::Currency::Convert::WebserviceX</remote-id>
         <remote-id type="cpan">Finance-Currency-Convert-WebserviceX</remote-id>
+        <remote-id type="cpan-module">Finance::Currency::Convert::WebserviceX</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Find-Lib/metadata.xml b/dev-perl/Find-Lib/metadata.xml
index 37db9d1..7dc3013 100644
--- a/dev-perl/Find-Lib/metadata.xml
+++ b/dev-perl/Find-Lib/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Find::Lib</remote-id>
         <remote-id type="cpan">Find-Lib</remote-id>
+        <remote-id type="cpan-module">Find::Lib</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/FindBin-Real/metadata.xml b/dev-perl/FindBin-Real/metadata.xml
index 60e90a2..bce4fb0 100644
--- a/dev-perl/FindBin-Real/metadata.xml
+++ b/dev-perl/FindBin-Real/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">FindBin::Real</remote-id>
         <remote-id type="cpan">FindBin-Real</remote-id>
+        <remote-id type="cpan-module">FindBin::Real</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/FindBin-libs/metadata.xml b/dev-perl/FindBin-libs/metadata.xml
index 669f05c..d20a12b 100644
--- a/dev-perl/FindBin-libs/metadata.xml
+++ b/dev-perl/FindBin-libs/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">FindBin::libs</remote-id>
                 <remote-id type="cpan">FindBin-libs</remote-id>
+                <remote-id type="cpan-module">FindBin::libs</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/FormValidator-Simple/metadata.xml b/dev-perl/FormValidator-Simple/metadata.xml
index ba415cd..74881e7 100644
--- a/dev-perl/FormValidator-Simple/metadata.xml
+++ b/dev-perl/FormValidator-Simple/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">FormValidator-Simple</remote-id>
         <remote-id type="cpan-module">FormValidator::Simple</remote-id>
         <remote-id type="cpan-module">FormValidator::Simple::ArrayList</remote-id>
         <remote-id type="cpan-module">FormValidator::Simple::Constants</remote-id>
@@ -23,6 +24,5 @@
         <remote-id type="cpan-module">FormValidator::Simple::Result</remote-id>
         <remote-id type="cpan-module">FormValidator::Simple::Results</remote-id>
         <remote-id type="cpan-module">FormValidator::Simple::Validator</remote-id>
-        <remote-id type="cpan">FormValidator-Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Gentoo-MirrorList/metadata.xml b/dev-perl/Gentoo-MirrorList/metadata.xml
index 30d0f4e..7878440 100644
--- a/dev-perl/Gentoo-MirrorList/metadata.xml
+++ b/dev-perl/Gentoo-MirrorList/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Gentoo-MirrorList</remote-id>
         <remote-id type="cpan-module">Gentoo::MirrorList</remote-id>
         <remote-id type="cpan-module">Gentoo::MirrorList::Mirror</remote-id>
-        <remote-id type="cpan">Gentoo-MirrorList</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Gentoo-Overlay-Group-INI/metadata.xml b/dev-perl/Gentoo-Overlay-Group-INI/metadata.xml
index aa110e6..ed78e77 100644
--- a/dev-perl/Gentoo-Overlay-Group-INI/metadata.xml
+++ b/dev-perl/Gentoo-Overlay-Group-INI/metadata.xml
@@ -8,5 +8,9 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Gentoo-Overlay-Group-INI</remote-id>
+		<remote-id type="cpan-module">Gentoo::Overlay::Group::INI</remote-id>
+		<remote-id type="cpan-module">Gentoo::Overlay::Group::INI::Assembler</remote-id>
+		<remote-id type="cpan-module">Gentoo::Overlay::Group::INI::Section</remote-id>
+		<remote-id type="cpan-module">Gentoo::Overlay::Group::INI::Section::Overlays</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Gentoo-Overlay-Group/metadata.xml b/dev-perl/Gentoo-Overlay-Group/metadata.xml
index ef4639d..890d8bd 100644
--- a/dev-perl/Gentoo-Overlay-Group/metadata.xml
+++ b/dev-perl/Gentoo-Overlay-Group/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Gentoo-Overlay-Group</remote-id>
+		<remote-id type="cpan-module">Gentoo::Overlay::Group</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Gentoo-Overlay/metadata.xml b/dev-perl/Gentoo-Overlay/metadata.xml
index bb23dac..7cfa2fd 100644
--- a/dev-perl/Gentoo-Overlay/metadata.xml
+++ b/dev-perl/Gentoo-Overlay/metadata.xml
@@ -7,12 +7,12 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Gentoo-Overlay</remote-id>
         <remote-id type="cpan-module">Gentoo::Overlay</remote-id>
         <remote-id type="cpan-module">Gentoo::Overlay::Category</remote-id>
         <remote-id type="cpan-module">Gentoo::Overlay::Ebuild</remote-id>
         <remote-id type="cpan-module">Gentoo::Overlay::Exceptions</remote-id>
         <remote-id type="cpan-module">Gentoo::Overlay::Package</remote-id>
         <remote-id type="cpan-module">Gentoo::Overlay::Types</remote-id>
-        <remote-id type="cpan">Gentoo-Overlay</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Getopt-Euclid/metadata.xml b/dev-perl/Getopt-Euclid/metadata.xml
index 95c783a..1a7b5ec 100644
--- a/dev-perl/Getopt-Euclid/metadata.xml
+++ b/dev-perl/Getopt-Euclid/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Getopt::Euclid</remote-id>
         <remote-id type="cpan">Getopt-Euclid</remote-id>
+        <remote-id type="cpan-module">Getopt::Euclid</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Getopt-Lucid/metadata.xml b/dev-perl/Getopt-Lucid/metadata.xml
index 5af0fce..791d570 100644
--- a/dev-perl/Getopt-Lucid/metadata.xml
+++ b/dev-perl/Getopt-Lucid/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Getopt-Lucid</remote-id>
         <remote-id type="cpan-module">Getopt::Lucid</remote-id>
         <remote-id type="cpan-module">Getopt::Lucid::Exception</remote-id>
         <remote-id type="cpan-module">Getopt::Lucid::Spec</remote-id>
-        <remote-id type="cpan">Getopt-Lucid</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Getopt-Usaginator/metadata.xml b/dev-perl/Getopt-Usaginator/metadata.xml
index 67f0dff..cf77429 100644
--- a/dev-perl/Getopt-Usaginator/metadata.xml
+++ b/dev-perl/Getopt-Usaginator/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Getopt::Usaginator</remote-id>
                 <remote-id type="cpan">Getopt-Usaginator</remote-id>
+                <remote-id type="cpan-module">Getopt::Usaginator</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Git-CPAN-Patch/metadata.xml b/dev-perl/Git-CPAN-Patch/metadata.xml
index 157e02c..6cf9e4f 100644
--- a/dev-perl/Git-CPAN-Patch/metadata.xml
+++ b/dev-perl/Git-CPAN-Patch/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Git-CPAN-Patch</remote-id>
         <remote-id type="cpan-module">Git::CPAN::Patch</remote-id>
         <remote-id type="cpan-module">Git::CPAN::Patch::Command::sources</remote-id>
         <remote-id type="cpan-module">Git::CPAN::Patch::Import</remote-id>
-        <remote-id type="cpan">Git-CPAN-Patch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Git-PurePerl/metadata.xml b/dev-perl/Git-PurePerl/metadata.xml
index 045e4f8..c11f116 100644
--- a/dev-perl/Git-PurePerl/metadata.xml
+++ b/dev-perl/Git-PurePerl/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Git-PurePerl</remote-id>
         <remote-id type="cpan-module">Git::PurePerl</remote-id>
         <remote-id type="cpan-module">Git::PurePerl::Actor</remote-id>
         <remote-id type="cpan-module">Git::PurePerl::Config</remote-id>
@@ -33,6 +34,5 @@
         <remote-id type="cpan-module">Git::PurePerl::Protocol::File</remote-id>
         <remote-id type="cpan-module">Git::PurePerl::Protocol::Git</remote-id>
         <remote-id type="cpan-module">Git::PurePerl::Protocol::SSH</remote-id>
-        <remote-id type="cpan">Git-PurePerl</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Git-Repository/metadata.xml b/dev-perl/Git-Repository/metadata.xml
index d07017a..da34e25 100644
--- a/dev-perl/Git-Repository/metadata.xml
+++ b/dev-perl/Git-Repository/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Git-Repository</remote-id>
                 <remote-id type="cpan-module">Git::Repository</remote-id>
                 <remote-id type="cpan-module">Git::Repository::Command</remote-id>
                 <remote-id type="cpan-module">Git::Repository::Log</remote-id>
@@ -10,6 +11,5 @@
                 <remote-id type="cpan-module">Git::Repository::Plugin</remote-id>
                 <remote-id type="cpan-module">Git::Repository::Plugin::Log</remote-id>
                 <remote-id type="cpan-module">Test::Git</remote-id>
-                <remote-id type="cpan">Git-Repository</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Git-Wrapper/metadata.xml b/dev-perl/Git-Wrapper/metadata.xml
index e4ac6bf..52f2074 100644
--- a/dev-perl/Git-Wrapper/metadata.xml
+++ b/dev-perl/Git-Wrapper/metadata.xml
@@ -7,11 +7,11 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Git-Wrapper</remote-id>
         <remote-id type="cpan-module">Git::Wrapper</remote-id>
         <remote-id type="cpan-module">Git::Wrapper::Exception</remote-id>
         <remote-id type="cpan-module">Git::Wrapper::Log</remote-id>
         <remote-id type="cpan-module">Git::Wrapper::Status</remote-id>
         <remote-id type="cpan-module">Git::Wrapper::Statuses</remote-id>
-        <remote-id type="cpan">Git-Wrapper</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Gitalist/metadata.xml b/dev-perl/Gitalist/metadata.xml
index 69ce2c2..aad732f 100644
--- a/dev-perl/Gitalist/metadata.xml
+++ b/dev-perl/Gitalist/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Gitalist</remote-id>
                 <remote-id type="cpan-module">Gitalist</remote-id>
                 <remote-id type="cpan-module">Gitalist::ActionRole::FilenameArgs</remote-id>
                 <remote-id type="cpan-module">Gitalist::ContentMangler::Resolver</remote-id>
@@ -49,6 +50,5 @@
                 <remote-id type="cpan-module">Gitalist::Utils</remote-id>
                 <remote-id type="cpan-module">Gitalist::View::Default</remote-id>
                 <remote-id type="cpan-module">Gitalist::View::SyntaxHighlight</remote-id>
-                <remote-id type="cpan">Gitalist</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Glib-Object-Introspection/metadata.xml b/dev-perl/Glib-Object-Introspection/metadata.xml
index fffbabb..51e9f5f 100644
--- a/dev-perl/Glib-Object-Introspection/metadata.xml
+++ b/dev-perl/Glib-Object-Introspection/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
   <herd>perl</herd>
   <upstream>
+    <remote-id type="cpan">Glib-Object-Introspection</remote-id>
     <remote-id type="cpan-module">Glib::Object::Introspection</remote-id>
     <remote-id type="cpan-module">Glib::Object::Introspection::_FuncWrapper</remote-id>
-    <remote-id type="cpan">Glib-Object-Introspection</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Graphics-ColorNames-WWW/metadata.xml b/dev-perl/Graphics-ColorNames-WWW/metadata.xml
index fb221bd..3fbd3e6 100644
--- a/dev-perl/Graphics-ColorNames-WWW/metadata.xml
+++ b/dev-perl/Graphics-ColorNames-WWW/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Graphics-ColorNames-WWW</remote-id>
         <remote-id type="cpan-module">Graphics::ColorNames::CSS</remote-id>
         <remote-id type="cpan-module">Graphics::ColorNames::IE</remote-id>
         <remote-id type="cpan-module">Graphics::ColorNames::SVG</remote-id>
         <remote-id type="cpan-module">Graphics::ColorNames::WWW</remote-id>
-        <remote-id type="cpan">Graphics-ColorNames-WWW</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Gtk3/metadata.xml b/dev-perl/Gtk3/metadata.xml
index 80443df..dd6e12d 100644
--- a/dev-perl/Gtk3/metadata.xml
+++ b/dev-perl/Gtk3/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>perl</herd>
   <upstream>
-    <remote-id type="cpan-module">Gtk3</remote-id>
     <remote-id type="cpan">Gtk3</remote-id>
+    <remote-id type="cpan-module">Gtk3</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Defang/metadata.xml b/dev-perl/HTML-Defang/metadata.xml
index dca0452..708ba67 100644
--- a/dev-perl/HTML-Defang/metadata.xml
+++ b/dev-perl/HTML-Defang/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">HTML::Defang</remote-id>
         <remote-id type="cpan">HTML-Defang</remote-id>
+        <remote-id type="cpan-module">HTML::Defang</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-FormFu-Model-DBIC/metadata.xml b/dev-perl/HTML-FormFu-Model-DBIC/metadata.xml
index 8f7d449..dc13a59 100644
--- a/dev-perl/HTML-FormFu-Model-DBIC/metadata.xml
+++ b/dev-perl/HTML-FormFu-Model-DBIC/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-FormFu-Model-DBIC</remote-id>
         <remote-id type="cpan-module">HTML::FormFu::Constraint::DBIC::Unique</remote-id>
         <remote-id type="cpan-module">HTML::FormFu::Model::DBIC</remote-id>
-        <remote-id type="cpan">HTML-FormFu-Model-DBIC</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-FormFu/metadata.xml b/dev-perl/HTML-FormFu/metadata.xml
index a137ce0..08a836a 100644
--- a/dev-perl/HTML-FormFu/metadata.xml
+++ b/dev-perl/HTML-FormFu/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-FormFu</remote-id>
         <remote-id type="cpan-module">HTML::FormFu</remote-id>
         <remote-id type="cpan-module">HTML::FormFu::Attribute</remote-id>
         <remote-id type="cpan-module">HTML::FormFu::Constants</remote-id>
@@ -170,6 +171,5 @@
         <remote-id type="cpan-module">HTML::FormFu::Util</remote-id>
         <remote-id type="cpan-module">HTML::FormFu::Validator</remote-id>
         <remote-id type="cpan-module">HTML::FormFu::Validator::Callback</remote-id>
-        <remote-id type="cpan">HTML-FormFu</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-FormHandler/metadata.xml b/dev-perl/HTML-FormHandler/metadata.xml
index bdf0b60..3a85ac6 100644
--- a/dev-perl/HTML-FormHandler/metadata.xml
+++ b/dev-perl/HTML-FormHandler/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-FormHandler</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Base</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Blocks</remote-id>
@@ -50,6 +51,7 @@
         <remote-id type="cpan-module">HTML::FormHandler::Field::Result</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Field::Second</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Field::Select</remote-id>
+        <remote-id type="cpan-module">HTML::FormHandler::Field::SelectCSV</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Field::Submit</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Field::Text</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Field::TextArea</remote-id>
@@ -59,6 +61,7 @@
         <remote-id type="cpan-module">HTML::FormHandler::Fields</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Foo</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::I18N</remote-id>
+        <remote-id type="cpan-module">HTML::FormHandler::I18N::bg_bg</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::I18N::de_de</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::I18N::en_us</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::I18N::hu_hu</remote-id>
@@ -125,6 +128,5 @@
         <remote-id type="cpan-module">HTML::FormHandler::Widget::Wrapper::Table</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Widget::Wrapper::TableInline</remote-id>
         <remote-id type="cpan-module">HTML::FormHandler::Wizard</remote-id>
-        <remote-id type="cpan">HTML-FormHandler</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-GenToc/metadata.xml b/dev-perl/HTML-GenToc/metadata.xml
index c6a755f..4131d59 100644
--- a/dev-perl/HTML-GenToc/metadata.xml
+++ b/dev-perl/HTML-GenToc/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">HTML::GenToc</remote-id>
         <remote-id type="cpan">HTML-GenToc</remote-id>
+        <remote-id type="cpan-module">HTML::GenToc</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Highlight/metadata.xml b/dev-perl/HTML-Highlight/metadata.xml
index bb8dca3..d11d547 100644
--- a/dev-perl/HTML-Highlight/metadata.xml
+++ b/dev-perl/HTML-Highlight/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">HTML::Highlight</remote-id>
                 <remote-id type="cpan">HTML-Highlight</remote-id>
+                <remote-id type="cpan-module">HTML::Highlight</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-LinkList/metadata.xml b/dev-perl/HTML-LinkList/metadata.xml
index a6512c1..7d174f5 100644
--- a/dev-perl/HTML-LinkList/metadata.xml
+++ b/dev-perl/HTML-LinkList/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">HTML::LinkList</remote-id>
         <remote-id type="cpan">HTML-LinkList</remote-id>
+        <remote-id type="cpan-module">HTML::LinkList</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Packer/metadata.xml b/dev-perl/HTML-Packer/metadata.xml
index 607509a..75148d0 100644
--- a/dev-perl/HTML-Packer/metadata.xml
+++ b/dev-perl/HTML-Packer/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">HTML::Packer</remote-id>
                 <remote-id type="cpan">HTML-Packer</remote-id>
+                <remote-id type="cpan-module">HTML::Packer</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Prototype/metadata.xml b/dev-perl/HTML-Prototype/metadata.xml
index 945c14c..b270474 100644
--- a/dev-perl/HTML-Prototype/metadata.xml
+++ b/dev-perl/HTML-Prototype/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-Prototype</remote-id>
         <remote-id type="cpan-module">HTML::Prototype</remote-id>
         <remote-id type="cpan-module">HTML::Prototype::Controls</remote-id>
         <remote-id type="cpan-module">HTML::Prototype::DragDrop</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">HTML::Prototype::Helper</remote-id>
         <remote-id type="cpan-module">HTML::Prototype::Helper::Tag</remote-id>
         <remote-id type="cpan-module">HTML::Prototype::Js</remote-id>
-        <remote-id type="cpan">HTML-Prototype</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Selector-XPath/metadata.xml b/dev-perl/HTML-Selector-XPath/metadata.xml
index e93a462..29145ed 100644
--- a/dev-perl/HTML-Selector-XPath/metadata.xml
+++ b/dev-perl/HTML-Selector-XPath/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">HTML::Selector::XPath</remote-id>
                 <remote-id type="cpan">HTML-Selector-XPath</remote-id>
+                <remote-id type="cpan-module">HTML::Selector::XPath</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-SuperForm/metadata.xml b/dev-perl/HTML-SuperForm/metadata.xml
index e187a92..1fcb2fc 100644
--- a/dev-perl/HTML-SuperForm/metadata.xml
+++ b/dev-perl/HTML-SuperForm/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-SuperForm</remote-id>
         <remote-id type="cpan-module">HTML::SuperForm</remote-id>
         <remote-id type="cpan-module">HTML::SuperForm::Field</remote-id>
         <remote-id type="cpan-module">HTML::SuperForm::Field::Checkbox</remote-id>
@@ -19,6 +20,5 @@
         <remote-id type="cpan-module">HTML::SuperForm::Field::Submit</remote-id>
         <remote-id type="cpan-module">HTML::SuperForm::Field::Text</remote-id>
         <remote-id type="cpan-module">HTML::SuperForm::Field::Textarea</remote-id>
-        <remote-id type="cpan">HTML-SuperForm</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-TagCloud/metadata.xml b/dev-perl/HTML-TagCloud/metadata.xml
index b33c0c1..8356de8 100644
--- a/dev-perl/HTML-TagCloud/metadata.xml
+++ b/dev-perl/HTML-TagCloud/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">HTML::TagCloud</remote-id>
         <remote-id type="cpan">HTML-TagCloud</remote-id>
+        <remote-id type="cpan-module">HTML::TagCloud</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-TagFilter/metadata.xml b/dev-perl/HTML-TagFilter/metadata.xml
index 9a73996..d4affa1 100644
--- a/dev-perl/HTML-TagFilter/metadata.xml
+++ b/dev-perl/HTML-TagFilter/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">HTML-TagFilter</remote-id>
                 <remote-id type="cpan-module">HTML::TagFilter</remote-id>
                 <remote-id type="cpan-module">My::Filter</remote-id>
-                <remote-id type="cpan">HTML-TagFilter</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Template-Pro/metadata.xml b/dev-perl/HTML-Template-Pro/metadata.xml
index 44ca925..2f96011 100644
--- a/dev-perl/HTML-Template-Pro/metadata.xml
+++ b/dev-perl/HTML-Template-Pro/metadata.xml
@@ -7,8 +7,8 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-Template-Pro</remote-id>
         <remote-id type="cpan-module">HTML::Template::Pro</remote-id>
         <remote-id type="cpan-module">HTML::Template::Pro::WrapAssociate</remote-id>
-        <remote-id type="cpan">HTML-Template-Pro</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Tiny/metadata.xml b/dev-perl/HTML-Tiny/metadata.xml
index f8294be..9e6770a 100644
--- a/dev-perl/HTML-Tiny/metadata.xml
+++ b/dev-perl/HTML-Tiny/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">HTML::Tiny</remote-id>
         <remote-id type="cpan">HTML-Tiny</remote-id>
+        <remote-id type="cpan-module">HTML::Tiny</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Toc/metadata.xml b/dev-perl/HTML-Toc/metadata.xml
index 7da0a80..f95c6ef 100644
--- a/dev-perl/HTML-Toc/metadata.xml
+++ b/dev-perl/HTML-Toc/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-Toc</remote-id>
         <remote-id type="cpan-module">HTML::Toc</remote-id>
         <remote-id type="cpan-module">HTML::TocGenerator</remote-id>
         <remote-id type="cpan-module">HTML::TocInsertor</remote-id>
@@ -17,6 +18,5 @@
         <remote-id type="cpan-module">HTML::_TokenTocEndParser</remote-id>
         <remote-id type="cpan-module">HTML::_TokenTocParser</remote-id>
         <remote-id type="cpan-module">HTML::_TokenUpdateParser</remote-id>
-        <remote-id type="cpan">HTML-Toc</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-TreeBuilder-LibXML/metadata.xml b/dev-perl/HTML-TreeBuilder-LibXML/metadata.xml
index 17a737e..08521c0 100644
--- a/dev-perl/HTML-TreeBuilder-LibXML/metadata.xml
+++ b/dev-perl/HTML-TreeBuilder-LibXML/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">HTML-TreeBuilder-LibXML</remote-id>
                 <remote-id type="cpan-module">HTML::TreeBuilder::LibXML</remote-id>
                 <remote-id type="cpan-module">HTML::TreeBuilder::LibXML::Node</remote-id>
-                <remote-id type="cpan">HTML-TreeBuilder-LibXML</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-TreeBuilder-XPath/metadata.xml b/dev-perl/HTML-TreeBuilder-XPath/metadata.xml
index e6fd6ba..56cea94 100644
--- a/dev-perl/HTML-TreeBuilder-XPath/metadata.xml
+++ b/dev-perl/HTML-TreeBuilder-XPath/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">HTML-TreeBuilder-XPath</remote-id>
                 <remote-id type="cpan-module">HTML::Element</remote-id>
                 <remote-id type="cpan-module">HTML::TreeBuilder::XPath</remote-id>
                 <remote-id type="cpan-module">HTML::TreeBuilder::XPath::Attribute</remote-id>
                 <remote-id type="cpan-module">HTML::TreeBuilder::XPath::Node</remote-id>
                 <remote-id type="cpan-module">HTML::TreeBuilder::XPath::Root</remote-id>
                 <remote-id type="cpan-module">HTML::TreeBuilder::XPath::TextNode</remote-id>
-                <remote-id type="cpan">HTML-TreeBuilder-XPath</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Widget/metadata.xml b/dev-perl/HTML-Widget/metadata.xml
index 0778631..a76e8bb 100644
--- a/dev-perl/HTML-Widget/metadata.xml
+++ b/dev-perl/HTML-Widget/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-Widget</remote-id>
         <remote-id type="cpan-module">HTML::Widget</remote-id>
         <remote-id type="cpan-module">HTML::Widget::Accessor</remote-id>
         <remote-id type="cpan-module">HTML::Widget::BlockContainer</remote-id>
@@ -64,6 +65,5 @@
         <remote-id type="cpan-module">HTML::Widget::Filter::Whitespace</remote-id>
         <remote-id type="cpan-module">HTML::Widget::NullContainer</remote-id>
         <remote-id type="cpan-module">HTML::Widget::Result</remote-id>
-        <remote-id type="cpan">HTML-Widget</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTML-Zoom/metadata.xml b/dev-perl/HTML-Zoom/metadata.xml
index 3544b00..66294ca 100644
--- a/dev-perl/HTML-Zoom/metadata.xml
+++ b/dev-perl/HTML-Zoom/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTML-Zoom</remote-id>
         <remote-id type="cpan-module">HTML::Zoom</remote-id>
         <remote-id type="cpan-module">HTML::Zoom::ArrayStream</remote-id>
         <remote-id type="cpan-module">HTML::Zoom::CodeStream</remote-id>
@@ -26,6 +27,5 @@
         <remote-id type="cpan-module">HTML::Zoom::TransformBuilder</remote-id>
         <remote-id type="cpan-module">HTML::Zoom::TransformedStream</remote-id>
         <remote-id type="cpan-module">HTML::Zoom::ZConfig</remote-id>
-        <remote-id type="cpan">HTML-Zoom</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTTP-Exception/metadata.xml b/dev-perl/HTTP-Exception/metadata.xml
index b673dff..f7b3c8a 100644
--- a/dev-perl/HTTP-Exception/metadata.xml
+++ b/dev-perl/HTTP-Exception/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTTP-Exception</remote-id>
         <remote-id type="cpan-module">HTTP::Exception</remote-id>
         <remote-id type="cpan-module">HTTP::Exception::1XX</remote-id>
         <remote-id type="cpan-module">HTTP::Exception::2XX</remote-id>
@@ -15,6 +16,5 @@
         <remote-id type="cpan-module">HTTP::Exception::5XX</remote-id>
         <remote-id type="cpan-module">HTTP::Exception::Base</remote-id>
         <remote-id type="cpan-module">HTTP::Exception::Loader</remote-id>
-        <remote-id type="cpan">HTTP-Exception</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTTP-HeaderParser-XS/metadata.xml b/dev-perl/HTTP-HeaderParser-XS/metadata.xml
index 7281679..335c088 100644
--- a/dev-perl/HTTP-HeaderParser-XS/metadata.xml
+++ b/dev-perl/HTTP-HeaderParser-XS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">HTTP::HeaderParser::XS</remote-id>
         <remote-id type="cpan">HTTP-HeaderParser-XS</remote-id>
+        <remote-id type="cpan-module">HTTP::HeaderParser::XS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTTP-Lite/metadata.xml b/dev-perl/HTTP-Lite/metadata.xml
index 8d0b976..3d344fc 100644
--- a/dev-perl/HTTP-Lite/metadata.xml
+++ b/dev-perl/HTTP-Lite/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">HTTP::Lite</remote-id>
         <remote-id type="cpan">HTTP-Lite</remote-id>
+        <remote-id type="cpan-module">HTTP::Lite</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTTP-Parser-XS/metadata.xml b/dev-perl/HTTP-Parser-XS/metadata.xml
index 4158bb2..e5a7390 100644
--- a/dev-perl/HTTP-Parser-XS/metadata.xml
+++ b/dev-perl/HTTP-Parser-XS/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTTP-Parser-XS</remote-id>
         <remote-id type="cpan-module">HTTP::Parser::XS</remote-id>
         <remote-id type="cpan-module">HTTP::Parser::XS::PP</remote-id>
-        <remote-id type="cpan">HTTP-Parser-XS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTTP-Proxy/metadata.xml b/dev-perl/HTTP-Proxy/metadata.xml
index 4b3794b..21da328 100644
--- a/dev-perl/HTTP-Proxy/metadata.xml
+++ b/dev-perl/HTTP-Proxy/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
     <herd>perl</herd>
     <upstream>
+        <remote-id type="cpan">HTTP-Proxy</remote-id>
         <remote-id type="cpan-module">HTTP::Proxy</remote-id>
         <remote-id type="cpan-module">HTTP::Proxy::BodyFilter</remote-id>
         <remote-id type="cpan-module">HTTP::Proxy::BodyFilter::complete</remote-id>
@@ -21,6 +22,5 @@
         <remote-id type="cpan-module">HTTP::Proxy::HeaderFilter</remote-id>
         <remote-id type="cpan-module">HTTP::Proxy::HeaderFilter::simple</remote-id>
         <remote-id type="cpan-module">HTTP::Proxy::HeaderFilter::standard</remote-id>
-        <remote-id type="cpan">HTTP-Proxy</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTTP-Request-AsCGI/metadata.xml b/dev-perl/HTTP-Request-AsCGI/metadata.xml
index 27cbdd2..3672eca 100644
--- a/dev-perl/HTTP-Request-AsCGI/metadata.xml
+++ b/dev-perl/HTTP-Request-AsCGI/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">HTTP::Request::AsCGI</remote-id>
         <remote-id type="cpan">HTTP-Request-AsCGI</remote-id>
+        <remote-id type="cpan-module">HTTP::Request::AsCGI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/HTTP-Server-Simple-PSGI/metadata.xml b/dev-perl/HTTP-Server-Simple-PSGI/metadata.xml
index 6b30d12..0f5f290 100644
--- a/dev-perl/HTTP-Server-Simple-PSGI/metadata.xml
+++ b/dev-perl/HTTP-Server-Simple-PSGI/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">HTTP-Server-Simple-PSGI</remote-id>
         <remote-id type="cpan-module">HTTP::Server::Simple::PSGI</remote-id>
         <remote-id type="cpan-module">HTTP::Server::Simple::PSGI::Writer</remote-id>
-        <remote-id type="cpan">HTTP-Server-Simple-PSGI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Handel/metadata.xml b/dev-perl/Handel/metadata.xml
index ca3b91b..643a178 100644
--- a/dev-perl/Handel/metadata.xml
+++ b/dev-perl/Handel/metadata.xml
@@ -6,10 +6,11 @@
         <email>mb@...</email>
         <name>Michele Beltrame</name>
     </maintainer>
-	<use>
-		<flag name="catalystframework">Catalyst Support</flag>
-	</use>
+    <use>
+        <flag name="catalystframework">Catalyst Support</flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">Handel</remote-id>
         <remote-id type="cpan-module">AxKit::XSP::Handel::Cart</remote-id>
         <remote-id type="cpan-module">AxKit::XSP::Handel::Checkout</remote-id>
         <remote-id type="cpan-module">AxKit::XSP::Handel::Order</remote-id>
@@ -84,6 +85,5 @@
         <remote-id type="cpan-module">Template::Plugin::Handel::Constants</remote-id>
         <remote-id type="cpan-module">Template::Plugin::Handel::Order</remote-id>
         <remote-id type="cpan-module">Template::Plugin::Handel::Order::Proxy</remote-id>
-        <remote-id type="cpan">Handel</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Hash-FieldHash/metadata.xml b/dev-perl/Hash-FieldHash/metadata.xml
index 2d1a7c6..ba9effd 100644
--- a/dev-perl/Hash-FieldHash/metadata.xml
+++ b/dev-perl/Hash-FieldHash/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Hash::FieldHash</remote-id>
         <remote-id type="cpan">Hash-FieldHash</remote-id>
+        <remote-id type="cpan-module">Hash::FieldHash</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Hash-Flatten/metadata.xml b/dev-perl/Hash-Flatten/metadata.xml
index 2f05b60..4db3e57 100644
--- a/dev-perl/Hash-Flatten/metadata.xml
+++ b/dev-perl/Hash-Flatten/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Hash::Flatten</remote-id>
         <remote-id type="cpan">Hash-Flatten</remote-id>
+        <remote-id type="cpan-module">Hash::Flatten</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Hash-Merge-Simple/metadata.xml b/dev-perl/Hash-Merge-Simple/metadata.xml
index a93673c..b08f0c8 100644
--- a/dev-perl/Hash-Merge-Simple/metadata.xml
+++ b/dev-perl/Hash-Merge-Simple/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Hash::Merge::Simple</remote-id>
         <remote-id type="cpan">Hash-Merge-Simple</remote-id>
+        <remote-id type="cpan-module">Hash::Merge::Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Hash-Util-FieldHash-Compat/metadata.xml b/dev-perl/Hash-Util-FieldHash-Compat/metadata.xml
index 5fb1569..d934075 100644
--- a/dev-perl/Hash-Util-FieldHash-Compat/metadata.xml
+++ b/dev-perl/Hash-Util-FieldHash-Compat/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Hash-Util-FieldHash-Compat</remote-id>
         <remote-id type="cpan-module">Hash::Util::FieldHash::Compat</remote-id>
         <remote-id type="cpan-module">Hash::Util::FieldHash::Compat::Destroyer</remote-id>
         <remote-id type="cpan-module">Hash::Util::FieldHash::Compat::Tie::FieldHash</remote-id>
         <remote-id type="cpan-module">Hash::Util::FieldHash::Compat::Tie::IdHash</remote-id>
-        <remote-id type="cpan">Hash-Util-FieldHash-Compat</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/IO-CaptureOutput/metadata.xml b/dev-perl/IO-CaptureOutput/metadata.xml
index 09d87f0..c8cd798 100644
--- a/dev-perl/IO-CaptureOutput/metadata.xml
+++ b/dev-perl/IO-CaptureOutput/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">IO::CaptureOutput</remote-id>
         <remote-id type="cpan">IO-CaptureOutput</remote-id>
+        <remote-id type="cpan-module">IO::CaptureOutput</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/IO-Interactive/metadata.xml b/dev-perl/IO-Interactive/metadata.xml
index 09386c6..368aa20 100644
--- a/dev-perl/IO-Interactive/metadata.xml
+++ b/dev-perl/IO-Interactive/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">IO::Interactive</remote-id>
         <remote-id type="cpan">IO-Interactive</remote-id>
+        <remote-id type="cpan-module">IO::Interactive</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/IO-Stty/metadata.xml b/dev-perl/IO-Stty/metadata.xml
index 9e8daa2..dfc8e19 100644
--- a/dev-perl/IO-Stty/metadata.xml
+++ b/dev-perl/IO-Stty/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">IO::Stty</remote-id>
                 <remote-id type="cpan">IO-Stty</remote-id>
+                <remote-id type="cpan-module">IO::Stty</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/IO-TieCombine/metadata.xml b/dev-perl/IO-TieCombine/metadata.xml
index 2eb3b52..a83c3d3 100644
--- a/dev-perl/IO-TieCombine/metadata.xml
+++ b/dev-perl/IO-TieCombine/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">IO-TieCombine</remote-id>
         <remote-id type="cpan-module">IO::TieCombine</remote-id>
         <remote-id type="cpan-module">IO::TieCombine::Handle</remote-id>
         <remote-id type="cpan-module">IO::TieCombine::Scalar</remote-id>
-        <remote-id type="cpan">IO-TieCombine</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/IPTables-ChainMgr/metadata.xml b/dev-perl/IPTables-ChainMgr/metadata.xml
index 0ee48fb..a1cf8bf 100644
--- a/dev-perl/IPTables-ChainMgr/metadata.xml
+++ b/dev-perl/IPTables-ChainMgr/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
     <herd>perl</herd>
     <upstream>
-        <remote-id type="cpan-module">IPTables::ChainMgr</remote-id>
         <remote-id type="cpan">IPTables-ChainMgr</remote-id>
+        <remote-id type="cpan-module">IPTables::ChainMgr</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/IPTables-Parse/metadata.xml b/dev-perl/IPTables-Parse/metadata.xml
index fb4002a..8091517 100644
--- a/dev-perl/IPTables-Parse/metadata.xml
+++ b/dev-perl/IPTables-Parse/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
     <herd>perl</herd>
     <upstream>
-        <remote-id type="cpan-module">IPTables::Parse</remote-id>
         <remote-id type="cpan">IPTables-Parse</remote-id>
+        <remote-id type="cpan-module">IPTables::Parse</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/IRC-Utils/metadata.xml b/dev-perl/IRC-Utils/metadata.xml
index 55cd64d..146c3e9 100644
--- a/dev-perl/IRC-Utils/metadata.xml
+++ b/dev-perl/IRC-Utils/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">IRC::Utils</remote-id>
 		<remote-id type="cpan">IRC-Utils</remote-id>
+		<remote-id type="cpan-module">IRC::Utils</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Image-Math-Constrain/metadata.xml b/dev-perl/Image-Math-Constrain/metadata.xml
index 347f610..5dccc0f 100644
--- a/dev-perl/Image-Math-Constrain/metadata.xml
+++ b/dev-perl/Image-Math-Constrain/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Image::Math::Constrain</remote-id>
         <remote-id type="cpan">Image-Math-Constrain</remote-id>
+        <remote-id type="cpan-module">Image::Math::Constrain</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Image-Resize/metadata.xml b/dev-perl/Image-Resize/metadata.xml
index 09cf579..517a012 100644
--- a/dev-perl/Image-Resize/metadata.xml
+++ b/dev-perl/Image-Resize/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Image::Resize</remote-id>
         <remote-id type="cpan">Image-Resize</remote-id>
+        <remote-id type="cpan-module">Image::Resize</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Imager/metadata.xml b/dev-perl/Imager/metadata.xml
index 1cd8a13..d66a9c2 100644
--- a/dev-perl/Imager/metadata.xml
+++ b/dev-perl/Imager/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Imager</remote-id>
         <remote-id type="cpan-module">Imager</remote-id>
         <remote-id type="cpan-module">Imager::Color</remote-id>
         <remote-id type="cpan-module">Imager::Color::Float</remote-id>
@@ -39,6 +40,5 @@
         <remote-id type="cpan-module">Imager::Regops</remote-id>
         <remote-id type="cpan-module">Imager::Test</remote-id>
         <remote-id type="cpan-module">Imager::Transform</remote-id>
-        <remote-id type="cpan">Imager</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Internals/metadata.xml b/dev-perl/Internals/metadata.xml
index b992fe1..70f537c 100644
--- a/dev-perl/Internals/metadata.xml
+++ b/dev-perl/Internals/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Internals</remote-id>
         <remote-id type="cpan">Internals</remote-id>
+        <remote-id type="cpan-module">Internals</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/JavaScript-Minifier-XS/metadata.xml b/dev-perl/JavaScript-Minifier-XS/metadata.xml
index 347bca3..bdc8293 100644
--- a/dev-perl/JavaScript-Minifier-XS/metadata.xml
+++ b/dev-perl/JavaScript-Minifier-XS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">JavaScript::Minifier::XS</remote-id>
         <remote-id type="cpan">JavaScript-Minifier-XS</remote-id>
+        <remote-id type="cpan-module">JavaScript::Minifier::XS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/JavaScript-Packer/metadata.xml b/dev-perl/JavaScript-Packer/metadata.xml
index fc402c4..ad2c6dd 100644
--- a/dev-perl/JavaScript-Packer/metadata.xml
+++ b/dev-perl/JavaScript-Packer/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">JavaScript::Packer</remote-id>
                 <remote-id type="cpan">JavaScript-Packer</remote-id>
+                <remote-id type="cpan-module">JavaScript::Packer</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Jemplate/metadata.xml b/dev-perl/Jemplate/metadata.xml
index b93e94a..5030022 100644
--- a/dev-perl/Jemplate/metadata.xml
+++ b/dev-perl/Jemplate/metadata.xml
@@ -7,12 +7,12 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Jemplate</remote-id>
         <remote-id type="cpan-module">Jemplate</remote-id>
         <remote-id type="cpan-module">Jemplate::Directive</remote-id>
         <remote-id type="cpan-module">Jemplate::Grammar</remote-id>
         <remote-id type="cpan-module">Jemplate::Parser</remote-id>
         <remote-id type="cpan-module">Jemplate::Runtime</remote-id>
         <remote-id type="cpan-module">Jemplate::Runtime::Compact</remote-id>
-        <remote-id type="cpan">Jemplate</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/KinoSearch/metadata.xml b/dev-perl/KinoSearch/metadata.xml
index 3cff258..c95fd42 100644
--- a/dev-perl/KinoSearch/metadata.xml
+++ b/dev-perl/KinoSearch/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">KinoSearch</remote-id>
         <remote-id type="cpan-module">KSx::Index::ByteBufDocReader</remote-id>
         <remote-id type="cpan-module">KSx::Index::ByteBufDocWriter</remote-id>
         <remote-id type="cpan-module">KSx::Index::LongFieldSim</remote-id>
@@ -21,6 +22,5 @@
         <remote-id type="cpan-module">KSx::Simple</remote-id>
         <remote-id type="cpan-module">KinoSearch::Analysis::Token</remote-id>
         <remote-id type="cpan-module">KinoSearch::Analysis::TokenBatch</remote-id>
-        <remote-id type="cpan">KinoSearch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/KinoSearch1/metadata.xml b/dev-perl/KinoSearch1/metadata.xml
index 27d6a44..2f426b5 100644
--- a/dev-perl/KinoSearch1/metadata.xml
+++ b/dev-perl/KinoSearch1/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">KinoSearch1</remote-id>
         <remote-id type="cpan-module">KinoSearch1</remote-id>
         <remote-id type="cpan-module">KinoSearch1::Analysis::Analyzer</remote-id>
         <remote-id type="cpan-module">KinoSearch1::Analysis::LCNormalizer</remote-id>
@@ -103,6 +104,5 @@
         <remote-id type="cpan-module">KinoSearch1::Util::ToStringUtils</remote-id>
         <remote-id type="cpan-module">KinoSearch1::Util::ToolSet</remote-id>
         <remote-id type="cpan-module">KinoSearch1::Util::VerifyArgs</remote-id>
-        <remote-id type="cpan">KinoSearch1</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/KiokuDB-Backend-DBI/metadata.xml b/dev-perl/KiokuDB-Backend-DBI/metadata.xml
index daf1e49..a08ac93 100644
--- a/dev-perl/KiokuDB-Backend-DBI/metadata.xml
+++ b/dev-perl/KiokuDB-Backend-DBI/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">KiokuDB-Backend-DBI</remote-id>
         <remote-id type="cpan-module">DBIx::Class::KiokuDB</remote-id>
         <remote-id type="cpan-module">DBIx::Class::KiokuDB::EntryProxy</remote-id>
         <remote-id type="cpan-module">DBIx::Class::Schema::KiokuDB</remote-id>
@@ -16,6 +17,5 @@
         <remote-id type="cpan-module">KiokuDB::TypeMap::Entry::DBIC::ResultSource</remote-id>
         <remote-id type="cpan-module">KiokuDB::TypeMap::Entry::DBIC::Row</remote-id>
         <remote-id type="cpan-module">KiokuDB::TypeMap::Entry::DBIC::Schema</remote-id>
-        <remote-id type="cpan">KiokuDB-Backend-DBI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/KiokuDB/metadata.xml b/dev-perl/KiokuDB/metadata.xml
index 58db31c..45484da 100644
--- a/dev-perl/KiokuDB/metadata.xml
+++ b/dev-perl/KiokuDB/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">KiokuDB</remote-id>
         <remote-id type="cpan-module">KiokuDB</remote-id>
         <remote-id type="cpan-module">KiokuDB::Backend</remote-id>
         <remote-id type="cpan-module">KiokuDB::Backend::Hash</remote-id>
@@ -159,6 +160,5 @@
         <remote-id type="cpan-module">Some::Other::Role</remote-id>
         <remote-id type="cpan-module">Some::Role</remote-id>
         <remote-id type="cpan-module">Some::Third::Role</remote-id>
-        <remote-id type="cpan">KiokuDB</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/KiokuX-Model/metadata.xml b/dev-perl/KiokuX-Model/metadata.xml
index 4bd7437..9e80588 100644
--- a/dev-perl/KiokuX-Model/metadata.xml
+++ b/dev-perl/KiokuX-Model/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">KiokuX::Model</remote-id>
         <remote-id type="cpan">KiokuX-Model</remote-id>
+        <remote-id type="cpan-module">KiokuX::Model</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/KiokuX-User/metadata.xml b/dev-perl/KiokuX-User/metadata.xml
index 6a9b638..e604a8a 100644
--- a/dev-perl/KiokuX-User/metadata.xml
+++ b/dev-perl/KiokuX-User/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">KiokuX-User</remote-id>
         <remote-id type="cpan-module">KiokuX::User</remote-id>
         <remote-id type="cpan-module">KiokuX::User::ID</remote-id>
         <remote-id type="cpan-module">KiokuX::User::Password</remote-id>
         <remote-id type="cpan-module">KiokuX::User::Util</remote-id>
-        <remote-id type="cpan">KiokuX-User</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/LWP-Online/metadata.xml b/dev-perl/LWP-Online/metadata.xml
index 014930d..48434ef 100644
--- a/dev-perl/LWP-Online/metadata.xml
+++ b/dev-perl/LWP-Online/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">LWP::Online</remote-id>
         <remote-id type="cpan">LWP-Online</remote-id>
+        <remote-id type="cpan-module">LWP::Online</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Language-Functional/metadata.xml b/dev-perl/Language-Functional/metadata.xml
index b4fa6b8..4304615 100644
--- a/dev-perl/Language-Functional/metadata.xml
+++ b/dev-perl/Language-Functional/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Language-Functional</remote-id>
         <remote-id type="cpan-module">InfiniteList</remote-id>
         <remote-id type="cpan-module">Language::Functional</remote-id>
-        <remote-id type="cpan">Language-Functional</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Lexical-Types/metadata.xml b/dev-perl/Lexical-Types/metadata.xml
index ce84f8e..432c33e 100644
--- a/dev-perl/Lexical-Types/metadata.xml
+++ b/dev-perl/Lexical-Types/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Lexical::Types</remote-id>
         <remote-id type="cpan">Lexical-Types</remote-id>
+        <remote-id type="cpan-module">Lexical::Types</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Lingua-EN-Inflect-Number/metadata.xml b/dev-perl/Lingua-EN-Inflect-Number/metadata.xml
index b86fa5f..0a13f2d 100644
--- a/dev-perl/Lingua-EN-Inflect-Number/metadata.xml
+++ b/dev-perl/Lingua-EN-Inflect-Number/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Lingua::EN::Inflect::Number</remote-id>
         <remote-id type="cpan">Lingua-EN-Inflect-Number</remote-id>
+        <remote-id type="cpan-module">Lingua::EN::Inflect::Number</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Lingua-EN-Inflect-Phrase/metadata.xml b/dev-perl/Lingua-EN-Inflect-Phrase/metadata.xml
index c742a7c..d0ec233 100644
--- a/dev-perl/Lingua-EN-Inflect-Phrase/metadata.xml
+++ b/dev-perl/Lingua-EN-Inflect-Phrase/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Lingua::EN::Inflect::Phrase</remote-id>
                 <remote-id type="cpan">Lingua-EN-Inflect-Phrase</remote-id>
+                <remote-id type="cpan-module">Lingua::EN::Inflect::Phrase</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Lingua-EN-Tagger/metadata.xml b/dev-perl/Lingua-EN-Tagger/metadata.xml
index d0e1833..2ebc48d 100644
--- a/dev-perl/Lingua-EN-Tagger/metadata.xml
+++ b/dev-perl/Lingua-EN-Tagger/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Lingua::EN::Tagger</remote-id>
                 <remote-id type="cpan">Lingua-EN-Tagger</remote-id>
+                <remote-id type="cpan-module">Lingua::EN::Tagger</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Lingua-Stem-Snowball/metadata.xml b/dev-perl/Lingua-Stem-Snowball/metadata.xml
index 4092e98..b749a20 100644
--- a/dev-perl/Lingua-Stem-Snowball/metadata.xml
+++ b/dev-perl/Lingua-Stem-Snowball/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Lingua::Stem::Snowball</remote-id>
         <remote-id type="cpan">Lingua-Stem-Snowball</remote-id>
+        <remote-id type="cpan-module">Lingua::Stem::Snowball</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Lingua-StopWords/metadata.xml b/dev-perl/Lingua-StopWords/metadata.xml
index ec3b48c..2aef7ec 100644
--- a/dev-perl/Lingua-StopWords/metadata.xml
+++ b/dev-perl/Lingua-StopWords/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Lingua-StopWords</remote-id>
         <remote-id type="cpan-module">Lingua::StopWords</remote-id>
         <remote-id type="cpan-module">Lingua::StopWords::DA</remote-id>
         <remote-id type="cpan-module">Lingua::StopWords::DE</remote-id>
@@ -21,6 +22,5 @@
         <remote-id type="cpan-module">Lingua::StopWords::PT</remote-id>
         <remote-id type="cpan-module">Lingua::StopWords::RU</remote-id>
         <remote-id type="cpan-module">Lingua::StopWords::SV</remote-id>
-        <remote-id type="cpan">Lingua-StopWords</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Linux-DVB/metadata.xml b/dev-perl/Linux-DVB/metadata.xml
index 338537e..7c1770e 100644
--- a/dev-perl/Linux-DVB/metadata.xml
+++ b/dev-perl/Linux-DVB/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Linux-DVB</remote-id>
                 <remote-id type="cpan-module">Linux::DVB</remote-id>
                 <remote-id type="cpan-module">Linux::DVB::Decode</remote-id>
                 <remote-id type="cpan-module">Linux::DVB::Demux</remote-id>
                 <remote-id type="cpan-module">Linux::DVB::Frontend</remote-id>
-                <remote-id type="cpan">Linux-DVB</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/List-Compare/metadata.xml b/dev-perl/List-Compare/metadata.xml
index 2bcda23..caf305c 100644
--- a/dev-perl/List-Compare/metadata.xml
+++ b/dev-perl/List-Compare/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">List-Compare</remote-id>
         <remote-id type="cpan-module">List::Compare</remote-id>
         <remote-id type="cpan-module">List::Compare::Accelerated</remote-id>
         <remote-id type="cpan-module">List::Compare::Base::_Auxiliary</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">List::Compare::Functional</remote-id>
         <remote-id type="cpan-module">List::Compare::Multiple</remote-id>
         <remote-id type="cpan-module">List::Compare::Multiple::Accelerated</remote-id>
-        <remote-id type="cpan">List-Compare</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Locale-Codes/metadata.xml b/dev-perl/Locale-Codes/metadata.xml
index f8e9370..622b676 100644
--- a/dev-perl/Locale-Codes/metadata.xml
+++ b/dev-perl/Locale-Codes/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Locale-Codes</remote-id>
         <remote-id type="cpan-module">Locale::Codes</remote-id>
         <remote-id type="cpan-module">Locale::Codes::Constants</remote-id>
         <remote-id type="cpan-module">Locale::Codes::Country</remote-id>
@@ -34,6 +35,5 @@
         <remote-id type="cpan-module">Locale::Currency</remote-id>
         <remote-id type="cpan-module">Locale::Language</remote-id>
         <remote-id type="cpan-module">Locale::Script</remote-id>
-        <remote-id type="cpan">Locale-Codes</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Locale-Currency-Format/metadata.xml b/dev-perl/Locale-Currency-Format/metadata.xml
index da5e9ff..4a72b9d 100644
--- a/dev-perl/Locale-Currency-Format/metadata.xml
+++ b/dev-perl/Locale-Currency-Format/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Locale::Currency::Format</remote-id>
         <remote-id type="cpan">Locale-Currency-Format</remote-id>
+        <remote-id type="cpan-module">Locale::Currency::Format</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Log-Any-Adapter-Dispatch/metadata.xml b/dev-perl/Log-Any-Adapter-Dispatch/metadata.xml
index 1cd2389..ab08281 100644
--- a/dev-perl/Log-Any-Adapter-Dispatch/metadata.xml
+++ b/dev-perl/Log-Any-Adapter-Dispatch/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Log::Any::Adapter::Dispatch</remote-id>
         <remote-id type="cpan">Log-Any-Adapter-Dispatch</remote-id>
+        <remote-id type="cpan-module">Log::Any::Adapter::Dispatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Log-Any-Adapter/metadata.xml b/dev-perl/Log-Any-Adapter/metadata.xml
index c95c371..94d6660 100644
--- a/dev-perl/Log-Any-Adapter/metadata.xml
+++ b/dev-perl/Log-Any-Adapter/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Log-Any-Adapter</remote-id>
         <remote-id type="cpan-module">Log::Any::Adapter</remote-id>
         <remote-id type="cpan-module">Log::Any::Adapter::Base</remote-id>
         <remote-id type="cpan-module">Log::Any::Manager</remote-id>
-        <remote-id type="cpan">Log-Any-Adapter</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Log-Contextual/metadata.xml b/dev-perl/Log-Contextual/metadata.xml
index 3ad36fd..b2fd4ca 100644
--- a/dev-perl/Log-Contextual/metadata.xml
+++ b/dev-perl/Log-Contextual/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Log-Contextual</remote-id>
         <remote-id type="cpan-module">Log::Contextual</remote-id>
         <remote-id type="cpan-module">Log::Contextual::SimpleLogger</remote-id>
         <remote-id type="cpan-module">Log::Contextual::TeeLogger</remote-id>
         <remote-id type="cpan-module">Log::Contextual::WarnLogger</remote-id>
-        <remote-id type="cpan">Log-Contextual</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Log-Dispatch-Array/metadata.xml b/dev-perl/Log-Dispatch-Array/metadata.xml
index 1ea35d3..b7261d4 100644
--- a/dev-perl/Log-Dispatch-Array/metadata.xml
+++ b/dev-perl/Log-Dispatch-Array/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Log::Dispatch::Array</remote-id>
                 <remote-id type="cpan">Log-Dispatch-Array</remote-id>
+                <remote-id type="cpan-module">Log::Dispatch::Array</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Log-Dispatch-Config/metadata.xml b/dev-perl/Log-Dispatch-Config/metadata.xml
index 63f4f42..002ef90 100644
--- a/dev-perl/Log-Dispatch-Config/metadata.xml
+++ b/dev-perl/Log-Dispatch-Config/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Log-Dispatch-Config</remote-id>
         <remote-id type="cpan-module">Log::Dispatch::Config</remote-id>
         <remote-id type="cpan-module">Log::Dispatch::Configurator</remote-id>
         <remote-id type="cpan-module">Log::Dispatch::Configurator::AppConfig</remote-id>
-        <remote-id type="cpan">Log-Dispatch-Config</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Log-Dispatchouli/metadata.xml b/dev-perl/Log-Dispatchouli/metadata.xml
index ff797c1..3c6db41 100644
--- a/dev-perl/Log-Dispatchouli/metadata.xml
+++ b/dev-perl/Log-Dispatchouli/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Log-Dispatchouli</remote-id>
                 <remote-id type="cpan-module">Log::Dispatchouli</remote-id>
                 <remote-id type="cpan-module">Log::Dispatchouli::Global</remote-id>
                 <remote-id type="cpan-module">Log::Dispatchouli::Proxy</remote-id>
-                <remote-id type="cpan">Log-Dispatchouli</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Log-Trace/metadata.xml b/dev-perl/Log-Trace/metadata.xml
index e57e0d4..7a34226 100644
--- a/dev-perl/Log-Trace/metadata.xml
+++ b/dev-perl/Log-Trace/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Log-Trace</remote-id>
                 <remote-id type="cpan-module">DB</remote-id>
                 <remote-id type="cpan-module">Log::Trace</remote-id>
                 <remote-id type="cpan-module">_Log::Trace::PerlVersion</remote-id>
-                <remote-id type="cpan">Log-Trace</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MKDoc-XML/metadata.xml b/dev-perl/MKDoc-XML/metadata.xml
index 8ddce66..91f1ab1 100644
--- a/dev-perl/MKDoc-XML/metadata.xml
+++ b/dev-perl/MKDoc-XML/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MKDoc-XML</remote-id>
         <remote-id type="cpan-module">MKDoc::XML</remote-id>
         <remote-id type="cpan-module">MKDoc::XML::Decode</remote-id>
         <remote-id type="cpan-module">MKDoc::XML::Decode::Numeric</remote-id>
@@ -21,6 +22,5 @@
         <remote-id type="cpan-module">MKDoc::XML::Tokenizer</remote-id>
         <remote-id type="cpan-module">MKDoc::XML::TreeBuilder</remote-id>
         <remote-id type="cpan-module">MKDoc::XML::TreePrinter</remote-id>
-        <remote-id type="cpan">MKDoc-XML</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MP4-Info/metadata.xml b/dev-perl/MP4-Info/metadata.xml
index 57f6492..a54a96a 100644
--- a/dev-perl/MP4-Info/metadata.xml
+++ b/dev-perl/MP4-Info/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">MP4::Info</remote-id>
                 <remote-id type="cpan">MP4-Info</remote-id>
+                <remote-id type="cpan-module">MP4::Info</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Mason/metadata.xml b/dev-perl/Mason/metadata.xml
index 761080e..3057d6d 100644
--- a/dev-perl/Mason/metadata.xml
+++ b/dev-perl/Mason/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Mason</remote-id>
                 <remote-id type="cpan-module">Mason</remote-id>
                 <remote-id type="cpan-module">Mason::App</remote-id>
                 <remote-id type="cpan-module">Mason::CodeCache</remote-id>
@@ -30,6 +31,5 @@
                 <remote-id type="cpan-module">Mason::Result</remote-id>
                 <remote-id type="cpan-module">Mason::TieHandle</remote-id>
                 <remote-id type="cpan-module">Mason::Types</remote-id>
-                <remote-id type="cpan">Mason</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Math-BaseCnv/metadata.xml b/dev-perl/Math-BaseCnv/metadata.xml
index 2a84ca3..1e76254 100644
--- a/dev-perl/Math-BaseCnv/metadata.xml
+++ b/dev-perl/Math-BaseCnv/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Math::BaseCnv</remote-id>
                 <remote-id type="cpan">Math-BaseCnv</remote-id>
+                <remote-id type="cpan-module">Math::BaseCnv</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Math-Combinatorics/metadata.xml b/dev-perl/Math-Combinatorics/metadata.xml
index a3f642f..a71b3e5 100644
--- a/dev-perl/Math-Combinatorics/metadata.xml
+++ b/dev-perl/Math-Combinatorics/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Math::Combinatorics</remote-id>
         <remote-id type="cpan">Math-Combinatorics</remote-id>
+        <remote-id type="cpan-module">Math::Combinatorics</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Math-Factor-XS/metadata.xml b/dev-perl/Math-Factor-XS/metadata.xml
index b97b231..de26ae7 100644
--- a/dev-perl/Math-Factor-XS/metadata.xml
+++ b/dev-perl/Math-Factor-XS/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Math::Factor::XS</remote-id>
                 <remote-id type="cpan">Math-Factor-XS</remote-id>
+                <remote-id type="cpan-module">Math::Factor::XS</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MemHandle/metadata.xml b/dev-perl/MemHandle/metadata.xml
index b1810d7..aac51a7 100644
--- a/dev-perl/MemHandle/metadata.xml
+++ b/dev-perl/MemHandle/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MemHandle</remote-id>
         <remote-id type="cpan-module">MemHandle</remote-id>
         <remote-id type="cpan-module">MemHandle::Tie</remote-id>
-        <remote-id type="cpan">MemHandle</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Memoize-ExpireLRU/metadata.xml b/dev-perl/Memoize-ExpireLRU/metadata.xml
index 8409a5b..f34b8de 100644
--- a/dev-perl/Memoize-ExpireLRU/metadata.xml
+++ b/dev-perl/Memoize-ExpireLRU/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Memoize::ExpireLRU</remote-id>
                 <remote-id type="cpan">Memoize-ExpireLRU</remote-id>
+                <remote-id type="cpan-module">Memoize::ExpireLRU</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Meta-Builder/metadata.xml b/dev-perl/Meta-Builder/metadata.xml
index 44289d2..6a5680e 100644
--- a/dev-perl/Meta-Builder/metadata.xml
+++ b/dev-perl/Meta-Builder/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Meta-Builder</remote-id>
         <remote-id type="cpan-module">Meta::Builder</remote-id>
         <remote-id type="cpan-module">Meta::Builder::Base</remote-id>
         <remote-id type="cpan-module">Meta::Builder::Util</remote-id>
-        <remote-id type="cpan">Meta-Builder</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MetaCPAN-API/metadata.xml b/dev-perl/MetaCPAN-API/metadata.xml
index 5e0d160..0c2877a 100644
--- a/dev-perl/MetaCPAN-API/metadata.xml
+++ b/dev-perl/MetaCPAN-API/metadata.xml
@@ -7,12 +7,12 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpan">MetaCPAN-API</remote-id>
 		<remote-id type="cpan-module">MetaCPAN::API</remote-id>
 		<remote-id type="cpan-module">MetaCPAN::API::Author</remote-id>
 		<remote-id type="cpan-module">MetaCPAN::API::Module</remote-id>
 		<remote-id type="cpan-module">MetaCPAN::API::POD</remote-id>
 		<remote-id type="cpan-module">MetaCPAN::API::Release</remote-id>
 		<remote-id type="cpan-module">MetaCPAN::API::Source</remote-id>
-		<remote-id type="cpan">MetaCPAN-API</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Method-Signatures-Simple/metadata.xml b/dev-perl/Method-Signatures-Simple/metadata.xml
index d58555e..3391e07 100644
--- a/dev-perl/Method-Signatures-Simple/metadata.xml
+++ b/dev-perl/Method-Signatures-Simple/metadata.xml
@@ -7,7 +7,7 @@
         <name>David Abbott</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Method::Signatures::Simple</remote-id>
         <remote-id type="cpan">Method-Signatures-Simple</remote-id>
+        <remote-id type="cpan-module">Method::Signatures::Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Method-Signatures/metadata.xml b/dev-perl/Method-Signatures/metadata.xml
index c396a26..c99ac85 100644
--- a/dev-perl/Method-Signatures/metadata.xml
+++ b/dev-perl/Method-Signatures/metadata.xml
@@ -7,9 +7,9 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpan">Method-Signatures</remote-id>
 		<remote-id type="cpan-module">Method::Signatures</remote-id>
 		<remote-id type="cpan-module">Method::Signatures::Modifiers</remote-id>
 		<remote-id type="cpan-module">Method::Signatures::Parser</remote-id>
-		<remote-id type="cpan">Method-Signatures</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Mixin-ExtraFields-Param/metadata.xml b/dev-perl/Mixin-ExtraFields-Param/metadata.xml
index fa88921..d8aed2c 100644
--- a/dev-perl/Mixin-ExtraFields-Param/metadata.xml
+++ b/dev-perl/Mixin-ExtraFields-Param/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Mixin::ExtraFields::Param</remote-id>
         <remote-id type="cpan">Mixin-ExtraFields-Param</remote-id>
+        <remote-id type="cpan-module">Mixin::ExtraFields::Param</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Mixin-ExtraFields/metadata.xml b/dev-perl/Mixin-ExtraFields/metadata.xml
index 9c41476..ade1107 100644
--- a/dev-perl/Mixin-ExtraFields/metadata.xml
+++ b/dev-perl/Mixin-ExtraFields/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Mixin-ExtraFields</remote-id>
         <remote-id type="cpan-module">Mixin::ExtraFields</remote-id>
         <remote-id type="cpan-module">Mixin::ExtraFields::Driver</remote-id>
         <remote-id type="cpan-module">Mixin::ExtraFields::Driver::HashGuts</remote-id>
-        <remote-id type="cpan">Mixin-ExtraFields</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Mixin-Linewise/metadata.xml b/dev-perl/Mixin-Linewise/metadata.xml
index 261fccd..e74151d 100644
--- a/dev-perl/Mixin-Linewise/metadata.xml
+++ b/dev-perl/Mixin-Linewise/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Mixin-Linewise</remote-id>
         <remote-id type="cpan-module">Mixin::Linewise</remote-id>
         <remote-id type="cpan-module">Mixin::Linewise::Readers</remote-id>
         <remote-id type="cpan-module">Mixin::Linewise::Writers</remote-id>
-        <remote-id type="cpan">Mixin-Linewise</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/ModPerl-VersionUtil/metadata.xml b/dev-perl/ModPerl-VersionUtil/metadata.xml
index ee34182..1fa8ab6 100644
--- a/dev-perl/ModPerl-VersionUtil/metadata.xml
+++ b/dev-perl/ModPerl-VersionUtil/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">ModPerl::VersionUtil</remote-id>
                 <remote-id type="cpan">ModPerl-VersionUtil</remote-id>
+                <remote-id type="cpan-module">ModPerl::VersionUtil</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Modern-Perl/metadata.xml b/dev-perl/Modern-Perl/metadata.xml
index c963ed8..bfe22d1 100644
--- a/dev-perl/Modern-Perl/metadata.xml
+++ b/dev-perl/Modern-Perl/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Modern::Perl</remote-id>
         <remote-id type="cpan">Modern-Perl</remote-id>
+        <remote-id type="cpan-module">Modern::Perl</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-CPANTS-Analyse/metadata.xml b/dev-perl/Module-CPANTS-Analyse/metadata.xml
index 8cc65b5..f861d55 100644
--- a/dev-perl/Module-CPANTS-Analyse/metadata.xml
+++ b/dev-perl/Module-CPANTS-Analyse/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Module-CPANTS-Analyse</remote-id>
         <remote-id type="cpan-module">Module::CPANTS::Analyse</remote-id>
         <remote-id type="cpan-module">Module::CPANTS::Kwalitee</remote-id>
         <remote-id type="cpan-module">Module::CPANTS::Kwalitee::BrokenInstaller</remote-id>
@@ -25,6 +26,5 @@
         <remote-id type="cpan-module">Module::CPANTS::Kwalitee::Signature</remote-id>
         <remote-id type="cpan-module">Module::CPANTS::Kwalitee::Uses</remote-id>
         <remote-id type="cpan-module">Module::CPANTS::Kwalitee::Version</remote-id>
-        <remote-id type="cpan">Module-CPANTS-Analyse</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Compile-TT/metadata.xml b/dev-perl/Module-Compile-TT/metadata.xml
index 5ac264b..00a7995 100644
--- a/dev-perl/Module-Compile-TT/metadata.xml
+++ b/dev-perl/Module-Compile-TT/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Module-Compile-TT</remote-id>
         <remote-id type="cpan-module">Module::Compile::TT</remote-id>
         <remote-id type="cpan-module">tt</remote-id>
-        <remote-id type="cpan">Module-Compile-TT</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Compile/metadata.xml b/dev-perl/Module-Compile/metadata.xml
index 116136a..49a9804 100644
--- a/dev-perl/Module-Compile/metadata.xml
+++ b/dev-perl/Module-Compile/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Module-Compile</remote-id>
         <remote-id type="cpan-module">Module::Compile</remote-id>
         <remote-id type="cpan-module">Module::Compile::Opt</remote-id>
         <remote-id type="cpan-module">Module::Install::Admin::PMC</remote-id>
         <remote-id type="cpan-module">Module::Install::PMC</remote-id>
         <remote-id type="cpan-module">Module::Optimize</remote-id>
-        <remote-id type="cpan">Module-Compile</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Extract-Namespaces/metadata.xml b/dev-perl/Module-Extract-Namespaces/metadata.xml
index dac0255..bb73b4d 100644
--- a/dev-perl/Module-Extract-Namespaces/metadata.xml
+++ b/dev-perl/Module-Extract-Namespaces/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Module-Extract-Namespaces</remote-id>
         <remote-id type="cpan-module">Foo::First</remote-id>
         <remote-id type="cpan-module">Foo::Second</remote-id>
         <remote-id type="cpan-module">Foo::Third</remote-id>
         <remote-id type="cpan-module">Module::Extract::Namespaces</remote-id>
-        <remote-id type="cpan">Module-Extract-Namespaces</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Module-Extract-VERSION/metadata.xml b/dev-perl/Module-Extract-VERSION/metadata.xml
index be9bf2f..fb7c7b9 100644
--- a/dev-perl/Module-Extract-VERSION/metadata.xml
+++ b/dev-perl/Module-Extract-VERSION/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Module-Extract-VERSION</remote-id>
         <remote-id type="cpan-module">ExtUtils::MakeMaker::_version</remote-id>
         <remote-id type="cpan-module">Module::Extract::VERSION</remote-id>
-        <remote-id type="cpan">Module-Extract-VERSION</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Module-Extract/metadata.xml b/dev-perl/Module-Extract/metadata.xml
index d565de2..c8b741c 100644
--- a/dev-perl/Module-Extract/metadata.xml
+++ b/dev-perl/Module-Extract/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Module::Extract</remote-id>
                 <remote-id type="cpan">Module-Extract</remote-id>
+                <remote-id type="cpan-module">Module::Extract</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-ExtractUse/metadata.xml b/dev-perl/Module-ExtractUse/metadata.xml
index 5d19aa8..30dfd06 100644
--- a/dev-perl/Module-ExtractUse/metadata.xml
+++ b/dev-perl/Module-ExtractUse/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Module-ExtractUse</remote-id>
         <remote-id type="cpan-module">Module::ExtractUse</remote-id>
         <remote-id type="cpan-module">Module::ExtractUse::Grammar</remote-id>
         <remote-id type="cpan-module">Parse::RecDescent::Module::ExtractUse::Grammar</remote-id>
-        <remote-id type="cpan">Module-ExtractUse</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Inspector/metadata.xml b/dev-perl/Module-Inspector/metadata.xml
index 692b1ed..63f9064 100644
--- a/dev-perl/Module-Inspector/metadata.xml
+++ b/dev-perl/Module-Inspector/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Module::Inspector</remote-id>
                 <remote-id type="cpan">Module-Inspector</remote-id>
+                <remote-id type="cpan-module">Module::Inspector</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Install-AuthorTests/metadata.xml b/dev-perl/Module-Install-AuthorTests/metadata.xml
index b8a1be6..fc57580 100644
--- a/dev-perl/Module-Install-AuthorTests/metadata.xml
+++ b/dev-perl/Module-Install-AuthorTests/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Module::Install::AuthorTests</remote-id>
         <remote-id type="cpan">Module-Install-AuthorTests</remote-id>
+        <remote-id type="cpan-module">Module::Install::AuthorTests</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Install-ProvidesClass/metadata.xml b/dev-perl/Module-Install-ProvidesClass/metadata.xml
index 5aaecb8..5e21959 100644
--- a/dev-perl/Module-Install-ProvidesClass/metadata.xml
+++ b/dev-perl/Module-Install-ProvidesClass/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Module::Install::ProvidesClass</remote-id>
         <remote-id type="cpan">Module-Install-ProvidesClass</remote-id>
+        <remote-id type="cpan-module">Module::Install::ProvidesClass</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Module-Install-ReadmeFromPod/metadata.xml b/dev-perl/Module-Install-ReadmeFromPod/metadata.xml
index 1b51d28..e094ac5 100644
--- a/dev-perl/Module-Install-ReadmeFromPod/metadata.xml
+++ b/dev-perl/Module-Install-ReadmeFromPod/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Module::Install::ReadmeFromPod</remote-id>
         <remote-id type="cpan">Module-Install-ReadmeFromPod</remote-id>
+        <remote-id type="cpan-module">Module::Install::ReadmeFromPod</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Math-Depends/metadata.xml b/dev-perl/Module-Math-Depends/metadata.xml
index f656ead..23ca836 100644
--- a/dev-perl/Module-Math-Depends/metadata.xml
+++ b/dev-perl/Module-Math-Depends/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Module::Math::Depends</remote-id>
                 <remote-id type="cpan">Module-Math-Depends</remote-id>
+                <remote-id type="cpan-module">Module::Math::Depends</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Pluggable-Fast/metadata.xml b/dev-perl/Module-Pluggable-Fast/metadata.xml
index 134ea70..9d762da 100644
--- a/dev-perl/Module-Pluggable-Fast/metadata.xml
+++ b/dev-perl/Module-Pluggable-Fast/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Module::Pluggable::Fast</remote-id>
         <remote-id type="cpan">Module-Pluggable-Fast</remote-id>
+        <remote-id type="cpan-module">Module::Pluggable::Fast</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Pluggable-Ordered/metadata.xml b/dev-perl/Module-Pluggable-Ordered/metadata.xml
index cdb3609..e024ef7 100644
--- a/dev-perl/Module-Pluggable-Ordered/metadata.xml
+++ b/dev-perl/Module-Pluggable-Ordered/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Module::Pluggable::Ordered</remote-id>
         <remote-id type="cpan">Module-Pluggable-Ordered</remote-id>
+        <remote-id type="cpan-module">Module::Pluggable::Ordered</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MojoMojo/metadata.xml b/dev-perl/MojoMojo/metadata.xml
index 8986121..50a4478 100644
--- a/dev-perl/MojoMojo/metadata.xml
+++ b/dev-perl/MojoMojo/metadata.xml
@@ -19,6 +19,7 @@
     <flag name="recaptcha">reCAPTCHA for anonymous edits</flag>
   </use>
   <upstream>
+    <remote-id type="cpan">MojoMojo</remote-id>
     <remote-id type="cpan-module">MojoMojo</remote-id>
     <remote-id type="cpan-module">MojoMojo::Controller::Admin</remote-id>
     <remote-id type="cpan-module">MojoMojo::Controller::Attachment</remote-id>
@@ -106,6 +107,5 @@
     <remote-id type="cpan-module">MojoMojo::WordDiff</remote-id>
     <remote-id type="cpan-module">Text::SmartyPants</remote-id>
     <remote-id type="cpan-module">Text::Wikispaces2Markdown</remote-id>
-    <remote-id type="cpan">MojoMojo</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MojoX-Renderer-TT/metadata.xml b/dev-perl/MojoX-Renderer-TT/metadata.xml
index 60a21c8..a881e33 100644
--- a/dev-perl/MojoX-Renderer-TT/metadata.xml
+++ b/dev-perl/MojoX-Renderer-TT/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">MojoX-Renderer-TT</remote-id>
                 <remote-id type="cpan-module">MojoX::Renderer::TT</remote-id>
                 <remote-id type="cpan-module">Mojolicious::Plugin::TtRenderer</remote-id>
-                <remote-id type="cpan">MojoX-Renderer-TT</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Mojolicious-Plugin-Authentication/metadata.xml b/dev-perl/Mojolicious-Plugin-Authentication/metadata.xml
index 4199031..13003eb 100644
--- a/dev-perl/Mojolicious-Plugin-Authentication/metadata.xml
+++ b/dev-perl/Mojolicious-Plugin-Authentication/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Mojolicious::Plugin::Authentication</remote-id>
                 <remote-id type="cpan">Mojolicious-Plugin-Authentication</remote-id>
+                <remote-id type="cpan-module">Mojolicious::Plugin::Authentication</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Mojolicious-Plugin-Database/metadata.xml b/dev-perl/Mojolicious-Plugin-Database/metadata.xml
index b7f7420..a58c2b6 100644
--- a/dev-perl/Mojolicious-Plugin-Database/metadata.xml
+++ b/dev-perl/Mojolicious-Plugin-Database/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Mojolicious::Plugin::Database</remote-id>
                 <remote-id type="cpan">Mojolicious-Plugin-Database</remote-id>
+                <remote-id type="cpan-module">Mojolicious::Plugin::Database</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Mojolicious/metadata.xml b/dev-perl/Mojolicious/metadata.xml
index fb16d70..809382e 100644
--- a/dev-perl/Mojolicious/metadata.xml
+++ b/dev-perl/Mojolicious/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Mojolicious</remote-id>
         <remote-id type="cpan-module">Mojo</remote-id>
         <remote-id type="cpan-module">Mojo::Asset</remote-id>
         <remote-id type="cpan-module">Mojo::Asset::File</remote-id>
@@ -111,6 +112,5 @@
         <remote-id type="cpan-module">Mojolicious::Types</remote-id>
         <remote-id type="cpan-module">Test::Mojo</remote-id>
         <remote-id type="cpan-module">ojo</remote-id>
-        <remote-id type="cpan">Mojolicious</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Moose-Autobox/metadata.xml b/dev-perl/Moose-Autobox/metadata.xml
index 64e5b02..3a9c9a0 100644
--- a/dev-perl/Moose-Autobox/metadata.xml
+++ b/dev-perl/Moose-Autobox/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Moose-Autobox</remote-id>
         <remote-id type="cpan-module">Moose::Autobox</remote-id>
         <remote-id type="cpan-module">Moose::Autobox::ARRAY</remote-id>
         <remote-id type="cpan-module">Moose::Autobox::Array</remote-id>
@@ -25,6 +26,5 @@
         <remote-id type="cpan-module">Moose::Autobox::String</remote-id>
         <remote-id type="cpan-module">Moose::Autobox::Undef</remote-id>
         <remote-id type="cpan-module">Moose::Autobox::Value</remote-id>
-        <remote-id type="cpan">Moose-Autobox</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-App-Cmd/metadata.xml b/dev-perl/MooseX-App-Cmd/metadata.xml
index d40efd2..fc5c135 100644
--- a/dev-perl/MooseX-App-Cmd/metadata.xml
+++ b/dev-perl/MooseX-App-Cmd/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-App-Cmd</remote-id>
         <remote-id type="cpan-module">MooseX::App::Cmd</remote-id>
         <remote-id type="cpan-module">MooseX::App::Cmd::Command</remote-id>
-        <remote-id type="cpan">MooseX-App-Cmd</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Async/metadata.xml b/dev-perl/MooseX-Async/metadata.xml
index b40e602..0a6c964 100644
--- a/dev-perl/MooseX-Async/metadata.xml
+++ b/dev-perl/MooseX-Async/metadata.xml
@@ -7,11 +7,11 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Async</remote-id>
         <remote-id type="cpan-module">MooseX::Async</remote-id>
         <remote-id type="cpan-module">MooseX::Async::Meta::Class</remote-id>
         <remote-id type="cpan-module">MooseX::Async::Meta::Method::State</remote-id>
         <remote-id type="cpan-module">MooseX::Async::Meta::Role</remote-id>
         <remote-id type="cpan-module">MooseX::Async::Meta::Trait</remote-id>
-        <remote-id type="cpan">MooseX-Async</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Attribute-Chained/metadata.xml b/dev-perl/MooseX-Attribute-Chained/metadata.xml
index d42e7c5..7bfe835 100644
--- a/dev-perl/MooseX-Attribute-Chained/metadata.xml
+++ b/dev-perl/MooseX-Attribute-Chained/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpan">MooseX-Attribute-Chained</remote-id>
 		<remote-id type="cpan-module">Moose::Meta::Attribute::Custom::Trait::Chained</remote-id>
 		<remote-id type="cpan-module">MooseX::Attribute::Chained</remote-id>
 		<remote-id type="cpan-module">MooseX::Attribute::Chained::Method::Accessor</remote-id>
@@ -16,6 +17,5 @@
 		<remote-id type="cpan-module">MooseX::ChainedAccessors::Accessor</remote-id>
 		<remote-id type="cpan-module">MooseX::Traits::Attribute::Chained</remote-id>
 		<remote-id type="cpan-module">MooseX::Traits::Attribute::ChainedClone</remote-id>
-		<remote-id type="cpan">MooseX-Attribute-Chained</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-AttributeIndexes/metadata.xml b/dev-perl/MooseX-AttributeIndexes/metadata.xml
index e47e1a4..1e3c680 100644
--- a/dev-perl/MooseX-AttributeIndexes/metadata.xml
+++ b/dev-perl/MooseX-AttributeIndexes/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-AttributeIndexes</remote-id>
         <remote-id type="cpan-module">Moose::Meta::Attribute::Custom::Trait::Indexed</remote-id>
         <remote-id type="cpan-module">MooseX::AttributeIndexes</remote-id>
         <remote-id type="cpan-module">MooseX::AttributeIndexes::Meta::Attribute::Trait::Indexed</remote-id>
@@ -16,6 +17,5 @@
         <remote-id type="cpan-module">MooseX::AttributeIndexes::Meta::Role::Composite</remote-id>
         <remote-id type="cpan-module">MooseX::AttributeIndexes::Provider</remote-id>
         <remote-id type="cpan-module">MooseX::AttributeIndexes::Provider::FromAttributes</remote-id>
-        <remote-id type="cpan">MooseX-AttributeIndexes</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-AttributeShortcuts/metadata.xml b/dev-perl/MooseX-AttributeShortcuts/metadata.xml
index ba101c2..bc2c5e6 100644
--- a/dev-perl/MooseX-AttributeShortcuts/metadata.xml
+++ b/dev-perl/MooseX-AttributeShortcuts/metadata.xml
@@ -7,8 +7,8 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpan">MooseX-AttributeShortcuts</remote-id>
 		<remote-id type="cpan-module">MooseX::AttributeShortcuts</remote-id>
 		<remote-id type="cpan-module">MooseX::AttributeShortcuts::Trait::Attribute</remote-id>
-		<remote-id type="cpan">MooseX-AttributeShortcuts</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-AuthorizedMethods/metadata.xml b/dev-perl/MooseX-AuthorizedMethods/metadata.xml
index 224e72d..da17014 100644
--- a/dev-perl/MooseX-AuthorizedMethods/metadata.xml
+++ b/dev-perl/MooseX-AuthorizedMethods/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-AuthorizedMethods</remote-id>
         <remote-id type="cpan-module">MooseX::AuthorizedMethods</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Authorized</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Authorized::Application::ToClass</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">MooseX::Meta::Method::Authorized::Application::ToInstance</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Authorized::CheckRoles</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Authorized::Meta::Role</remote-id>
-        <remote-id type="cpan">MooseX-AuthorizedMethods</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Blessed-Reconstruct/metadata.xml b/dev-perl/MooseX-Blessed-Reconstruct/metadata.xml
index 836905d..320f055 100644
--- a/dev-perl/MooseX-Blessed-Reconstruct/metadata.xml
+++ b/dev-perl/MooseX-Blessed-Reconstruct/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Blessed::Reconstruct</remote-id>
         <remote-id type="cpan">MooseX-Blessed-Reconstruct</remote-id>
+        <remote-id type="cpan-module">MooseX::Blessed::Reconstruct</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-ChainedAccessors/metadata.xml b/dev-perl/MooseX-ChainedAccessors/metadata.xml
index a8415f9..b2f19b2 100644
--- a/dev-perl/MooseX-ChainedAccessors/metadata.xml
+++ b/dev-perl/MooseX-ChainedAccessors/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
                 <remote-id type="cpan">MooseX-ChainedAccessors</remote-id>
         </upstream>

diff --git a/dev-perl/MooseX-Clone/metadata.xml b/dev-perl/MooseX-Clone/metadata.xml
index 0c2c703..bcce744 100644
--- a/dev-perl/MooseX-Clone/metadata.xml
+++ b/dev-perl/MooseX-Clone/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Clone</remote-id>
         <remote-id type="cpan-module">MooseX::Clone</remote-id>
         <remote-id type="cpan-module">MooseX::Clone::Meta::Attribute::Trait::Clone</remote-id>
         <remote-id type="cpan-module">MooseX::Clone::Meta::Attribute::Trait::Clone::Base</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">MooseX::Clone::Meta::Attribute::Trait::Copy</remote-id>
         <remote-id type="cpan-module">MooseX::Clone::Meta::Attribute::Trait::NoClone</remote-id>
         <remote-id type="cpan-module">MooseX::Clone::Meta::Attribute::Trait::StrableClone</remote-id>
-        <remote-id type="cpan">MooseX-Clone</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/MooseX-ConfigFromFile/metadata.xml b/dev-perl/MooseX-ConfigFromFile/metadata.xml
index e168fc7..3f75a1a 100644
--- a/dev-perl/MooseX-ConfigFromFile/metadata.xml
+++ b/dev-perl/MooseX-ConfigFromFile/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::ConfigFromFile</remote-id>
         <remote-id type="cpan">MooseX-ConfigFromFile</remote-id>
+        <remote-id type="cpan-module">MooseX::ConfigFromFile</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Daemonize/metadata.xml b/dev-perl/MooseX-Daemonize/metadata.xml
index 02376ba..311c3da 100644
--- a/dev-perl/MooseX-Daemonize/metadata.xml
+++ b/dev-perl/MooseX-Daemonize/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Daemonize</remote-id>
         <remote-id type="cpan-module">MooseX::Daemonize</remote-id>
         <remote-id type="cpan-module">MooseX::Daemonize::Core</remote-id>
         <remote-id type="cpan-module">MooseX::Daemonize::Pid</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">MooseX::Daemonize::WithPidFile</remote-id>
         <remote-id type="cpan-module">Test::MooseX::Daemonize</remote-id>
         <remote-id type="cpan-module">Test::MooseX::Daemonize::Testable</remote-id>
-        <remote-id type="cpan">MooseX-Daemonize</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Declare/metadata.xml b/dev-perl/MooseX-Declare/metadata.xml
index f3b3cac..21b438a 100644
--- a/dev-perl/MooseX-Declare/metadata.xml
+++ b/dev-perl/MooseX-Declare/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Declare</remote-id>
         <remote-id type="cpan-module">MooseX::Declare</remote-id>
         <remote-id type="cpan-module">MooseX::Declare::Context</remote-id>
         <remote-id type="cpan-module">MooseX::Declare::Context::Namespaced</remote-id>
@@ -31,6 +32,5 @@
         <remote-id type="cpan-module">MooseX::Declare::Syntax::OptionHandling</remote-id>
         <remote-id type="cpan-module">MooseX::Declare::Syntax::RoleApplication</remote-id>
         <remote-id type="cpan-module">MooseX::Declare::Util</remote-id>
-        <remote-id type="cpan">MooseX-Declare</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Emulate-Class-Accessor-Fast/metadata.xml b/dev-perl/MooseX-Emulate-Class-Accessor-Fast/metadata.xml
index 5dc3305..677c4a5 100644
--- a/dev-perl/MooseX-Emulate-Class-Accessor-Fast/metadata.xml
+++ b/dev-perl/MooseX-Emulate-Class-Accessor-Fast/metadata.xml
@@ -11,10 +11,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Emulate-Class-Accessor-Fast</remote-id>
         <remote-id type="cpan-module">MooseX::Adopt::Class::Accessor::Fast</remote-id>
         <remote-id type="cpan-module">MooseX::Emulate::Class::Accessor::Fast</remote-id>
         <remote-id type="cpan-module">MooseX::Emulate::Class::Accessor::Fast::Meta::Accessor</remote-id>
         <remote-id type="cpan-module">MooseX::Emulate::Class::Accessor::Fast::Meta::Role::Attribute</remote-id>
-        <remote-id type="cpan">MooseX-Emulate-Class-Accessor-Fast</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Has-Options/metadata.xml b/dev-perl/MooseX-Has-Options/metadata.xml
index 1a29a65..5c3ab0c 100644
--- a/dev-perl/MooseX-Has-Options/metadata.xml
+++ b/dev-perl/MooseX-Has-Options/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">MooseX::Has::Options</remote-id>
 		<remote-id type="cpan">MooseX-Has-Options</remote-id>
+		<remote-id type="cpan-module">MooseX::Has::Options</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Has-Sugar/metadata.xml b/dev-perl/MooseX-Has-Sugar/metadata.xml
index 0d6c30f..4962728 100644
--- a/dev-perl/MooseX-Has-Sugar/metadata.xml
+++ b/dev-perl/MooseX-Has-Sugar/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Has-Sugar</remote-id>
         <remote-id type="cpan-module">MooseX::Has::Sugar</remote-id>
         <remote-id type="cpan-module">MooseX::Has::Sugar::Minimal</remote-id>
         <remote-id type="cpan-module">MooseX::Has::Sugar::Saccharin</remote-id>
-        <remote-id type="cpan">MooseX-Has-Sugar</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/MooseX-HasDefaults/metadata.xml b/dev-perl/MooseX-HasDefaults/metadata.xml
index d538913..d948426 100644
--- a/dev-perl/MooseX-HasDefaults/metadata.xml
+++ b/dev-perl/MooseX-HasDefaults/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">MooseX-HasDefaults</remote-id>
                 <remote-id type="cpan-module">MooseX::HasDefaults</remote-id>
                 <remote-id type="cpan-module">MooseX::HasDefaults::Meta::IsRO</remote-id>
                 <remote-id type="cpan-module">MooseX::HasDefaults::Meta::IsRW</remote-id>
                 <remote-id type="cpan-module">MooseX::HasDefaults::RO</remote-id>
                 <remote-id type="cpan-module">MooseX::HasDefaults::RW</remote-id>
-                <remote-id type="cpan">MooseX-HasDefaults</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-InsideOut/metadata.xml b/dev-perl/MooseX-InsideOut/metadata.xml
index 44a3ae5..6dfbc1b 100644
--- a/dev-perl/MooseX-InsideOut/metadata.xml
+++ b/dev-perl/MooseX-InsideOut/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-InsideOut</remote-id>
         <remote-id type="cpan-module">MooseX::InsideOut</remote-id>
         <remote-id type="cpan-module">MooseX::InsideOut::Role::Meta::Instance</remote-id>
-        <remote-id type="cpan">MooseX-InsideOut</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Iterator/metadata.xml b/dev-perl/MooseX-Iterator/metadata.xml
index 7afecd7..e3782bc 100644
--- a/dev-perl/MooseX-Iterator/metadata.xml
+++ b/dev-perl/MooseX-Iterator/metadata.xml
@@ -7,12 +7,12 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Iterator</remote-id>
         <remote-id type="cpan-module">Moose::Meta::Attribute::Custom::Iterable</remote-id>
         <remote-id type="cpan-module">MooseX::Iterator</remote-id>
         <remote-id type="cpan-module">MooseX::Iterator::Array</remote-id>
         <remote-id type="cpan-module">MooseX::Iterator::Hash</remote-id>
         <remote-id type="cpan-module">MooseX::Iterator::Meta::Iterable</remote-id>
         <remote-id type="cpan-module">MooseX::Iterator::Role</remote-id>
-        <remote-id type="cpan">MooseX-Iterator</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-LazyLogDispatch/metadata.xml b/dev-perl/MooseX-LazyLogDispatch/metadata.xml
index f0c94b9..309af04 100644
--- a/dev-perl/MooseX-LazyLogDispatch/metadata.xml
+++ b/dev-perl/MooseX-LazyLogDispatch/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-LazyLogDispatch</remote-id>
         <remote-id type="cpan-module">MooseX::LazyLogDispatch</remote-id>
         <remote-id type="cpan-module">MooseX::LazyLogDispatch::Levels</remote-id>
-        <remote-id type="cpan">MooseX-LazyLogDispatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-LazyRequire/metadata.xml b/dev-perl/MooseX-LazyRequire/metadata.xml
index aa3681e..4c26294 100644
--- a/dev-perl/MooseX-LazyRequire/metadata.xml
+++ b/dev-perl/MooseX-LazyRequire/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-LazyRequire</remote-id>
         <remote-id type="cpan-module">MooseX::LazyRequire</remote-id>
         <remote-id type="cpan-module">MooseX::LazyRequire::Meta::Attribute::Trait::LazyRequire</remote-id>
-        <remote-id type="cpan">MooseX-LazyRequire</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Lexical-Types/metadata.xml b/dev-perl/MooseX-Lexical-Types/metadata.xml
index 22c8c51..7459805 100644
--- a/dev-perl/MooseX-Lexical-Types/metadata.xml
+++ b/dev-perl/MooseX-Lexical-Types/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Lexical-Types</remote-id>
         <remote-id type="cpan-module">MooseX::Lexical::Types</remote-id>
         <remote-id type="cpan-module">MooseX::Lexical::Types::TypeDecorator</remote-id>
         <remote-id type="cpan-module">MooseX::Lexical::Types::TypedScalar</remote-id>
-        <remote-id type="cpan">MooseX-Lexical-Types</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/MooseX-Log-Log4perl/metadata.xml b/dev-perl/MooseX-Log-Log4perl/metadata.xml
index 2cfff8c..c7f3765 100644
--- a/dev-perl/MooseX-Log-Log4perl/metadata.xml
+++ b/dev-perl/MooseX-Log-Log4perl/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Log-Log4perl</remote-id>
         <remote-id type="cpan-module">MooseX::Log::Log4perl</remote-id>
         <remote-id type="cpan-module">MooseX::Log::Log4perl::Easy</remote-id>
-        <remote-id type="cpan">MooseX-Log-Log4perl</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-LogDispatch/metadata.xml b/dev-perl/MooseX-LogDispatch/metadata.xml
index 50ba0f1..f849945 100644
--- a/dev-perl/MooseX-LogDispatch/metadata.xml
+++ b/dev-perl/MooseX-LogDispatch/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-LogDispatch</remote-id>
         <remote-id type="cpan-module">MooseX::LogDispatch</remote-id>
         <remote-id type="cpan-module">MooseX::LogDispatch::Levels</remote-id>
-        <remote-id type="cpan">MooseX-LogDispatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-MarkAsMethods/metadata.xml b/dev-perl/MooseX-MarkAsMethods/metadata.xml
index e6292cd..26fcdc8 100644
--- a/dev-perl/MooseX-MarkAsMethods/metadata.xml
+++ b/dev-perl/MooseX-MarkAsMethods/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-MarkAsMethods</remote-id>
         <remote-id type="cpan-module">MooseX::MarkAsMethods</remote-id>
         <remote-id type="cpan-module">MooseX::MarkAsMethods::MetaRole::MethodMarker</remote-id>
-        <remote-id type="cpan">MooseX-MarkAsMethods</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Meta-TypeConstraint-ForceCoercion/metadata.xml b/dev-perl/MooseX-Meta-TypeConstraint-ForceCoercion/metadata.xml
index eef32e1..f6ea7f9 100644
--- a/dev-perl/MooseX-Meta-TypeConstraint-ForceCoercion/metadata.xml
+++ b/dev-perl/MooseX-Meta-TypeConstraint-ForceCoercion/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Meta::TypeConstraint::ForceCoercion</remote-id>
         <remote-id type="cpan">MooseX-Meta-TypeConstraint-ForceCoercion</remote-id>
+        <remote-id type="cpan-module">MooseX::Meta::TypeConstraint::ForceCoercion</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Method-Signatures/metadata.xml b/dev-perl/MooseX-Method-Signatures/metadata.xml
index ba541f9..8959b2e 100644
--- a/dev-perl/MooseX-Method-Signatures/metadata.xml
+++ b/dev-perl/MooseX-Method-Signatures/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Method-Signatures</remote-id>
         <remote-id type="cpan-module">MooseX::Method::Signatures</remote-id>
         <remote-id type="cpan-module">MooseX::Method::Signatures::Meta::Method</remote-id>
         <remote-id type="cpan-module">MooseX::Method::Signatures::Types</remote-id>
-        <remote-id type="cpan">MooseX-Method-Signatures</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Method/metadata.xml b/dev-perl/MooseX-Method/metadata.xml
index dabcec3..2698799 100644
--- a/dev-perl/MooseX-Method/metadata.xml
+++ b/dev-perl/MooseX-Method/metadata.xml
@@ -7,6 +7,7 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Method</remote-id>
         <remote-id type="cpan-module">Foo1</remote-id>
         <remote-id type="cpan-module">Foo2</remote-id>
         <remote-id type="cpan-module">Foo3</remote-id>
@@ -33,6 +34,5 @@
         <remote-id type="cpan-module">MooseX::Test::Signature::Combined</remote-id>
         <remote-id type="cpan-module">MooseX::Test::Signature::Named</remote-id>
         <remote-id type="cpan-module">MooseX::Test::Signature::Positional</remote-id>
-        <remote-id type="cpan">MooseX-Method</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-MethodAttributes/metadata.xml b/dev-perl/MooseX-MethodAttributes/metadata.xml
index c8498c8..8be2a22 100644
--- a/dev-perl/MooseX-MethodAttributes/metadata.xml
+++ b/dev-perl/MooseX-MethodAttributes/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-MethodAttributes</remote-id>
         <remote-id type="cpan-module">MooseX::MethodAttributes</remote-id>
         <remote-id type="cpan-module">MooseX::MethodAttributes::Inheritable</remote-id>
         <remote-id type="cpan-module">MooseX::MethodAttributes::Role</remote-id>
@@ -20,6 +21,5 @@
         <remote-id type="cpan-module">MooseX::MethodAttributes::Role::Meta::Role</remote-id>
         <remote-id type="cpan-module">MooseX::MethodAttributes::Role::Meta::Role::Application</remote-id>
         <remote-id type="cpan-module">MooseX::MethodAttributes::Role::Meta::Role::Application::Summation</remote-id>
-        <remote-id type="cpan">MooseX-MethodAttributes</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-MultiMethods/metadata.xml b/dev-perl/MooseX-MultiMethods/metadata.xml
index b17dd2a..35a5690 100644
--- a/dev-perl/MooseX-MultiMethods/metadata.xml
+++ b/dev-perl/MooseX-MultiMethods/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-MultiMethods</remote-id>
         <remote-id type="cpan-module">MooseX::MultiMethods</remote-id>
         <remote-id type="cpan-module">MooseX::MultiMethods::Meta::Method</remote-id>
-        <remote-id type="cpan">MooseX-MultiMethods</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/MooseX-NonMoose/metadata.xml b/dev-perl/MooseX-NonMoose/metadata.xml
index c2425a3..c6a9b61 100644
--- a/dev-perl/MooseX-NonMoose/metadata.xml
+++ b/dev-perl/MooseX-NonMoose/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-NonMoose</remote-id>
         <remote-id type="cpan-module">MooseX::NonMoose</remote-id>
         <remote-id type="cpan-module">MooseX::NonMoose::InsideOut</remote-id>
         <remote-id type="cpan-module">MooseX::NonMoose::Meta::Role::Class</remote-id>
         <remote-id type="cpan-module">MooseX::NonMoose::Meta::Role::Constructor</remote-id>
-        <remote-id type="cpan">MooseX-NonMoose</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-OneArgNew/metadata.xml b/dev-perl/MooseX-OneArgNew/metadata.xml
index 54a3494..d3c15d5 100644
--- a/dev-perl/MooseX-OneArgNew/metadata.xml
+++ b/dev-perl/MooseX-OneArgNew/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::OneArgNew</remote-id>
         <remote-id type="cpan">MooseX-OneArgNew</remote-id>
+        <remote-id type="cpan-module">MooseX::OneArgNew</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-POE/metadata.xml b/dev-perl/MooseX-POE/metadata.xml
index 5104aa7..d201c36 100644
--- a/dev-perl/MooseX-POE/metadata.xml
+++ b/dev-perl/MooseX-POE/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-POE</remote-id>
         <remote-id type="cpan-module">MooseX::POE</remote-id>
         <remote-id type="cpan-module">MooseX::POE::Aliased</remote-id>
         <remote-id type="cpan-module">MooseX::POE::Meta::Method::State</remote-id>
@@ -18,6 +19,5 @@
         <remote-id type="cpan-module">MooseX::POE::Meta::Trait::SweetArgs</remote-id>
         <remote-id type="cpan-module">MooseX::POE::Role</remote-id>
         <remote-id type="cpan-module">MooseX::POE::SweetArgs</remote-id>
-        <remote-id type="cpan">MooseX-POE</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Param/metadata.xml b/dev-perl/MooseX-Param/metadata.xml
index 7d9d99d..0cb7a2c 100644
--- a/dev-perl/MooseX-Param/metadata.xml
+++ b/dev-perl/MooseX-Param/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Param</remote-id>
         <remote-id type="cpan">MooseX-Param</remote-id>
+        <remote-id type="cpan-module">MooseX::Param</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Params-Validate/metadata.xml b/dev-perl/MooseX-Params-Validate/metadata.xml
index bd83eca..acf1e64 100644
--- a/dev-perl/MooseX-Params-Validate/metadata.xml
+++ b/dev-perl/MooseX-Params-Validate/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Params::Validate</remote-id>
         <remote-id type="cpan">MooseX-Params-Validate</remote-id>
+        <remote-id type="cpan-module">MooseX::Params::Validate</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-RelatedClassRoles/metadata.xml b/dev-perl/MooseX-RelatedClassRoles/metadata.xml
index 3b73382..0f511c5 100644
--- a/dev-perl/MooseX-RelatedClassRoles/metadata.xml
+++ b/dev-perl/MooseX-RelatedClassRoles/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::RelatedClassRoles</remote-id>
         <remote-id type="cpan">MooseX-RelatedClassRoles</remote-id>
+        <remote-id type="cpan-module">MooseX::RelatedClassRoles</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Role-Cmd/metadata.xml b/dev-perl/MooseX-Role-Cmd/metadata.xml
index 9e157cf..06bacb6 100644
--- a/dev-perl/MooseX-Role-Cmd/metadata.xml
+++ b/dev-perl/MooseX-Role-Cmd/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Role-Cmd</remote-id>
         <remote-id type="cpan-module">MooseX::Role::Cmd</remote-id>
         <remote-id type="cpan-module">MooseX::Role::Cmd::Meta::Attribute::Trait</remote-id>
-        <remote-id type="cpan">MooseX-Role-Cmd</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Role-Restricted/metadata.xml b/dev-perl/MooseX-Role-Restricted/metadata.xml
index b04612a..6c0bf6e 100644
--- a/dev-perl/MooseX-Role-Restricted/metadata.xml
+++ b/dev-perl/MooseX-Role-Restricted/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Role::Restricted</remote-id>
         <remote-id type="cpan">MooseX-Role-Restricted</remote-id>
+        <remote-id type="cpan-module">MooseX::Role::Restricted</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Role-TraitConstructor/metadata.xml b/dev-perl/MooseX-Role-TraitConstructor/metadata.xml
index 00497bf..cd62cb8 100644
--- a/dev-perl/MooseX-Role-TraitConstructor/metadata.xml
+++ b/dev-perl/MooseX-Role-TraitConstructor/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Role::TraitConstructor</remote-id>
         <remote-id type="cpan">MooseX-Role-TraitConstructor</remote-id>
+        <remote-id type="cpan-module">MooseX::Role::TraitConstructor</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Role-WithOverloading/metadata.xml b/dev-perl/MooseX-Role-WithOverloading/metadata.xml
index 1741d66..13e8176 100644
--- a/dev-perl/MooseX-Role-WithOverloading/metadata.xml
+++ b/dev-perl/MooseX-Role-WithOverloading/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Role-WithOverloading</remote-id>
         <remote-id type="cpan-module">MooseX::Role::WithOverloading</remote-id>
         <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role</remote-id>
         <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application</remote-id>
@@ -19,6 +20,5 @@
         <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::ToInstance</remote-id>
         <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::ToRole</remote-id>
         <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Composite</remote-id>
-        <remote-id type="cpan">MooseX-Role-WithOverloading</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-SemiAffordanceAccessor/metadata.xml b/dev-perl/MooseX-SemiAffordanceAccessor/metadata.xml
index e481389..9daf2a2 100644
--- a/dev-perl/MooseX-SemiAffordanceAccessor/metadata.xml
+++ b/dev-perl/MooseX-SemiAffordanceAccessor/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-SemiAffordanceAccessor</remote-id>
         <remote-id type="cpan-module">MooseX::SemiAffordanceAccessor</remote-id>
         <remote-id type="cpan-module">MooseX::SemiAffordanceAccessor::Role::Attribute</remote-id>
-        <remote-id type="cpan">MooseX-SemiAffordanceAccessor</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-SetOnce/metadata.xml b/dev-perl/MooseX-SetOnce/metadata.xml
index 7908046..459c43b 100644
--- a/dev-perl/MooseX-SetOnce/metadata.xml
+++ b/dev-perl/MooseX-SetOnce/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-SetOnce</remote-id>
         <remote-id type="cpan-module">Moose::Meta::Attribute::Custom::Trait::SetOnce</remote-id>
         <remote-id type="cpan-module">MooseX::SetOnce</remote-id>
         <remote-id type="cpan-module">MooseX::SetOnce::Accessor</remote-id>
         <remote-id type="cpan-module">MooseX::SetOnce::Attribute</remote-id>
-        <remote-id type="cpan">MooseX-SetOnce</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-SimpleConfig/metadata.xml b/dev-perl/MooseX-SimpleConfig/metadata.xml
index 1ec182a..5b4dba4 100644
--- a/dev-perl/MooseX-SimpleConfig/metadata.xml
+++ b/dev-perl/MooseX-SimpleConfig/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::SimpleConfig</remote-id>
         <remote-id type="cpan">MooseX-SimpleConfig</remote-id>
+        <remote-id type="cpan-module">MooseX::SimpleConfig</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Singleton/metadata.xml b/dev-perl/MooseX-Singleton/metadata.xml
index 06c296f..801da3a 100644
--- a/dev-perl/MooseX-Singleton/metadata.xml
+++ b/dev-perl/MooseX-Singleton/metadata.xml
@@ -7,11 +7,11 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Singleton</remote-id>
         <remote-id type="cpan-module">MooseX::Singleton</remote-id>
         <remote-id type="cpan-module">MooseX::Singleton::Role::Meta::Class</remote-id>
         <remote-id type="cpan-module">MooseX::Singleton::Role::Meta::Instance</remote-id>
         <remote-id type="cpan-module">MooseX::Singleton::Role::Meta::Method::Constructor</remote-id>
         <remote-id type="cpan-module">MooseX::Singleton::Role::Object</remote-id>
-        <remote-id type="cpan">MooseX-Singleton</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Storage/metadata.xml b/dev-perl/MooseX-Storage/metadata.xml
index c5967bb..931f8c8 100644
--- a/dev-perl/MooseX-Storage/metadata.xml
+++ b/dev-perl/MooseX-Storage/metadata.xml
@@ -6,21 +6,17 @@
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
     </maintainer>
-	<use>
-		<flag name="json">Support for storing as JSON
+    <use>
+        <flag name="json">Support for storing as JSON
 		via<pkg>dev-perl/JSON-Any</pkg></flag>
-
-		<flag name="yaml">Support for storing as YAML via
+        <flag name="yaml">Support for storing as YAML via
 		<pkg>dev-perl/Best</pkg></flag>
-
-		<flag name="storable">Support for
+        <flag name="storable">Support for
 		<pkg>virtual/perl-Storable</pkg></flag>
-
-		<flag name="file">Support for <pkg>virtual/perl-IO</pkg>
-		</flag>
-
-	</use>
+        <flag name="file">Support for <pkg>virtual/perl-IO</pkg></flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">MooseX-Storage</remote-id>
         <remote-id type="cpan-module">Moose::Meta::Attribute::Custom::DoNotSerialize</remote-id>
         <remote-id type="cpan-module">Moose::Meta::Attribute::Custom::Trait::DoNotSerialize</remote-id>
         <remote-id type="cpan-module">MooseX::Storage</remote-id>
@@ -43,6 +39,5 @@
         <remote-id type="cpan-module">MooseX::Storage::Traits::DisableCycleDetection</remote-id>
         <remote-id type="cpan-module">MooseX::Storage::Traits::OnlyWhenBuilt</remote-id>
         <remote-id type="cpan-module">MooseX::Storage::Util</remote-id>
-        <remote-id type="cpan">MooseX-Storage</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Traits-Pluggable/metadata.xml b/dev-perl/MooseX-Traits-Pluggable/metadata.xml
index ca432c2..2197afd 100644
--- a/dev-perl/MooseX-Traits-Pluggable/metadata.xml
+++ b/dev-perl/MooseX-Traits-Pluggable/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Traits::Pluggable</remote-id>
         <remote-id type="cpan">MooseX-Traits-Pluggable</remote-id>
+        <remote-id type="cpan-module">MooseX::Traits::Pluggable</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Traits/metadata.xml b/dev-perl/MooseX-Traits/metadata.xml
index af7e54c..19343d7 100644
--- a/dev-perl/MooseX-Traits/metadata.xml
+++ b/dev-perl/MooseX-Traits/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Traits</remote-id>
         <remote-id type="cpan-module">MooseX::Traits</remote-id>
         <remote-id type="cpan-module">MooseX::Traits::Util</remote-id>
-        <remote-id type="cpan">MooseX-Traits</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-TransactionalMethods/metadata.xml b/dev-perl/MooseX-TransactionalMethods/metadata.xml
index 669aaf8..26ddb14 100644
--- a/dev-perl/MooseX-TransactionalMethods/metadata.xml
+++ b/dev-perl/MooseX-TransactionalMethods/metadata.xml
@@ -7,12 +7,12 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-TransactionalMethods</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Transactional</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Transactional::Application::ToClass</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Transactional::Application::ToComposite</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Transactional::Application::ToInstance</remote-id>
         <remote-id type="cpan-module">MooseX::Meta::Method::Transactional::Meta::Role</remote-id>
         <remote-id type="cpan-module">MooseX::TransactionalMethods</remote-id>
-        <remote-id type="cpan">MooseX-TransactionalMethods</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Types-Authen-Passphrase/metadata.xml b/dev-perl/MooseX-Types-Authen-Passphrase/metadata.xml
index 1575d10..19371f9 100644
--- a/dev-perl/MooseX-Types-Authen-Passphrase/metadata.xml
+++ b/dev-perl/MooseX-Types-Authen-Passphrase/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Types::Authen::Passphrase</remote-id>
         <remote-id type="cpan">MooseX-Types-Authen-Passphrase</remote-id>
+        <remote-id type="cpan-module">MooseX::Types::Authen::Passphrase</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Types-Common/metadata.xml b/dev-perl/MooseX-Types-Common/metadata.xml
index 2b17354..38825ee 100644
--- a/dev-perl/MooseX-Types-Common/metadata.xml
+++ b/dev-perl/MooseX-Types-Common/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Types-Common</remote-id>
         <remote-id type="cpan-module">MooseX::Types::Common</remote-id>
         <remote-id type="cpan-module">MooseX::Types::Common::Numeric</remote-id>
         <remote-id type="cpan-module">MooseX::Types::Common::String</remote-id>
-        <remote-id type="cpan">MooseX-Types-Common</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Types-ISO8601/metadata.xml b/dev-perl/MooseX-Types-ISO8601/metadata.xml
index e828f2f..829c88b 100644
--- a/dev-perl/MooseX-Types-ISO8601/metadata.xml
+++ b/dev-perl/MooseX-Types-ISO8601/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">MooseX::Types::ISO8601</remote-id>
                 <remote-id type="cpan">MooseX-Types-ISO8601</remote-id>
+                <remote-id type="cpan-module">MooseX::Types::ISO8601</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Types-LoadableClass/metadata.xml b/dev-perl/MooseX-Types-LoadableClass/metadata.xml
index 864119e..ce98939 100644
--- a/dev-perl/MooseX-Types-LoadableClass/metadata.xml
+++ b/dev-perl/MooseX-Types-LoadableClass/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Types::LoadableClass</remote-id>
         <remote-id type="cpan">MooseX-Types-LoadableClass</remote-id>
+        <remote-id type="cpan-module">MooseX::Types::LoadableClass</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Types-Perl/metadata.xml b/dev-perl/MooseX-Types-Perl/metadata.xml
index 6c8e896..f017556 100644
--- a/dev-perl/MooseX-Types-Perl/metadata.xml
+++ b/dev-perl/MooseX-Types-Perl/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Types::Perl</remote-id>
         <remote-id type="cpan">MooseX-Types-Perl</remote-id>
+        <remote-id type="cpan-module">MooseX::Types::Perl</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Types-Set-Object/metadata.xml b/dev-perl/MooseX-Types-Set-Object/metadata.xml
index b7c905c..73c14a9 100644
--- a/dev-perl/MooseX-Types-Set-Object/metadata.xml
+++ b/dev-perl/MooseX-Types-Set-Object/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Types::Set::Object</remote-id>
         <remote-id type="cpan">MooseX-Types-Set-Object</remote-id>
+        <remote-id type="cpan-module">MooseX::Types::Set::Object</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/MooseX-Types-Structured/metadata.xml b/dev-perl/MooseX-Types-Structured/metadata.xml
index dd7bc8f..6d652bd 100644
--- a/dev-perl/MooseX-Types-Structured/metadata.xml
+++ b/dev-perl/MooseX-Types-Structured/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Types::Structured</remote-id>
         <remote-id type="cpan">MooseX-Types-Structured</remote-id>
+        <remote-id type="cpan-module">MooseX::Types::Structured</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Types-URI/metadata.xml b/dev-perl/MooseX-Types-URI/metadata.xml
index f6a7b23..b8d5623 100644
--- a/dev-perl/MooseX-Types-URI/metadata.xml
+++ b/dev-perl/MooseX-Types-URI/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::Types::URI</remote-id>
         <remote-id type="cpan">MooseX-Types-URI</remote-id>
+        <remote-id type="cpan-module">MooseX::Types::URI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-Types-VariantTable/metadata.xml b/dev-perl/MooseX-Types-VariantTable/metadata.xml
index 31c1e18..7d5961b 100644
--- a/dev-perl/MooseX-Types-VariantTable/metadata.xml
+++ b/dev-perl/MooseX-Types-VariantTable/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Types-VariantTable</remote-id>
         <remote-id type="cpan-module">Moose::Meta::Method::VariantTable</remote-id>
         <remote-id type="cpan-module">MooseX::Types::VariantTable</remote-id>
         <remote-id type="cpan-module">MooseX::Types::VariantTable::Declare</remote-id>
-        <remote-id type="cpan">MooseX-Types-VariantTable</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/MooseX-Workers/metadata.xml b/dev-perl/MooseX-Workers/metadata.xml
index 7522ec4..91a6c16 100644
--- a/dev-perl/MooseX-Workers/metadata.xml
+++ b/dev-perl/MooseX-Workers/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">MooseX-Workers</remote-id>
         <remote-id type="cpan-module">MooseX::Workers</remote-id>
         <remote-id type="cpan-module">MooseX::Workers::Engine</remote-id>
         <remote-id type="cpan-module">MooseX::Workers::Job</remote-id>
-        <remote-id type="cpan">MooseX-Workers</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/MooseX-YAML/metadata.xml b/dev-perl/MooseX-YAML/metadata.xml
index 226f20e..2725a66 100644
--- a/dev-perl/MooseX-YAML/metadata.xml
+++ b/dev-perl/MooseX-YAML/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">MooseX::YAML</remote-id>
         <remote-id type="cpan">MooseX-YAML</remote-id>
+        <remote-id type="cpan-module">MooseX::YAML</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Net-API-RPX/metadata.xml b/dev-perl/Net-API-RPX/metadata.xml
index 7d9da59..f6e977f 100644
--- a/dev-perl/Net-API-RPX/metadata.xml
+++ b/dev-perl/Net-API-RPX/metadata.xml
@@ -7,11 +7,11 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Net-API-RPX</remote-id>
         <remote-id type="cpan-module">Net::API::RPX</remote-id>
         <remote-id type="cpan-module">Net::API::RPX::Exception</remote-id>
         <remote-id type="cpan-module">Net::API::RPX::Exception::Network</remote-id>
         <remote-id type="cpan-module">Net::API::RPX::Exception::Service</remote-id>
         <remote-id type="cpan-module">Net::API::RPX::Exception::Usage</remote-id>
-        <remote-id type="cpan">Net-API-RPX</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Net-ARP/metadata.xml b/dev-perl/Net-ARP/metadata.xml
index 898d3be..04ff3f3 100644
--- a/dev-perl/Net-ARP/metadata.xml
+++ b/dev-perl/Net-ARP/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Net::ARP</remote-id>
                 <remote-id type="cpan">Net-ARP</remote-id>
+                <remote-id type="cpan-module">Net::ARP</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Net-IP-Minimal/metadata.xml b/dev-perl/Net-IP-Minimal/metadata.xml
index 5b92db0..0a50793 100644
--- a/dev-perl/Net-IP-Minimal/metadata.xml
+++ b/dev-perl/Net-IP-Minimal/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Net::IP::Minimal</remote-id>
 		<remote-id type="cpan">Net-IP-Minimal</remote-id>
+		<remote-id type="cpan-module">Net::IP::Minimal</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Net-IPv4Addr/metadata.xml b/dev-perl/Net-IPv4Addr/metadata.xml
index e33e7b4..3ba048b 100644
--- a/dev-perl/Net-IPv4Addr/metadata.xml
+++ b/dev-perl/Net-IPv4Addr/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Net::IPv4Addr</remote-id>
                 <remote-id type="cpan">Net-IPv4Addr</remote-id>
+                <remote-id type="cpan-module">Net::IPv4Addr</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Net-LDAP-Server-Test/metadata.xml b/dev-perl/Net-LDAP-Server-Test/metadata.xml
index f16b4c8..33821ee 100644
--- a/dev-perl/Net-LDAP-Server-Test/metadata.xml
+++ b/dev-perl/Net-LDAP-Server-Test/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Net::LDAP::Server::Test</remote-id>
         <remote-id type="cpan">Net-LDAP-Server-Test</remote-id>
+        <remote-id type="cpan-module">Net::LDAP::Server::Test</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Net-LDAP-Server/metadata.xml b/dev-perl/Net-LDAP-Server/metadata.xml
index 84e9aed..39a5256 100644
--- a/dev-perl/Net-LDAP-Server/metadata.xml
+++ b/dev-perl/Net-LDAP-Server/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Net::LDAP::Server</remote-id>
         <remote-id type="cpan">Net-LDAP-Server</remote-id>
+        <remote-id type="cpan-module">Net::LDAP::Server</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Net-Server-SS-PreFork/metadata.xml b/dev-perl/Net-Server-SS-PreFork/metadata.xml
index 348311d..cc16ace 100644
--- a/dev-perl/Net-Server-SS-PreFork/metadata.xml
+++ b/dev-perl/Net-Server-SS-PreFork/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Net::Server::SS::PreFork</remote-id>
         <remote-id type="cpan">Net-Server-SS-PreFork</remote-id>
+        <remote-id type="cpan-module">Net::Server::SS::PreFork</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Net-UPS/metadata.xml b/dev-perl/Net-UPS/metadata.xml
index 585620d..27d91ee 100644
--- a/dev-perl/Net-UPS/metadata.xml
+++ b/dev-perl/Net-UPS/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Net-UPS</remote-id>
         <remote-id type="cpan-module">Net::UPS</remote-id>
         <remote-id type="cpan-module">Net::UPS::Address</remote-id>
         <remote-id type="cpan-module">Net::UPS::ErrorHandler</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">Net::UPS::Rate</remote-id>
         <remote-id type="cpan-module">Net::UPS::Service</remote-id>
         <remote-id type="cpan-module">Net::UPS::Tutorial</remote-id>
-        <remote-id type="cpan">Net-UPS</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Number-Bytes-Human/metadata.xml b/dev-perl/Number-Bytes-Human/metadata.xml
index ba044be..3d4bbe5 100644
--- a/dev-perl/Number-Bytes-Human/metadata.xml
+++ b/dev-perl/Number-Bytes-Human/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Number::Bytes::Human</remote-id>
         <remote-id type="cpan">Number-Bytes-Human</remote-id>
+        <remote-id type="cpan-module">Number::Bytes::Human</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Number-Tolerant/metadata.xml b/dev-perl/Number-Tolerant/metadata.xml
index 1af348d..b3ea48e 100644
--- a/dev-perl/Number-Tolerant/metadata.xml
+++ b/dev-perl/Number-Tolerant/metadata.xml
@@ -7,11 +7,11 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Number-Tolerant</remote-id>
         <remote-id type="cpan-module">Number::Tolerant</remote-id>
         <remote-id type="cpan-module">Number::Tolerant::Constant</remote-id>
         <remote-id type="cpan-module">Number::Tolerant::Type</remote-id>
         <remote-id type="cpan-module">Number::Tolerant::Union</remote-id>
         <remote-id type="cpan-module">Test::Tolerant</remote-id>
-        <remote-id type="cpan">Number-Tolerant</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Object-ID/metadata.xml b/dev-perl/Object-ID/metadata.xml
index cd8094b..557a3b1 100644
--- a/dev-perl/Object-ID/metadata.xml
+++ b/dev-perl/Object-ID/metadata.xml
@@ -5,11 +5,13 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="object_uuid">Unique object identifier using UUIDs</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="object_uuid">Unique object identifier using UUIDs</flag>
+    </use>
     <upstream>
         <remote-id type="cpan">Object-ID</remote-id>
+        <remote-id type="cpan-module">Object::ID</remote-id>
+        <remote-id type="cpan-module">UNIVERSAL::Object::ID</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Object-MultiType/metadata.xml b/dev-perl/Object-MultiType/metadata.xml
index 790463b..3d31512 100644
--- a/dev-perl/Object-MultiType/metadata.xml
+++ b/dev-perl/Object-MultiType/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Object-MultiType</remote-id>
                 <remote-id type="cpan-module">Object::MultiType</remote-id>
                 <remote-id type="cpan-module">Object::MultiType::Saver</remote-id>
-                <remote-id type="cpan">Object-MultiType</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Object-Pluggable/metadata.xml b/dev-perl/Object-Pluggable/metadata.xml
index 5385c6b..726d453 100644
--- a/dev-perl/Object-Pluggable/metadata.xml
+++ b/dev-perl/Object-Pluggable/metadata.xml
@@ -7,9 +7,9 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpan">Object-Pluggable</remote-id>
 		<remote-id type="cpan-module">Object::Pluggable</remote-id>
 		<remote-id type="cpan-module">Object::Pluggable::Constants</remote-id>
 		<remote-id type="cpan-module">Object::Pluggable::Pipeline</remote-id>
-		<remote-id type="cpan">Object-Pluggable</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Object-Signature/metadata.xml b/dev-perl/Object-Signature/metadata.xml
index 6386e60..3e4bacd 100644
--- a/dev-perl/Object-Signature/metadata.xml
+++ b/dev-perl/Object-Signature/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Object-Signature</remote-id>
         <remote-id type="cpan-module">Object::Signature</remote-id>
         <remote-id type="cpan-module">Object::Signature::File</remote-id>
-        <remote-id type="cpan">Object-Signature</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Object-Tiny/metadata.xml b/dev-perl/Object-Tiny/metadata.xml
index ceab86c..49038ab 100644
--- a/dev-perl/Object-Tiny/metadata.xml
+++ b/dev-perl/Object-Tiny/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Object::Tiny</remote-id>
                 <remote-id type="cpan">Object-Tiny</remote-id>
+                <remote-id type="cpan-module">Object::Tiny</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Ogg-Vorbis-Decoder/metadata.xml b/dev-perl/Ogg-Vorbis-Decoder/metadata.xml
index 6d2b54b..be761a2 100644
--- a/dev-perl/Ogg-Vorbis-Decoder/metadata.xml
+++ b/dev-perl/Ogg-Vorbis-Decoder/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Ogg::Vorbis::Decoder</remote-id>
         <remote-id type="cpan">Ogg-Vorbis-Decoder</remote-id>
+        <remote-id type="cpan-module">Ogg::Vorbis::Decoder</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/POE-Component-Client-DNS/metadata.xml b/dev-perl/POE-Component-Client-DNS/metadata.xml
index 7519e9d..a7d1ac5 100644
--- a/dev-perl/POE-Component-Client-DNS/metadata.xml
+++ b/dev-perl/POE-Component-Client-DNS/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">POE::Component::Client::DNS</remote-id>
                 <remote-id type="cpan">POE-Component-Client-DNS</remote-id>
+                <remote-id type="cpan-module">POE::Component::Client::DNS</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/POE-Component-Client-Keepalive/metadata.xml b/dev-perl/POE-Component-Client-Keepalive/metadata.xml
index 2cc8668..4a9d1e0 100644
--- a/dev-perl/POE-Component-Client-Keepalive/metadata.xml
+++ b/dev-perl/POE-Component-Client-Keepalive/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">POE-Component-Client-Keepalive</remote-id>
                 <remote-id type="cpan-module">POE::Component::Client::Keepalive</remote-id>
                 <remote-id type="cpan-module">POE::Component::Connection::Keepalive</remote-id>
                 <remote-id type="cpan-module">TestServer</remote-id>
-                <remote-id type="cpan">POE-Component-Client-Keepalive</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/POE-Component-IRC/metadata.xml b/dev-perl/POE-Component-IRC/metadata.xml
index 91ee2e1..a0058eb 100644
--- a/dev-perl/POE-Component-IRC/metadata.xml
+++ b/dev-perl/POE-Component-IRC/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpan">POE-Component-IRC</remote-id>
 		<remote-id type="cpan-module">POE::Component::IRC</remote-id>
 		<remote-id type="cpan-module">POE::Component::IRC::Common</remote-id>
 		<remote-id type="cpan-module">POE::Component::IRC::Constants</remote-id>
@@ -33,6 +34,5 @@
 		<remote-id type="cpan-module">POE::Component::IRC::State</remote-id>
 		<remote-id type="cpan-module">POE::Filter::IRC</remote-id>
 		<remote-id type="cpan-module">POE::Filter::IRC::Compat</remote-id>
-		<remote-id type="cpan">POE-Component-IRC</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/POE-Component-Resolver/metadata.xml b/dev-perl/POE-Component-Resolver/metadata.xml
index 47f79c9..915078f 100644
--- a/dev-perl/POE-Component-Resolver/metadata.xml
+++ b/dev-perl/POE-Component-Resolver/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">POE-Component-Resolver</remote-id>
                 <remote-id type="cpan-module">POE::Component::Resolver</remote-id>
                 <remote-id type="cpan-module">POE::Component::Resolver::Sidecar</remote-id>
-                <remote-id type="cpan">POE-Component-Resolver</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/POE-Component-Syndicator/metadata.xml b/dev-perl/POE-Component-Syndicator/metadata.xml
index 13deaa6..5bd25d2 100644
--- a/dev-perl/POE-Component-Syndicator/metadata.xml
+++ b/dev-perl/POE-Component-Syndicator/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">POE::Component::Syndicator</remote-id>
 		<remote-id type="cpan">POE-Component-Syndicator</remote-id>
+		<remote-id type="cpan-module">POE::Component::Syndicator</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/POE-Filter-IRCD/metadata.xml b/dev-perl/POE-Filter-IRCD/metadata.xml
index 8484395..89db3cb 100644
--- a/dev-perl/POE-Filter-IRCD/metadata.xml
+++ b/dev-perl/POE-Filter-IRCD/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">POE::Filter::IRCD</remote-id>
 		<remote-id type="cpan">POE-Filter-IRCD</remote-id>
+		<remote-id type="cpan-module">POE::Filter::IRCD</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/PPI-HTML/metadata.xml b/dev-perl/PPI-HTML/metadata.xml
index c043d3e..8b52944 100644
--- a/dev-perl/PPI-HTML/metadata.xml
+++ b/dev-perl/PPI-HTML/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">PPI-HTML</remote-id>
         <remote-id type="cpan-module">PPI::HTML</remote-id>
         <remote-id type="cpan-module">PPI::HTML::Fragment</remote-id>
-        <remote-id type="cpan">PPI-HTML</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/PPI-XS/metadata.xml b/dev-perl/PPI-XS/metadata.xml
index 0f91ba5..7e3565a 100644
--- a/dev-perl/PPI-XS/metadata.xml
+++ b/dev-perl/PPI-XS/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">PPI::XS</remote-id>
         <remote-id type="cpan">PPI-XS</remote-id>
+        <remote-id type="cpan-module">PPI::XS</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/PSGI/metadata.xml b/dev-perl/PSGI/metadata.xml
index 66c9b50..9b4d5f6 100644
--- a/dev-perl/PSGI/metadata.xml
+++ b/dev-perl/PSGI/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">PSGI</remote-id>
         <remote-id type="cpan">PSGI</remote-id>
+        <remote-id type="cpan-module">PSGI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Package-Generator/metadata.xml b/dev-perl/Package-Generator/metadata.xml
index e6cbb3c..cae1524 100644
--- a/dev-perl/Package-Generator/metadata.xml
+++ b/dev-perl/Package-Generator/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Package-Generator</remote-id>
                 <remote-id type="cpan-module">Package::Generator</remote-id>
                 <remote-id type="cpan-module">Package::Reaper</remote-id>
-                <remote-id type="cpan">Package-Generator</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Package-Pkg/metadata.xml b/dev-perl/Package-Pkg/metadata.xml
index ea00544..6d7959a 100644
--- a/dev-perl/Package-Pkg/metadata.xml
+++ b/dev-perl/Package-Pkg/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Package-Pkg</remote-id>
                 <remote-id type="cpan-module">Package::Pkg</remote-id>
                 <remote-id type="cpan-module">Package::Pkg::Lexicon</remote-id>
                 <remote-id type="cpan-module">Package::Pkg::Loader</remote-id>
-                <remote-id type="cpan">Package-Pkg</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Padre-Plugin-Autoformat/metadata.xml b/dev-perl/Padre-Plugin-Autoformat/metadata.xml
index baaf6f8..0d43d46 100644
--- a/dev-perl/Padre-Plugin-Autoformat/metadata.xml
+++ b/dev-perl/Padre-Plugin-Autoformat/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Padre::Plugin::Autoformat</remote-id>
                 <remote-id type="cpan">Padre-Plugin-Autoformat</remote-id>
+                <remote-id type="cpan-module">Padre::Plugin::Autoformat</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Padre-Plugin-PerlCritic/metadata.xml b/dev-perl/Padre-Plugin-PerlCritic/metadata.xml
index 13dc9c3..c784d3f 100644
--- a/dev-perl/Padre-Plugin-PerlCritic/metadata.xml
+++ b/dev-perl/Padre-Plugin-PerlCritic/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Padre::Plugin::PerlCritic</remote-id>
                 <remote-id type="cpan">Padre-Plugin-PerlCritic</remote-id>
+                <remote-id type="cpan-module">Padre::Plugin::PerlCritic</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Padre-Plugin-PerlTidy/metadata.xml b/dev-perl/Padre-Plugin-PerlTidy/metadata.xml
index 2fdf281..8c7db7e 100644
--- a/dev-perl/Padre-Plugin-PerlTidy/metadata.xml
+++ b/dev-perl/Padre-Plugin-PerlTidy/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Padre::Plugin::PerlTidy</remote-id>
                 <remote-id type="cpan">Padre-Plugin-PerlTidy</remote-id>
+                <remote-id type="cpan-module">Padre::Plugin::PerlTidy</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Padre-Plugin-Vi/metadata.xml b/dev-perl/Padre-Plugin-Vi/metadata.xml
index ea43a7c..d323107 100644
--- a/dev-perl/Padre-Plugin-Vi/metadata.xml
+++ b/dev-perl/Padre-Plugin-Vi/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Padre-Plugin-Vi</remote-id>
                 <remote-id type="cpan-module">Padre::Plugin::Vi</remote-id>
                 <remote-id type="cpan-module">Padre::Plugin::Vi::CommandLine</remote-id>
                 <remote-id type="cpan-module">Padre::Plugin::Vi::Editor</remote-id>
                 <remote-id type="cpan-module">Padre::Plugin::Vi::TabCompletition</remote-id>
-                <remote-id type="cpan">Padre-Plugin-Vi</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Padre-Plugin-XML/metadata.xml b/dev-perl/Padre-Plugin-XML/metadata.xml
index da6c7c1..8e3e56e 100644
--- a/dev-perl/Padre-Plugin-XML/metadata.xml
+++ b/dev-perl/Padre-Plugin-XML/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Padre-Plugin-XML</remote-id>
                 <remote-id type="cpan-module">Padre::Plugin::XML</remote-id>
                 <remote-id type="cpan-module">Padre::Plugin::XML::Document</remote-id>
                 <remote-id type="cpan-module">Padre::Task::SyntaxChecker::XML</remote-id>
-                <remote-id type="cpan">Padre-Plugin-XML</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Parallel-Iterator/metadata.xml b/dev-perl/Parallel-Iterator/metadata.xml
index eeaae85..27862e5 100644
--- a/dev-perl/Parallel-Iterator/metadata.xml
+++ b/dev-perl/Parallel-Iterator/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Parallel::Iterator</remote-id>
         <remote-id type="cpan">Parallel-Iterator</remote-id>
+        <remote-id type="cpan-module">Parallel::Iterator</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Parse-BACKPAN-Packages/metadata.xml b/dev-perl/Parse-BACKPAN-Packages/metadata.xml
index c03a57d..72ded0c 100644
--- a/dev-perl/Parse-BACKPAN-Packages/metadata.xml
+++ b/dev-perl/Parse-BACKPAN-Packages/metadata.xml
@@ -5,15 +5,15 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="big-net-test">Permit connecting to the internet and BACKPAN
+    </maintainer>
+    <use>
+        <flag name="big-net-test">Permit connecting to the internet and BACKPAN
 			to run a test that downloads 1MB of data or more</flag>
-	</use>
+    </use>
     <upstream>
+        <remote-id type="cpan">Parse-BACKPAN-Packages</remote-id>
         <remote-id type="cpan-module">Parse::BACKPAN::Packages</remote-id>
         <remote-id type="cpan-module">Parse::BACKPAN::Packages::Distribution</remote-id>
         <remote-id type="cpan-module">Parse::BACKPAN::Packages::File</remote-id>
-        <remote-id type="cpan">Parse-BACKPAN-Packages</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Parse-CPAN-Distributions/metadata.xml b/dev-perl/Parse-CPAN-Distributions/metadata.xml
index e9c341a..d86abca 100644
--- a/dev-perl/Parse-CPAN-Distributions/metadata.xml
+++ b/dev-perl/Parse-CPAN-Distributions/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Parse::CPAN::Distributions</remote-id>
         <remote-id type="cpan">Parse-CPAN-Distributions</remote-id>
+        <remote-id type="cpan-module">Parse::CPAN::Distributions</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Parse-CPAN-Packages/metadata.xml b/dev-perl/Parse-CPAN-Packages/metadata.xml
index 3b02c99..d058709 100644
--- a/dev-perl/Parse-CPAN-Packages/metadata.xml
+++ b/dev-perl/Parse-CPAN-Packages/metadata.xml
@@ -7,9 +7,9 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Parse-CPAN-Packages</remote-id>
         <remote-id type="cpan-module">Parse::CPAN::Packages</remote-id>
         <remote-id type="cpan-module">Parse::CPAN::Packages::Distribution</remote-id>
         <remote-id type="cpan-module">Parse::CPAN::Packages::Package</remote-id>
-        <remote-id type="cpan">Parse-CPAN-Packages</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Parse-Method-Signatures/metadata.xml b/dev-perl/Parse-Method-Signatures/metadata.xml
index 0acef7b..bfb3654 100644
--- a/dev-perl/Parse-Method-Signatures/metadata.xml
+++ b/dev-perl/Parse-Method-Signatures/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Parse-Method-Signatures</remote-id>
         <remote-id type="cpan-module">Parse::Method::Signatures</remote-id>
         <remote-id type="cpan-module">Parse::Method::Signatures::Param</remote-id>
         <remote-id type="cpan-module">Parse::Method::Signatures::Param::Bindable</remote-id>
@@ -20,6 +21,5 @@
         <remote-id type="cpan-module">Parse::Method::Signatures::Sig</remote-id>
         <remote-id type="cpan-module">Parse::Method::Signatures::TypeConstraint</remote-id>
         <remote-id type="cpan-module">Parse::Method::Signatures::Types</remote-id>
-        <remote-id type="cpan">Parse-Method-Signatures</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Path-Abstract/metadata.xml b/dev-perl/Path-Abstract/metadata.xml
index 48babbe..bd29fd5 100644
--- a/dev-perl/Path-Abstract/metadata.xml
+++ b/dev-perl/Path-Abstract/metadata.xml
@@ -7,9 +7,9 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Path-Abstract</remote-id>
         <remote-id type="cpan-module">Path::Abstract</remote-id>
         <remote-id type="cpan-module">Path::Abstract::Fast</remote-id>
         <remote-id type="cpan-module">Path::Abstract::Underload</remote-id>
-        <remote-id type="cpan">Path-Abstract</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Path-Class-Rule/metadata.xml b/dev-perl/Path-Class-Rule/metadata.xml
index 9e23ac3..397c23a 100644
--- a/dev-perl/Path-Class-Rule/metadata.xml
+++ b/dev-perl/Path-Class-Rule/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Path::Class::Rule</remote-id>
 		<remote-id type="cpan">Path-Class-Rule</remote-id>
+		<remote-id type="cpan-module">Path::Class::Rule</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Perl-MinimumVersion/metadata.xml b/dev-perl/Perl-MinimumVersion/metadata.xml
index a6ba109..a3d3aa2 100644
--- a/dev-perl/Perl-MinimumVersion/metadata.xml
+++ b/dev-perl/Perl-MinimumVersion/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Perl-MinimumVersion</remote-id>
         <remote-id type="cpan-module">Perl::MinimumVersion</remote-id>
         <remote-id type="cpan-module">Perl::MinimumVersion::Reason</remote-id>
-        <remote-id type="cpan">Perl-MinimumVersion</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Perl-PrereqScanner/metadata.xml b/dev-perl/Perl-PrereqScanner/metadata.xml
index 2c47997..4378d72 100644
--- a/dev-perl/Perl-PrereqScanner/metadata.xml
+++ b/dev-perl/Perl-PrereqScanner/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Perl-PrereqScanner</remote-id>
         <remote-id type="cpan-module">Perl::PrereqScanner</remote-id>
         <remote-id type="cpan-module">Perl::PrereqScanner::Scanner</remote-id>
         <remote-id type="cpan-module">Perl::PrereqScanner::Scanner::Aliased</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">Perl::PrereqScanner::Scanner::POE</remote-id>
         <remote-id type="cpan-module">Perl::PrereqScanner::Scanner::Perl5</remote-id>
         <remote-id type="cpan-module">Perl::PrereqScanner::Scanner::TestMore</remote-id>
-        <remote-id type="cpan">Perl-PrereqScanner</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Perl-Version/metadata.xml b/dev-perl/Perl-Version/metadata.xml
index 9be21d6..6b21d68 100644
--- a/dev-perl/Perl-Version/metadata.xml
+++ b/dev-perl/Perl-Version/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Perl::Version</remote-id>
         <remote-id type="cpan">Perl-Version</remote-id>
+        <remote-id type="cpan-module">Perl::Version</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Perl6-Caller/metadata.xml b/dev-perl/Perl6-Caller/metadata.xml
index 5058481..b6d8a19 100644
--- a/dev-perl/Perl6-Caller/metadata.xml
+++ b/dev-perl/Perl6-Caller/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Perl6::Caller</remote-id>
         <remote-id type="cpan">Perl6-Caller</remote-id>
+        <remote-id type="cpan-module">Perl6::Caller</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Petal/metadata.xml b/dev-perl/Petal/metadata.xml
index 79d1b78..71c8086 100644
--- a/dev-perl/Petal/metadata.xml
+++ b/dev-perl/Petal/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Petal</remote-id>
         <remote-id type="cpan-module">Petal</remote-id>
         <remote-id type="cpan-module">Petal::Cache::Disk</remote-id>
         <remote-id type="cpan-module">Petal::Cache::Memory</remote-id>
@@ -26,6 +27,5 @@
         <remote-id type="cpan-module">Petal::TranslationService::MOFile</remote-id>
         <remote-id type="cpan-module">Petal::TranslationService::Noop</remote-id>
         <remote-id type="cpan-module">Petal::TranslationService::h4x0r</remote-id>
-        <remote-id type="cpan">Petal</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Plack-Middleware-ForceEnv/metadata.xml b/dev-perl/Plack-Middleware-ForceEnv/metadata.xml
index cab6e71..564e833 100644
--- a/dev-perl/Plack-Middleware-ForceEnv/metadata.xml
+++ b/dev-perl/Plack-Middleware-ForceEnv/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Plack::Middleware::ForceEnv</remote-id>
 		<remote-id type="cpan">Plack-Middleware-ForceEnv</remote-id>
+		<remote-id type="cpan-module">Plack::Middleware::ForceEnv</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Plack-Middleware-ReverseProxy/metadata.xml b/dev-perl/Plack-Middleware-ReverseProxy/metadata.xml
index a035e36..e13d75b 100644
--- a/dev-perl/Plack-Middleware-ReverseProxy/metadata.xml
+++ b/dev-perl/Plack-Middleware-ReverseProxy/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Plack::Middleware::ReverseProxy</remote-id>
         <remote-id type="cpan">Plack-Middleware-ReverseProxy</remote-id>
+        <remote-id type="cpan-module">Plack::Middleware::ReverseProxy</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Plack-Test-ExternalServer/metadata.xml b/dev-perl/Plack-Test-ExternalServer/metadata.xml
index 89cf2dd..02f3a93 100644
--- a/dev-perl/Plack-Test-ExternalServer/metadata.xml
+++ b/dev-perl/Plack-Test-ExternalServer/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Plack::Test::ExternalServer</remote-id>
         <remote-id type="cpan">Plack-Test-ExternalServer</remote-id>
+        <remote-id type="cpan-module">Plack::Test::ExternalServer</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Coverage-Moose/metadata.xml b/dev-perl/Pod-Coverage-Moose/metadata.xml
index bf8def6..dec25ab 100644
--- a/dev-perl/Pod-Coverage-Moose/metadata.xml
+++ b/dev-perl/Pod-Coverage-Moose/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Pod::Coverage::Moose</remote-id>
         <remote-id type="cpan">Pod-Coverage-Moose</remote-id>
+        <remote-id type="cpan-module">Pod::Coverage::Moose</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Coverage-TrustPod/metadata.xml b/dev-perl/Pod-Coverage-TrustPod/metadata.xml
index e294a83..4bbe9dd 100644
--- a/dev-perl/Pod-Coverage-TrustPod/metadata.xml
+++ b/dev-perl/Pod-Coverage-TrustPod/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Pod::Coverage::TrustPod</remote-id>
         <remote-id type="cpan">Pod-Coverage-TrustPod</remote-id>
+        <remote-id type="cpan-module">Pod::Coverage::TrustPod</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Pod-Elemental-PerlMunger/metadata.xml b/dev-perl/Pod-Elemental-PerlMunger/metadata.xml
index b538c71..fa52cc7 100644
--- a/dev-perl/Pod-Elemental-PerlMunger/metadata.xml
+++ b/dev-perl/Pod-Elemental-PerlMunger/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Pod::Elemental::PerlMunger</remote-id>
         <remote-id type="cpan">Pod-Elemental-PerlMunger</remote-id>
+        <remote-id type="cpan-module">Pod::Elemental::PerlMunger</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Elemental-Transformer-List/metadata.xml b/dev-perl/Pod-Elemental-Transformer-List/metadata.xml
index d7d3018..b9b8377 100644
--- a/dev-perl/Pod-Elemental-Transformer-List/metadata.xml
+++ b/dev-perl/Pod-Elemental-Transformer-List/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Pod::Elemental::Transformer::List</remote-id>
         <remote-id type="cpan">Pod-Elemental-Transformer-List</remote-id>
+        <remote-id type="cpan-module">Pod::Elemental::Transformer::List</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Elemental-Transformer-WikiDoc/metadata.xml b/dev-perl/Pod-Elemental-Transformer-WikiDoc/metadata.xml
index d782c79..10d7fa5 100644
--- a/dev-perl/Pod-Elemental-Transformer-WikiDoc/metadata.xml
+++ b/dev-perl/Pod-Elemental-Transformer-WikiDoc/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Pod-Elemental-Transformer-WikiDoc</remote-id>
         <remote-id type="cpan-module">Pod::Elemental::Transformer::WikiDoc</remote-id>
         <remote-id type="cpan-module">Pod::Weaver::Plugin::WikiDoc</remote-id>
-        <remote-id type="cpan">Pod-Elemental-Transformer-WikiDoc</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Elemental/metadata.xml b/dev-perl/Pod-Elemental/metadata.xml
index a1d1e80..526f2a6 100644
--- a/dev-perl/Pod-Elemental/metadata.xml
+++ b/dev-perl/Pod-Elemental/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Pod-Elemental</remote-id>
         <remote-id type="cpan-module">Pod::Elemental</remote-id>
         <remote-id type="cpan-module">Pod::Elemental::Autoblank</remote-id>
         <remote-id type="cpan-module">Pod::Elemental::Autochomp</remote-id>
@@ -33,6 +34,5 @@
         <remote-id type="cpan-module">Pod::Elemental::Transformer::Nester</remote-id>
         <remote-id type="cpan-module">Pod::Elemental::Transformer::Pod5</remote-id>
         <remote-id type="cpan-module">Pod::Elemental::Types</remote-id>
-        <remote-id type="cpan">Pod-Elemental</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Eventual/metadata.xml b/dev-perl/Pod-Eventual/metadata.xml
index fd620d6..cb602e9 100644
--- a/dev-perl/Pod-Eventual/metadata.xml
+++ b/dev-perl/Pod-Eventual/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Pod-Eventual</remote-id>
         <remote-id type="cpan-module">Pod::Eventual</remote-id>
         <remote-id type="cpan-module">Pod::Eventual::Simple</remote-id>
-        <remote-id type="cpan">Pod-Eventual</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Pod-ProjectDocs/metadata.xml b/dev-perl/Pod-ProjectDocs/metadata.xml
index 3ca814e..6c087c0 100644
--- a/dev-perl/Pod-ProjectDocs/metadata.xml
+++ b/dev-perl/Pod-ProjectDocs/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Pod-ProjectDocs</remote-id>
         <remote-id type="cpan-module">Pod::ProjectDocs</remote-id>
         <remote-id type="cpan-module">Pod::ProjectDocs::ArrowImage</remote-id>
         <remote-id type="cpan-module">Pod::ProjectDocs::CSS</remote-id>
@@ -20,6 +21,5 @@
         <remote-id type="cpan-module">Pod::ProjectDocs::Parser::JavaScriptPod</remote-id>
         <remote-id type="cpan-module">Pod::ProjectDocs::Parser::PerlPod</remote-id>
         <remote-id type="cpan-module">Pod::ProjectDocs::Template</remote-id>
-        <remote-id type="cpan">Pod-ProjectDocs</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Pod-PseudoPod/metadata.xml b/dev-perl/Pod-PseudoPod/metadata.xml
index 219c47b..553fed4 100644
--- a/dev-perl/Pod-PseudoPod/metadata.xml
+++ b/dev-perl/Pod-PseudoPod/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Pod-PseudoPod</remote-id>
                 <remote-id type="cpan-module">Pod::PseudoPod</remote-id>
                 <remote-id type="cpan-module">Pod::PseudoPod::Checker</remote-id>
                 <remote-id type="cpan-module">Pod::PseudoPod::DocBook</remote-id>
                 <remote-id type="cpan-module">Pod::PseudoPod::HTML</remote-id>
                 <remote-id type="cpan-module">Pod::PseudoPod::Index</remote-id>
                 <remote-id type="cpan-module">Pod::PseudoPod::Text</remote-id>
-                <remote-id type="cpan">Pod-PseudoPod</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Strip/metadata.xml b/dev-perl/Pod-Strip/metadata.xml
index 96ccfe3..588f7f6 100644
--- a/dev-perl/Pod-Strip/metadata.xml
+++ b/dev-perl/Pod-Strip/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Pod::Strip</remote-id>
         <remote-id type="cpan">Pod-Strip</remote-id>
+        <remote-id type="cpan-module">Pod::Strip</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Weaver-Plugin-Encoding/metadata.xml b/dev-perl/Pod-Weaver-Plugin-Encoding/metadata.xml
index 21dbb2c..67fce4f 100644
--- a/dev-perl/Pod-Weaver-Plugin-Encoding/metadata.xml
+++ b/dev-perl/Pod-Weaver-Plugin-Encoding/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Pod::Weaver::Plugin::Encoding</remote-id>
         <remote-id type="cpan">Pod-Weaver-Plugin-Encoding</remote-id>
+        <remote-id type="cpan-module">Pod::Weaver::Plugin::Encoding</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-Weaver/metadata.xml b/dev-perl/Pod-Weaver/metadata.xml
index a611ac9..548f2bc 100644
--- a/dev-perl/Pod-Weaver/metadata.xml
+++ b/dev-perl/Pod-Weaver/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Pod-Weaver</remote-id>
         <remote-id type="cpan-module">Pod::Weaver</remote-id>
         <remote-id type="cpan-module">Pod::Weaver::Config</remote-id>
         <remote-id type="cpan-module">Pod::Weaver::Config::Assembler</remote-id>
@@ -31,6 +32,5 @@
         <remote-id type="cpan-module">Pod::Weaver::Section::Name</remote-id>
         <remote-id type="cpan-module">Pod::Weaver::Section::Region</remote-id>
         <remote-id type="cpan-module">Pod::Weaver::Section::Version</remote-id>
-        <remote-id type="cpan">Pod-Weaver</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Pod-WikiDoc/metadata.xml b/dev-perl/Pod-WikiDoc/metadata.xml
index 2e905b2..c7c7e5a 100644
--- a/dev-perl/Pod-WikiDoc/metadata.xml
+++ b/dev-perl/Pod-WikiDoc/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Pod::WikiDoc</remote-id>
         <remote-id type="cpan">Pod-WikiDoc</remote-id>
+        <remote-id type="cpan-module">Pod::WikiDoc</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Regexp-Assemble/metadata.xml b/dev-perl/Regexp-Assemble/metadata.xml
index b85e344..22ab287 100644
--- a/dev-perl/Regexp-Assemble/metadata.xml
+++ b/dev-perl/Regexp-Assemble/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Regexp::Assemble</remote-id>
         <remote-id type="cpan">Regexp-Assemble</remote-id>
+        <remote-id type="cpan-module">Regexp::Assemble</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Regexp-Copy/metadata.xml b/dev-perl/Regexp-Copy/metadata.xml
index 3d96af4..d06b967 100644
--- a/dev-perl/Regexp-Copy/metadata.xml
+++ b/dev-perl/Regexp-Copy/metadata.xml
@@ -7,9 +7,9 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Regexp-Copy</remote-id>
         <remote-id type="cpan-module">Regexp</remote-id>
         <remote-id type="cpan-module">Regexp::Copy</remote-id>
         <remote-id type="cpan-module">Regexp::Storable</remote-id>
-        <remote-id type="cpan">Regexp-Copy</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Regexp-Grammars/metadata.xml b/dev-perl/Regexp-Grammars/metadata.xml
index 6d636f0..3993fb5 100644
--- a/dev-perl/Regexp-Grammars/metadata.xml
+++ b/dev-perl/Regexp-Grammars/metadata.xml
@@ -7,11 +7,11 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Regexp-Grammars</remote-id>
         <remote-id type="cpan-module">Regexp</remote-id>
         <remote-id type="cpan-module">Regexp::Grammars</remote-id>
         <remote-id type="cpan-module">Regexp::Grammars::ContextRestorer</remote-id>
         <remote-id type="cpan-module">Regexp::Grammars::Precursor</remote-id>
         <remote-id type="cpan-module">Regexp::Grammars::TranslatorRestorer</remote-id>
-        <remote-id type="cpan">Regexp-Grammars</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Regexp-RegGrp/metadata.xml b/dev-perl/Regexp-RegGrp/metadata.xml
index 06f130a..765000c 100644
--- a/dev-perl/Regexp-RegGrp/metadata.xml
+++ b/dev-perl/Regexp-RegGrp/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Regexp-RegGrp</remote-id>
         <remote-id type="cpan-module">Regexp::RegGrp</remote-id>
         <remote-id type="cpan-module">Regexp::RegGrp::Data</remote-id>
-        <remote-id type="cpan">Regexp-RegGrp</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Role-HasMessage/metadata.xml b/dev-perl/Role-HasMessage/metadata.xml
index c36cae8..3ac5b20 100644
--- a/dev-perl/Role-HasMessage/metadata.xml
+++ b/dev-perl/Role-HasMessage/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Role-HasMessage</remote-id>
         <remote-id type="cpan-module">Role::HasMessage</remote-id>
         <remote-id type="cpan-module">Role::HasMessage::Errf</remote-id>
-        <remote-id type="cpan">Role-HasMessage</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Role-HasPayload/metadata.xml b/dev-perl/Role-HasPayload/metadata.xml
index 4c6910f..8707af3 100644
--- a/dev-perl/Role-HasPayload/metadata.xml
+++ b/dev-perl/Role-HasPayload/metadata.xml
@@ -7,10 +7,10 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Role-HasPayload</remote-id>
         <remote-id type="cpan-module">Role::HasPayload</remote-id>
         <remote-id type="cpan-module">Role::HasPayload::Auto</remote-id>
         <remote-id type="cpan-module">Role::HasPayload::Merged</remote-id>
         <remote-id type="cpan-module">Role::HasPayload::Meta::Attribute::Payload</remote-id>
-        <remote-id type="cpan">Role-HasPayload</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Role-Identifiable/metadata.xml b/dev-perl/Role-Identifiable/metadata.xml
index adc388e..4622f39 100644
--- a/dev-perl/Role-Identifiable/metadata.xml
+++ b/dev-perl/Role-Identifiable/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Role-Identifiable</remote-id>
         <remote-id type="cpan-module">Role::Identifiable::HasIdent</remote-id>
         <remote-id type="cpan-module">Role::Identifiable::HasTags</remote-id>
-        <remote-id type="cpan">Role-Identifiable</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/SWF-Chart/metadata.xml b/dev-perl/SWF-Chart/metadata.xml
index d403db2..addfcd5 100644
--- a/dev-perl/SWF-Chart/metadata.xml
+++ b/dev-perl/SWF-Chart/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">SWF::Chart</remote-id>
         <remote-id type="cpan">SWF-Chart</remote-id>
+        <remote-id type="cpan-module">SWF::Chart</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Scalar-String/metadata.xml b/dev-perl/Scalar-String/metadata.xml
index d363804..1d2863e 100644
--- a/dev-perl/Scalar-String/metadata.xml
+++ b/dev-perl/Scalar-String/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Scalar::String</remote-id>
         <remote-id type="cpan">Scalar-String</remote-id>
+        <remote-id type="cpan-module">Scalar::String</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Scope-Upper/metadata.xml b/dev-perl/Scope-Upper/metadata.xml
index 8728fc4..401c4a4 100644
--- a/dev-perl/Scope-Upper/metadata.xml
+++ b/dev-perl/Scope-Upper/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Scope::Upper</remote-id>
         <remote-id type="cpan">Scope-Upper</remote-id>
+        <remote-id type="cpan-module">Scope::Upper</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Search-GIN-Extract-AttributeIndexes/metadata.xml b/dev-perl/Search-GIN-Extract-AttributeIndexes/metadata.xml
index 6ece1c8..646da5c 100644
--- a/dev-perl/Search-GIN-Extract-AttributeIndexes/metadata.xml
+++ b/dev-perl/Search-GIN-Extract-AttributeIndexes/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Search::GIN::Extract::AttributeIndexes</remote-id>
         <remote-id type="cpan">Search-GIN-Extract-AttributeIndexes</remote-id>
+        <remote-id type="cpan-module">Search::GIN::Extract::AttributeIndexes</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Search-GIN/metadata.xml b/dev-perl/Search-GIN/metadata.xml
index e67a6a1..58aabd6 100644
--- a/dev-perl/Search-GIN/metadata.xml
+++ b/dev-perl/Search-GIN/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Search-GIN</remote-id>
         <remote-id type="cpan-module">Search::GIN</remote-id>
         <remote-id type="cpan-module">Search::GIN::Callbacks</remote-id>
         <remote-id type="cpan-module">Search::GIN::Core</remote-id>
@@ -37,6 +38,5 @@
         <remote-id type="cpan-module">Search::GIN::Query::Manual</remote-id>
         <remote-id type="cpan-module">Search::GIN::Query::Set</remote-id>
         <remote-id type="cpan-module">Search::GIN::SelfIDs</remote-id>
-        <remote-id type="cpan">Search-GIN</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Search-Sitemap/metadata.xml b/dev-perl/Search-Sitemap/metadata.xml
index 075d7a7..d71a008 100644
--- a/dev-perl/Search-Sitemap/metadata.xml
+++ b/dev-perl/Search-Sitemap/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Search-Sitemap</remote-id>
         <remote-id type="cpan-module">Search::Sitemap</remote-id>
         <remote-id type="cpan-module">Search::Sitemap::Index</remote-id>
         <remote-id type="cpan-module">Search::Sitemap::Ping</remote-id>
@@ -19,6 +20,5 @@
         <remote-id type="cpan-module">Search::Sitemap::URL</remote-id>
         <remote-id type="cpan-module">Search::Sitemap::URLStore</remote-id>
         <remote-id type="cpan-module">Search::Sitemap::URLStore::Memory</remote-id>
-        <remote-id type="cpan">Search-Sitemap</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Set-Crontab/metadata.xml b/dev-perl/Set-Crontab/metadata.xml
index 2576940..cc2f3a1 100644
--- a/dev-perl/Set-Crontab/metadata.xml
+++ b/dev-perl/Set-Crontab/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Set::Crontab</remote-id>
         <remote-id type="cpan">Set-Crontab</remote-id>
+        <remote-id type="cpan-module">Set::Crontab</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Smart-Comments/metadata.xml b/dev-perl/Smart-Comments/metadata.xml
index 5f0ccc9..04d9f19 100644
--- a/dev-perl/Smart-Comments/metadata.xml
+++ b/dev-perl/Smart-Comments/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Smart::Comments</remote-id>
         <remote-id type="cpan">Smart-Comments</remote-id>
+        <remote-id type="cpan-module">Smart::Comments</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Socket-GetAddrInfo/metadata.xml b/dev-perl/Socket-GetAddrInfo/metadata.xml
index 5f2c5ee..5cd873e 100644
--- a/dev-perl/Socket-GetAddrInfo/metadata.xml
+++ b/dev-perl/Socket-GetAddrInfo/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Socket-GetAddrInfo</remote-id>
                 <remote-id type="cpan-module">Socket::GetAddrInfo</remote-id>
                 <remote-id type="cpan-module">Socket::GetAddrInfo::Core</remote-id>
                 <remote-id type="cpan-module">Socket::GetAddrInfo::Emul</remote-id>
                 <remote-id type="cpan-module">Socket::GetAddrInfo::Socket6api</remote-id>
                 <remote-id type="cpan-module">Socket::GetAddrInfo::Strict</remote-id>
                 <remote-id type="cpan-module">Socket::GetAddrInfo::XS</remote-id>
-                <remote-id type="cpan">Socket-GetAddrInfo</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Software-License/metadata.xml b/dev-perl/Software-License/metadata.xml
index cc2fca3..1e3c75a 100644
--- a/dev-perl/Software-License/metadata.xml
+++ b/dev-perl/Software-License/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Software-License</remote-id>
         <remote-id type="cpan-module">Software::License</remote-id>
         <remote-id type="cpan-module">Software::License::AGPL_3</remote-id>
         <remote-id type="cpan-module">Software::License::Apache_1_1</remote-id>
@@ -36,6 +37,5 @@
         <remote-id type="cpan-module">Software::License::Sun</remote-id>
         <remote-id type="cpan-module">Software::License::Zlib</remote-id>
         <remote-id type="cpan-module">Software::LicenseUtils</remote-id>
-        <remote-id type="cpan">Software-License</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Spreadsheet-ParseExcel-Simple/metadata.xml b/dev-perl/Spreadsheet-ParseExcel-Simple/metadata.xml
index 0dbc61d..ee00966 100644
--- a/dev-perl/Spreadsheet-ParseExcel-Simple/metadata.xml
+++ b/dev-perl/Spreadsheet-ParseExcel-Simple/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Spreadsheet-ParseExcel-Simple</remote-id>
         <remote-id type="cpan-module">Spreadsheet::ParseExcel::Simple</remote-id>
         <remote-id type="cpan-module">Spreadsheet::ParseExcel::Simple::_Sheet</remote-id>
-        <remote-id type="cpan">Spreadsheet-ParseExcel-Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Spreadsheet-WriteExcel-Simple/metadata.xml b/dev-perl/Spreadsheet-WriteExcel-Simple/metadata.xml
index 7942cea..245c608 100644
--- a/dev-perl/Spreadsheet-WriteExcel-Simple/metadata.xml
+++ b/dev-perl/Spreadsheet-WriteExcel-Simple/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Spreadsheet::WriteExcel::Simple</remote-id>
         <remote-id type="cpan">Spreadsheet-WriteExcel-Simple</remote-id>
+        <remote-id type="cpan-module">Spreadsheet::WriteExcel::Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Starman/metadata.xml b/dev-perl/Starman/metadata.xml
index 9d29015..c901f66 100644
--- a/dev-perl/Starman/metadata.xml
+++ b/dev-perl/Starman/metadata.xml
@@ -5,15 +5,15 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="recommended">Install recommended dependencies</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="recommended">Install recommended dependencies</flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">Starman</remote-id>
         <remote-id type="cpan-module">HTTP::Server::PSGI::Net::Server::PreFork</remote-id>
         <remote-id type="cpan-module">Plack::Handler::Starman</remote-id>
         <remote-id type="cpan-module">Starman</remote-id>
         <remote-id type="cpan-module">Starman::Server</remote-id>
-        <remote-id type="cpan">Starman</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/String-CamelCase/metadata.xml b/dev-perl/String-CamelCase/metadata.xml
index ca5b582..ee1e07e 100644
--- a/dev-perl/String-CamelCase/metadata.xml
+++ b/dev-perl/String-CamelCase/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::CamelCase</remote-id>
         <remote-id type="cpan">String-CamelCase</remote-id>
+        <remote-id type="cpan-module">String::CamelCase</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/String-CodiceFiscale/metadata.xml b/dev-perl/String-CodiceFiscale/metadata.xml
index 3b0fa94..1534124 100644
--- a/dev-perl/String-CodiceFiscale/metadata.xml
+++ b/dev-perl/String-CodiceFiscale/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::CodiceFiscale</remote-id>
         <remote-id type="cpan">String-CodiceFiscale</remote-id>
+        <remote-id type="cpan-module">String::CodiceFiscale</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/String-Diff/metadata.xml b/dev-perl/String-Diff/metadata.xml
index 90815bc..ae47429 100644
--- a/dev-perl/String-Diff/metadata.xml
+++ b/dev-perl/String-Diff/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::Diff</remote-id>
         <remote-id type="cpan">String-Diff</remote-id>
+        <remote-id type="cpan-module">String::Diff</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/String-Errf/metadata.xml b/dev-perl/String-Errf/metadata.xml
index 08da8cd..477edbf 100644
--- a/dev-perl/String-Errf/metadata.xml
+++ b/dev-perl/String-Errf/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::Errf</remote-id>
         <remote-id type="cpan">String-Errf</remote-id>
+        <remote-id type="cpan-module">String::Errf</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/String-Escape/metadata.xml b/dev-perl/String-Escape/metadata.xml
index 9c662a0..7acd0f0 100644
--- a/dev-perl/String-Escape/metadata.xml
+++ b/dev-perl/String-Escape/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::Escape</remote-id>
         <remote-id type="cpan">String-Escape</remote-id>
+        <remote-id type="cpan-module">String::Escape</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/String-Flogger/metadata.xml b/dev-perl/String-Flogger/metadata.xml
index 9a25fe8..6157195 100644
--- a/dev-perl/String-Flogger/metadata.xml
+++ b/dev-perl/String-Flogger/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::Flogger</remote-id>
         <remote-id type="cpan">String-Flogger</remote-id>
+        <remote-id type="cpan-module">String::Flogger</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/String-Formatter/metadata.xml b/dev-perl/String-Formatter/metadata.xml
index b1be1fe..01f693b 100644
--- a/dev-perl/String-Formatter/metadata.xml
+++ b/dev-perl/String-Formatter/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">String-Formatter</remote-id>
         <remote-id type="cpan-module">String::Formatter</remote-id>
         <remote-id type="cpan-module">String::Formatter::Cookbook</remote-id>
-        <remote-id type="cpan">String-Formatter</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/String-MkPasswd/metadata.xml b/dev-perl/String-MkPasswd/metadata.xml
index 8ca637d..e179c62 100644
--- a/dev-perl/String-MkPasswd/metadata.xml
+++ b/dev-perl/String-MkPasswd/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::MkPasswd</remote-id>
         <remote-id type="cpan">String-MkPasswd</remote-id>
+        <remote-id type="cpan-module">String::MkPasswd</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/String-Random/metadata.xml b/dev-perl/String-Random/metadata.xml
index 8490a8b..8c17253 100644
--- a/dev-perl/String-Random/metadata.xml
+++ b/dev-perl/String-Random/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::Random</remote-id>
         <remote-id type="cpan">String-Random</remote-id>
+        <remote-id type="cpan-module">String::Random</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/String-ToIdentifier-EN/metadata.xml b/dev-perl/String-ToIdentifier-EN/metadata.xml
index 80b1882..8b3eefe 100644
--- a/dev-perl/String-ToIdentifier-EN/metadata.xml
+++ b/dev-perl/String-ToIdentifier-EN/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">String-ToIdentifier-EN</remote-id>
         <remote-id type="cpan-module">String::ToIdentifier::EN</remote-id>
         <remote-id type="cpan-module">String::ToIdentifier::EN::Unicode</remote-id>
-        <remote-id type="cpan">String-ToIdentifier-EN</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/String-Truncate/metadata.xml b/dev-perl/String-Truncate/metadata.xml
index 84dfb34..65e9567 100644
--- a/dev-perl/String-Truncate/metadata.xml
+++ b/dev-perl/String-Truncate/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">String::Truncate</remote-id>
         <remote-id type="cpan">String-Truncate</remote-id>
+        <remote-id type="cpan-module">String::Truncate</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Sub-Compose/metadata.xml b/dev-perl/Sub-Compose/metadata.xml
index 05c6a51..cadef84 100644
--- a/dev-perl/Sub-Compose/metadata.xml
+++ b/dev-perl/Sub-Compose/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Sub::Compose</remote-id>
         <remote-id type="cpan">Sub-Compose</remote-id>
+        <remote-id type="cpan-module">Sub::Compose</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Sub-Current/metadata.xml b/dev-perl/Sub-Current/metadata.xml
index c268361..49cde95 100644
--- a/dev-perl/Sub-Current/metadata.xml
+++ b/dev-perl/Sub-Current/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Sub::Current</remote-id>
         <remote-id type="cpan">Sub-Current</remote-id>
+        <remote-id type="cpan-module">Sub::Current</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Sub-Curried/metadata.xml b/dev-perl/Sub-Curried/metadata.xml
index 0c896e3..01acacc 100644
--- a/dev-perl/Sub-Curried/metadata.xml
+++ b/dev-perl/Sub-Curried/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Sub-Curried</remote-id>
         <remote-id type="cpan-module">Sub::Composable</remote-id>
         <remote-id type="cpan-module">Sub::Curried</remote-id>
-        <remote-id type="cpan">Sub-Curried</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Sub-Exporter-ForMethods/metadata.xml b/dev-perl/Sub-Exporter-ForMethods/metadata.xml
index ab51be1..70866c2 100644
--- a/dev-perl/Sub-Exporter-ForMethods/metadata.xml
+++ b/dev-perl/Sub-Exporter-ForMethods/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Sub::Exporter::ForMethods</remote-id>
         <remote-id type="cpan">Sub-Exporter-ForMethods</remote-id>
+        <remote-id type="cpan-module">Sub::Exporter::ForMethods</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Sub-Exporter-GlobExporter/metadata.xml b/dev-perl/Sub-Exporter-GlobExporter/metadata.xml
index 52809b3..16807ba 100644
--- a/dev-perl/Sub-Exporter-GlobExporter/metadata.xml
+++ b/dev-perl/Sub-Exporter-GlobExporter/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Sub::Exporter::GlobExporter</remote-id>
         <remote-id type="cpan">Sub-Exporter-GlobExporter</remote-id>
+        <remote-id type="cpan-module">Sub::Exporter::GlobExporter</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Syntax-Highlight-Engine-Kate/metadata.xml b/dev-perl/Syntax-Highlight-Engine-Kate/metadata.xml
index 574adcf..004d171 100644
--- a/dev-perl/Syntax-Highlight-Engine-Kate/metadata.xml
+++ b/dev-perl/Syntax-Highlight-Engine-Kate/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Syntax-Highlight-Engine-Kate</remote-id>
         <remote-id type="cpan-module">Syntax::Highlight::Engine::Kate</remote-id>
         <remote-id type="cpan-module">Syntax::Highlight::Engine::Kate::ABC</remote-id>
         <remote-id type="cpan-module">Syntax::Highlight::Engine::Kate::AHDL</remote-id>
@@ -143,6 +144,5 @@
         <remote-id type="cpan-module">Syntax::Highlight::Engine::Kate::Xslt</remote-id>
         <remote-id type="cpan-module">Syntax::Highlight::Engine::Kate::Yacas</remote-id>
         <remote-id type="cpan-module">Syntax::Highlight::Engine::Kate::Yacc_Bison</remote-id>
-        <remote-id type="cpan">Syntax-Highlight-Engine-Kate</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/System-Command/metadata.xml b/dev-perl/System-Command/metadata.xml
index a22f31c..d2374ee 100644
--- a/dev-perl/System-Command/metadata.xml
+++ b/dev-perl/System-Command/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">System::Command</remote-id>
                 <remote-id type="cpan">System-Command</remote-id>
+                <remote-id type="cpan-module">System::Command</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Taint-Util/metadata.xml b/dev-perl/Taint-Util/metadata.xml
index 010fe1c..1a36931 100644
--- a/dev-perl/Taint-Util/metadata.xml
+++ b/dev-perl/Taint-Util/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Taint::Util</remote-id>
         <remote-id type="cpan">Taint-Util</remote-id>
+        <remote-id type="cpan-module">Taint::Util</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Catalyst/metadata.xml b/dev-perl/Task-Catalyst/metadata.xml
index a3d142f..4ecf69a 100644
--- a/dev-perl/Task-Catalyst/metadata.xml
+++ b/dev-perl/Task-Catalyst/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Task::Catalyst</remote-id>
         <remote-id type="cpan">Task-Catalyst</remote-id>
+        <remote-id type="cpan-module">Task::Catalyst</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Async/metadata.xml b/dev-perl/Task-Kensho-Async/metadata.xml
index 67b9d19..83b10e5 100644
--- a/dev-perl/Task-Kensho-Async/metadata.xml
+++ b/dev-perl/Task-Kensho-Async/metadata.xml
@@ -5,12 +5,12 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="POE">Install POE</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="POE">Install POE</flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Async</remote-id>
         <remote-id type="cpan">Task-Kensho-Async</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Async</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-CLI/metadata.xml b/dev-perl/Task-Kensho-CLI/metadata.xml
index 5849e64..cd85dd5 100644
--- a/dev-perl/Task-Kensho-CLI/metadata.xml
+++ b/dev-perl/Task-Kensho-CLI/metadata.xml
@@ -5,16 +5,16 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="ack">Install <pkg>sys-apps/ack</pkg></flag>
-		<flag name="nopaste">Install <pkg>dev-perl/App-Nopaste</pkg></flag>
-		<flag name="repl">Install <pkg>dev-perl/Devel-REPL</pkg></flag>
-		<flag name="corelist">Install <pkg>virtual/perl-Module-CoreList</pkg></flag>
-		<flag name="perlbrew">Install <pkg>dev-perl/App-perlbrew</pkg></flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="ack">Install <pkg>sys-apps/ack</pkg></flag>
+        <flag name="nopaste">Install <pkg>dev-perl/App-Nopaste</pkg></flag>
+        <flag name="repl">Install <pkg>dev-perl/Devel-REPL</pkg></flag>
+        <flag name="corelist">Install <pkg>virtual/perl-Module-CoreList</pkg></flag>
+        <flag name="perlbrew">Install <pkg>dev-perl/App-perlbrew</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::CLI</remote-id>
         <remote-id type="cpan">Task-Kensho-CLI</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::CLI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Config/metadata.xml b/dev-perl/Task-Kensho-Config/metadata.xml
index ceb6983..8ffb835 100644
--- a/dev-perl/Task-Kensho-Config/metadata.xml
+++ b/dev-perl/Task-Kensho-Config/metadata.xml
@@ -5,13 +5,13 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="config_any">Install <pkg>dev-perl/Config-Any</pkg></flag>
-		<flag name="config_general">Install <pkg>dev-perl/config-general</pkg></flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="config_any">Install <pkg>dev-perl/Config-Any</pkg></flag>
+        <flag name="config_general">Install <pkg>dev-perl/config-general</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Config</remote-id>
         <remote-id type="cpan">Task-Kensho-Config</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Config</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-DBDev/metadata.xml b/dev-perl/Task-Kensho-DBDev/metadata.xml
index e6618f7..132d5e1 100644
--- a/dev-perl/Task-Kensho-DBDev/metadata.xml
+++ b/dev-perl/Task-Kensho-DBDev/metadata.xml
@@ -5,17 +5,17 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="perl-dbi">Install <pkg>dev-perl/DBI</pkg></flag>
-		<flag name="sqlite">Install <pkg>dev-perl/DBI-SQLite</pkg></flag>
-		<flag name="dbixclass">Install <pkg>dev-perl/DBIx-Class</pkg></flag>
-		<flag name="schemaloader">Install
+    </maintainer>
+    <use>
+        <flag name="perl-dbi">Install <pkg>dev-perl/DBI</pkg></flag>
+        <flag name="sqlite">Install <pkg>dev-perl/DBI-SQLite</pkg></flag>
+        <flag name="dbixclass">Install <pkg>dev-perl/DBIx-Class</pkg></flag>
+        <flag name="schemaloader">Install
 			<pkg>dev-perl/DBIx-Class-Schema-Loader</pkg></flag>
-		<flag name="sqlt">Install <pkg>dev-perl/SQL-Translator</pkg></flag>
-	</use>
+        <flag name="sqlt">Install <pkg>dev-perl/SQL-Translator</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::DBDev</remote-id>
         <remote-id type="cpan">Task-Kensho-DBDev</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::DBDev</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Dates/metadata.xml b/dev-perl/Task-Kensho-Dates/metadata.xml
index e6b5e63..f2effd5 100644
--- a/dev-perl/Task-Kensho-Dates/metadata.xml
+++ b/dev-perl/Task-Kensho-Dates/metadata.xml
@@ -5,18 +5,17 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="datetime">Install <pkg>dev-perl/DateTime</pkg></flag>
-		<flag name="datetiny">Install <pkg>dev-perl/Date-Tiny</pkg></flag>
-		<flag name="timetiny">Install <pkg>dev-perl/Time-Tiny</pkg></flag>
-		<flag name="datetimetiny">Install
-			<pkg>dev-perl/DateTime-Tiny</pkg></flag>
-		<flag name="timeparsedate">Install <pkg>dev-perl/Time-modules</pkg>
+    </maintainer>
+    <use>
+        <flag name="datetime">Install <pkg>dev-perl/DateTime</pkg></flag>
+        <flag name="datetiny">Install <pkg>dev-perl/Date-Tiny</pkg></flag>
+        <flag name="timetiny">Install <pkg>dev-perl/Time-Tiny</pkg></flag>
+        <flag name="datetimetiny">Install
+			<pkg>dev-perl/DateTime-Tiny</pkg></flag><flag name="timeparsedate">Install <pkg>dev-perl/Time-modules</pkg>
 			which provides Time::ParseDate</flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Dates</remote-id>
         <remote-id type="cpan">Task-Kensho-Dates</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Dates</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Email/metadata.xml b/dev-perl/Task-Kensho-Email/metadata.xml
index e3636d4..29ac77b 100644
--- a/dev-perl/Task-Kensho-Email/metadata.xml
+++ b/dev-perl/Task-Kensho-Email/metadata.xml
@@ -5,16 +5,16 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="emailsimple">Install <pkg>dev-perl/Email-Simple</pkg></flag>
-		<flag name="emailvalid">Install <pkg>dev-perl/Email-Valid</pkg></flag>
-		<flag name="emailsender">Install <pkg>dev-perl/Email-Sender</pkg></flag>
-		<flag name="emailmimekit">Install
+    </maintainer>
+    <use>
+        <flag name="emailsimple">Install <pkg>dev-perl/Email-Simple</pkg></flag>
+        <flag name="emailvalid">Install <pkg>dev-perl/Email-Valid</pkg></flag>
+        <flag name="emailsender">Install <pkg>dev-perl/Email-Sender</pkg></flag>
+        <flag name="emailmimekit">Install
 			<pkg>dev-perl/Email-MIME-Kit</pkg></flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Email</remote-id>
         <remote-id type="cpan">Task-Kensho-Email</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Email</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-ExcelCSV/metadata.xml b/dev-perl/Task-Kensho-ExcelCSV/metadata.xml
index 9ba3640..222c491 100644
--- a/dev-perl/Task-Kensho-ExcelCSV/metadata.xml
+++ b/dev-perl/Task-Kensho-ExcelCSV/metadata.xml
@@ -5,16 +5,16 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="csv-xs">Install <pkg>dev-perl/Text-CSV_XS</pkg></flag>
-		<flag name="parseexcelsimple">Install
+    </maintainer>
+    <use>
+        <flag name="csv-xs">Install <pkg>dev-perl/Text-CSV_XS</pkg></flag>
+        <flag name="parseexcelsimple">Install
 			<pkg>dev-perl/Spreadsheet-ParseExcel-Simple</pkg></flag>
-		<flag name="writeexcelsimple">Install
+        <flag name="writeexcelsimple">Install
 			<pkg>dev-perl/Spreadsheet-WriteExcel-Simple</pkg></flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::ExcelCSV</remote-id>
         <remote-id type="cpan">Task-Kensho-ExcelCSV</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::ExcelCSV</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Exceptions/metadata.xml b/dev-perl/Task-Kensho-Exceptions/metadata.xml
index d4fc6db..d7215bb 100644
--- a/dev-perl/Task-Kensho-Exceptions/metadata.xml
+++ b/dev-perl/Task-Kensho-Exceptions/metadata.xml
@@ -6,13 +6,13 @@
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
     </maintainer>
-	<use>
-		<flag name="trytiny">Install <pkg>dev-perl/Try-Tiny</pkg></flag>
-		<flag name="trycatch">Install <pkg>dev-perl/TryCatch</pkg></flag>
-		<flag name="autodie">Install <pkg>dev-perl/autodie</pkg></flag>
-	</use>
+    <use>
+        <flag name="trytiny">Install <pkg>dev-perl/Try-Tiny</pkg></flag>
+        <flag name="trycatch">Install <pkg>dev-perl/TryCatch</pkg></flag>
+        <flag name="autodie">Install <pkg>dev-perl/autodie</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Exceptions</remote-id>
         <remote-id type="cpan">Task-Kensho-Exceptions</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Exceptions</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Hackery/metadata.xml b/dev-perl/Task-Kensho-Hackery/metadata.xml
index f15d126..9c4be90 100644
--- a/dev-perl/Task-Kensho-Hackery/metadata.xml
+++ b/dev-perl/Task-Kensho-Hackery/metadata.xml
@@ -5,16 +5,16 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="smartcomments">Install
+    </maintainer>
+    <use>
+        <flag name="smartcomments">Install
 			<pkg>dev-perl/Smart-Comments</pkg></flag>
-		<flag name="progressbarsimple">Install
+        <flag name="progressbarsimple">Install
 			<pkg>dev-perl/Term-ProgressBar-Simple</pkg></flag>
-		<flag name="ioall">Install <pkg>dev-perl/IO-All</pkg></flag>
-	</use>
+        <flag name="ioall">Install <pkg>dev-perl/IO-All</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Hackery</remote-id>
         <remote-id type="cpan">Task-Kensho-Hackery</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Hackery</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Logging/metadata.xml b/dev-perl/Task-Kensho-Logging/metadata.xml
index 52431aa..ccfd80b 100644
--- a/dev-perl/Task-Kensho-Logging/metadata.xml
+++ b/dev-perl/Task-Kensho-Logging/metadata.xml
@@ -5,15 +5,15 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="logdispatch">Install <pkg>dev-perl/log-dispatch</pkg></flag>
-		<flag name="log4perl">Install <pkg>dev-perl/Log-Log4perl</pkg></flag>
-		<flag name="logcontextual">Install
+    </maintainer>
+    <use>
+        <flag name="logdispatch">Install <pkg>dev-perl/log-dispatch</pkg></flag>
+        <flag name="log4perl">Install <pkg>dev-perl/Log-Log4perl</pkg></flag>
+        <flag name="logcontextual">Install
 			<pkg>dev-perl/Log-Contextual</pkg></flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Logging</remote-id>
         <remote-id type="cpan">Task-Kensho-Logging</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Logging</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-ModuleDev/metadata.xml b/dev-perl/Task-Kensho-ModuleDev/metadata.xml
index 0f23001..209c15b 100644
--- a/dev-perl/Task-Kensho-ModuleDev/metadata.xml
+++ b/dev-perl/Task-Kensho-ModuleDev/metadata.xml
@@ -5,25 +5,25 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="dzil">Install <pkg>dev-perl/Dist-Zilla</pkg></flag>
-		<flag name="moduleinstall">Install
+    </maintainer>
+    <use>
+        <flag name="dzil">Install <pkg>dev-perl/Dist-Zilla</pkg></flag>
+        <flag name="moduleinstall">Install
 			<pkg>dev-perl/Module-Install</pkg></flag>
-		<flag name="nytprof">Install <pkg>dev-perl/Devel-NYTProf</pkg></flag>
-		<flag name="perltidy">Install <pkg>dev-perl/perltidy</pkg></flag>
-		<flag name="perlcritic">Install <pkg>dev-perl/Perl-Critic</pkg></flag>
-		<flag name="carpalways">Install <pkg>dev-perl/Carp-Always</pkg></flag>
-		<flag name="modernperl">Install <pkg>dev-perl/Modern-Perl</pkg></flag>
-		<flag name="perlversion">Install <pkg>dev-perl/Perl-Version</pkg></flag>
-		<flag name="softwarelicense">Install
+        <flag name="nytprof">Install <pkg>dev-perl/Devel-NYTProf</pkg></flag>
+        <flag name="perltidy">Install <pkg>dev-perl/perltidy</pkg></flag>
+        <flag name="perlcritic">Install <pkg>dev-perl/Perl-Critic</pkg></flag>
+        <flag name="carpalways">Install <pkg>dev-perl/Carp-Always</pkg></flag>
+        <flag name="modernperl">Install <pkg>dev-perl/Modern-Perl</pkg></flag>
+        <flag name="perlversion">Install <pkg>dev-perl/Perl-Version</pkg></flag>
+        <flag name="softwarelicense">Install
 			<pkg>dev-perl/Software-License</pkg></flag>
-		<flag name="podreadme">Install <pkg>dev-perl/Pod-Readme</pkg></flag>
-		<flag name="cpanuploader">Install
+        <flag name="podreadme">Install <pkg>dev-perl/Pod-Readme</pkg></flag>
+        <flag name="cpanuploader">Install
 			<pkg>dev-perl/CAPN-Uploader</pkg></flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::ModuleDev</remote-id>
         <remote-id type="cpan">Task-Kensho-ModuleDev</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::ModuleDev</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-OOP/metadata.xml b/dev-perl/Task-Kensho-OOP/metadata.xml
index 621d1fb..9e337d9 100644
--- a/dev-perl/Task-Kensho-OOP/metadata.xml
+++ b/dev-perl/Task-Kensho-OOP/metadata.xml
@@ -5,13 +5,13 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="moose">Install Moose and friends via
+    </maintainer>
+    <use>
+        <flag name="moose">Install Moose and friends via
 			<pkg>dev-perl/Task-Moose</pkg></flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::OOP</remote-id>
         <remote-id type="cpan">Task-Kensho-OOP</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::OOP</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Scalability/metadata.xml b/dev-perl/Task-Kensho-Scalability/metadata.xml
index 60f3a7d..ac9bc77 100644
--- a/dev-perl/Task-Kensho-Scalability/metadata.xml
+++ b/dev-perl/Task-Kensho-Scalability/metadata.xml
@@ -5,12 +5,12 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="chi">Install <pkg>dev-perl/CHI</pkg></flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="chi">Install <pkg>dev-perl/CHI</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Scalability</remote-id>
         <remote-id type="cpan">Task-Kensho-Scalability</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Scalability</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Testing/metadata.xml b/dev-perl/Task-Kensho-Testing/metadata.xml
index da05782..31ac4d6 100644
--- a/dev-perl/Task-Kensho-Testing/metadata.xml
+++ b/dev-perl/Task-Kensho-Testing/metadata.xml
@@ -5,22 +5,22 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="testsimple">Install Test::Simple/Test::More via
+    </maintainer>
+    <use>
+        <flag name="testsimple">Install Test::Simple/Test::More via
 			<pkg>virtual/perl-Test-Simple</pkg></flag>
-		<flag name="testmost">Install <pkg>dev-perl/Test-Most</pkg></flag>
-		<flag name="testexception">Install
+        <flag name="testmost">Install <pkg>dev-perl/Test-Most</pkg></flag>
+        <flag name="testexception">Install
 			<pkg>dev-perl/Test-Exception</pkg></flag>
-		<flag name="testpod">Install <pkg>dev-perl/Test-Pod</pkg></flag>
-		<flag name="testpodcoverage">Install
+        <flag name="testpod">Install <pkg>dev-perl/Test-Pod</pkg></flag>
+        <flag name="testpodcoverage">Install
 			<pkg>dev-perl/Test-Pod-Coverage</pkg></flag>
-		<flag name="testmemorycycle">Install
+        <flag name="testmemorycycle">Install
 			<pkg>dev-perl/Test-Memory-Cycle</pkg></flag>
-		<flag name="develcover">Install <pkg>dev-perl/Devel-Cover</pkg></flag>
-	</use>
+        <flag name="develcover">Install <pkg>dev-perl/Devel-Cover</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Testing</remote-id>
         <remote-id type="cpan">Task-Kensho-Testing</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Testing</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-Toolchain/metadata.xml b/dev-perl/Task-Kensho-Toolchain/metadata.xml
index 4f8acd1..5b09d26 100644
--- a/dev-perl/Task-Kensho-Toolchain/metadata.xml
+++ b/dev-perl/Task-Kensho-Toolchain/metadata.xml
@@ -5,15 +5,15 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="cpanm">Install <pkg>dev-perl/App-cpanminus</pkg></flag>
-		<flag name="locallib">Install <pkg>dev-perl/local-lib</pkg></flag>
-		<flag name="version">Install version.pm via
+    </maintainer>
+    <use>
+        <flag name="cpanm">Install <pkg>dev-perl/App-cpanminus</pkg></flag>
+        <flag name="locallib">Install <pkg>dev-perl/local-lib</pkg></flag>
+        <flag name="version">Install version.pm via
 			<pkg>virutal/perl-version</pkg></flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::Toolchain</remote-id>
         <remote-id type="cpan">Task-Kensho-Toolchain</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::Toolchain</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-WebCrawling/metadata.xml b/dev-perl/Task-Kensho-WebCrawling/metadata.xml
index 990ede2..1b9b7a0 100644
--- a/dev-perl/Task-Kensho-WebCrawling/metadata.xml
+++ b/dev-perl/Task-Kensho-WebCrawling/metadata.xml
@@ -5,17 +5,17 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="httplite">Install <pkg>dev-perl/HTTP-Lite</pkg></flag>
-		<flag name="lwp">Install LWP::* from
+    </maintainer>
+    <use>
+        <flag name="httplite">Install <pkg>dev-perl/HTTP-Lite</pkg></flag>
+        <flag name="lwp">Install LWP::* from
 			<pkg>dev-perl/libwww-perl</pkg></flag>
-		<flag name="wwwmech">Install <pkg>dev-perl/WWW-Mechanize</pkg></flag>
-		<flag name="wwwmechtreebuilder">Install
+        <flag name="wwwmech">Install <pkg>dev-perl/WWW-Mechanize</pkg></flag>
+        <flag name="wwwmechtreebuilder">Install
 			<pkg>dev-perl/WWW-Mechanize-TreeBuilder</pkg></flag>
-	</use>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::WebCrawling</remote-id>
         <remote-id type="cpan">Task-Kensho-WebCrawling</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::WebCrawling</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-WebDev/metadata.xml b/dev-perl/Task-Kensho-WebDev/metadata.xml
index 74508ea..30e2c6c 100644
--- a/dev-perl/Task-Kensho-WebDev/metadata.xml
+++ b/dev-perl/Task-Kensho-WebDev/metadata.xml
@@ -5,21 +5,19 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="catalyst">Install Catalyst and friends via
-			<pkg>dev-perl/Task-Catalyst</pkg></flag>
-		<flag name="tt">Install Template Toolkit (
+    </maintainer>
+    <use>
+        <flag name="catalyst">Install Catalyst and friends via
+			<pkg>dev-perl/Task-Catalyst</pkg></flag><flag name="tt">Install Template Toolkit (
 			<pkg>dev-perl/Template-Toolkit</pkg>)</flag>
-		<flag name="cgi-formbuilder-perlconfig">Install
-			<pkg>dev-perl/CGI-FormBuilder-Source-Perl</pkg>
-		</flag>
-		<flag name="xmlrss">Install <pkg>dev-perl/XML-RSS</pkg></flag>
-		<flag name="xmlatom">Install <pkg>dev-perl/XML-Atom</pkg></flag>
-		<flag name="mimetypes">Install <pkg>dev-perl/MIME-Types</pkg></flag>
-	</use>
+        <flag name="cgi-formbuilder-perlconfig">Install
+			<pkg>dev-perl/CGI-FormBuilder-Source-Perl</pkg></flag>
+        <flag name="xmlrss">Install <pkg>dev-perl/XML-RSS</pkg></flag>
+        <flag name="xmlatom">Install <pkg>dev-perl/XML-Atom</pkg></flag>
+        <flag name="mimetypes">Install <pkg>dev-perl/MIME-Types</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::WebDev</remote-id>
         <remote-id type="cpan">Task-Kensho-WebDev</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::WebDev</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho-XML/metadata.xml b/dev-perl/Task-Kensho-XML/metadata.xml
index 350fcf0..7d08ee6 100644
--- a/dev-perl/Task-Kensho-XML/metadata.xml
+++ b/dev-perl/Task-Kensho-XML/metadata.xml
@@ -5,17 +5,17 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="libxml">Install <pkg>dev-perl/XML-LibXML</pkg></flag>
-		<flag name="libxslt">Install <pkg>dev-perl/XML-LibXSLT</pkg></flag>
-		<flag name="sax">Install <pkg>dev-perl/XML-SAX</pkg></flag>
-		<flag name="xmlgeneratorperldata">Install
+    </maintainer>
+    <use>
+        <flag name="libxml">Install <pkg>dev-perl/XML-LibXML</pkg></flag>
+        <flag name="libxslt">Install <pkg>dev-perl/XML-LibXSLT</pkg></flag>
+        <flag name="sax">Install <pkg>dev-perl/XML-SAX</pkg></flag>
+        <flag name="xmlgeneratorperldata">Install
 			<pkg>dev-perl/XML-Generator-PerlData</pkg></flag>
-		<flag name="saxwriter">Install <pkg>dev-perl/XML-SAX-Writer</pkg></flag>
-	</use>
+        <flag name="saxwriter">Install <pkg>dev-perl/XML-SAX-Writer</pkg></flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho::XML</remote-id>
         <remote-id type="cpan">Task-Kensho-XML</remote-id>
+        <remote-id type="cpan-module">Task::Kensho::XML</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Kensho/metadata.xml b/dev-perl/Task-Kensho/metadata.xml
index 37cfd35..fce7d0d 100644
--- a/dev-perl/Task-Kensho/metadata.xml
+++ b/dev-perl/Task-Kensho/metadata.xml
@@ -6,28 +6,28 @@
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
     </maintainer>
-	<use>
-		<flag name="basic-toolchain">Basic Toolchain</flag>
-		<flag name="exceptions">Exception Handling</flag>
-		<flag name="testing">Testing</flag>
-		<flag name="oop">Object Oriented Programming</flag>
-		<flag name="async">Asynchronous Programming</flag>
-		<flag name="webdev">Web Development</flag>
-		<flag name="db">Database Development</flag>
-		<flag name="crawl">Web Crawling</flag>
-		<flag name="module-devel">Module Development</flag>
-		<flag name="date">Date Modules</flag>
-		<flag name="config">Config Modules</flag>
-		<flag name="cli">Useful Command-line Tools</flag>
-		<flag name="scripting">Script Hackery</flag>
-		<flag name="xml">XML Processing</flag>
-		<flag name="spreadsheet">Excel/CSV Spreadsheet Tools</flag>
-		<flag name="email">Email Tools</flag>
-		<flag name="scalability">Scalarbility Tools</flag>
-		<flag name="logging">Logging Tools</flag>
-	</use>
+    <use>
+        <flag name="basic-toolchain">Basic Toolchain</flag>
+        <flag name="exceptions">Exception Handling</flag>
+        <flag name="testing">Testing</flag>
+        <flag name="oop">Object Oriented Programming</flag>
+        <flag name="async">Asynchronous Programming</flag>
+        <flag name="webdev">Web Development</flag>
+        <flag name="db">Database Development</flag>
+        <flag name="crawl">Web Crawling</flag>
+        <flag name="module-devel">Module Development</flag>
+        <flag name="date">Date Modules</flag>
+        <flag name="config">Config Modules</flag>
+        <flag name="cli">Useful Command-line Tools</flag>
+        <flag name="scripting">Script Hackery</flag>
+        <flag name="xml">XML Processing</flag>
+        <flag name="spreadsheet">Excel/CSV Spreadsheet Tools</flag>
+        <flag name="email">Email Tools</flag>
+        <flag name="scalability">Scalarbility Tools</flag>
+        <flag name="logging">Logging Tools</flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Kensho</remote-id>
         <remote-id type="cpan">Task-Kensho</remote-id>
+        <remote-id type="cpan-module">Task::Kensho</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Task-Moose/metadata.xml b/dev-perl/Task-Moose/metadata.xml
index 0608840..367920e 100644
--- a/dev-perl/Task-Moose/metadata.xml
+++ b/dev-perl/Task-Moose/metadata.xml
@@ -5,28 +5,28 @@
     <maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
-	</maintainer>
-	<use>
-		<flag name="strict">Install packages that can make Moose stricter</flag>
-		<flag name="traits">Install packages that facilitate working with
+    </maintainer>
+    <use>
+        <flag name="strict">Install packages that can make Moose stricter</flag>
+        <flag name="traits">Install packages that facilitate working with
 			Moose Roles/Types</flag>
-		<flag name="instancetype">Install packages that provide Instance types
+        <flag name="instancetype">Install packages that provide Instance types
 			for Moose.</flag>
-		<flag name="declare">Install packages that provide Devel::Declare based
+        <flag name="declare">Install packages that provide Devel::Declare based
 			declarative syntax.</flag>
-		<flag name="types">Install various Moose Type extensions</flag>
-		<flag name="cli">Install Moose libraries that assist with Command Line
+        <flag name="types">Install various Moose Type extensions</flag>
+        <flag name="cli">Install Moose libraries that assist with Command Line
 			Integration</flag>
-		<flag name="logging">Install Moose logging libraries</flag>
-		<flag name="async">Install libraries for working with Moose
+        <flag name="logging">Install Moose logging libraries</flag>
+        <flag name="async">Install libraries for working with Moose
 			Asynchronously</flag>
-		<flag name="utilroles">Install various utility roles for Moose</flag>
-		<flag name="other">Install other tools that are helpful with working
+        <flag name="utilroles">Install various utility roles for Moose</flag>
+        <flag name="other">Install other tools that are helpful with working
 			with Moose</flag>
-		<flag name="utils">Install utilities for working with Moose</flag>
-	</use>
+        <flag name="utils">Install utilities for working with Moose</flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Task::Moose</remote-id>
         <remote-id type="cpan">Task-Moose</remote-id>
+        <remote-id type="cpan-module">Task::Moose</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tee/metadata.xml b/dev-perl/Tee/metadata.xml
index f8b4cc4..7b81779 100644
--- a/dev-perl/Tee/metadata.xml
+++ b/dev-perl/Tee/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Tee</remote-id>
         <remote-id type="cpan-module">Tee</remote-id>
         <remote-id type="cpan-module">Tee::App</remote-id>
-        <remote-id type="cpan">Tee</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Alloy/metadata.xml b/dev-perl/Template-Alloy/metadata.xml
index f7c61e6..19f7f59 100644
--- a/dev-perl/Template-Alloy/metadata.xml
+++ b/dev-perl/Template-Alloy/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Template-Alloy</remote-id>
         <remote-id type="cpan-module">Template::Alloy</remote-id>
         <remote-id type="cpan-module">Template::Alloy::Compile</remote-id>
         <remote-id type="cpan-module">Template::Alloy::Context</remote-id>
@@ -24,6 +25,5 @@
         <remote-id type="cpan-module">Template::Alloy::VMethod</remote-id>
         <remote-id type="cpan-module">Template::Alloy::Velocity</remote-id>
         <remote-id type="cpan-module">Template::Alloy::_ContextStash</remote-id>
-        <remote-id type="cpan">Template-Alloy</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Plugin-CSV-Escape/metadata.xml b/dev-perl/Template-Plugin-CSV-Escape/metadata.xml
index 7eadc68..818da5f 100644
--- a/dev-perl/Template-Plugin-CSV-Escape/metadata.xml
+++ b/dev-perl/Template-Plugin-CSV-Escape/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Template::Plugin::CSV::Escape</remote-id>
         <remote-id type="cpan">Template-Plugin-CSV-Escape</remote-id>
+        <remote-id type="cpan-module">Template::Plugin::CSV::Escape</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Plugin-Class/metadata.xml b/dev-perl/Template-Plugin-Class/metadata.xml
index 5569b57..92201e0 100644
--- a/dev-perl/Template-Plugin-Class/metadata.xml
+++ b/dev-perl/Template-Plugin-Class/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Template-Plugin-Class</remote-id>
         <remote-id type="cpan-module">Template::Plugin::Class</remote-id>
         <remote-id type="cpan-module">Template::Plugin::Class::Proxy</remote-id>
-        <remote-id type="cpan">Template-Plugin-Class</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Plugin-Cycle/metadata.xml b/dev-perl/Template-Plugin-Cycle/metadata.xml
index ecf2230..81c54da 100644
--- a/dev-perl/Template-Plugin-Cycle/metadata.xml
+++ b/dev-perl/Template-Plugin-Cycle/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Template::Plugin::Cycle</remote-id>
                 <remote-id type="cpan">Template-Plugin-Cycle</remote-id>
+                <remote-id type="cpan-module">Template::Plugin::Cycle</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Plugin-HTML-Strip/metadata.xml b/dev-perl/Template-Plugin-HTML-Strip/metadata.xml
index a57cc30..057dad3 100644
--- a/dev-perl/Template-Plugin-HTML-Strip/metadata.xml
+++ b/dev-perl/Template-Plugin-HTML-Strip/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Template::Plugin::HTML::Strip</remote-id>
         <remote-id type="cpan">Template-Plugin-HTML-Strip</remote-id>
+        <remote-id type="cpan-module">Template::Plugin::HTML::Strip</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Plugin-JSON/metadata.xml b/dev-perl/Template-Plugin-JSON/metadata.xml
index 2e3f7f7..81cc221 100644
--- a/dev-perl/Template-Plugin-JSON/metadata.xml
+++ b/dev-perl/Template-Plugin-JSON/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Template::Plugin::JSON</remote-id>
         <remote-id type="cpan">Template-Plugin-JSON</remote-id>
+        <remote-id type="cpan-module">Template::Plugin::JSON</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Plugin-JavaScript/metadata.xml b/dev-perl/Template-Plugin-JavaScript/metadata.xml
index 4ce2dc2..15d3dba 100644
--- a/dev-perl/Template-Plugin-JavaScript/metadata.xml
+++ b/dev-perl/Template-Plugin-JavaScript/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Template::Plugin::JavaScript</remote-id>
         <remote-id type="cpan">Template-Plugin-JavaScript</remote-id>
+        <remote-id type="cpan-module">Template::Plugin::JavaScript</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Plugin-Textile2/metadata.xml b/dev-perl/Template-Plugin-Textile2/metadata.xml
index 494ec49..dd72860 100644
--- a/dev-perl/Template-Plugin-Textile2/metadata.xml
+++ b/dev-perl/Template-Plugin-Textile2/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Template::Plugin::Textile2</remote-id>
         <remote-id type="cpan">Template-Plugin-Textile2</remote-id>
+        <remote-id type="cpan-module">Template::Plugin::Textile2</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Plugin-UTF8Decode/metadata.xml b/dev-perl/Template-Plugin-UTF8Decode/metadata.xml
index 8412e5f..3f38d22 100644
--- a/dev-perl/Template-Plugin-UTF8Decode/metadata.xml
+++ b/dev-perl/Template-Plugin-UTF8Decode/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Template::Plugin::UTF8Decode</remote-id>
         <remote-id type="cpan">Template-Plugin-UTF8Decode</remote-id>
+        <remote-id type="cpan-module">Template::Plugin::UTF8Decode</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Provider-DBIC/metadata.xml b/dev-perl/Template-Provider-DBIC/metadata.xml
index 4cbe4e6..7e8a172 100644
--- a/dev-perl/Template-Provider-DBIC/metadata.xml
+++ b/dev-perl/Template-Provider-DBIC/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Template::Provider::DBIC</remote-id>
         <remote-id type="cpan">Template-Provider-DBIC</remote-id>
+        <remote-id type="cpan-module">Template::Provider::DBIC</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Provider-Encoding/metadata.xml b/dev-perl/Template-Provider-Encoding/metadata.xml
index bc36e99..b7b6cdd 100644
--- a/dev-perl/Template-Provider-Encoding/metadata.xml
+++ b/dev-perl/Template-Provider-Encoding/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Template-Provider-Encoding</remote-id>
                 <remote-id type="cpan-module">Template::Plugin::encoding</remote-id>
                 <remote-id type="cpan-module">Template::Provider::Encoding</remote-id>
                 <remote-id type="cpan-module">Template::Stash::ForceUTF8</remote-id>
-                <remote-id type="cpan">Template-Provider-Encoding</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Template-Timer/metadata.xml b/dev-perl/Template-Timer/metadata.xml
index 4f47a49..534bdc7 100644
--- a/dev-perl/Template-Timer/metadata.xml
+++ b/dev-perl/Template-Timer/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Template::Timer</remote-id>
         <remote-id type="cpan">Template-Timer</remote-id>
+        <remote-id type="cpan-module">Template::Timer</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tenjin/metadata.xml b/dev-perl/Tenjin/metadata.xml
index 23487db..ed1323b 100644
--- a/dev-perl/Tenjin/metadata.xml
+++ b/dev-perl/Tenjin/metadata.xml
@@ -7,11 +7,11 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Tenjin</remote-id>
         <remote-id type="cpan-module">Tenjin</remote-id>
         <remote-id type="cpan-module">Tenjin::Context</remote-id>
         <remote-id type="cpan-module">Tenjin::Preprocessor</remote-id>
         <remote-id type="cpan-module">Tenjin::Template</remote-id>
         <remote-id type="cpan-module">Tenjin::Util</remote-id>
-        <remote-id type="cpan">Tenjin</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Term-ProgressBar-Quiet/metadata.xml b/dev-perl/Term-ProgressBar-Quiet/metadata.xml
index 54bbace..dfb287c 100644
--- a/dev-perl/Term-ProgressBar-Quiet/metadata.xml
+++ b/dev-perl/Term-ProgressBar-Quiet/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Term::ProgressBar::Quiet</remote-id>
         <remote-id type="cpan">Term-ProgressBar-Quiet</remote-id>
+        <remote-id type="cpan-module">Term::ProgressBar::Quiet</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Term-ProgressBar-Simple/metadata.xml b/dev-perl/Term-ProgressBar-Simple/metadata.xml
index 8503800..ca2ef87 100644
--- a/dev-perl/Term-ProgressBar-Simple/metadata.xml
+++ b/dev-perl/Term-ProgressBar-Simple/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Term::ProgressBar::Simple</remote-id>
         <remote-id type="cpan">Term-ProgressBar-Simple</remote-id>
+        <remote-id type="cpan-module">Term::ProgressBar::Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Term-Prompt/metadata.xml b/dev-perl/Term-Prompt/metadata.xml
index b799d14..b5e51ea 100644
--- a/dev-perl/Term-Prompt/metadata.xml
+++ b/dev-perl/Term-Prompt/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Term::Prompt</remote-id>
         <remote-id type="cpan">Term-Prompt</remote-id>
+        <remote-id type="cpan-module">Term::Prompt</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Term-Size/metadata.xml b/dev-perl/Term-Size/metadata.xml
index dfd236a..42dd13f 100644
--- a/dev-perl/Term-Size/metadata.xml
+++ b/dev-perl/Term-Size/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Term::Size</remote-id>
                 <remote-id type="cpan">Term-Size</remote-id>
+                <remote-id type="cpan-module">Term::Size</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Assertions/metadata.xml b/dev-perl/Test-Assertions/metadata.xml
index 05e2725..796ccf0 100644
--- a/dev-perl/Test-Assertions/metadata.xml
+++ b/dev-perl/Test-Assertions/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Test-Assertions</remote-id>
                 <remote-id type="cpan-module">Test::Assertions</remote-id>
                 <remote-id type="cpan-module">Test::Assertions::TestScript</remote-id>
-                <remote-id type="cpan">Test-Assertions</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Block/metadata.xml b/dev-perl/Test-Block/metadata.xml
index d5d39b5..6095074 100644
--- a/dev-perl/Test-Block/metadata.xml
+++ b/dev-perl/Test-Block/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Test-Block</remote-id>
                 <remote-id type="cpan-module">Test::Block</remote-id>
                 <remote-id type="cpan-module">Test::Block::Plan</remote-id>
-                <remote-id type="cpan">Test-Block</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-CPAN-Meta-YAML/metadata.xml b/dev-perl/Test-CPAN-Meta-YAML/metadata.xml
index e5ccf94..69ab431 100644
--- a/dev-perl/Test-CPAN-Meta-YAML/metadata.xml
+++ b/dev-perl/Test-CPAN-Meta-YAML/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Test-CPAN-Meta-YAML</remote-id>
         <remote-id type="cpan-module">Test::CPAN::Meta::YAML</remote-id>
         <remote-id type="cpan-module">Test::CPAN::Meta::YAML::Version</remote-id>
-        <remote-id type="cpan">Test-CPAN-Meta-YAML</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-CPAN-Meta/metadata.xml b/dev-perl/Test-CPAN-Meta/metadata.xml
index 5c1d6ee..d51636e 100644
--- a/dev-perl/Test-CPAN-Meta/metadata.xml
+++ b/dev-perl/Test-CPAN-Meta/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Test-CPAN-Meta</remote-id>
         <remote-id type="cpan-module">Test::CPAN::Meta</remote-id>
         <remote-id type="cpan-module">Test::CPAN::Meta::Version</remote-id>
-        <remote-id type="cpan">Test-CPAN-Meta</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Test-CheckDeps/metadata.xml b/dev-perl/Test-CheckDeps/metadata.xml
index 061cde2..4745f4c 100644
--- a/dev-perl/Test-CheckDeps/metadata.xml
+++ b/dev-perl/Test-CheckDeps/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Test::CheckDeps</remote-id>
 		<remote-id type="cpan">Test-CheckDeps</remote-id>
+		<remote-id type="cpan-module">Test::CheckDeps</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Class-Most/metadata.xml b/dev-perl/Test-Class-Most/metadata.xml
index 5a3b2d8..d2efc28 100644
--- a/dev-perl/Test-Class-Most/metadata.xml
+++ b/dev-perl/Test-Class-Most/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Test::Class::Most</remote-id>
                 <remote-id type="cpan">Test-Class-Most</remote-id>
+                <remote-id type="cpan-module">Test::Class::Most</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Compile/metadata.xml b/dev-perl/Test-Compile/metadata.xml
index e98b635..c43cd4e 100644
--- a/dev-perl/Test-Compile/metadata.xml
+++ b/dev-perl/Test-Compile/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Test::Compile</remote-id>
                 <remote-id type="cpan">Test-Compile</remote-id>
+                <remote-id type="cpan-module">Test::Compile</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Corpus-Audio-MPD/metadata.xml b/dev-perl/Test-Corpus-Audio-MPD/metadata.xml
index edde728..1f6adde 100644
--- a/dev-perl/Test-Corpus-Audio-MPD/metadata.xml
+++ b/dev-perl/Test-Corpus-Audio-MPD/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::Corpus::Audio::MPD</remote-id>
         <remote-id type="cpan">Test-Corpus-Audio-MPD</remote-id>
+        <remote-id type="cpan-module">Test::Corpus::Audio::MPD</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-EOL/metadata.xml b/dev-perl/Test-EOL/metadata.xml
index 2bee5e0..a317696 100644
--- a/dev-perl/Test-EOL/metadata.xml
+++ b/dev-perl/Test-EOL/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::EOL</remote-id>
         <remote-id type="cpan">Test-EOL</remote-id>
+        <remote-id type="cpan-module">Test::EOL</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Expect/metadata.xml b/dev-perl/Test-Expect/metadata.xml
index 6f971cc..d41e21a 100644
--- a/dev-perl/Test-Expect/metadata.xml
+++ b/dev-perl/Test-Expect/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::Expect</remote-id>
         <remote-id type="cpan">Test-Expect</remote-id>
+        <remote-id type="cpan-module">Test::Expect</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-File-ShareDir/metadata.xml b/dev-perl/Test-File-ShareDir/metadata.xml
index 87b1414..f8ec919 100644
--- a/dev-perl/Test-File-ShareDir/metadata.xml
+++ b/dev-perl/Test-File-ShareDir/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Test-File-ShareDir</remote-id>
         <remote-id type="cpan-module">Test::File::ShareDir</remote-id>
         <remote-id type="cpan-module">Test::File::ShareDir::TempDirObject</remote-id>
-        <remote-id type="cpan">Test-File-ShareDir</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-InDistDir/metadata.xml b/dev-perl/Test-InDistDir/metadata.xml
index f4f75d7..b8e66d7 100644
--- a/dev-perl/Test-InDistDir/metadata.xml
+++ b/dev-perl/Test-InDistDir/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::InDistDir</remote-id>
         <remote-id type="cpan">Test-InDistDir</remote-id>
+        <remote-id type="cpan-module">Test::InDistDir</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-JSON/metadata.xml b/dev-perl/Test-JSON/metadata.xml
index 8bd2d82..b70cb19 100644
--- a/dev-perl/Test-JSON/metadata.xml
+++ b/dev-perl/Test-JSON/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::JSON</remote-id>
         <remote-id type="cpan">Test-JSON</remote-id>
+        <remote-id type="cpan-module">Test::JSON</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Kwalitee/metadata.xml b/dev-perl/Test-Kwalitee/metadata.xml
index d557ee9..d45c42f 100644
--- a/dev-perl/Test-Kwalitee/metadata.xml
+++ b/dev-perl/Test-Kwalitee/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::Kwalitee</remote-id>
         <remote-id type="cpan">Test-Kwalitee</remote-id>
+        <remote-id type="cpan-module">Test::Kwalitee</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Lazy/metadata.xml b/dev-perl/Test-Lazy/metadata.xml
index beff21d..09f62c2 100644
--- a/dev-perl/Test-Lazy/metadata.xml
+++ b/dev-perl/Test-Lazy/metadata.xml
@@ -7,9 +7,9 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Test-Lazy</remote-id>
         <remote-id type="cpan-module">Test::Lazy</remote-id>
         <remote-id type="cpan-module">Test::Lazy::Template</remote-id>
         <remote-id type="cpan-module">Test::Lazy::Tester</remote-id>
-        <remote-id type="cpan">Test-Lazy</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-LeakTrace/metadata.xml b/dev-perl/Test-LeakTrace/metadata.xml
index c986f26..4fdf6f9 100644
--- a/dev-perl/Test-LeakTrace/metadata.xml
+++ b/dev-perl/Test-LeakTrace/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Test-LeakTrace</remote-id>
         <remote-id type="cpan-module">Test::LeakTrace</remote-id>
         <remote-id type="cpan-module">Test::LeakTrace::Script</remote-id>
-        <remote-id type="cpan">Test-LeakTrace</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Log-Dispatch/metadata.xml b/dev-perl/Test-Log-Dispatch/metadata.xml
index ab764d7..8e44c78 100644
--- a/dev-perl/Test-Log-Dispatch/metadata.xml
+++ b/dev-perl/Test-Log-Dispatch/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::Log::Dispatch</remote-id>
         <remote-id type="cpan">Test-Log-Dispatch</remote-id>
+        <remote-id type="cpan-module">Test::Log::Dispatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-MinimumVersion/metadata.xml b/dev-perl/Test-MinimumVersion/metadata.xml
index 40d803e..2d417d8 100644
--- a/dev-perl/Test-MinimumVersion/metadata.xml
+++ b/dev-perl/Test-MinimumVersion/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::MinimumVersion</remote-id>
         <remote-id type="cpan">Test-MinimumVersion</remote-id>
+        <remote-id type="cpan-module">Test::MinimumVersion</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Mock-LWP/metadata.xml b/dev-perl/Test-Mock-LWP/metadata.xml
index 65b885e..535c0fc 100644
--- a/dev-perl/Test-Mock-LWP/metadata.xml
+++ b/dev-perl/Test-Mock-LWP/metadata.xml
@@ -7,6 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Test-Mock-LWP</remote-id>
         <remote-id type="cpan-module">HTTP::Request</remote-id>
         <remote-id type="cpan-module">HTTP::Response</remote-id>
         <remote-id type="cpan-module">LWP::UserAgent</remote-id>
@@ -14,6 +15,5 @@
         <remote-id type="cpan-module">Test::Mock::HTTP::Response</remote-id>
         <remote-id type="cpan-module">Test::Mock::LWP</remote-id>
         <remote-id type="cpan-module">Test::Mock::LWP::UserAgent</remote-id>
-        <remote-id type="cpan">Test-Mock-LWP</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-MockModule/metadata.xml b/dev-perl/Test-MockModule/metadata.xml
index 95a9230..c4a08a9 100644
--- a/dev-perl/Test-MockModule/metadata.xml
+++ b/dev-perl/Test-MockModule/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Test::MockModule</remote-id>
 		<remote-id type="cpan">Test-MockModule</remote-id>
+		<remote-id type="cpan-module">Test::MockModule</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Regression/metadata.xml b/dev-perl/Test-Regression/metadata.xml
index e1b7854..637ed49 100644
--- a/dev-perl/Test-Regression/metadata.xml
+++ b/dev-perl/Test-Regression/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::Regression</remote-id>
         <remote-id type="cpan">Test-Regression</remote-id>
+        <remote-id type="cpan-module">Test::Regression</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Reporter/metadata.xml b/dev-perl/Test-Reporter/metadata.xml
index e753097..284e672 100644
--- a/dev-perl/Test-Reporter/metadata.xml
+++ b/dev-perl/Test-Reporter/metadata.xml
@@ -7,10 +7,10 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Test-Reporter</remote-id>
         <remote-id type="cpan-module">Test::Reporter</remote-id>
         <remote-id type="cpan-module">Test::Reporter::Transport</remote-id>
         <remote-id type="cpan-module">Test::Reporter::Transport::File</remote-id>
         <remote-id type="cpan-module">Test::Reporter::Transport::Null</remote-id>
-        <remote-id type="cpan">Test-Reporter</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Spec/metadata.xml b/dev-perl/Test-Spec/metadata.xml
index db0d8de..0e912d9 100644
--- a/dev-perl/Test-Spec/metadata.xml
+++ b/dev-perl/Test-Spec/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Test-Spec</remote-id>
                 <remote-id type="cpan-module">Test::Spec</remote-id>
                 <remote-id type="cpan-module">Test::Spec::Context</remote-id>
                 <remote-id type="cpan-module">Test::Spec::ExportProxy</remote-id>
@@ -11,6 +12,5 @@
                 <remote-id type="cpan-module">Test::Spec::Mocks::MockObject</remote-id>
                 <remote-id type="cpan-module">Test::Spec::Mocks::Stub</remote-id>
                 <remote-id type="cpan-module">Test::Spec::SharedHash</remote-id>
-                <remote-id type="cpan">Test-Spec</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Strict/metadata.xml b/dev-perl/Test-Strict/metadata.xml
index 92f93b5..64cce4a 100644
--- a/dev-perl/Test-Strict/metadata.xml
+++ b/dev-perl/Test-Strict/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Test::Strict</remote-id>
                 <remote-id type="cpan">Test-Strict</remote-id>
+                <remote-id type="cpan-module">Test::Strict</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-TempDir/metadata.xml b/dev-perl/Test-TempDir/metadata.xml
index 8d1a1e1..a03396d 100644
--- a/dev-perl/Test-TempDir/metadata.xml
+++ b/dev-perl/Test-TempDir/metadata.xml
@@ -7,9 +7,9 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Test-TempDir</remote-id>
         <remote-id type="cpan-module">Test::TempDir</remote-id>
         <remote-id type="cpan-module">Test::TempDir::Factory</remote-id>
         <remote-id type="cpan-module">Test::TempDir::Handle</remote-id>
-        <remote-id type="cpan">Test-TempDir</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-TinyMocker/metadata.xml b/dev-perl/Test-TinyMocker/metadata.xml
index e67f160..3a37e29 100644
--- a/dev-perl/Test-TinyMocker/metadata.xml
+++ b/dev-perl/Test-TinyMocker/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Test::TinyMocker</remote-id>
                 <remote-id type="cpan">Test-TinyMocker</remote-id>
+                <remote-id type="cpan-module">Test::TinyMocker</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-UseAllModules/metadata.xml b/dev-perl/Test-UseAllModules/metadata.xml
index 97d5094..eaf5791 100644
--- a/dev-perl/Test-UseAllModules/metadata.xml
+++ b/dev-perl/Test-UseAllModules/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::UseAllModules</remote-id>
         <remote-id type="cpan">Test-UseAllModules</remote-id>
+        <remote-id type="cpan-module">Test::UseAllModules</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-WWW-Mechanize-Catalyst/metadata.xml b/dev-perl/Test-WWW-Mechanize-Catalyst/metadata.xml
index 3feac2b..48a1a50 100644
--- a/dev-perl/Test-WWW-Mechanize-Catalyst/metadata.xml
+++ b/dev-perl/Test-WWW-Mechanize-Catalyst/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::WWW::Mechanize::Catalyst</remote-id>
         <remote-id type="cpan">Test-WWW-Mechanize-Catalyst</remote-id>
+        <remote-id type="cpan-module">Test::WWW::Mechanize::Catalyst</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-WWW-Mechanize-PSGI/metadata.xml b/dev-perl/Test-WWW-Mechanize-PSGI/metadata.xml
index 82023ad..f020ee8 100644
--- a/dev-perl/Test-WWW-Mechanize-PSGI/metadata.xml
+++ b/dev-perl/Test-WWW-Mechanize-PSGI/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">Test::WWW::Mechanize::PSGI</remote-id>
 		<remote-id type="cpan">Test-WWW-Mechanize-PSGI</remote-id>
+		<remote-id type="cpan-module">Test::WWW::Mechanize::PSGI</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-Without-Module/metadata.xml b/dev-perl/Test-Without-Module/metadata.xml
index 2cd4bcd..397c006 100644
--- a/dev-perl/Test-Without-Module/metadata.xml
+++ b/dev-perl/Test-Without-Module/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::Without::Module</remote-id>
         <remote-id type="cpan">Test-Without-Module</remote-id>
+        <remote-id type="cpan-module">Test::Without::Module</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-YAML-Meta/metadata.xml b/dev-perl/Test-YAML-Meta/metadata.xml
index 334490c..34d9e02 100644
--- a/dev-perl/Test-YAML-Meta/metadata.xml
+++ b/dev-perl/Test-YAML-Meta/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::YAML::Meta</remote-id>
         <remote-id type="cpan">Test-YAML-Meta</remote-id>
+        <remote-id type="cpan-module">Test::YAML::Meta</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-YAML-Valid/metadata.xml b/dev-perl/Test-YAML-Valid/metadata.xml
index e3d7db0..88ab74d 100644
--- a/dev-perl/Test-YAML-Valid/metadata.xml
+++ b/dev-perl/Test-YAML-Valid/metadata.xml
@@ -6,13 +6,13 @@
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
     </maintainer>
-	<use>
-		<flag name="yaml-syck">YAML::Syck support</flag>
-		<flag name="yaml-xs">YAML::XS support</flag>
-		<flag name="yaml-tiny">YAML::Tiny support</flag>
-	</use>
+    <use>
+        <flag name="yaml-syck">YAML::Syck support</flag>
+        <flag name="yaml-xs">YAML::XS support</flag>
+        <flag name="yaml-tiny">YAML::Tiny support</flag>
+    </use>
     <upstream>
-        <remote-id type="cpan-module">Test::YAML::Valid</remote-id>
         <remote-id type="cpan">Test-YAML-Valid</remote-id>
+        <remote-id type="cpan-module">Test::YAML::Valid</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Test-utf8/metadata.xml b/dev-perl/Test-utf8/metadata.xml
index 82d606b..0662aee 100644
--- a/dev-perl/Test-utf8/metadata.xml
+++ b/dev-perl/Test-utf8/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Test::utf8</remote-id>
         <remote-id type="cpan">Test-utf8</remote-id>
+        <remote-id type="cpan-module">Test::utf8</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-Context-EitherSide/metadata.xml b/dev-perl/Text-Context-EitherSide/metadata.xml
index e22cbee..6a80c91 100644
--- a/dev-perl/Text-Context-EitherSide/metadata.xml
+++ b/dev-perl/Text-Context-EitherSide/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Text::Context::EitherSide</remote-id>
         <remote-id type="cpan">Text-Context-EitherSide</remote-id>
+        <remote-id type="cpan-module">Text::Context::EitherSide</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-Context/metadata.xml b/dev-perl/Text-Context/metadata.xml
index 118d43f..bd3c392 100644
--- a/dev-perl/Text-Context/metadata.xml
+++ b/dev-perl/Text-Context/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Text-Context</remote-id>
         <remote-id type="cpan-module">Text::Context</remote-id>
         <remote-id type="cpan-module">Text::Context::Para</remote-id>
-        <remote-id type="cpan">Text-Context</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-Diff-Parser/metadata.xml b/dev-perl/Text-Diff-Parser/metadata.xml
index c01d4cb..6b659a3 100644
--- a/dev-perl/Text-Diff-Parser/metadata.xml
+++ b/dev-perl/Text-Diff-Parser/metadata.xml
@@ -7,8 +7,8 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Text-Diff-Parser</remote-id>
         <remote-id type="cpan-module">Text::Diff::Parser</remote-id>
         <remote-id type="cpan-module">Text::Diff::Parser::Change</remote-id>
-        <remote-id type="cpan">Text-Diff-Parser</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-Emoticon-MSN/metadata.xml b/dev-perl/Text-Emoticon-MSN/metadata.xml
index 8632b90..3113c32 100644
--- a/dev-perl/Text-Emoticon-MSN/metadata.xml
+++ b/dev-perl/Text-Emoticon-MSN/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Text::Emoticon::MSN</remote-id>
         <remote-id type="cpan">Text-Emoticon-MSN</remote-id>
+        <remote-id type="cpan-module">Text::Emoticon::MSN</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-Emoticon/metadata.xml b/dev-perl/Text-Emoticon/metadata.xml
index e172db8..9e2dc11 100644
--- a/dev-perl/Text-Emoticon/metadata.xml
+++ b/dev-perl/Text-Emoticon/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Text::Emoticon</remote-id>
         <remote-id type="cpan">Text-Emoticon</remote-id>
+        <remote-id type="cpan-module">Text::Emoticon</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-MultiMarkdown/metadata.xml b/dev-perl/Text-MultiMarkdown/metadata.xml
index 5488230..d5ffa56 100644
--- a/dev-perl/Text-MultiMarkdown/metadata.xml
+++ b/dev-perl/Text-MultiMarkdown/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Text::MultiMarkdown</remote-id>
         <remote-id type="cpan">Text-MultiMarkdown</remote-id>
+        <remote-id type="cpan-module">Text::MultiMarkdown</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-SimpleTable/metadata.xml b/dev-perl/Text-SimpleTable/metadata.xml
index 8c7064b..7152fe0 100644
--- a/dev-perl/Text-SimpleTable/metadata.xml
+++ b/dev-perl/Text-SimpleTable/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Text::SimpleTable</remote-id>
         <remote-id type="cpan">Text-SimpleTable</remote-id>
+        <remote-id type="cpan-module">Text::SimpleTable</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-Textile/metadata.xml b/dev-perl/Text-Textile/metadata.xml
index f490203..77f0aa1 100644
--- a/dev-perl/Text-Textile/metadata.xml
+++ b/dev-perl/Text-Textile/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Text::Textile</remote-id>
         <remote-id type="cpan">Text-Textile</remote-id>
+        <remote-id type="cpan-module">Text::Textile</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Text-vCard/metadata.xml b/dev-perl/Text-vCard/metadata.xml
index 906c6e8..427f186 100644
--- a/dev-perl/Text-vCard/metadata.xml
+++ b/dev-perl/Text-vCard/metadata.xml
@@ -7,9 +7,9 @@
         <name>Daniel Westermann-Clark</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Text-vCard</remote-id>
         <remote-id type="cpan-module">Text::vCard</remote-id>
         <remote-id type="cpan-module">Text::vCard::Addressbook</remote-id>
         <remote-id type="cpan-module">Text::vCard::Node</remote-id>
-        <remote-id type="cpan">Text-vCard</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Throwable-X/metadata.xml b/dev-perl/Throwable-X/metadata.xml
index 48a8cf3..fe844bb 100644
--- a/dev-perl/Throwable-X/metadata.xml
+++ b/dev-perl/Throwable-X/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Throwable-X</remote-id>
         <remote-id type="cpan-module">Throwable::X</remote-id>
         <remote-id type="cpan-module">Throwable::X::Types</remote-id>
-        <remote-id type="cpan">Throwable-X</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tie-CPHash/metadata.xml b/dev-perl/Tie-CPHash/metadata.xml
index 7009ce0..b2b42f5 100644
--- a/dev-perl/Tie-CPHash/metadata.xml
+++ b/dev-perl/Tie-CPHash/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Tie::CPHash</remote-id>
                 <remote-id type="cpan">Tie-CPHash</remote-id>
+                <remote-id type="cpan-module">Tie::CPHash</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tie-RefHash-Weak/metadata.xml b/dev-perl/Tie-RefHash-Weak/metadata.xml
index d53a09e..cbb4d0e 100644
--- a/dev-perl/Tie-RefHash-Weak/metadata.xml
+++ b/dev-perl/Tie-RefHash-Weak/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Tie::RefHash::Weak</remote-id>
                 <remote-id type="cpan">Tie-RefHash-Weak</remote-id>
+                <remote-id type="cpan-module">Tie::RefHash::Weak</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tie-RefHash/metadata.xml b/dev-perl/Tie-RefHash/metadata.xml
index 9108f1f..f6cf59c 100644
--- a/dev-perl/Tie-RefHash/metadata.xml
+++ b/dev-perl/Tie-RefHash/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Tie-RefHash</remote-id>
                 <remote-id type="cpan-module">Tie::RefHash</remote-id>
                 <remote-id type="cpan-module">Tie::RefHash::Nestable</remote-id>
-                <remote-id type="cpan">Tie-RefHash</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tie-Restore/metadata.xml b/dev-perl/Tie-Restore/metadata.xml
index e755168..054b02a 100644
--- a/dev-perl/Tie-Restore/metadata.xml
+++ b/dev-perl/Tie-Restore/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Tie::Restore</remote-id>
                 <remote-id type="cpan">Tie-Restore</remote-id>
+                <remote-id type="cpan-module">Tie::Restore</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tie-Trace/metadata.xml b/dev-perl/Tie-Trace/metadata.xml
index 1ba69d9..a318e21 100644
--- a/dev-perl/Tie-Trace/metadata.xml
+++ b/dev-perl/Tie-Trace/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Tie::Trace</remote-id>
         <remote-id type="cpan">Tie-Trace</remote-id>
+        <remote-id type="cpan-module">Tie::Trace</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Time-Format/metadata.xml b/dev-perl/Time-Format/metadata.xml
index e45a7b9..d68274e 100644
--- a/dev-perl/Time-Format/metadata.xml
+++ b/dev-perl/Time-Format/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">Time::Format</remote-id>
                 <remote-id type="cpan">Time-Format</remote-id>
+                <remote-id type="cpan-module">Time::Format</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Time-Tiny/metadata.xml b/dev-perl/Time-Tiny/metadata.xml
index caaf60a..57e6898 100644
--- a/dev-perl/Time-Tiny/metadata.xml
+++ b/dev-perl/Time-Tiny/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Time::Tiny</remote-id>
         <remote-id type="cpan">Time-Tiny</remote-id>
+        <remote-id type="cpan-module">Time::Tiny</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Time-Warp/metadata.xml b/dev-perl/Time-Warp/metadata.xml
index 9f49d29..7967a65 100644
--- a/dev-perl/Time-Warp/metadata.xml
+++ b/dev-perl/Time-Warp/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Time::Warp</remote-id>
         <remote-id type="cpan">Time-Warp</remote-id>
+        <remote-id type="cpan-module">Time::Warp</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Time-y2038/metadata.xml b/dev-perl/Time-y2038/metadata.xml
index 04a6f8e..6b16755 100644
--- a/dev-perl/Time-y2038/metadata.xml
+++ b/dev-perl/Time-y2038/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Time-y2038</remote-id>
         <remote-id type="cpan-module">Time::y2038</remote-id>
         <remote-id type="cpan-module">Time::y2038::Everywhere</remote-id>
-        <remote-id type="cpan">Time-y2038</remote-id>
     </upstream>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-perl/Travel-Routing-DE-VRR/metadata.xml b/dev-perl/Travel-Routing-DE-VRR/metadata.xml
index 32880c1..7846b69 100644
--- a/dev-perl/Travel-Routing-DE-VRR/metadata.xml
+++ b/dev-perl/Travel-Routing-DE-VRR/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Travel-Routing-DE-VRR</remote-id>
                 <remote-id type="cpan-module">Travel::Routing::DE::VRR</remote-id>
                 <remote-id type="cpan-module">Travel::Routing::DE::VRR::Route</remote-id>
                 <remote-id type="cpan-module">Travel::Routing::DE::VRR::Route::Part</remote-id>
-                <remote-id type="cpan">Travel-Routing-DE-VRR</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tree-Simple-VisitorFactory/metadata.xml b/dev-perl/Tree-Simple-VisitorFactory/metadata.xml
index cbebe15..1bce647 100644
--- a/dev-perl/Tree-Simple-VisitorFactory/metadata.xml
+++ b/dev-perl/Tree-Simple-VisitorFactory/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">Tree-Simple-VisitorFactory</remote-id>
         <remote-id type="cpan-module">Tree::Simple::Visitor::BreadthFirstTraversal</remote-id>
         <remote-id type="cpan-module">Tree::Simple::Visitor::CreateDirectoryTree</remote-id>
         <remote-id type="cpan-module">Tree::Simple::Visitor::FindByNodeValue</remote-id>
@@ -25,6 +26,5 @@
         <remote-id type="cpan-module">Tree::Simple::Visitor::ToNestedHash</remote-id>
         <remote-id type="cpan-module">Tree::Simple::Visitor::VariableDepthClone</remote-id>
         <remote-id type="cpan-module">Tree::Simple::VisitorFactory</remote-id>
-        <remote-id type="cpan">Tree-Simple-VisitorFactory</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Tree-Trie/metadata.xml b/dev-perl/Tree-Trie/metadata.xml
index 65f6ae6..2c385e3 100644
--- a/dev-perl/Tree-Trie/metadata.xml
+++ b/dev-perl/Tree-Trie/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Tree::Trie</remote-id>
         <remote-id type="cpan">Tree-Trie</remote-id>
+        <remote-id type="cpan-module">Tree::Trie</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/TryCatch/metadata.xml b/dev-perl/TryCatch/metadata.xml
index ffb8496..251e8ca 100644
--- a/dev-perl/TryCatch/metadata.xml
+++ b/dev-perl/TryCatch/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">TryCatch</remote-id>
         <remote-id type="cpan">TryCatch</remote-id>
+        <remote-id type="cpan-module">TryCatch</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/URI-FromHash/metadata.xml b/dev-perl/URI-FromHash/metadata.xml
index 8297426..6a73f09 100644
--- a/dev-perl/URI-FromHash/metadata.xml
+++ b/dev-perl/URI-FromHash/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">URI::FromHash</remote-id>
         <remote-id type="cpan">URI-FromHash</remote-id>
+        <remote-id type="cpan-module">URI::FromHash</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/UUID/metadata.xml b/dev-perl/UUID/metadata.xml
index 17a5e32..d9007e6 100644
--- a/dev-perl/UUID/metadata.xml
+++ b/dev-perl/UUID/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">UUID</remote-id>
                 <remote-id type="cpan">UUID</remote-id>
+                <remote-id type="cpan-module">UUID</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/User/metadata.xml b/dev-perl/User/metadata.xml
index 2cb1172..88aff64 100644
--- a/dev-perl/User/metadata.xml
+++ b/dev-perl/User/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">User</remote-id>
         <remote-id type="cpan">User</remote-id>
+        <remote-id type="cpan-module">User</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/V/metadata.xml b/dev-perl/V/metadata.xml
index 6064762..0077bfc 100644
--- a/dev-perl/V/metadata.xml
+++ b/dev-perl/V/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">V</remote-id>
                 <remote-id type="cpan-module">V</remote-id>
                 <remote-id type="cpan-module">V::Module::Info</remote-id>
                 <remote-id type="cpan-module">V::Module::Info::_version</remote-id>
-                <remote-id type="cpan">V</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/VCI/metadata.xml b/dev-perl/VCI/metadata.xml
index adddea8..b46f5ee 100644
--- a/dev-perl/VCI/metadata.xml
+++ b/dev-perl/VCI/metadata.xml
@@ -5,13 +5,14 @@
     <maintainer>
         <email>dwc@...</email>
         <name>Daniel Westermann-Clark</name>
-	</maintainer>
-	<use>
-		<flag name="bazaar"> Add support of the Bazaar VCS</flag>
-		<flag name="git"> Add support for the Git VCS</flag>
-		<flag name="mercurial"> Add support for the Mercurial VCS</flag>
-	</use>
+    </maintainer>
+    <use>
+        <flag name="bazaar"> Add support of the Bazaar VCS</flag>
+        <flag name="git"> Add support for the Git VCS</flag>
+        <flag name="mercurial"> Add support for the Mercurial VCS</flag>
+    </use>
     <upstream>
+        <remote-id type="cpan">VCI</remote-id>
         <remote-id type="cpan-module">VCI</remote-id>
         <remote-id type="cpan-module">VCI::Abstract::Commit</remote-id>
         <remote-id type="cpan-module">VCI::Abstract::Committable</remote-id>
@@ -68,6 +69,5 @@
         <remote-id type="cpan-module">VCI::VCS::Svn::History</remote-id>
         <remote-id type="cpan-module">VCI::VCS::Svn::Project</remote-id>
         <remote-id type="cpan-module">VCI::VCS::Svn::Repository</remote-id>
-        <remote-id type="cpan">VCI</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Version-Next/metadata.xml b/dev-perl/Version-Next/metadata.xml
index 5e0adcb..99f5a56 100644
--- a/dev-perl/Version-Next/metadata.xml
+++ b/dev-perl/Version-Next/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">Version::Next</remote-id>
         <remote-id type="cpan">Version-Next</remote-id>
+        <remote-id type="cpan-module">Version::Next</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/WWW-Facebook-API/metadata.xml b/dev-perl/WWW-Facebook-API/metadata.xml
index 86a0219..9370d39 100644
--- a/dev-perl/WWW-Facebook-API/metadata.xml
+++ b/dev-perl/WWW-Facebook-API/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">WWW-Facebook-API</remote-id>
         <remote-id type="cpan-module">WWW::Facebook::API</remote-id>
         <remote-id type="cpan-module">WWW::Facebook::API::Admin</remote-id>
         <remote-id type="cpan-module">WWW::Facebook::API::Application</remote-id>
@@ -37,6 +38,5 @@
         <remote-id type="cpan-module">WWW::Facebook::API::Stream</remote-id>
         <remote-id type="cpan-module">WWW::Facebook::API::Users</remote-id>
         <remote-id type="cpan-module">WWW::Facebook::API::Video</remote-id>
-        <remote-id type="cpan">WWW-Facebook-API</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/WWW-Mechanize-Cached/metadata.xml b/dev-perl/WWW-Mechanize-Cached/metadata.xml
index 62a0eab..2715749 100644
--- a/dev-perl/WWW-Mechanize-Cached/metadata.xml
+++ b/dev-perl/WWW-Mechanize-Cached/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">WWW::Mechanize::Cached</remote-id>
 		<remote-id type="cpan">WWW-Mechanize-Cached</remote-id>
+		<remote-id type="cpan-module">WWW::Mechanize::Cached</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/WWW-Mechanize-TreeBuilder/metadata.xml b/dev-perl/WWW-Mechanize-TreeBuilder/metadata.xml
index 6f92d03..d15a3b3 100644
--- a/dev-perl/WWW-Mechanize-TreeBuilder/metadata.xml
+++ b/dev-perl/WWW-Mechanize-TreeBuilder/metadata.xml
@@ -7,7 +7,7 @@
     <name>Michele Beltrame</name>
   </maintainer>
   <upstream>
-    <remote-id type="cpan-module">WWW::Mechanize::TreeBuilder</remote-id>
     <remote-id type="cpan">WWW-Mechanize-TreeBuilder</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::TreeBuilder</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-perl/WWW-Search-PubMed/metadata.xml b/dev-perl/WWW-Search-PubMed/metadata.xml
index c860bfd..68cf793 100644
--- a/dev-perl/WWW-Search-PubMed/metadata.xml
+++ b/dev-perl/WWW-Search-PubMed/metadata.xml
@@ -7,8 +7,8 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">WWW-Search-PubMed</remote-id>
         <remote-id type="cpan-module">WWW::Search::PubMed</remote-id>
         <remote-id type="cpan-module">WWW::Search::PubMed::Result</remote-id>
-        <remote-id type="cpan">WWW-Search-PubMed</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/WWW-Search/metadata.xml b/dev-perl/WWW-Search/metadata.xml
index 003e242..b76cab3 100644
--- a/dev-perl/WWW-Search/metadata.xml
+++ b/dev-perl/WWW-Search/metadata.xml
@@ -7,6 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">WWW-Search</remote-id>
         <remote-id type="cpan-module">WWW::Search</remote-id>
         <remote-id type="cpan-module">WWW::Search::Null</remote-id>
         <remote-id type="cpan-module">WWW::Search::Null::Count</remote-id>
@@ -17,6 +18,5 @@
         <remote-id type="cpan-module">WWW::Search::Simple</remote-id>
         <remote-id type="cpan-module">WWW::Search::Test</remote-id>
         <remote-id type="cpan-module">WWW::SearchResult</remote-id>
-        <remote-id type="cpan">WWW-Search</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/WWW-Shorten-Simple/metadata.xml b/dev-perl/WWW-Shorten-Simple/metadata.xml
index 8aa8985..89be5c3 100644
--- a/dev-perl/WWW-Shorten-Simple/metadata.xml
+++ b/dev-perl/WWW-Shorten-Simple/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">WWW::Shorten::Simple</remote-id>
         <remote-id type="cpan">WWW-Shorten-Simple</remote-id>
+        <remote-id type="cpan-module">WWW::Shorten::Simple</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Weather-Com/metadata.xml b/dev-perl/Weather-Com/metadata.xml
index 67708d7..855716d 100644
--- a/dev-perl/Weather-Com/metadata.xml
+++ b/dev-perl/Weather-Com/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Weather-Com</remote-id>
                 <remote-id type="cpan-module">Weather::Com</remote-id>
                 <remote-id type="cpan-module">Weather::Com::AirPressure</remote-id>
                 <remote-id type="cpan-module">Weather::Com::Base</remote-id>
@@ -24,6 +25,5 @@
                 <remote-id type="cpan-module">Weather::Com::UVIndex</remote-id>
                 <remote-id type="cpan-module">Weather::Com::Units</remote-id>
                 <remote-id type="cpan-module">Weather::Com::Wind</remote-id>
-                <remote-id type="cpan">Weather-Com</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/Web-Scraper/metadata.xml b/dev-perl/Web-Scraper/metadata.xml
index db198ff..38f6f7d 100644
--- a/dev-perl/Web-Scraper/metadata.xml
+++ b/dev-perl/Web-Scraper/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">Web-Scraper</remote-id>
                 <remote-id type="cpan-module">Web::Scraper</remote-id>
                 <remote-id type="cpan-module">Web::Scraper::Filter</remote-id>
                 <remote-id type="cpan-module">Web::Scraper::LibXML</remote-id>
-                <remote-id type="cpan">Web-Scraper</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/XML-Clean/metadata.xml b/dev-perl/XML-Clean/metadata.xml
index bf9c538..f00779c 100644
--- a/dev-perl/XML-Clean/metadata.xml
+++ b/dev-perl/XML-Clean/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">XML::Clean</remote-id>
         <remote-id type="cpan">XML-Clean</remote-id>
+        <remote-id type="cpan-module">XML::Clean</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/XML-FeedPP/metadata.xml b/dev-perl/XML-FeedPP/metadata.xml
index 2ae0d65..07b1642 100644
--- a/dev-perl/XML-FeedPP/metadata.xml
+++ b/dev-perl/XML-FeedPP/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">XML-FeedPP</remote-id>
                 <remote-id type="cpan-module">XML::FeedPP</remote-id>
                 <remote-id type="cpan-module">XML::FeedPP::Atom</remote-id>
                 <remote-id type="cpan-module">XML::FeedPP::Atom::Atom03</remote-id>
@@ -24,6 +25,5 @@
                 <remote-id type="cpan-module">XML::FeedPP::RSS::Channel</remote-id>
                 <remote-id type="cpan-module">XML::FeedPP::RSS::Item</remote-id>
                 <remote-id type="cpan-module">XML::FeedPP::Util</remote-id>
-                <remote-id type="cpan">XML-FeedPP</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/XML-Generator-PerlData/metadata.xml b/dev-perl/XML-Generator-PerlData/metadata.xml
index 987d5ee..7cd9077 100644
--- a/dev-perl/XML-Generator-PerlData/metadata.xml
+++ b/dev-perl/XML-Generator-PerlData/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">XML::Generator::PerlData</remote-id>
         <remote-id type="cpan">XML-Generator-PerlData</remote-id>
+        <remote-id type="cpan-module">XML::Generator::PerlData</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/XML-Smart/metadata.xml b/dev-perl/XML-Smart/metadata.xml
index 6a116de..bef0bb8 100644
--- a/dev-perl/XML-Smart/metadata.xml
+++ b/dev-perl/XML-Smart/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
+                <remote-id type="cpan">XML-Smart</remote-id>
                 <remote-id type="cpan-module">XML::Smart</remote-id>
                 <remote-id type="cpan-module">XML::Smart::Base64</remote-id>
                 <remote-id type="cpan-module">XML::Smart::DTD</remote-id>
@@ -16,6 +17,5 @@
                 <remote-id type="cpan-module">XML::Smart::TieScalar</remote-id>
                 <remote-id type="cpan-module">XML::Smart::Tree</remote-id>
                 <remote-id type="cpan-module">XML::Smart::XPath</remote-id>
-                <remote-id type="cpan">XML-Smart</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/XML-Tidy/metadata.xml b/dev-perl/XML-Tidy/metadata.xml
index 65488c8..6bd939f 100644
--- a/dev-perl/XML-Tidy/metadata.xml
+++ b/dev-perl/XML-Tidy/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">XML::Tidy</remote-id>
                 <remote-id type="cpan">XML-Tidy</remote-id>
+                <remote-id type="cpan-module">XML::Tidy</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/XML-TreePP/metadata.xml b/dev-perl/XML-TreePP/metadata.xml
index 4953d6b..e2a03ac 100644
--- a/dev-perl/XML-TreePP/metadata.xml
+++ b/dev-perl/XML-TreePP/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">XML::TreePP</remote-id>
                 <remote-id type="cpan">XML-TreePP</remote-id>
+                <remote-id type="cpan-module">XML::TreePP</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/XXX/metadata.xml b/dev-perl/XXX/metadata.xml
index 8cc8a99..fbe9ddf 100644
--- a/dev-perl/XXX/metadata.xml
+++ b/dev-perl/XXX/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">XXX</remote-id>
         <remote-id type="cpan">XXX</remote-id>
+        <remote-id type="cpan-module">XXX</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/aliased/metadata.xml b/dev-perl/aliased/metadata.xml
index 28260a8..92e8eea 100644
--- a/dev-perl/aliased/metadata.xml
+++ b/dev-perl/aliased/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">aliased</remote-id>
         <remote-id type="cpan">aliased</remote-id>
+        <remote-id type="cpan-module">aliased</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/autobox-Core/metadata.xml b/dev-perl/autobox-Core/metadata.xml
index fa3561e..e27af6e 100644
--- a/dev-perl/autobox-Core/metadata.xml
+++ b/dev-perl/autobox-Core/metadata.xml
@@ -7,11 +7,11 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">autobox-Core</remote-id>
         <remote-id type="cpan-module">autobox::Core</remote-id>
         <remote-id type="cpan-module">autobox::Core::ARRAY</remote-id>
         <remote-id type="cpan-module">autobox::Core::CODE</remote-id>
         <remote-id type="cpan-module">autobox::Core::HASH</remote-id>
         <remote-id type="cpan-module">autobox::Core::SCALAR</remote-id>
-        <remote-id type="cpan">autobox-Core</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/autobox-List-Util/metadata.xml b/dev-perl/autobox-List-Util/metadata.xml
index f916b68..d301715 100644
--- a/dev-perl/autobox-List-Util/metadata.xml
+++ b/dev-perl/autobox-List-Util/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">autobox::List::Util</remote-id>
         <remote-id type="cpan">autobox-List-Util</remote-id>
+        <remote-id type="cpan-module">autobox::List::Util</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/autobox-dump/metadata.xml b/dev-perl/autobox-dump/metadata.xml
index 269a005..c6bf97d 100644
--- a/dev-perl/autobox-dump/metadata.xml
+++ b/dev-perl/autobox-dump/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">autobox-dump</remote-id>
         <remote-id type="cpan-module">autobox::dump</remote-id>
         <remote-id type="cpan-module">autobox::dump::inner</remote-id>
-        <remote-id type="cpan">autobox-dump</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/autobox/metadata.xml b/dev-perl/autobox/metadata.xml
index 32bbf09..bb7de75 100644
--- a/dev-perl/autobox/metadata.xml
+++ b/dev-perl/autobox/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">autobox</remote-id>
         <remote-id type="cpan">autobox</remote-id>
+        <remote-id type="cpan-module">autobox</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/autodie/metadata.xml b/dev-perl/autodie/metadata.xml
index fb94711..e7ce079 100644
--- a/dev-perl/autodie/metadata.xml
+++ b/dev-perl/autodie/metadata.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
-    <maintainer>
+	<herd>perl</herd>
+	<maintainer>
         <email>kentfredric@...</email>
         <name>Kent Fredric</name>
 	</maintainer>
 	<use>
-		<flag name='system'>Support for autodying system() via
-			<pkg>dev-perl/IPC-System-Simple</pkg>
-		</flag>
+        <flag name="system">Support for autodying system() via
+			<pkg>dev-perl/IPC-System-Simple</pkg></flag>
 	</use>
 	<upstream>
-		<remote-id type="cpan-module">Fatal</remote-id>
-		<remote-id type="cpan-module">autodie</remote-id>
-		<remote-id type="cpan-module">autodie::Scope::Guard</remote-id>
-		<remote-id type="cpan-module">autodie::exception</remote-id>
-		<remote-id type="cpan-module">autodie::exception::system</remote-id>
-		<remote-id type="cpan-module">autodie::hints</remote-id>
-		<changelog>http://search.cpan.org/dist/autodie/Changes</changelog>
-		<remote-id type="cpan">autodie</remote-id>
+        <changelog>http://search.cpan.org/dist/autodie/Changes</changelog>
+        <remote-id type="cpan">autodie</remote-id>
+        <remote-id type="cpan-module">Fatal</remote-id>
+        <remote-id type="cpan-module">autodie</remote-id>
+        <remote-id type="cpan-module">autodie::Scope::Guard</remote-id>
+        <remote-id type="cpan-module">autodie::exception</remote-id>
+        <remote-id type="cpan-module">autodie::exception::system</remote-id>
+        <remote-id type="cpan-module">autodie::hints</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/autovivification/metadata.xml b/dev-perl/autovivification/metadata.xml
index 8a5f617..95ad388 100644
--- a/dev-perl/autovivification/metadata.xml
+++ b/dev-perl/autovivification/metadata.xml
@@ -7,7 +7,7 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">autovivification</remote-id>
         <remote-id type="cpan">autovivification</remote-id>
+        <remote-id type="cpan-module">autovivification</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/local-lib/metadata.xml b/dev-perl/local-lib/metadata.xml
index 1622f2c..ab4a62d 100644
--- a/dev-perl/local-lib/metadata.xml
+++ b/dev-perl/local-lib/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">local-lib</remote-id>
         <remote-id type="cpan-module">lib::core::only</remote-id>
         <remote-id type="cpan-module">local::lib</remote-id>
-        <remote-id type="cpan">local-lib</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/mocked/metadata.xml b/dev-perl/mocked/metadata.xml
index 25c8b12..efd04c8 100644
--- a/dev-perl/mocked/metadata.xml
+++ b/dev-perl/mocked/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">mocked</remote-id>
         <remote-id type="cpan-module">mocked</remote-id>
         <remote-id type="cpan-module">unmocked</remote-id>
-        <remote-id type="cpan">mocked</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/perl5i/metadata.xml b/dev-perl/perl5i/metadata.xml
index c36bdb2..32b80e8 100644
--- a/dev-perl/perl5i/metadata.xml
+++ b/dev-perl/perl5i/metadata.xml
@@ -8,5 +8,42 @@
     </maintainer>
     <upstream>
         <remote-id type="cpan">perl5i</remote-id>
+        <remote-id type="cpan-module">perl5i</remote-id>
+        <remote-id type="cpan-module">perl5i::0</remote-id>
+        <remote-id type="cpan-module">perl5i::1</remote-id>
+        <remote-id type="cpan-module">perl5i::1::ARRAY</remote-id>
+        <remote-id type="cpan-module">perl5i::1::CODE</remote-id>
+        <remote-id type="cpan-module">perl5i::1::DateTime</remote-id>
+        <remote-id type="cpan-module">perl5i::1::HASH</remote-id>
+        <remote-id type="cpan-module">perl5i::1::Meta</remote-id>
+        <remote-id type="cpan-module">perl5i::1::Meta::Class</remote-id>
+        <remote-id type="cpan-module">perl5i::1::Meta::Instance</remote-id>
+        <remote-id type="cpan-module">perl5i::1::SCALAR</remote-id>
+        <remote-id type="cpan-module">perl5i::1::UNIVERSAL</remote-id>
+        <remote-id type="cpan-module">perl5i::1::autobox</remote-id>
+        <remote-id type="cpan-module">perl5i::2</remote-id>
+        <remote-id type="cpan-module">perl5i::2::ARRAY</remote-id>
+        <remote-id type="cpan-module">perl5i::2::CODE</remote-id>
+        <remote-id type="cpan-module">perl5i::2::DateTime</remote-id>
+        <remote-id type="cpan-module">perl5i::2::DateTime::Format::CTime</remote-id>
+        <remote-id type="cpan-module">perl5i::2::DateTime::time</remote-id>
+        <remote-id type="cpan-module">perl5i::2::DateTime::y2038</remote-id>
+        <remote-id type="cpan-module">perl5i::2::HASH</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Meta</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Meta::Class</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Meta::Instance</remote-id>
+        <remote-id type="cpan-module">perl5i::2::RequireMessage</remote-id>
+        <remote-id type="cpan-module">perl5i::2::SCALAR</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Signature</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Signature::Function::None</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Signature::Method::None</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Signature::None</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Signature::Real</remote-id>
+        <remote-id type="cpan-module">perl5i::2::Signatures</remote-id>
+        <remote-id type="cpan-module">perl5i::2::UNIVERSAL</remote-id>
+        <remote-id type="cpan-module">perl5i::2::autobox</remote-id>
+        <remote-id type="cpan-module">perl5i::2::equal</remote-id>
+        <remote-id type="cpan-module">perl5i::cmd</remote-id>
+        <remote-id type="cpan-module">perl5i::latest</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/pip/metadata.xml b/dev-perl/pip/metadata.xml
index 8befa5c..6231226 100644
--- a/dev-perl/pip/metadata.xml
+++ b/dev-perl/pip/metadata.xml
@@ -7,11 +7,11 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">pip</remote-id>
         <remote-id type="cpan-module">Module::P5Z</remote-id>
         <remote-id type="cpan-module">Module::Plan::Archive</remote-id>
         <remote-id type="cpan-module">Module::Plan::Base</remote-id>
         <remote-id type="cpan-module">Module::Plan::Lite</remote-id>
         <remote-id type="cpan-module">pip</remote-id>
-        <remote-id type="cpan">pip</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/pod2pdf/metadata.xml b/dev-perl/pod2pdf/metadata.xml
index a2671a6..ac5616b 100644
--- a/dev-perl/pod2pdf/metadata.xml
+++ b/dev-perl/pod2pdf/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
-                <remote-id type="cpan-module">App::pod2pdf</remote-id>
                 <remote-id type="cpan">pod2pdf</remote-id>
+                <remote-id type="cpan-module">App::pod2pdf</remote-id>
         </upstream>
 </pkgmetadata>

diff --git a/dev-perl/signatures/metadata.xml b/dev-perl/signatures/metadata.xml
index 77fefd2..a2cc7b5 100644
--- a/dev-perl/signatures/metadata.xml
+++ b/dev-perl/signatures/metadata.xml
@@ -7,7 +7,7 @@
         <name>Michele Beltrame</name>
     </maintainer>
     <upstream>
-        <remote-id type="cpan-module">signatures</remote-id>
         <remote-id type="cpan">signatures</remote-id>
+        <remote-id type="cpan-module">signatures</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/true/metadata.xml b/dev-perl/true/metadata.xml
index 2eed30f..450acee 100644
--- a/dev-perl/true/metadata.xml
+++ b/dev-perl/true/metadata.xml
@@ -7,8 +7,8 @@
         <name>Kent Fredric</name>
     </maintainer>
     <upstream>
+        <remote-id type="cpan">true</remote-id>
         <remote-id type="cpan-module">true</remote-id>
         <remote-id type="cpan-module">true::VERSION</remote-id>
-        <remote-id type="cpan">true</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/dev-perl/utf8-all/metadata.xml b/dev-perl/utf8-all/metadata.xml
index 0826547..305bebb 100644
--- a/dev-perl/utf8-all/metadata.xml
+++ b/dev-perl/utf8-all/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Kent Fredric</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="cpan-module">utf8::all</remote-id>
 		<remote-id type="cpan">utf8-all</remote-id>
+		<remote-id type="cpan-module">utf8::all</remote-id>
 	</upstream>
 </pkgmetadata>


Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
proj/perl-overlay:master commit in: dev-perl/Module-CPANTS-Analyse/, dev-perl/CGI-Application-Plugin-Stash/, ...
Next by thread:
proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/apps/packages/management/commands/
Previous by date:
gentoo commit in xml/htdocs/proj/en/metastructure/herds: herds.xml
Next by date:
gentoo-x86 commit in media-libs/gluon/files: - New directory


Updated Jun 26, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.