Remove perl maintainer tags if in perl herd. Add cpan remote-id tags. Remove empty longdescriptions

(Portage version: 2.2_rc83/cvs/Linux x86_64)

64 files changed, 267 insertions, 191 deletions

diff --git a/perl-core/Archive-Tar/metadata.xml b/perl-core/Archive-Tar/metadata.xml
index 801e9385a1e0..9b129eedbb98 100644
--- a/perl-core/Archive-Tar/metadata.xml
+++ b/perl-core/Archive-Tar/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Tar</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Attribute-Handlers/metadata.xml b/perl-core/Attribute-Handlers/metadata.xml
index 801e9385a1e0..b79df731c72e 100644
--- a/perl-core/Attribute-Handlers/metadata.xml
+++ b/perl-core/Attribute-Handlers/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Attribute-Handlers</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/AutoLoader/metadata.xml b/perl-core/AutoLoader/metadata.xml
index 801e9385a1e0..591a48f1e9c7 100644
--- a/perl-core/AutoLoader/metadata.xml
+++ b/perl-core/AutoLoader/metadata.xml
@@ -1,5 +1,8 @@
 <?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">AutoLoader</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/CGI/metadata.xml b/perl-core/CGI/metadata.xml
index 86672fe64c10..867e59ef5eb7 100644
--- a/perl-core/CGI/metadata.xml
+++ b/perl-core/CGI/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">CGI.pm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Class-ISA/metadata.xml b/perl-core/Class-ISA/metadata.xml
index 801e9385a1e0..161d55043e69 100644
--- a/perl-core/Class-ISA/metadata.xml
+++ b/perl-core/Class-ISA/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Class-ISA</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Compress-Raw-Bzip2/metadata.xml b/perl-core/Compress-Raw-Bzip2/metadata.xml
index 801e9385a1e0..4170498e802d 100644
--- a/perl-core/Compress-Raw-Bzip2/metadata.xml
+++ b/perl-core/Compress-Raw-Bzip2/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Compress-Raw-Bzip2</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Compress-Raw-Zlib/metadata.xml b/perl-core/Compress-Raw-Zlib/metadata.xml
index 801e9385a1e0..84f04a6a2c8f 100644
--- a/perl-core/Compress-Raw-Zlib/metadata.xml
+++ b/perl-core/Compress-Raw-Zlib/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Compress-Raw-Zlib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/DB_File/metadata.xml b/perl-core/DB_File/metadata.xml
index 86672fe64c10..550a08493edf 100644
--- a/perl-core/DB_File/metadata.xml
+++ b/perl-core/DB_File/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">DB_File</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Digest-MD5/metadata.xml b/perl-core/Digest-MD5/metadata.xml
index 86672fe64c10..0bd3a001cc00 100644
--- a/perl-core/Digest-MD5/metadata.xml
+++ b/perl-core/Digest-MD5/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Digest-MD5</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Digest-SHA/metadata.xml b/perl-core/Digest-SHA/metadata.xml
index 801e9385a1e0..d0e7ae20acb0 100644
--- a/perl-core/Digest-SHA/metadata.xml
+++ b/perl-core/Digest-SHA/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Digest-SHA</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Encode/metadata.xml b/perl-core/Encode/metadata.xml
index 801e9385a1e0..676517b8f8fb 100644
--- a/perl-core/Encode/metadata.xml
+++ b/perl-core/Encode/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Encode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-CBuilder/metadata.xml b/perl-core/ExtUtils-CBuilder/metadata.xml
index 801e9385a1e0..ac839a315d42 100644
--- a/perl-core/ExtUtils-CBuilder/metadata.xml
+++ b/perl-core/ExtUtils-CBuilder/metadata.xml
@@ -1,5 +1,8 @@
 <?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">ExtUtils-CBuilder</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-Command/metadata.xml b/perl-core/ExtUtils-Command/metadata.xml
index 801e9385a1e0..c8bc33bb9ff3 100644
--- a/perl-core/ExtUtils-Command/metadata.xml
+++ b/perl-core/ExtUtils-Command/metadata.xml
@@ -1,5 +1,8 @@
 <?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">ExtUtils-Command</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-Install/metadata.xml b/perl-core/ExtUtils-Install/metadata.xml
