[gentoo-commits] dev/axs:master commit in: dev-perl/Math-Libm/, dev-perl/ExtUtils-CppGuess/, dev-perl/Encode-Locale/, ...

[Ian Stakenvicius]

commit:     68020e433ef529dffc95e4a256fdd8e84c007dcd
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 20:34:45 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 20:34:49 2016 +0000
URL:        https://gitweb.gentoo.org/dev/axs.git/commit/?id=68020e43

Various fixes related to perl and metadata

- dropped 'herd' tags from metadata in favour of new 'project' type maintainer tags
- dropped virtual/perl-* and perl-core/* packages as the main tree has new enough versions now
- adjusted dependency atoms containing virtual/perl-Module-Build to dev-perl/Module-Buildto match main tree

 dev-perl/Encode-Locale/metadata.xml                |  5 ++++-
 ...0.ebuild => ExtUtils-CppGuess-0.80.0-r1.ebuild} |  2 +-
 dev-perl/ExtUtils-CppGuess/Manifest                |  2 +-
 dev-perl/ExtUtils-CppGuess/metadata.xml            | 13 ++++++-----
 ... => ExtUtils-Typemaps-Default-1.50.0-r1.ebuild} |  2 +-
 dev-perl/ExtUtils-Typemaps-Default/Manifest        |  2 +-
 dev-perl/ExtUtils-Typemaps-Default/metadata.xml    | 25 ++++++++++++----------
 dev-perl/Math-Libm/metadata.xml                    | 12 +++++++----
 dev-perl/Math-PlanePath/metadata.xml               | 25 ++++++++++++----------
 dev-perl/Module-Build-WithXSpp/Manifest            |  2 +-
 ...ild => Module-Build-WithXSpp-0.140.0-r1.ebuild} |  2 +-
 dev-perl/Module-Build-WithXSpp/metadata.xml        |  9 +++++++-
 dev-perl/Net-Bonjour/metadata.xml                  | 17 +++++++++------
 dev-perl/Wx-GLCanvas/metadata.xml                  | 12 +++++++----
 dev-perl/constant-defer/metadata.xml               | 13 ++++++-----
 perl-core/Socket/Manifest                          |  3 ---
 perl-core/Socket/Socket-2.16.0.ebuild              | 22 -------------------
 perl-core/Socket/metadata.xml                      |  9 --------
 perl-core/threads/Manifest                         |  3 ---
 perl-core/threads/metadata.xml                     |  9 --------
 perl-core/threads/threads-1.960.0.ebuild           | 20 -----------------
 virtual/perl-Socket/Manifest                       |  2 --
 virtual/perl-Socket/metadata.xml                   |  5 -----
 virtual/perl-Socket/perl-Socket-2.16.0.ebuild      | 16 --------------
 virtual/perl-threads/Manifest                      |  2 --
 virtual/perl-threads/metadata.xml                  |  5 -----
 virtual/perl-threads/perl-threads-1.960.0.ebuild   | 16 --------------
 27 files changed, 88 insertions(+), 167 deletions(-)

diff --git a/dev-perl/Encode-Locale/metadata.xml b/dev-perl/Encode-Locale/metadata.xml
index 0b26b9e..2691766 100644
--- a/dev-perl/Encode-Locale/metadata.xml
+++ b/dev-perl/Encode-Locale/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Encode-Locale</remote-id>
 		<remote-id type="cpan-module">Encode::Locale</remote-id>

diff --git a/dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.80.0.ebuild b/dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.80.0-r1.ebuild
similarity index 93%
rename from dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.80.0.ebuild
rename to dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.80.0-r1.ebuild
index 869d546..aa192a7 100644
--- a/dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.80.0.ebuild
+++ b/dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.80.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 RDEPEND="dev-perl/Capture-Tiny"
 
 DEPEND="${RDEPEND}
-	>=virtual/perl-Module-Build-0.420.0
+	>=dev-perl/Module-Build-0.420.0
 	test? (
 		virtual/perl-autodie
 		virtual/perl-Test-Simple

diff --git a/dev-perl/ExtUtils-CppGuess/Manifest b/dev-perl/ExtUtils-CppGuess/Manifest
index f9e7c0c..255aa07 100644
--- a/dev-perl/ExtUtils-CppGuess/Manifest
+++ b/dev-perl/ExtUtils-CppGuess/Manifest
@@ -1,3 +1,3 @@
 DIST ExtUtils-CppGuess-0.08.tar.gz 7169 SHA256 a45d9ed5449d3378f073d6e69ed79365176775cd6367e62898494b99d455dede SHA512 9521741132d7f8ce20ccddea30b09cd685f75330af01b6bcfaa3728cf40b0a5849042e2f2b8bb0b7c38cf4adb22b1c1bc71c4e6eff8f7674708e7c251570e92e WHIRLPOOL abb183221705100512c210e90954760c22a614dec4646044af27e7aaa5ff8e8045367851bea307c25459014bb253165c42b694253482c92815f5d25d444ce02c
-EBUILD ExtUtils-CppGuess-0.80.0.ebuild 535 SHA256 08beceb886691b7d853d8e49e54580bb7c9e2b4acd754532ff2bb79135792600 SHA512 6108e51358daa3401555259a098fa462159be09750f572e84deccba3d28df1ce88b60a76b062511a4b0b484024640e0cddaa0e3e5bc5d0f142fd5cfedb998eb4 WHIRLPOOL a8c5ab95939ebee6a48310f82c425bc762f9d76c9ec9bc653a99158b0bbde5a91b088c755b6da7c4c3e26588e607b3d4a3b66bffd72ed83fdfd79bb4e08e8bd3
+EBUILD ExtUtils-CppGuess-0.80.0-r1.ebuild 531 SHA256 53c1556060fe4ff34de317bad1b7e641f97437319324767866795e25998ce10d SHA512 cfea23b09312a589fee5394bc455821507e806ff96e7e8df4c016c1d56d492eea987c46979290a0d92db3912bfb3b6b5ae1c168ff54493ba19dc63f9d567e76b WHIRLPOOL a97ee0854550a9eae8fc40c0d7e6714e12597c72f6eb2cfb4642e3d19d4b4a0bea3b30fdf8a626cca999f398e4803e56eb3610c1019160735be326d543394c10
 MISC metadata.xml 308 SHA256 28bba861d58b79e2e1e44553f8d99903ea5143b44acc52d037e422ad754f1edf SHA512 c1e356a10b13ebcc6a069232da5b467f31434f501241a721c4df29a06bebe8d474a5310189d0f7039ed168fe5a0be5a8e19c9c416374c130cc83b6a2c0faee5a WHIRLPOOL 39b50a55fbc34ab68b64bcd8dd164103f2e8e3d17e91c7097fa722d442b6514efc66f2ebd07cbfffe04a99c3f59e220688d255c9c335ab848b999b7b61baec6a

diff --git a/dev-perl/ExtUtils-CppGuess/metadata.xml b/dev-perl/ExtUtils-CppGuess/metadata.xml
index 9a4b867..297b581 100644
--- a/dev-perl/ExtUtils-CppGuess/metadata.xml
+++ b/dev-perl/ExtUtils-CppGuess/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">ExtUtils-CppGuess</remote-id>
-    <remote-id type="cpan-module">ExtUtils::CppGuess</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">ExtUtils-CppGuess</remote-id>
+		<remote-id type="cpan-module">ExtUtils::CppGuess</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0.ebuild b/dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0-r1.ebuild
similarity index 91%
rename from dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0.ebuild
rename to dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0-r1.ebuild
index b15fed6..9899e46 100644
--- a/dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0.ebuild
+++ b/dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="test"
 
 RDEPEND=">=virtual/perl-ExtUtils-ParseXS-3.180.300"
 DEPEND="${RDEPEND}
-	>=virtual/perl-Module-Build-0.400.0
+	>=dev-perl/Module-Build-0.400.0
 	test? (
 		virtual/perl-Test-Simple
 	)

diff --git a/dev-perl/ExtUtils-Typemaps-Default/Manifest b/dev-perl/ExtUtils-Typemaps-Default/Manifest
index 6b9d920..ff69f3b 100644
--- a/dev-perl/ExtUtils-Typemaps-Default/Manifest
+++ b/dev-perl/ExtUtils-Typemaps-Default/Manifest
@@ -1,3 +1,3 @@
 DIST ExtUtils-Typemaps-Default-1.05.tar.gz 9327 SHA256 3dfaf5837ebfdc007895bfca84c3c2e76d589a7d336400e8dfb3243d818215de SHA512 91f3f5e3abfe2532a38bfb097d06e5a4145c84729a906af5269353f92b19bfcb86ac5c664067dc3adad405bbc8d0b43071180da4e6575e468b7b946d6c44e949 WHIRLPOOL e33d47c237e1501492e3c25b0e5026a829bc4f1558ecc90289a231ed78c7862f1b4abaf77a3454016c7e86ef54bbc4849b431a82bff32a9bbc9c3c288da7cc1e
-EBUILD ExtUtils-Typemaps-Default-1.50.0.ebuild 440 SHA256 86985d6217650ba1f0df2360ec01f522c405318b7621bb288050dd6954d86f80 SHA512 ab920b18f1b4c2db1e1a54ed6dd200b55136339e51f9d2221464151c5741dc7e25203e12f0b1edd9915811bb5d9e9637c127ea77ce9f6de94b787d833bd4d435 WHIRLPOOL 18b3b3f804f609a616856d80a39f4c0d9340e6e241f86e1eb1c62fd3730b81dc2c695496f70328a4de4ee8ce066cfcc76474c1541e8639d1cc0494d5dd2b8741
+EBUILD ExtUtils-Typemaps-Default-1.50.0-r1.ebuild 436 SHA256 edf2b8c3685884456a2b5c42b25116bf801753135d71b2e99e4a31f4bfe5eb19 SHA512 4172be2e08cb7f0995eecf9a4637702e6f5d922f237551f2212f120b213f23343d3b0de7b677ce9fb1844e4dc2dbbdb8f64b207583ee4196df6805d09e9370c5 WHIRLPOOL 7cadb1e97ac03d89224803db6af59419da7cb790c5fb976139c2c51c4b096e473a95bdf8f81aa52a389d83e76e2af9feef3f0939234020cbed276c0407698269
 MISC metadata.xml 775 SHA256 a701195196482854968f8bfd663f58bae62d86626c0dab5e004b98915fc5bd67 SHA512 4aeb1b7ac7005f6e3e53959320b3747f22326ac61baa567b992b2e77d1cef93dd782127b72bb77ab74028ac11f606151fc87f51717a84483c97b5da3baa1c427 WHIRLPOOL 2df2d84f34d58e26d2f245fd36c156c730e542c366e2e57c990c60abada39fd06a219d4945d526028240ba465dbdb181a133cac385368807f7835ec259d49fb7

diff --git a/dev-perl/ExtUtils-Typemaps-Default/metadata.xml b/dev-perl/ExtUtils-Typemaps-Default/metadata.xml
index d9c10fb..68d1f19 100644
--- a/dev-perl/ExtUtils-Typemaps-Default/metadata.xml
+++ b/dev-perl/ExtUtils-Typemaps-Default/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">ExtUtils-Typemaps-Default</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Typemaps::Basic</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Typemaps::Default</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Typemaps::ObjectMap</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Typemaps::STL</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Typemaps::STL::List</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Typemaps::STL::String</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Typemaps::STL::Vector</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">ExtUtils-Typemaps-Default</remote-id>
+		<remote-id type="cpan-module">ExtUtils::Typemaps::Basic</remote-id>
+		<remote-id type="cpan-module">ExtUtils::Typemaps::Default</remote-id>
+		<remote-id type="cpan-module">ExtUtils::Typemaps::ObjectMap</remote-id>
+		<remote-id type="cpan-module">ExtUtils::Typemaps::STL</remote-id>
+		<remote-id type="cpan-module">ExtUtils::Typemaps::STL::List</remote-id>
+		<remote-id type="cpan-module">ExtUtils::Typemaps::STL::String</remote-id>
+		<remote-id type="cpan-module">ExtUtils::Typemaps::STL::Vector</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Math-Libm/metadata.xml b/dev-perl/Math-Libm/metadata.xml
index 408dc10..22711e8 100644
--- a/dev-perl/Math-Libm/metadata.xml
+++ b/dev-perl/Math-Libm/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">Math-Libm</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Math-Libm</remote-id>
+		<remote-id type="cpan-module">Math::Libm</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Math-PlanePath/metadata.xml b/dev-perl/Math-PlanePath/metadata.xml
index e074650..88c9b8c 100644
--- a/dev-perl/Math-PlanePath/metadata.xml
+++ b/dev-perl/Math-PlanePath/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">Math-PlanePath</remote-id>
-    <remote-id type="cpan-module">Math::PlanePath</remote-id>
-    <remote-id type="cpan-module">Math::PlanePath::ToothpickTree</remote-id>
-    <remote-id type="cpan-module">Math::PlanePath::ToothpickReplicate</remote-id>
-    <remote-id type="cpan-module">Math::PlanePath::ToothpickUpist</remote-id>
-    <remote-id type="cpan-module">Math::PlanePath::LCornerTree</remote-id>
-    <remote-id type="cpan-module">Math::PlanePath::LCornerReplicate</remote-id>
-    <remote-id type="cpan-module">Math::PlanePath::OneOfEight</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Math-PlanePath</remote-id>
+		<remote-id type="cpan-module">Math::PlanePath</remote-id>
+		<remote-id type="cpan-module">Math::PlanePath::ToothpickTree</remote-id>
+		<remote-id type="cpan-module">Math::PlanePath::ToothpickReplicate</remote-id>
+		<remote-id type="cpan-module">Math::PlanePath::ToothpickUpist</remote-id>
+		<remote-id type="cpan-module">Math::PlanePath::LCornerTree</remote-id>
+		<remote-id type="cpan-module">Math::PlanePath::LCornerReplicate</remote-id>
+		<remote-id type="cpan-module">Math::PlanePath::OneOfEight</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Module-Build-WithXSpp/Manifest b/dev-perl/Module-Build-WithXSpp/Manifest
index f273b10..13cc077 100644
--- a/dev-perl/Module-Build-WithXSpp/Manifest
+++ b/dev-perl/Module-Build-WithXSpp/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Build-WithXSpp-0.14.tar.gz 14103 SHA256 53b3c8c8fdbd50fc3dad3d19da20f1b6414ef70665b9311710c802969e746934 SHA512 2d334656128fe9e4b2e06ce23fc33b81bd4302477dcca2ac2cf87a74cbd4d160c7875e2a252e85116dc17a6e9ee53d43457a7d50e0cdd33d3514ad47eac4554c WHIRLPOOL 617ab44960c975551d62bb1f61a2c9a4f503edb0454f00bc3b21bd8a19ad6a8d31480324d71382979f3f368d93d1fd463d5480b91841929acd9cc14739857a78
-EBUILD Module-Build-WithXSpp-0.140.0.ebuild 590 SHA256 d853b407aadfbc2de7a0bf105be07ae95847c5635e9a0304d49ac847d58fcd92 SHA512 54b96b624bd9efb30223158671177b628b3ea3eae4d1fedef8e09f07d6568374a4e429657d4db635629b8261252448d244b0b8e0ca02e472a99f1a540f02fe68 WHIRLPOOL ac8afccea561c7b93683644cb7645500e084bcae81cf6e85c8830c4debfafbc62fa849b2fec800d39b159c624ba5f3617443d4962ce1b4792694b51e3a16e6a4
+EBUILD Module-Build-WithXSpp-0.140.0-r1.ebuild 586 SHA256 f5dc26039c40cf4c7162a9b848910ce9cd2d09c7c011856a16eb57474e7e8535 SHA512 7ccf83fad15ffe0c5f8394938ba82b5c6e666c13bdb5a8873b821b1c2478eb7fd09873e567d58654e864e412a7b33cfdede33bce75ad61f5c91a7e48a661be74 WHIRLPOOL 6fd08d70b62ca99014396d1344004139fe59e22871b8a10b658a3f40d6ae14e528d40ef82c29e69ba5e2cba2e285ef80670ab5991d38f63585fd64c206eacd56
 MISC metadata.xml 159 SHA256 9e7c719a784bb48388c9a12217b85baa75f1b04e9bf049d74b740785fa5006dd SHA512 5ff7b5593ea8976b44c7d63c7cd649f56d649b0d7c4fa5a16bf71ecdf36e40afa8fd9c28df0b8f0c7f9577c47b6ee63d3330f9304d545b46657d6a5f2bfa124a WHIRLPOOL 7ca7b971bad6145bdf2215f73d158f190984644554e8f32132c57c22f1209a5684060661c02e181c135c34c8729d491090ff6d4b23614198e19b9e2deda35a0a

diff --git a/dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0.ebuild b/dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0-r1.ebuild
similarity index 93%
rename from dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0.ebuild
rename to dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0-r1.ebuild
index 6e60e07..f3a9d6e 100644
--- a/dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0.ebuild
+++ b/dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	virtual/perl-Digest-MD5
 	virtual/perl-ExtUtils-CBuilder
 	>=virtual/perl-ExtUtils-ParseXS-2.220.500
-	>=virtual/perl-Module-Build-0.260.0
+	>=dev-perl/Module-Build-0.260.0
 "
 
 DEPEND="${RDEPEND}

diff --git a/dev-perl/Module-Build-WithXSpp/metadata.xml b/dev-perl/Module-Build-WithXSpp/metadata.xml
index 36ee0f0..5f6402c 100644
--- a/dev-perl/Module-Build-WithXSpp/metadata.xml
+++ b/dev-perl/Module-Build-WithXSpp/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Module-Build-WithXSpp</remote-id>
+		<remote-id type="cpan-module">Module::Build::WithXSpp</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Net-Bonjour/metadata.xml b/dev-perl/Net-Bonjour/metadata.xml
index a8be56d..f906d7a 100644
--- a/dev-perl/Net-Bonjour/metadata.xml
+++ b/dev-perl/Net-Bonjour/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">Net-Bonjour</remote-id>
-    <remote-id type="cpan-module">Net::Bonjour</remote-id>
-    <remote-id type="cpan-module">Net::Bonjour::Entry</remote-id>
-    <remote-id type="cpan-module">Net::Bonjour::Rendezvous</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Net-Bonjour</remote-id>
+		<remote-id type="cpan-module">Net::Bonjour</remote-id>
+		<remote-id type="cpan-module">Net::Bonjour::Entry</remote-id>
+		<remote-id type="cpan-module">Net::Bonjour::Rendezvous</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/Wx-GLCanvas/metadata.xml b/dev-perl/Wx-GLCanvas/metadata.xml
index 99921fa..45a02a7 100644
--- a/dev-perl/Wx-GLCanvas/metadata.xml
+++ b/dev-perl/Wx-GLCanvas/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">Wx-GLCanvas</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Wx-GLCanvas</remote-id>
+		<remote-id type="cpan-module">Wx::GLCanvas</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-perl/constant-defer/metadata.xml b/dev-perl/constant-defer/metadata.xml
index 548605d..fe36084 100644
--- a/dev-perl/constant-defer/metadata.xml
+++ b/dev-perl/constant-defer/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">constant-defer</remote-id>
-    <remote-id type="cpan-module">constant::defer</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>perl@g.o</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">constant-defer</remote-id>
+		<remote-id type="cpan-module">constant::defer</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/perl-core/Socket/Manifest b/perl-core/Socket/Manifest
deleted file mode 100644
index 7ffbde8..0000000
--- a/perl-core/Socket/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Socket-2.016.tar.gz 40582 SHA256 5e7abfa0515a14f22e24ddc21e68984d9827962a2dd348751dfe968e3c2070bf SHA512 aa2294697ea64425136b8afdb37b4a3a9bfcafbbbfdf1c3d30bdd66e2f7b5d35a8176c8a623f2b428f97d73193c5d50c083c28ef82a3046580710c5a200e8bea WHIRLPOOL e271c0a31a45484f3148c87a794f9d165624e6d28c8f0c5ab00093b231e3734ee0cf8857a10fd75f7954c01d53952036c6eb2ed84193a8c70b20ba66ea3824ea
-EBUILD Socket-2.16.0.ebuild 693 SHA256 7650594c91f0d4784b246d59788a6d7301c00efd5e9ae55f103cbb0d2e12aa86 SHA512 29b0fe6ab6ed2cfa9864b951af393846a51300ac42631b4c2fc5c70a2225401238641a6e880a789912866bd5bb1d4983cc037fedff7068714a060bd82ac90363 WHIRLPOOL 9dacee1eef491f5c408b524bd4ae23b06bf9b65572710a350496078a9db328fe668625afd5a60db5b444ef79e4c5d43bfca510ef52b2746dec75ac0fd58d0e97
-MISC metadata.xml 285 SHA256 36f674d719539166454f9ddb85875e4c62b80b04365560e139d3874eeea6abf2 SHA512 afcb74c32794300aedcd42898e3ef0b4f268f625f8cc5d4dc761f3c45c0ccb42fbd1d97bd28efda3ecb1393d1cfa88c0ef1a80410fc4e47e9c5a78c60cc18feb WHIRLPOOL af01ee063c484b8e48b03fbe6cb69d647ee93549c04a1c995fa636c64298e9418203b347687278b5d43d63f49618709221e2c185367f4e2ac7a4a511ca6ef326

diff --git a/perl-core/Socket/Socket-2.16.0.ebuild b/perl-core/Socket/Socket-2.16.0.ebuild
deleted file mode 100644
index 0361818..0000000
--- a/perl-core/Socket/Socket-2.16.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MODULE_AUTHOR=PEVANS
-MODULE_VERSION=2.016
-inherit perl-module
-
-DESCRIPTION="Networking constants and support functions"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	virtual/perl-ExtUtils-CBuilder
-	>=virtual/perl-ExtUtils-Constant-0.230.0
-"
-
-SRC_TEST="do"

diff --git a/perl-core/Socket/metadata.xml b/perl-core/Socket/metadata.xml
deleted file mode 100644
index cc9a039..0000000
--- a/perl-core/Socket/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">Socket</remote-id>
-    <remote-id type="cpan-module">Socket</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/perl-core/threads/Manifest b/perl-core/threads/Manifest
deleted file mode 100644
index 3a4c4b0..0000000
--- a/perl-core/threads/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST threads-1.96.tar.gz 104818 SHA256 694cdbdac3ba8430e795ebc1dbee6245b0307e294e46fbd7a9abe77b531d9603 SHA512 fdda61d6deb2938875ab46efec373d1fc314b924e30655c193216207a14ece6ec386e0f3704b656af57f160c183ef6ae1b0d0aa9eb10b23d40c1ab316fa011c6 WHIRLPOOL d45f5554ddfdc110b154c399345bb29297fc1f52179481dcf276e557a45c62447744ce695a9474a197becc6f8ab1104183db3b4e22dc682a0f0b8e9580e51dbb
-EBUILD threads-1.960.0.ebuild 649 SHA256 f73a6ef4412e25cd2a5071c89799d937be02a4704a8acb2fa7e491e700faef3f SHA512 81432a24c219f6ecf7e4f0d3535d4e9f65f183ab4166ae446d989549d098223328abd235f2977b6c053a23a656e420f9f65df78f0b4d3506503ce4a1462a85f7 WHIRLPOOL 262ec0c7bc91ab037f27a11e62c86e4f8f1eaeb4b912ef0b2616a488a70d5a5326bda00448975322193d859a4bbf5156cce1ca51f82848eceea7bfae99af4b6f
-MISC metadata.xml 287 SHA256 f18375d72c8a1ff8b240e09689b591de31426d46763eef906da9dc6ed63366d1 SHA512 ed30b0c892ae3d752c890641a44b438c63e288edf843917205d2565fe638e8e58c7a6f9b93bcd46062a058d3e29b16753748e54de52215c843f7d396ac277a7f WHIRLPOOL 0db0c91af5aa51f5939576963ceb45d3be35b0ec1eee9ea6569e462e002832f4c589e6ae022ebd9527133cac672d43ba4de0a5e072dc245ade1c37ab7e062c03

diff --git a/perl-core/threads/metadata.xml b/perl-core/threads/metadata.xml
deleted file mode 100644
index fa44d30..0000000
--- a/perl-core/threads/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">threads</remote-id>
-    <remote-id type="cpan-module">threads</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/perl-core/threads/threads-1.960.0.ebuild b/perl-core/threads/threads-1.960.0.ebuild
deleted file mode 100644
index 49bff67..0000000
--- a/perl-core/threads/threads-1.960.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MODULE_AUTHOR=JDHEDDEN
-MODULE_VERSION=1.96
-inherit perl-module
-
-DESCRIPTION="Perl interpreter-based threads"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-lang/perl[ithreads]"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do

diff --git a/virtual/perl-Socket/Manifest b/virtual/perl-Socket/Manifest
deleted file mode 100644
index 7f41040..0000000
--- a/virtual/perl-Socket/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD perl-Socket-2.16.0.ebuild 584 SHA256 9bc65b23bed0e85b2607e6204ebedef04e93a01487b2b510179fb4ba517c750c SHA512 c48cbfd071e93eeb4f833cddf13ba53383e31294ee007857bae878739b4d932d59887e475a781ef9254cf5ee98d6dc0ba2262a0b30a8bb3fdc6b03b1ec089413 WHIRLPOOL 35358c41460c54de5cb1f17fc7deec8a6187c96ef75e6c57e34a680b66c191efdcef2497c245bd426fe30acf9c4da8c722f5d0939dabbe43e1deb1a67522417f
-MISC metadata.xml 161 SHA256 03133f1c99f9897289d97dc74a0ccc9b0a8138838507982422de997be1910a54 SHA512 105dfa237851f1eaa24a51b58404cc2dd4c96e5ae29dc602aa10fe916c2b8af6e6272ac89e7e1352d64e38799f38a293eebf488843490417657e94c3e751f5c8 WHIRLPOOL e2af9fd199381669706b1ddf6bc2db7a9019b6acdb1422a8f2ee8311705c819c120e87df08901c7865b37c916540862ff1d207773541d848ece41eb03e8a3d0b

diff --git a/virtual/perl-Socket/metadata.xml b/virtual/perl-Socket/metadata.xml
deleted file mode 100644
index fcd994b..0000000
--- a/virtual/perl-Socket/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <herd>perl</herd>
-</pkgmetadata>

diff --git a/virtual/perl-Socket/perl-Socket-2.16.0.ebuild b/virtual/perl-Socket/perl-Socket-2.16.0.ebuild
deleted file mode 100644
index 0b3f0ed..0000000
--- a/virtual/perl-Socket/perl-Socket-2.16.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"

diff --git a/virtual/perl-threads/Manifest b/virtual/perl-threads/Manifest
deleted file mode 100644
index 121593b..0000000
--- a/virtual/perl-threads/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD perl-threads-1.960.0.ebuild 584 SHA256 9bc65b23bed0e85b2607e6204ebedef04e93a01487b2b510179fb4ba517c750c SHA512 c48cbfd071e93eeb4f833cddf13ba53383e31294ee007857bae878739b4d932d59887e475a781ef9254cf5ee98d6dc0ba2262a0b30a8bb3fdc6b03b1ec089413 WHIRLPOOL 35358c41460c54de5cb1f17fc7deec8a6187c96ef75e6c57e34a680b66c191efdcef2497c245bd426fe30acf9c4da8c722f5d0939dabbe43e1deb1a67522417f
-MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc

diff --git a/virtual/perl-threads/metadata.xml b/virtual/perl-threads/metadata.xml
deleted file mode 100644
index 801e938..0000000
--- a/virtual/perl-threads/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>perl</herd>
-</pkgmetadata>

diff --git a/virtual/perl-threads/perl-threads-1.960.0.ebuild b/virtual/perl-threads/perl-threads-1.960.0.ebuild
deleted file mode 100644
index 0b3f0ed..0000000
--- a/virtual/perl-threads/perl-threads-1.960.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"