index 36ee0f08c67c..48d223dd3fa7 100644
--- a/perl-core/ExtUtils-Install/metadata.xml
+++ b/perl-core/ExtUtils-Install/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">ExtUtils-Install</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-MakeMaker/metadata.xml b/perl-core/ExtUtils-MakeMaker/metadata.xml
index fcd994bc881b..a2f68d0dff5a 100644
--- a/perl-core/ExtUtils-MakeMaker/metadata.xml
+++ b/perl-core/ExtUtils-MakeMaker/metadata.xml
@@ -1,5 +1,8 @@
 <?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">ExtUtils-MakeMaker</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-Manifest/metadata.xml b/perl-core/ExtUtils-Manifest/metadata.xml
index fcd994bc881b..973a86bcfc08 100644
--- a/perl-core/ExtUtils-Manifest/metadata.xml
+++ b/perl-core/ExtUtils-Manifest/metadata.xml
@@ -1,5 +1,8 @@
 <?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">ExtUtils-Manifest</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-ParseXS/metadata.xml b/perl-core/ExtUtils-ParseXS/metadata.xml
index 801e9385a1e0..26740f8fd857 100644
--- a/perl-core/ExtUtils-ParseXS/metadata.xml
+++ b/perl-core/ExtUtils-ParseXS/metadata.xml
@@ -1,5 +1,8 @@
 <?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">ExtUtils-ParseXS</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/File-Path/metadata.xml b/perl-core/File-Path/metadata.xml
index 5b0bbbacca03..9b6b2236aaa9 100644
--- a/perl-core/File-Path/metadata.xml
+++ b/perl-core/File-Path/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">File-Path</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/File-Spec/metadata.xml b/perl-core/File-Spec/metadata.xml
index 084fb1c7ec94..4f3520e4a450 100644
--- a/perl-core/File-Spec/metadata.xml
+++ b/perl-core/File-Spec/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription>Following the 0.X series of File-Spec, Ken Williams
+  <herd>perl</herd>
+  <longdescription>Following the 0.X series of File-Spec, Ken Williams
 	(author) has merged file-spec with cwd and adopted the cwd version schemea -
 	hence the jump to the 3.0 series. In addition, the package is now part of
 	the PathTools package upstream. Maintaining the ebuild as File-Spec for the
 	interim.</longdescription>
+  <upstream>
+    <remote-id type="cpan">PathTools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/File-Temp/metadata.xml b/perl-core/File-Temp/metadata.xml
index 86672fe64c10..da38534a4a7a 100644
--- a/perl-core/File-Temp/metadata.xml
+++ b/perl-core/File-Temp/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">File-Temp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Filter/metadata.xml b/perl-core/Filter/metadata.xml
index 86672fe64c10..bd5920569da8 100644
--- a/perl-core/Filter/metadata.xml
+++ b/perl-core/Filter/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Filter</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Getopt-Long/metadata.xml b/perl-core/Getopt-Long/metadata.xml
index 86672fe64c10..8d12000f34d3 100644
--- a/perl-core/Getopt-Long/metadata.xml
+++ b/perl-core/Getopt-Long/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Getopt-Long</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/IO-Compress/metadata.xml b/perl-core/IO-Compress/metadata.xml
index 801e9385a1e0..5a09d5eb4720 100644
--- a/perl-core/IO-Compress/metadata.xml
+++ b/perl-core/IO-Compress/metadata.xml
@@ -1,5 +1,8 @@
 <?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">IO-Compress</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/IO-Zlib/metadata.xml b/perl-core/IO-Zlib/metadata.xml
index 801e9385a1e0..b7af0849f8d5 100644
--- a/perl-core/IO-Zlib/metadata.xml
+++ b/perl-core/IO-Zlib/metadata.xml
@@ -1,5 +1,8 @@
 <?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">IO-Zlib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/IO/metadata.xml b/perl-core/IO/metadata.xml
index 86672fe64c10..0723c222379d 100644
--- a/perl-core/IO/metadata.xml
+++ b/perl-core/IO/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">IO</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/IPC-Cmd/metadata.xml b/perl-core/IPC-Cmd/metadata.xml
index 801e9385a1e0..2d09a8d91212 100644
--- a/perl-core/IPC-Cmd/metadata.xml
+++ b/perl-core/IPC-Cmd/metadata.xml
@@ -1,5 +1,8 @@
 <?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">IPC-Cmd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Locale-Maketext-Simple/metadata.xml b/perl-core/Locale-Maketext-Simple/metadata.xml
index 801e9385a1e0..ad2daee64a18 100644
--- a/perl-core/Locale-Maketext-Simple/metadata.xml
+++ b/perl-core/Locale-Maketext-Simple/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Locale-Maketext-Simple</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/MIME-Base64/metadata.xml b/perl-core/MIME-Base64/metadata.xml
index 86672fe64c10..b886d6eaa392 100644
--- a/perl-core/MIME-Base64/metadata.xml
+++ b/perl-core/MIME-Base64/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">MIME-Base64</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Memoize/metadata.xml b/perl-core/Memoize/metadata.xml
index 86672fe64c10..5d7851158bb5 100644
--- a/perl-core/Memoize/metadata.xml
+++ b/perl-core/Memoize/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Memoize</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Build/metadata.xml b/perl-core/Module-Build/metadata.xml
index 801e9385a1e0..1dd4bf677fde 100644
--- a/perl-core/Module-Build/metadata.xml
+++ b/perl-core/Module-Build/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Build</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-CoreList/metadata.xml b/perl-core/Module-CoreList/metadata.xml
index 056ad389507d..89f580ce1991 100644
--- a/perl-core/Module-CoreList/metadata.xml
+++ b/perl-core/Module-CoreList/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
+  <herd>perl</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Module-CoreList</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Load-Conditional/metadata.xml b/perl-core/Module-Load-Conditional/metadata.xml
index 801e9385a1e0..2f28ebc8ce29 100644
--- a/perl-core/Module-Load-Conditional/metadata.xml
+++ b/perl-core/Module-Load-Conditional/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Load-Conditional</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Load/metadata.xml b/perl-core/Module-Load/metadata.xml
index 801e9385a1e0..2e368657fbd3 100644
--- a/perl-core/Module-Load/metadata.xml
+++ b/perl-core/Module-Load/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Load</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Loaded/metadata.xml b/perl-core/Module-Loaded/metadata.xml
index 801e9385a1e0..a6d01e16bb31 100644
--- a/perl-core/Module-Loaded/metadata.xml
+++ b/perl-core/Module-Loaded/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Loaded</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Pluggable/metadata.xml b/perl-core/Module-Pluggable/metadata.xml
index 801e9385a1e0..577e7196ee54 100644
--- a/perl-core/Module-Pluggable/metadata.xml
+++ b/perl-core/Module-Pluggable/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Pluggable</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Package-Constants/metadata.xml b/perl-core/Package-Constants/metadata.xml
index 801e9385a1e0..d9208c172d74 100644
--- a/perl-core/Package-Constants/metadata.xml
+++ b/perl-core/Package-Constants/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Constants</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Params-Check/metadata.xml b/perl-core/Params-Check/metadata.xml
index 801e9385a1e0..893cb8d55660 100644
--- a/perl-core/Params-Check/metadata.xml
+++ b/perl-core/Params-Check/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Params-Check</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Parse-CPAN-Meta/metadata.xml b/perl-core/Parse-CPAN-Meta/metadata.xml
index 056ad389507d..e0a1bd390b7f 100644
--- a/perl-core/Parse-CPAN-Meta/metadata.xml
+++ b/perl-core/Parse-CPAN-Meta/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
+  <herd>perl</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Parse-CPAN-Meta</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Pod-Escapes/metadata.xml b/perl-core/Pod-Escapes/metadata.xml
index 801e9385a1e0..38875ab50d9c 100644
--- a/perl-core/Pod-Escapes/metadata.xml
+++ b/perl-core/Pod-Escapes/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Escapes</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Pod-Simple/metadata.xml b/perl-core/Pod-Simple/metadata.xml
index 801e9385a1e0..11b4b01e8cef 100644
--- a/perl-core/Pod-Simple/metadata.xml
+++ b/perl-core/Pod-Simple/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Simple</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/PodParser/metadata.xml b/perl-core/PodParser/metadata.xml
index 86672fe64c10..be4b5fde12d4 100644
--- a/perl-core/PodParser/metadata.xml
+++ b/perl-core/PodParser/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Pod-Parser</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Scalar-List-Utils/metadata.xml b/perl-core/Scalar-List-Utils/metadata.xml
index 86672fe64c10..9f9af3cde0b8 100644
--- a/perl-core/Scalar-List-Utils/metadata.xml
+++ b/perl-core/Scalar-List-Utils/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Scalar-List-Utils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Storable/metadata.xml b/perl-core/Storable/metadata.xml
index 86672fe64c10..4c935d9e5916 100644
--- a/perl-core/Storable/metadata.xml
+++ b/perl-core/Storable/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Storable</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Sys-Syslog/metadata.xml b/perl-core/Sys-Syslog/metadata.xml
index 176e5a8a3176..994434ae78fd 100644
--- a/perl-core/Sys-Syslog/metadata.xml
+++ b/perl-core/Sys-Syslog/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription>This core perl package is being provided as an ebuild to
+  <herd>perl</herd>
+  <longdescription>This core perl package is being provided as an ebuild to
 	address recent security issues with Sys::Syslog. Perl 5.8.8 and above should
 	have 0.13 or greater bundled with them, but users of less than 5.8.8 may
 	benefit from the ebuild.</longdescription>
+  <upstream>
+    <remote-id type="cpan">Sys-Syslog</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Term-ANSIColor/metadata.xml b/perl-core/Term-ANSIColor/metadata.xml
index 801e9385a1e0..4284e59d6a0a 100644
--- a/perl-core/Term-ANSIColor/metadata.xml
+++ b/perl-core/Term-ANSIColor/metadata.xml
@@ -1,5 +1,8 @@
 <?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">ANSIColor</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Test-Harness/metadata.xml b/perl-core/Test-Harness/metadata.xml
index 801e9385a1e0..dd7c10e4e78e 100644
--- a/perl-core/Test-Harness/metadata.xml
+++ b/perl-core/Test-Harness/metadata.xml
@@ -1,5 +1,8 @@
 <?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-Harness</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Test-Simple/metadata.xml b/perl-core/Test-Simple/metadata.xml
index 86672fe64c10..91d153e11d43 100644
--- a/perl-core/Test-Simple/metadata.xml
+++ b/perl-core/Test-Simple/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Test-Simple</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Test/metadata.xml b/perl-core/Test/metadata.xml
index 801e9385a1e0..351b52ff0447 100644
--- a/perl-core/Test/metadata.xml
+++ b/perl-core/Test/metadata.xml
@@ -1,5 +1,8 @@
 <?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</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Text-Balanced/metadata.xml b/perl-core/Text-Balanced/metadata.xml
index 86672fe64c10..e4da9c13e0df 100644
--- a/perl-core/Text-Balanced/metadata.xml
+++ b/perl-core/Text-Balanced/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Text-Balanced</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Text-Tabs+Wrap/metadata.xml b/perl-core/Text-Tabs+Wrap/metadata.xml
index 801e9385a1e0..0c24f8b8e2c8 100644
--- a/perl-core/Text-Tabs+Wrap/metadata.xml
+++ b/perl-core/Text-Tabs+Wrap/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Text-Tabs+Wrap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Time-HiRes/metadata.xml b/perl-core/Time-HiRes/metadata.xml
index 86672fe64c10..13a9a75e8cda 100644
--- a/perl-core/Time-HiRes/metadata.xml
+++ b/perl-core/Time-HiRes/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Time-HiRes</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Time-Local/metadata.xml b/perl-core/Time-Local/metadata.xml
index 86672fe64c10..a9c2140ccc23 100644
--- a/perl-core/Time-Local/metadata.xml
+++ b/perl-core/Time-Local/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Time-Local</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/Time-Piece/metadata.xml b/perl-core/Time-Piece/metadata.xml
index 801e9385a1e0..54ad2008003a 100644
--- a/perl-core/Time-Piece/metadata.xml
+++ b/perl-core/Time-Piece/metadata.xml
@@ -1,5 +1,8 @@
 <?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">Time-Piece</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/XSLoader/metadata.xml b/perl-core/XSLoader/metadata.xml
index 801e9385a1e0..aca53eaf4966 100644
--- a/perl-core/XSLoader/metadata.xml
+++ b/perl-core/XSLoader/metadata.xml
@@ -1,5 +1,8 @@
 <?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">XSLoader</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/digest-base/metadata.xml b/perl-core/digest-base/metadata.xml
index 86672fe64c10..6d1229e31bf5 100644
--- a/perl-core/digest-base/metadata.xml
+++ b/perl-core/digest-base/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Digest</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/i18n-langtags/metadata.xml b/perl-core/i18n-langtags/metadata.xml
index 86672fe64c10..05a729b181f8 100644
--- a/perl-core/i18n-langtags/metadata.xml
+++ b/perl-core/i18n-langtags/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">I18N-LangTags</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/libnet/metadata.xml b/perl-core/libnet/metadata.xml
index 8d09d5da05ee..1890b7b78bd3 100644
--- a/perl-core/libnet/metadata.xml
+++ b/perl-core/libnet/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription>dev-perl/libnet provides the suite of basic Net:: modules (Net::Cmd, Net::Config, Net::Domain, Net::FTP, Net::NNTP, Net::Netrc, Net::POP3, Net::SMTP, and Net::Time as the key ones)</longdescription>
+  <herd>perl</herd>
+  <longdescription>dev-perl/libnet provides the suite of basic Net:: modules (Net::Cmd, Net::Config, Net::Domain, Net::FTP, Net::NNTP, Net::Netrc, Net::POP3, Net::SMTP, and Net::Time as the key ones)</longdescription>
+  <upstream>
+    <remote-id type="cpan">libnet</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/locale-maketext/metadata.xml b/perl-core/locale-maketext/metadata.xml
index 86672fe64c10..1c60be9ba90c 100644
--- a/perl-core/locale-maketext/metadata.xml
+++ b/perl-core/locale-maketext/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Locale-Maketext</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/net-ping/metadata.xml b/perl-core/net-ping/metadata.xml
index 86672fe64c10..79957d6b9159 100644
--- a/perl-core/net-ping/metadata.xml
+++ b/perl-core/net-ping/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Net-Ping</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/parent/metadata.xml b/perl-core/parent/metadata.xml
index 056ad389507d..54b67fe47e86 100644
--- a/perl-core/parent/metadata.xml
+++ b/perl-core/parent/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
+  <herd>perl</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">parent</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/podlators/metadata.xml b/perl-core/podlators/metadata.xml
index 801e9385a1e0..3197e204feb6 100644
--- a/perl-core/podlators/metadata.xml
+++ b/perl-core/podlators/metadata.xml
@@ -1,5 +1,8 @@
 <?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">podlators</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/threads-shared/metadata.xml b/perl-core/threads-shared/metadata.xml
index 801e9385a1e0..f67472b0f3d9 100644
--- a/perl-core/threads-shared/metadata.xml
+++ b/perl-core/threads-shared/metadata.xml
@@ -1,5 +1,8 @@
 <?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">threads-shared</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/threads/metadata.xml b/perl-core/threads/metadata.xml
index 801e9385a1e0..40b433c9c742 100644
--- a/perl-core/threads/metadata.xml
+++ b/perl-core/threads/metadata.xml
@@ -1,5 +1,8 @@
 <?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">threads</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/perl-core/version/metadata.xml b/perl-core/version/metadata.xml
index 801e9385a1e0..933a75042292 100644
--- a/perl-core/version/metadata.xml
+++ b/perl-core/version/metadata.xml
@@ -1,5 +1,8 @@
 <?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">version</remote-id>
+  </upstream>
 </pkgmetadata>