The CGI module is no longer part of core Perl and has been moved to dev-perl

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

40 files changed, 320 insertions, 194 deletions

diff --git a/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild b/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild
index ac9fe8c64329..068896e1210f 100644
--- a/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild
+++ b/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild,v 1.2 2014/03/04 21:40:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild,v 1.3 2015/06/13 17:18:02 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ DEPEND="adminserver? ( net-nds/389-admin )
 
 RDEPEND="${DEPEND}
 	dev-perl/perl-mozldap
-	virtual/perl-CGI"
+	dev-perl/CGI"
 
 src_prepare() {
 	# as per 389 documentation, when 64bit, export USE_64
diff --git a/www-apps/389-dsgw/ChangeLog b/www-apps/389-dsgw/ChangeLog
index e662a97bdd0b..6710c197c546 100644
--- a/www-apps/389-dsgw/ChangeLog
+++ b/www-apps/389-dsgw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/389-dsgw
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/389-dsgw/ChangeLog,v 1.8 2014/06/22 20:37:14 lxnay Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/389-dsgw/ChangeLog,v 1.9 2015/06/13 17:18:02 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  389-dsgw-1.1.10.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
   22 Jun 2014; Fabio Erculiani <lxnay@gentoo.org> metadata.xml:
   reset to maintainer-needed@
diff --git a/www-apps/389-dsgw/Manifest b/www-apps/389-dsgw/Manifest
index 7b1555d066bf..a8ed0f5de610 100644
--- a/www-apps/389-dsgw/Manifest
+++ b/www-apps/389-dsgw/Manifest
@@ -2,24 +2,25 @@
 Hash: SHA256
 
 DIST 389-dsgw-1.1.10.tar.bz2 726295 SHA256 07aa0d9a432b8d9d63b2c64b7c17021b3fe2ac2ec62e4d596723253f3c0e4e3f SHA512 52c73867d6801c3f3bff424c9b302298e67f0b07bc5746f83aa83367b5fbff605ffcced968eaf6ab4863a17c703ec529644a4227aa2925aea65943a72ff4e2e8 WHIRLPOOL 34c7fcc8bce7f6bfcbb429b0bd26b1d8836cb8d94a4403e8be89ee9cbd3041f9f057fe1ecaf607e1630d1ae8fbc6018cfa9de794de83aa7890b4f18a158940a5
-EBUILD 389-dsgw-1.1.10.ebuild 1052 SHA256 a9d6a249f04eb510eeff2743abe36229fe94f4fa6078318ea56846b77e47d2bb SHA512 4d911900312840bed4dd2a501735bbcaa613b3a346dbae537a27a1c8dcc82cc197cb7bededab110e50bdd344de495c1da31873d34a15bdf5ff4ed91144345041 WHIRLPOOL 1e868f3372e1d9410c50283aa94abbe7ee4b642ea28192bf8555865ff709db66d8825cedb48083fa511fb5a16a8367d2e787eddcb4d7ee2141fc16951e6d7f6c
-MISC ChangeLog 1318 SHA256 7e499c52c751bf84c30e8c170bd79094dd79a04fe253c17446d576794fa45823 SHA512 2eb35029c8bdf60c84da06aa628bef0ed57d4cf8fd2a1cc60b9cfba732ff68fe4cf74d04513d1948c548adf6cc50214f7fc34243f43a913130fd680e1f162bcb WHIRLPOOL f7dca233165fd9b48aecb54aa0a59a94ece44b628e39c3f112facfb7c9f88ce231326468da3e5984e9274cdc284ae963e75ca6a387e85aa5d761138faf544adb
+EBUILD 389-dsgw-1.1.10.ebuild 1048 SHA256 37cfd7ca43468965e0563bfa0f081dd42baea5ed5b4f17e9db73397269d00ecb SHA512 11bfd6fbe3772f0d13db5571c05b14579a618da8a54811f1760c9332b2b4047ba0c2c0bfbfd11dd63a2484640e303a54c4c3f5e305d3bc90362c6329541feb54 WHIRLPOOL 8f3ea952bcf3165d35e37054ba78d03f70a8777ff402fd7282f2dc1be62a53e0a9c2a88f869249f4538d12bcb6b8083ba586f22a9c7a03d740d591397a0e5466
+MISC ChangeLog 1485 SHA256 48481397e2d7bcd2d6079ea8b3fc79a87f5e1fd49adb86512084b56335107d04 SHA512 6bc69dfb2aff93d515328c0827ee4ab3bd02be7caaa598b7ada73beb00f6043ef01577906faece418c99175b4916ff8359b42783fb665059e7153010b596d3ec WHIRLPOOL 2d29de0e8f660f7030531e660da96bbb93e7843fcba464e5a85486b89ac31172227e1023429d39ae3c979f5b4a41fa2b8adc556ba53aca67c82da1df6dfb75a6
 MISC metadata.xml 288 SHA256 f2f32d0fc4a1bc7a4389d84371fb094cc34526cc414dcf7c0d8a77ff6d05b93f SHA512 f11b6ee08805e75e98a866b4120a758112c5083348bc0c4d7b43ef66c9cceabf6e69ffeeb9f24b6e1cd09732273c399f0b82d441a6ad2ac4ec3d89bffeddd9f5 WHIRLPOOL 5e1ec257ca07274d4da467af051f1d2a5b62b172fd279204ed0eab93adc70d1a49bd860f8e4c9392c521ad4aa670039456d35ceb23f6a9b1ccf8c42698d5e502
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJTrCBjRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7IPgD/982F+PAP00srYz7z5Iz2OHOQo+cSkbgDOPS9qBiG/4MxCS9cL2pYj+uG48
-LGGHS1adOD4dDxTwPAWnDaT3W5BSHFYDQurlE5ImLu2fVW+mf0TOBQYmlIDpA1bY
-cha8lChVRLuwCmm4b5G0tUNXRbwldSeLNgMbTLHOD1SE727EeYWnd3QEwz2i0jz8
-O+FY2oXtNa2BuWimiJxN6ANW8SBqMTQCSHMJcA3XMX/4fN9d9kEwPldoiKLoDFS1
-3MSq9xxTyFHbUy2lJHEFNTF6lF7TkIlouk9iyRpo64Cg9kn/TYpI5f+klX4Z+NNa
-PC+2+ZqwJ7lPW8w1/cxTzN7+e2xx7qbeyuRpeiPaNhtDVEn1s6BAPkPvELbD1bFz
-gLia1MkixJI3EkJtDIpwu+PwfiTxzxNn8KEUG0OU5i8VAFvxqV7F0wVFZaiMsIBT
-BZaassrlZTAG7AQCdLpU33+S0qo0Ui0HBKxkfPvgVw+3vRcBDJE9n2cKDJuj1Q9o
-Uo/cLI0E93wBWonflo+t0dgWz+OjH6aqeKZ8R71X1ADLOfrI4m+lY4gQvrupBqZK
-6YZlg+l3yHaIpggf0PZAL6UVhd+jd/Vm8DNQqzFe/7QLTmV9ZvKJ/FmkNa35Drgt
-MCRsonVWB90PdtLtomDajjlUFFThz+ri0YL4ICxirzUawz/F6Q==
-=HY6+
+iQJ8BAEBCABmBQJVfGXLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5DvsP/RZYtoV6tbG1G4MyB0s9N0Ui
+UTej9bR1REDI2ir3RC1YEGv59mlEZyw2bXcPk+tsqNVw5RYPofQgatsEJEooGIM/
+Twb29LWpIzcFhvButOa9IM/GXZHKKOhyGRmZejboy9r3qRj7a1hcL1vvonYv9sCM
+PMXLEIGGgTOSkhjvsgChqPAHz7pY7xFFnBLRIGrFPpPGYjVXC6XiwPM6faskmibt
+1UK7DEz5bUx/Kg2q5CUpXyWZmqJgmZ+81B/XokBf95rgrdz5POD9XkM9swTUNNtp
+/TF0hKaDQfQ41IuVuqpZ1X1MO8XbbJiGWC6xqE5/JeBGK04IXJjGXGk8+7tTuLBa
+qkgPr+2y93QIb5xkfpyGBX5M+R77ySi5EcBW0DYlzlX/VDAMBnjOr/wMWFubu0UX
+XgqLMvHz1AXCsaVgIXWLLTR4roQXRSkKADp01EzGn0/4BAiL87nZNs7TsUvCA3ND
+uego5yk0/+uP9bsmIgSPVAr4Vof/pCCwhrIbnkRQrwJU1mlqPNRsYoR3GtJRbTw0
+na0vZt8K9ztxhjpTXIi2s68l8rRQKhEY59Anp75fwmPYl1GxqA7n0wHuh+c4dEeH
+A+NB+S0vgthtvgmzPfmCeUco64vPvRvJqgy8d2nsCO0qeg6ZIEkCDZW/+IAn8VjW
+wHy9GyqNMpHZ7gqRw2U/
+=Wekc
 -----END PGP SIGNATURE-----
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
index 3a14d20f27e1..f80b2c9648ac 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild,v 1.16 2014/08/09 23:07:13 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild,v 1.17 2015/06/13 17:18:27 dilfridge Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ DEPEND="${DEPEND}
 	>=dev-perl/ImageInfo-1.04-r2
 	>=dev-perl/ImageSize-2.99-r1
 	dev-perl/text-template
-	>=virtual/perl-CGI-3.08
+	>=dev-perl/CGI-3.08
 	dev-perl/Image-Imlib2
 "
 
diff --git a/www-apps/Apache-Gallery/ChangeLog b/www-apps/Apache-Gallery/ChangeLog
index 1b09ac29bf83..6a0d2d347549 100644
--- a/www-apps/Apache-Gallery/ChangeLog
+++ b/www-apps/Apache-Gallery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/Apache-Gallery
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.37 2014/12/19 19:24:26 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.38 2015/06/13 17:18:27 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  Apache-Gallery-1.0_rc3.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
   19 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Drop perl herd from metadata
diff --git a/www-apps/Apache-Gallery/Manifest b/www-apps/Apache-Gallery/Manifest
index 1171974ea980..2b53e3f7eff3 100644
--- a/www-apps/Apache-Gallery/Manifest
+++ b/www-apps/Apache-Gallery/Manifest
@@ -4,25 +4,25 @@ Hash: SHA256
 AUX 76_apache2-gallery.conf 1442 SHA256 f6c0099476bdec5f495e7de4cbdff088ed0ce01ef8993ba657a463cdb365a7ab SHA512 fb9f2c7c8d3fc38501311cdc76141326fa96ff8f9a33e8b9e9efc8ee7208fcb6168981ded323cc7851ea30f1b9ff1db3541cdd1c71a4f2c99ce9cb280efc7900 WHIRLPOOL dd0d7d7c966a56040f6c61e5d2664788c171cf053ce0bf415655c91e56470036d434aa78a0574d5f4f4d12e3840a1ef81dbe5212d6513ed7d52f449ba53769af
 AUX postinstall-en.txt 90 SHA256 d46f8343e97402107390a651ee3e31adfcd9034d9f88d4ae5dcc83061851dfc1 SHA512 3cecb9f07c69b20805a64e3184e3aea8e934d7ac7e42d53884268f7614780f25be524dafb25ae0d4ce1f9b1aed1fe88dfa27d98827182888fc36eb8301be0968 WHIRLPOOL a6cf9c0169db55b59b1654c04002bffb26b8de6547975822513193f9793b13696ac5d75e1f4396837bd840aaa2a08bb6c02215643038980b812c66eee5d599b6
 DIST Apache-Gallery-1.0RC3.tar.gz 83891 SHA256 9a7ab7566d811bb21dd27bc9a27cdcfb2c7a96c01727ad9a04313fc80e68e1f7
-EBUILD Apache-Gallery-1.0_rc3.ebuild 1412 SHA256 b35f734f1e27569733eec2142f5b685a8661b07a2699a77ae6088706876e6f68 SHA512 5a3e0ff5fc81da26f19852d34d2bd7a34c032dff1482000a918e1ebc374889fa59d3b881c4d42dd5e25014d07678f8b85dbd22c3aa864b764600c6252f7e0a36 WHIRLPOOL a1736eb667543cfa0b8d09b63521cfcd6177fd1331cdb9114b1a398e76b0917eabef3b383b7ba600592d0dc1ff0d7f5dc1444850bad6f4289057b9b6e317e211
-MISC ChangeLog 6613 SHA256 4cfa657a4a1ff5e7fbb420d9d3f01ecc06cbabbab5b6ecad3d3d68ab60de7a9e SHA512 10747ff7df4b834c22621b4f50bc9ee03ba84dfa680b462b14f08557d2c021f3e9d2c1471e441924496853968e2412afd83bce58e330fe337b900788a7dba370 WHIRLPOOL e01a67b07a3fdecbec647cf23e2b4459fe90094644f9975680d730face0cd6944426b12f06a9f9ce388d2bfdb64d72c420e69b026bf87d3473e6a32aeff93e90
+EBUILD Apache-Gallery-1.0_rc3.ebuild 1410 SHA256 3d1e2bdfad9bb5c0fa341dc8df7199086cdfa62f4afee6eda2c4064ee6826416 SHA512 8e10b379aa760d4ebf214eac77b2240af03f5fc7819c2cd01758379d18addea3163b6b453b688c3c67232d2a176239db5105c41682034e83a19d78be3cc18018 WHIRLPOOL 67ee1e09c4a3c8a5a9c200ab11de130a584b804ea5b0b038824d7452834eb63b99de7283d0110ae4926b04eed9fe7d356aecaa13c6bec8bb94e0b8c39382d6fc
+MISC ChangeLog 6783 SHA256 21e1456169d2cafeb97f31eeeb530d6c2efdb678b902c0ca5e75c5f12d752fd3 SHA512 6688cc9c453c4d03123cbae8f97a35f18a2f916a1a0f43bff67851e266ac4a29d7d81b80a681c3477518f2b082e2acc15be1beb22e293d6f6cefda9969463d98 WHIRLPOOL 64b659db8af2ee6423f473cc848cc98beda6bcb1ee5e941c0b450cfa6e9f157cc541e9284cdaf0945acc9ff046bab3eedec1d9aad998efe092834bd3ad6a227e
 MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUlHtrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcjWcP/2P2lBuekadYyPW3eMAcM2Sr
-VOPiSMUJy+8F1n/LWfewanSayrDLkOv/6akT5vbZyWK8CnnPAHou9E+aRR/RwC/D
-5XzRFI0Ps2TkwQ1zRf1P5lk54QewLTOUT7cyv73P+61a8xUtNqXky1frc7PwQXQE
-FJDnVgEICj/VXYpKfkNzuTGrRXDY1oAY/W8ShH1FN3+hxvnm1MQltTpWipx7SRkf
-bLGP0SaWnMhmfw9DxcMu1WgdumBjVdqhTzFWaLatdBX1anfE8r5HZaMc34Y0OpDr
-Z3OfFECYiCWQ60zcHhD9IzL0ESB8lbxSxXCHzGS7w0t8SUOLv4JQeXoYTqUGRdXP
-Sz9Rmz8yM+f/XedlPifsvqefQiiM07xxIsOmLFrv/jCKPZDcmg1AYJht5q2/liyx
-vZjXCu6lxJDR+7kvyJizDrE/bXtfxYdDgkN1Drzltq6gSOIXB3Im2h+/AnPC37Xu
-o3KhRq8RSIBKLN2EfhfairIY5LdFJk+HjSolnwzl1GNcu1ASv6lRJ6RVrkD6Wk6k
-odczBcYqPj0JhRn5ePlrhP+rLS7A4w328zxifXsbKUCRDtAKfyTxvhcvLSagzKyG
-RSVnEaMqP2h8eh6mYj4Ukve7+45WF/Pm2xGrLzUNPDVlOJnzBnBqFmffx9bx5k91
-nEpsoH4Y7Zj+29QHSBg5
-=e3/L
+iQJ8BAEBCABmBQJVfGXkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5lo8P/iDoB8HdJKDTAQIRUdPEpAqM
+7W2xYjwfwUXKrMmOqH0OV07lBOoYENrhrYfmqYEmPQDRtPW7OqkgYXZNKk6vLRIU
+FPODC3LbpjOorHtY+4uW9DHGJNXpcyTrON1r0x97sUp4HHEYOUM8m6mmhJRuw+BG
+9vV6fP7WLVc3miEUXawSnQI9myXuM3cVGKn06tFa3TUTs9ZJLcmvrXBFx7/+NelT
+JxfobozX4hknBKV3+wDoPULbmeBrGSuc06kBYyPxKE57IfaEtR8Gl0jgePSClcKI
+PddjIf4zixlXrvDRt+N0YFRrt3XMhBM+WnStiIsfqyQ6IhYqnI3/BR+A9qz6Pxtf
+mVECvrz1QM35OZwXv68mqIm1GhFEKrmQbsBa1txjWy+7nYJOnsvMNGSZSICc5FHY
+Z2Z6iWgqz6s1+4RhOdImEkc2v2lRnTrND/xDGkBJTchEQVY3cXgPotItDQ4TDRqF
+JS8ynguDdJiGn7L5sZuXXiuGBWbu0UIzPUq+BGktRAzJYfdXnJbBJ11aUOZlh9mH
+8xS5U+vBfLq5TM0QhLSkOD6eKybJAjPIczlTlKe7+IAAc6dhPI5NCOQzSa9Uw26P
+zP5PqatZdPbhQDL4OBe8x99Wxt0N+HpxGmfnE0dAASY87DQzNDG8XPJ94gCcUaI/
+DUHMsebIXaNqSziv8nEX
+=AQrw
 -----END PGP SIGNATURE-----
diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index e21e7acbdd5e..786e6f75d639 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/bugzilla
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.230 2014/10/15 19:08:45 creffett Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.231 2015/06/13 17:19:04 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  bugzilla-4.0.15.ebuild, bugzilla-4.2.11.ebuild, bugzilla-4.4.6.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
   15 Oct 2014; Chris Reffett <creffett@gentoo.org> -bugzilla-4.2.10.ebuild,
   -bugzilla-4.4.4.ebuild:
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index ac5d2cfa4fc5..48291c4c560f 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -10,27 +10,27 @@ AUX 4.0/reconfig 349 SHA256 8301aeda585234ed30cc8ffa8fc6e72138ed8e9d50c695dd2455
 DIST bugzilla-4.0.15.tar.gz 2875815 SHA256 4751da395f1d439505e07b80a36120186cf3d1f02c8505293d76eb66eeb3c779 SHA512 4394268dbf5a82e1693d63661296650155b8b44e39c69d06997c0e07fb71f1421050992b75240e13a9d149f847a38be9c354e95471c98328e3019136f2019a02 WHIRLPOOL dd81e4fa0cad2194d011d1fab15fed0b44d80be5c3f527fcf9925d4bdc93890e2994c703ee1e9fe76b2ce5f71900bbfc45d416b27cbd81f67d2dcc78edb511a8
 DIST bugzilla-4.2.11.tar.gz 2955315 SHA256 b3f94024a405469b62fb1aec47cea25fb4d52c8e6009b2723c43c7d9442c7d17 SHA512 80c400c6887e4dd15201de61651dabcf709a019c3a17323d94a845ae899bcbe43d81ca46f1ae2e41a173e1a06e4d4edc147cfd62dbce08a23df90a6f8c21631c WHIRLPOOL a1445cbd05fd9730ffbe70e2f9740e64ee9b7e5344c4ade77f7237fbefde698bd598f95af5dedabc4ca581465f6be681a700ef329216fbeec107d8c5f29f1a38
 DIST bugzilla-4.4.6.tar.gz 2956046 SHA256 ac3547195f2ce156488aac2cc537620775e08a9d888441daab2b40ab66ab01f4 SHA512 af95af117f7d5ada390a94716f1d3ed9b97e06f47c028c57635b2b4a720827e4749bee23842b7ff7d3a2ee8cc6257ccf2dc2b135c821838e78a31ceb63ce1b68 WHIRLPOOL 90daa07e1f9c064f4954d413348af958544091ffa71e27d0fb8ba7e4265a96e8d1d6e5903edd71e90ddd34f9c6a44d1cdab3e7bc2db2c97cb576182692be8743
-EBUILD bugzilla-4.0.15.ebuild 3210 SHA256 85a56afe87bc8de94b5e33edcf073edb056f2c184b64f193321130b778b10577 SHA512 d5ccefbc00f167f70d91fe716657bb120882313629043440dde72dc8b22b7c8eb4f17b6bf2dcf8b0ac7cfebf989a7421eb3bb6ccf16c5f042de24b1c416dec05 WHIRLPOOL bf2079197123b3f481876b1019b8050dd0eb48252610dbb07504cb2d0fada4f6f32afcd6db8f47c8815afae8c9941454a54e970d1a9f1557a64f46d244b31fd1
-EBUILD bugzilla-4.2.11.ebuild 3202 SHA256 99ee6b7da0817d3a6a4c595f299f6858a6b1289b4793edc654125774efb555a2 SHA512 42107c203530da2c973cea0db63cee9995e2c2726b03b2e84e897e6d22d2c4d6399912db9023132abb56e5d04d1996991f44391e9f158088bb0d52e600a714c9 WHIRLPOOL cc95a487fc63e3ee06340537043f87ad8123a7f3b8d87da4fc5475332df671565cc2a7002c984479b102718c7feb0902983b5ecee888948d5475cc39ea57009c
-EBUILD bugzilla-4.4.6.ebuild 3201 SHA256 ff5ea1ba7ddb29bf2b305cae2c01be0dd8b9ac29bd0d5726b4cd9ca9acbbd39e SHA512 13c5f25c675e3772073711bb6ef07a1d9c954e120ad825eed620b84e47fa4df9ce4c8b6e0936f14aea9642ec964381f10b061e8d4d4155c009b8557abda24958 WHIRLPOOL 2dc1e1d58c768442e33ff80c089dc7c781502e82865080e07bbe5ffcde88a16df33ac8fe35ddcb04456e7ae149cc5671d0305918e5833a2e3c2cc7f82b657d3c
-MISC ChangeLog 39685 SHA256 c6346286d1bea225f2d4aaf56c47cb8a83a3b5d7f963adf3c4f715b4cf7628eb SHA512 547e97c66f83f84d7e64b6e5fccfef0399106e3d5ea09d52c669eca92de6ce4a1372b306884e1510384d7630de31274b7661e3d9080bedad50163c8d69f3125c WHIRLPOOL 580f34c8df802e670920658c9ec4ab6e2387bd0b042277d014e8c2510b0cad5c25432b908fc788199c8bc12afdb89862425683f53d254bcbd2dc4608abcea65b
+EBUILD bugzilla-4.0.15.ebuild 3207 SHA256 c2b248ee6a4ea9c318964a50a09d9bf7f608e0b160d2eeff09c0dcf31b3c5d61 SHA512 0b6f163c793c07a341a6342564d2471024124ba9496b6049bb52dd187f8a3a44e2ba36d0d0729ea1959295f5fd320419b678e505d637563988b66bee3fb919da WHIRLPOOL 403667a92d54bff95e3fca511944bfabf39635a59a1b2e304631dc91de53955949fcb698615ec1734e48defc39b431fc03df6ba1f823c93af5851107c8694476
+EBUILD bugzilla-4.2.11.ebuild 3204 SHA256 cbc3ea689dd1d47e59f2e03c9924ec6372dcbb167a05bece40bad39856dd59b3 SHA512 2f43d3adab93456c99b4b8e3cf6bc595952caa59be70fae5fcf59b2ac204b8ac1f925a2b6aaa68cb81b2a3868ab9de815a3c0ff16b9690ec1bb4afa89be57432 WHIRLPOOL 49b32ccb89c2d488ca3d904cf99e77456df688a35c7c17bd148c02bdafd27e79928efbafb318d57d88b24b774d65d61ce6689a488f71f20e37105e62578e2d8c
+EBUILD bugzilla-4.4.6.ebuild 3203 SHA256 7ef75c041952ced3ec28c35b1621996d12c29a76bad543559e34e9b1338aef8b SHA512 dc44ae66bfde8fa2c3f718025adacb3f1d2c41d76ba5ebaaa2cabe5c26e69f4e5791592011d0340943ffba9edf07448f73c5c25f46ce09721575e404c1c0e3ce WHIRLPOOL 68bfc40467a2a1e29fcc334c846b8abca71676cc605f5c3adb9d67abed836a442750294dfe615e3e2a320f32f25ccb37af48c96da4776336a9e1bf46b18b61ae
+MISC ChangeLog 39896 SHA256 0fec75594ca3c49167db9a216101e4f179d8e0a8552c7a33a74d373969980f05 SHA512 365bcd5b6c2d948db5cf0cee5157dda17b1d3ba4de87d9309cd9c454e72ecd29f0953b02314ee179c98a6e92720b42b137351304e50b737a6953685c6c809d70 WHIRLPOOL c182ae7f3c4529abebdf35bf12b58c5ea82cce587e3e48cce3c46ba4d63e04c8d1c5fccda1d314c1101a5a81e9d286f2cdc2abe91d7398e60e8870aad029710b
 MISC metadata.xml 655 SHA256 40c7e557d7fb498e1c0fea1c2826483053df2198949f10a0c04eb3815b535c3f SHA512 f904876eb23aa98e5a653de5938e9132482b66c58a9da835b4f3b6cbd0c2128ec7d67a1eba32d470a4d0cd6c8edb7fc7226f683b3f00dc2243ee655c3139f010 WHIRLPOOL 600863ed9d84981e4d3d552948633e31a2f03ebacf540910c456ccb14a5d2fdb322d538c586915eb40140a5be3d9a7952397ce172e561a9d9b2efd95e9791211
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUPsZBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzgwNDhGMjg4MzhERTE1NTY2NjA4MkZE
-MUJBQjZCNTI4REIwMjlDAAoJENG6trUo2wKcpy8QAKD+BzeDxXiQQvGBiL7LnD7J
-ARLoRfOCf0JsVzwKLE/NWZKSsxcZmVUykVqvMhggDS3VaTYVmo9T1sISAd9X1oVO
-cRDFfMRejBjvbyjY4qRVuYWgLA/VBhHbtDbqkD6xkfqGuc+7dlym881rAqo6f3hg
-0shfb1D3lBzfLsXbYtHvIFX2NJKjGvVBTcvj6tJdhUC39VK39FHf+iCZnW3YJEAr
-F5pWvgE/AhgNvSOqOKAb3ZVQv7v9f3Ickp3SC0av2K5GCnCFVISE58Sp6/zP5Zmt
-cleapPrLQfIc3OlDxTIWYPxWpes/RyRr/evNFi3Ry4SdM99GmHc0OT40khzl0IVW
-sjqlQbw8Rr8ziqacS7Oz38kE96NGS/Zckkh7Z0xToXBiR4bDV00yRdkZPZ3MoSWj
-NoGXjEnFFvINyTWuIA3nAZnJBsKB6K+YkTXmc74f4rAwaBKd4LrDOjhQxLnBBy0G
-KUE3AZ5+Tg+VNeS8Q4DYRWw7EW5vBGB+j/LZn+pkaPaumvUGfX9s++cXvdZiYNKz
-YE72C1AoRCacrofzJ2XLl+E1rnjRJHSYW+btAmYX9sQQfnd/CEjTExWlIfQ4KPVE
-z8qlhl6tqi9Cb78z8idSyZk8BpXkkFd6cP8WIcXT4PCkYNxt0h7Rtr3pKZ/XHwVP
-KkDy0SMba8jupqawT8Ac
-=nqf6
+iQJ8BAEBCABmBQJVfGYJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5OpkP/0vqSrhuJMx4cWotzvH23IhK
+007S4OzAy8htpw75m6UiQBnhebZtf3B06txL0wPvrVoP6skgIYRAGi9E+cyg3P3r
+OEl0HrjwwnmBUob22YbRRagIKOHtnHNPxVd/59IdWwwR7zYDt1ziLDv3tU2DIkkS
+KORuTbxiiEKcBD/8M6uwDcfOWhyzn/XH9fBrOqZGYXNR4bde42ZGLu+RVcypabXJ
+g17pr9W60E3yBtu1HGxLdcmeqWzrINmoVOSzIUEqk33bnQ3SPGyMH6V4vcHkXtrq
+fDZkAMkxkK0aI22vBl2uCuOyfhHqqWTOpHFXeo473GXzgUIneUnQBA+MsETG6Ucq
+nac7B58WOOvJexazMoi5h+0ZiEZhZiWtY3Vvqsqi/DpZTRn1bnqZBULbG3935u7n
+wE7ax5KSndfL3zOvCjsNyT8zduT6PNgBVZsEUuZcVR586sZGXBlRZjxsgSy83+kX
+ivD01Wg9rccTsbRfhlfy7I2WFqtRWfOhqaJ+mSGLqqNvqP3hSYOF99yCbhxKrsbd
+5I5O28bGxRoT1oWIefx/bqeYkusNIc1nbvZxZqc+EXpMDbGphrsz2/98c/ngX9CR
+Sy/9QubPjtb4OSeRQ+5rE82XufFbK+RvX6xzUbdv4Iqbh6XSc9BXmmnQ2uqZAyz3
+U6Ig8ASe7qaOSXLpyOHp
+=8FdG
 -----END PGP SIGNATURE-----
diff --git a/www-apps/bugzilla/bugzilla-4.0.15.ebuild b/www-apps/bugzilla/bugzilla-4.0.15.ebuild
index 160bcc7e4223..657ebc34df3e 100644
--- a/www-apps/bugzilla/bugzilla-4.0.15.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.0.15.ebuild,v 1.1 2014/10/11 22:09:48 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.0.15.ebuild,v 1.2 2015/06/13 17:19:04 dilfridge Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ IUSE="modperl extras graphviz mysql postgres sqlite test"
 COMMON_DEPS="
 	>=dev-lang/perl-5.8.8
 
-	>=virtual/perl-CGI-3.510
+	>=dev-perl/CGI-3.510
 	virtual/perl-Digest-SHA
 	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DateTime-0.50
diff --git a/www-apps/bugzilla/bugzilla-4.2.11.ebuild b/www-apps/bugzilla/bugzilla-4.2.11.ebuild
index 232bb0b06950..9d7034648244 100644
--- a/www-apps/bugzilla/bugzilla-4.2.11.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.2.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.2.11.ebuild,v 1.3 2014/10/15 19:02:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.2.11.ebuild,v 1.4 2015/06/13 17:19:04 dilfridge Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ IUSE="modperl extras graphviz mysql postgres sqlite test"
 COMMON_DEPS="
 	>=dev-lang/perl-5.8.8
 
-	>=virtual/perl-CGI-3.510
+	>=dev-perl/CGI-3.510
 	virtual/perl-Digest-SHA
 	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DateTime-0.50
diff --git a/www-apps/bugzilla/bugzilla-4.4.6.ebuild b/www-apps/bugzilla/bugzilla-4.4.6.ebuild
index 3b1169e1aa62..a48f1e9eb3ab 100644
--- a/www-apps/bugzilla/bugzilla-4.4.6.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.4.6.ebuild,v 1.3 2014/10/15 19:02:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.4.6.ebuild,v 1.4 2015/06/13 17:19:04 dilfridge Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ IUSE="modperl extras graphviz mysql postgres sqlite test"
 COMMON_DEPS="
 	>=dev-lang/perl-5.8.8
 
-	>=virtual/perl-CGI-3.510
+	>=dev-perl/CGI-3.510
 	virtual/perl-Digest-SHA
 	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DateTime-0.50
diff --git a/www-apps/collectd-web/ChangeLog b/www-apps/collectd-web/ChangeLog
index ab205fb52885..e13547f4bc5d 100644
--- a/www-apps/collectd-web/ChangeLog
+++ b/www-apps/collectd-web/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/collectd-web
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/collectd-web/ChangeLog,v 1.6 2014/03/02 08:04:46 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/collectd-web/ChangeLog,v 1.7 2015/06/13 17:19:27 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-web-0.4.0.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
   02 Mar 2014; Agostino Sarubbo <ago@gentoo.org> collectd-web-0.4.0.ebuild:
   Stable for x86, wrt bug #424053
diff --git a/www-apps/collectd-web/Manifest b/www-apps/collectd-web/Manifest
index ba9552cc9e16..f42e603aca09 100644
--- a/www-apps/collectd-web/Manifest
+++ b/www-apps/collectd-web/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST collectd-web-0.4.0.tar.gz 771364 SHA256 08cda1ae2efe971087a7f312c9686dc8104bcb58c426925dca1a4e1be24551bd SHA512 7ce242ceab9d98c28332c66d8db727fe8f4ea357eb847f0d3f9275bac813941255bbaf0078282a4cd08750915ee81665d52ba07a94d1a3a72298b822de7a95e9 WHIRLPOOL e7772ffee202ea1701a5193a8f4554eee2fe1b1ac4dc8a65cc73c0c5024743341b5fc0e56d28106d6cb2185068abc5c5002700af6250754be8c421678c96d98e
-EBUILD collectd-web-0.4.0.ebuild 941 SHA256 54cd3d8127b70012c06b98cba23bf61053d0fc85c5644571d76a5caa3cd61686 SHA512 6661d90c70a736ed2e3c900423418147c2be2543619abf9ab02c1f498939787839b117bea09129462f2f7ee2775b6e970432cc1f44f6fb7392aa1023ca4715d2 WHIRLPOOL 45ef585015fc87ffdb175a461058c61ac377508aaca9d1e15af18a332583c6beebae8113162357f7cf6281c481db0ab584621f282838d6ebfa3dc5d16fd1991a
-MISC ChangeLog 947 SHA256 9657a8ad76d11337e3ad9f0504d44593ab0018f55b59038fce5a114daf845bd2 SHA512 0a2ebe373efc4bf0db132a98a2b938ab77a62ad7e55da1232a6db281ab2a730f639139e934a2b22403455401f277d5ea8259f59da0bad52f6f09d4b77c6f6598 WHIRLPOOL cdc2b727dbc3cc41ae650bae679e4c6d80974e4335d1111af40a8a08df54846f943379b19db595b6e1e24eef671880ce8b66a92e38656479deb64c0424b84d8b
+EBUILD collectd-web-0.4.0.ebuild 943 SHA256 4cf7eb4c59b97aebc2b901e972d7c5d9516ccfeed207405ff4562aec66a31718 SHA512 288a91f9133a8142b4cfb68716073b4303b9edbc0b12c7279ebd4840ea287ffbc4b5a941fe8e15f625870844c83b8c3da0cb056c230770aba1be2eeca89003c3 WHIRLPOOL 4853371ac2d24f65c9f7cf3c35c1043c21c45865b119089a3d7f2720ed0d7bf7251be4d58bea3ba648043185109d02c1fe281d38c02e8a0dedacb13936a43610
+MISC ChangeLog 1119 SHA256 e8d6560a50072b7742667976e97902503252d059c65e75d1723327f66876ca9e SHA512 332319b2f16af389f182c2344640f1d59c298f5452db2c56ebfd217a0bffcb85c78740aeaa2d2ec28c2f2ec42d11f436b34f9b89e83321b99baeedc56ce238cd WHIRLPOOL 5502c5d6d6ebe0e3cd2a3a1d4b145b47a41f2aa5fc0bf3cf97ab0994850b5c6d7688dba9d341d3bc5c9b76030fc701a3ba6d9f5543f8ff8edb5ee644364f41d3
 MISC metadata.xml 162 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40 SHA512 bb84d2a2083ba579e9b0e1d7db9997561af9eeeb41c1af4af41a6f51aedfc3e03cac9cb1a1f730ce576065925ba44de8e6de9d35c392e9d1f002f8a1e89feded WHIRLPOOL d36edc46fcf9a70b7618a861f337cfc7baab6088d13817a5d57c98a5168b23b6408d6641f167569afe9e542cb29d40988c757a86f52daaa3e8bf409730a515c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTEuYfAAoJELp701BxlEWfNtYQAI9mLe0z1I7tbCED03ZMGJWj
-fMqUs/dWsaHYSSBJ0N2dizwXplRf8L7g5UM91FmPkb3keofKovQX0L0zLj/RaM8z
-Otm00g6TG4V3mt8z6q9pHYkXPiovQIxA/v42lp5MVg+y/YOaG7+0WnR6Z/AA4urL
-QLU9XiBiAtym2Cn/5eVC7A38E6ku3ieRoGQ5U3O9x0RbWwYH42n8eAspOIwTtLN8
-rur8eRwuPyNvzwefBYfk9dkqsP2h1wkX1tfKNaxy0UCovpPkKlGynZdj4OH8dii8
-mZrR5WcVtfbX5dnM+GYRXipWu9+f+AdCrOZJn3rZi3ltEx+aHCG4PuKjV7kNmctt
-tiJXhlpaT70eGa3WlQ7atF1WK0rOfVY9bM6Zo8sRO3fjrf4ZEOUhKz15TfJaXVTJ
-dMBwMeczRat8gOdxTtYGClOvKa31b4nUy/p6hjKEB98923QD7zAWWC8y8rn8J3Z7
-fKohVVS66AQyJqZ/YCYu40X0aU/SLKA1zRDtMB2ElA/Vspal2dRTy7pZWB3C0kJU
-OeJ7W5K7awn+mvQoaNVWGks1BC+EervJrScBYZGu5tBCfQzK79HWaV69GTBkRZQh
-5r6mdcGmOEhY4daBrP0fK7oSR2qvb1mraIzAIMValWN5WByt3Oj/wdTV32J3NEFA
-2Nci01i3RT83ej6Ll7VW
-=TzIs
+iQJ8BAEBCABmBQJVfGYgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5FjEP/0J68K4ebXci+tAOYjQxQhNI
+XiE47Adi5d8IwBTgEA4e7InWjjny22nguWHJIhwc8b6vspibK0XTnSv7ueCxn5wX
+pDrcppt4GQSKjFZjefHtmEo1qpWN3CyPrAjXW1S5uPKIKBKiodoXYXSjB8hYktMQ
+tb3wrWkDMIpnGmtKKYZbE4ZGiIqvBc6X0Sw9q82s63sKESpJaxN+XCjGe93mt7k2
+jh7paikBxGwFFXWhx6+n8nTIenFA2qHCXKTXl9OJsbOfdAUTU29JmMK5A9wogYqj
+h8iqbq9JYM/pnqS043SyjKHOrwIJ+uQ3WBzf62VaRrGs5oS/XPQBBBc77FLdksNU
+2fm7RwKJmdinyDZug/WpmLtGAPnZnMBXSif183WxTPjk0QB0yV553RNtBCO/WvU4
+7LLDZkN0PshyFoZlHGV37U7KCFBdN7Lzd/D6My6oEAsVdw6Cc7ziBEnSO3q+4uL8
+LRpOzwU+ESnQi70JwRo1RJtMRSwl2ZiktGvtRwJE90PFuT9IO/EgwO6+ihyOBGW4
+1pGm4RggzA39fimqvQP8f9dylvwrB05r8eCOAYqa36z8J4TyQ863P+sV+1KoQ99N
+S++xBHcvb40VvlqIlx7hzhYVJldaO8Yror08PvbA1z9oeeVFz/NQl/ylMWFXcKvQ
+oHEwvx3MbUqjNigmOGhM
+=fGeb
 -----END PGP SIGNATURE-----
diff --git a/www-apps/collectd-web/collectd-web-0.4.0.ebuild b/www-apps/collectd-web/collectd-web-0.4.0.ebuild
index 361031c8461a..f9c0df71a8db 100644
--- a/www-apps/collectd-web/collectd-web-0.4.0.ebuild
+++ b/www-apps/collectd-web/collectd-web-0.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/collectd-web/collectd-web-0.4.0.ebuild,v 1.4 2014/03/02 08:04:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/collectd-web/collectd-web-0.4.0.ebuild,v 1.5 2015/06/13 17:19:27 dilfridge Exp $
 
 EAPI=3
 
@@ -21,7 +21,7 @@ S="${WORKDIR}/httpdss-collectd-web-a23c49f"
 DEPEND="dev-perl/HTML-Parser
 	net-analyzer/rrdtool[perl]
 	dev-perl/JSON
-	virtual/perl-CGI
+	dev-perl/CGI
 	dev-perl/URI
 	virtual/perl-Time-Local
 	virtual/ttf-fonts"
diff --git a/www-apps/drraw/ChangeLog b/www-apps/drraw/ChangeLog
index 21034583dcdd..ce1ee1551d76 100644
--- a/www-apps/drraw/ChangeLog
+++ b/www-apps/drraw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/drraw
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/ChangeLog,v 1.9 2008/02/22 17:06:43 hollow Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/ChangeLog,v 1.10 2015/06/13 17:19:47 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org> drraw-2.0.1.ebuild,
+  drraw-2.1.3.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
   22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> drraw-2.0.1.ebuild,
   drraw-2.1.3.ebuild:
diff --git a/www-apps/drraw/Manifest b/www-apps/drraw/Manifest
index 13316fa879c0..c845edc60d20 100644
--- a/www-apps/drraw/Manifest
+++ b/www-apps/drraw/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX postinstall-en.txt 137 RMD160 f8cf7573ad192a87141110046b63980bcbfb872d SHA1 1aee0d7ba51bc0c00d45e7e4d711e04ddc96fe92 SHA256 433a5ba1d31484646faea29ad158ae674c487cff8d867d7818fcc97ca0430041
-DIST drraw-2.0.1.tgz 40970 RMD160 fe467042632d0bf075d48b5778bcf0a45811eaf7 SHA1 0f4f31e01170b83c40b9e0acca61212b1be055e9 SHA256 4fb52e116635951a5767be08b589c34633095394f94c7df5cbc2b8b88cc41c69
-DIST drraw-2.1.3.tgz 45970 RMD160 238d637c6c0ad19b4a8f611db99b0fd3d98bfeb0 SHA1 e106ccdc416124e4697936e4aeb54935e7a48aa9 SHA256 c3290781426f81327632b4b0da80360882438f3d44cca81fdeaa3f9b22c3674e
-EBUILD drraw-2.0.1.ebuild 1139 RMD160 0021968ba335cb62140f26beac14d4c977e2188a SHA1 80698bee3fafb17c2dd51e912eb853ff2c137546 SHA256 b49e94eb6e1b1b57dcd5298a022ee4ff122bf8ee22fe39085b083e45177a957a
-EBUILD drraw-2.1.3.ebuild 1146 RMD160 47e449e749d0ed3acfbc41ab465e044befdb90ba SHA1 83865aab664c6a1d8a0148aa203c3c5c70b9fc04 SHA256 51fe8ad7353cb4b130695061796a7a0aa260c4334a9cfd5d6d792c8cb66ce6bf
-MISC ChangeLog 1242 RMD160 709573b72ba1136e99cbcf00485c7c46ddac78a0 SHA1 22ef0bf19df56f3f35b9c40cae0fd2ec86e56589 SHA256 b59e30efed2a6ceb018556a23e16eba5dd9585eb6b09a62a98db832c56046a91
-MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+AUX postinstall-en.txt 137 SHA256 433a5ba1d31484646faea29ad158ae674c487cff8d867d7818fcc97ca0430041 SHA512 17286b3758a6f2606b80ae493725647128b6f7ebce3318c3ffcf7ce13e4bc14c730013ec4633421630cdfbbd1eaa7310587066fac8063a777221d4b31581bffe WHIRLPOOL 7d7609682d3c22722ba52ec43af83d6831ef920f4b607d500bea200d8181f68163a7fa8d4d9832b112dfd89f854f1e83b39816412eb51c2002fe0e1542c194b5
+DIST drraw-2.0.1.tgz 40970 SHA256 4fb52e116635951a5767be08b589c34633095394f94c7df5cbc2b8b88cc41c69
+DIST drraw-2.1.3.tgz 45970 SHA256 c3290781426f81327632b4b0da80360882438f3d44cca81fdeaa3f9b22c3674e
+EBUILD drraw-2.0.1.ebuild 1138 SHA256 8a48701700297739fa2c6912912c0edc392e57dae5ced1e81305e9940ce075df SHA512 370030aa02c5084c82ea47c449ae58a8171dab02df3f8021798db6dad7817bc80c9036ef154f3cdf46c8ea097b0dab63da9f3ac97dc055f73cc7bfc43f771ca3 WHIRLPOOL c9c5e82069c96beb377719dabcb6cee01ff9b63c95f972efd37f855fe5205209f2d3c154b11f6cf2bf0e5b01648489a020b2a010d664555e6508c3aa99997b42
+EBUILD drraw-2.1.3.ebuild 1145 SHA256 2f0ad454aeece60b918ba1ba839256782be2a7dfdea5634652028f4f000cf0f6 SHA512 2f8c6fe123bb92d18e4275041d1236148ecccc49c1c5f49cac1e9f6f951efe068ba9ac8cf628eb88234df5e0534651c9f19507a29fdd8da5297468cf2e9314fd WHIRLPOOL c9dfa0e62092395d2660575ff5627bbe12390b3c976395cc1fc3b9f75d3912ad879f9925d625b6427db1b170abe6caa0d4edc98d36bc28c1d4a504d5d4d0cb3f
+MISC ChangeLog 1425 SHA256 2ba1be1a8475c4ec84a8e5945e6176af71c637366d2b4652377bfbd89c1afcf4 SHA512 41b50320dd8a75fc6f6e525007b34d5ce0348ae56bb9b800e1815cae5a6f5e2591d36a5754c8041f560457441f8c9c3ed57e91aa8a87ed82bcf92f329f551660 WHIRLPOOL 01dd138667ab7110444507cf247f77ce85482bb2e2f2e5aa4dcb19933d6b4a7604d5b80d391e7f8a382f4fda5910b8fe271aa6c1433f6e56325a4cf5a3c722b9
+MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEARECAAYFAke/ASwACgkQmPFBzbX68WGTSgCfZum6D0lm1JDfPmVBuU8CtKUj
-3jUAniEY2z0+y0dEGOhQ2ZGPHBOkXnn2
-=xObI
+iQJ8BAEBCABmBQJVfGY0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5a3wP/3AJhetcdNgIP4kdLHBK7j9s
+4o71fiQHD5LjR9hk7xDgxADR2/8ySevDJ3x12DX7zGV0vlSRDCT7ZRiZrpM9nesz
+J1QHteEH10DnsvDYQzjxDLePM2UGoY5CyRS9mLTXtRUZ9xnrHtESu1eKbwtNAbkN
+3p99B3KgwdT/sEazg6Hv4VP7K0qHAcVv5XGSbVLdN0hU1CF9vX9HoqdM3BMJudI6
+RMMB8hMVw6t83mg63VknXrm5yZDYFIY2sl0BXsqmhFrG9rkk/2zRIPuYJJnm8YCp
+G1inZKj/q3aQ0N9iod8CbhFSaFZSiEu9i8IiWamCtU1URRr3Xz6RYtlYl7BEwkEZ
+GNOfG7oIUz0vbCIcdufnAY8F8azziaxOsymYv6rEO4Trcj6Un5Bmf+EVsTdfcikJ
+WPa04D4szARk9kkzfW398ziVTwXvI5wrNMxOF1vCt/EvTzhKICp98Xk5+G8XbdZk
+dX0pObozaFflJCeQGdMbteHhtHASwx1/YxVcp/9KeoiCuoSQJUDOAdO1FP2a5iVV
+XkG0s/skFSdN3rgINRLNL1Q8e0zLBfcoQIa4WNGalco/qTyJcaCjw6K7joTWD7Fz
+MbpBfjF1ux6Vb8QGna2qV7BuvCrqjuBj6jxAreyvFjkdG6BEedENf/SoRCsL1Eyg
+7h24upDMndH3cFDHR7Zn
+=9rX2
 -----END PGP SIGNATURE-----
diff --git a/www-apps/drraw/drraw-2.0.1.ebuild b/www-apps/drraw/drraw-2.0.1.ebuild
index d23245d31707..78f63f04391c 100644
--- a/www-apps/drraw/drraw-2.0.1.ebuild
+++ b/www-apps/drraw/drraw-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.0.1.ebuild,v 1.5 2008/02/22 17:06:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.0.1.ebuild,v 1.6 2015/06/13 17:19:47 dilfridge Exp $
 
 inherit webapp
 
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ppc"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6
-	virtual/perl-CGI
+	dev-perl/CGI
 	>=net-analyzer/rrdtool-1.0.47"
 
 need_httpd_cgi
diff --git a/www-apps/drraw/drraw-2.1.3.ebuild b/www-apps/drraw/drraw-2.1.3.ebuild
index f0a682a248f1..5eb598667502 100644
--- a/www-apps/drraw/drraw-2.1.3.ebuild
+++ b/www-apps/drraw/drraw-2.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.1.3.ebuild,v 1.4 2008/02/22 17:06:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.1.3.ebuild,v 1.5 2015/06/13 17:19:47 dilfridge Exp $
 
 inherit webapp
 
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6
-	virtual/perl-CGI
+	dev-perl/CGI
 	>=net-analyzer/rrdtool-1.2.1"
 
 need_httpd_cgi
diff --git a/www-apps/ikiwiki/ChangeLog b/www-apps/ikiwiki/ChangeLog
index 3ee6054d5cfe..982117d6a0e6 100644
--- a/www-apps/ikiwiki/ChangeLog
+++ b/www-apps/ikiwiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/ikiwiki
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ChangeLog,v 1.25 2015/02/08 16:00:34 alicef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ChangeLog,v 1.26 2015/06/13 17:20:27 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  ikiwiki-3.20140227.ebuild, ikiwiki-3.20140916.ebuild,
+  ikiwiki-3.20150107.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
 *ikiwiki-3.20150107 (08 Feb 2015)
 
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index bd332d7a5e45..c5e5f59d69a4 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ikiwiki_3.20140227.tar.gz 3186289 SHA256 2333636af56a9966640a9b2b0eb0b4b2293e6eec4376d619f641d1c088c677ad SHA512 00cfdeeaa2fd31fe2b75d5d9bafd9a62950df833592f840f376a7279368068081d1b8e7844e12bca9631d8a15a0c29c0bdaa85276fefc30b6d66b9d5a2e134eb WHIRLPOOL da7dbdb25d4ae8f2073505e74eb2a17aba693e4492b005dadda289acb3f9c5b5245a05168410bfca9f89f3f76c6854461f7f16439ee905c37a22332955e2a124
 DIST ikiwiki_3.20140916.tar.gz 3213411 SHA256 c0362be677cc8a825d0abf43dba6e86c7d74838dc73ecc8f390f2e3625d2dc16 SHA512 3bb01173a1c34ea3c24a3330ab827bf7e9029a830f13ee575cc66a9f421aa5838e613528dc4f2fc5c5bb8f217976d590f5f45ed812b0ad98abd174771bf5178f WHIRLPOOL d3f4a83c0d823dd0d6ab126d4965623a84c7fb1559513d7c29c8385aae11525d6ecef5afb26220da95271a8a148d5c5668e9d755020708ea0f15f702302b596d
 DIST ikiwiki_3.20150107.tar.gz 3285794 SHA256 6eef15e58da48ecb0510a38eaa196f48b192cd9b0ea91ec9a41b062ab4fee93f SHA512 14cc08f42b94245d2f6ba55b0f6d43fb32b55963c11079a26f02e8b3c3a5ec214ed41efa703d1f563fd2d1f306198d9cc03e37c6d4e54e22e2b466d402e15e88 WHIRLPOOL b025332613efb2fe19b2301465a78d0d4307dcf6bd37fa579d65d7fbf48ed1959a0f4d010508e8d4319e6a7b21d7178adc93226a4d3623181ef66706ec6defca
-EBUILD ikiwiki-3.20140227.ebuild 2201 SHA256 661457325a09e42d27378bc1a0cd840eebad05776e128eca3d4f4d44fc61ba7a SHA512 350cf4046f9cdc43e126a77a8abd2e32126be3ad2da4831b915c2b687e702947fcb2cbd1c22220979206e70216f613423d0b9e437eb6313317fc39099e0a6bdb WHIRLPOOL 9fc42c38c08f70fe27309dacec40587e6553f8d85744d401c137eacdc61040ce09433770ec4c5fdb4523093fda489ea1fd774e64c0002dc9349ec27396edaac7
-EBUILD ikiwiki-3.20140916.ebuild 2201 SHA256 ebe70e08aac4e2162c4c54e085f5aa81ec37c08faaea9222352b2af095157b70 SHA512 82c37d98308e96f8afb507e38ad3e49d65b52388c23828dc00791e9c44fd851eb3e3d077edc95f9eebc8f3bdc9f2999688fd97cf63b5ca956f1b56e33baf7560 WHIRLPOOL 1efd583713173c2464fb1ca71dead866469944a658aaefe73663f38aa58234856fc9cbc7e5e0c0ff5ffabea2e5466316262c36a93bf90259fd56e344ef398511
-EBUILD ikiwiki-3.20150107.ebuild 2197 SHA256 c9f00690e8e6a8ac9a6eb6d76d33dd3a5b40394a6b4d0690b9cdfcb2aabbade5 SHA512 fc8049ad5ff39d268ec0e9659760cf48aa7a816ea199802f0ec8fffb34c9018723ff3e75c2528f5322f023720f1e8c10570a3050c0ba8599a1b36d81a3608d0a WHIRLPOOL 95934bde355fd908343d84ce5728892cdd1ddff8c93020a0671c6ddb1bd99e481df76cd55166973b9793c3a66d8534a944a6bd23edc240eae3dd41876fa8b95f
-MISC ChangeLog 3760 SHA256 97e0c5da8a064fd82928805ab7d2f8eb338d288b15b4ae8e58af6481d4c4dea2 SHA512 e543f6c3ad91c701725dc43cea8fdfd14e556a228b35782dcf05eaa6caef52efbce8c5617c8d91325cf991fe44803d18a73fb6438944a6a9f5970d537ba04973 WHIRLPOOL edfe9f881fceecc1b1c5b3d4292cfe80a8b718643675f0e7565f99c2a821f1ea8ec12c13eb070716a186499207df3f49e109ac2f43204db9020f7b30f5d7e9c3
+EBUILD ikiwiki-3.20140227.ebuild 2201 SHA256 bc6aedbbc8091c9bb068d69aef54fa15f2f1f5e71eb947ee0766e5bad9525b60 SHA512 a73d380e64b6f7d87ae6084bf7528a3ff55962733d2fabbe5e08c1871da2827c4d78ee9d0b70ea08eddf1be936a5436513231a5b6dd4e50c44e98a842a8d2993 WHIRLPOOL ea67bfa17674c4253bed38553881d05fe24236811297f11548b2e034e68cc75324fff76eeb370b4c32d4bba1485e67ea0625fef13485e8646307208b5f74b502
+EBUILD ikiwiki-3.20140916.ebuild 2201 SHA256 508279d306479b5de5c7bb083b77e771995aebe5eaa9c16082a6090690651843 SHA512 3f44a58a98a26513e016404ff8ae66c98c9ec232ce02e040458adc0601a9a5767cd151fccf3fb1246c12842a4251371888ab54f67811cc3a7bd8d7a124e33e44 WHIRLPOOL 639bddac533e7c545f209b548d29d03933f842756207c055e4371767fe2d552434f609de4e31af50af156c3e6e51327b2040684b0761d73c888d07e8c9c0dd06
+EBUILD ikiwiki-3.20150107.ebuild 2196 SHA256 856c9af62b6c219ff72b6a5ac7f81d6001f345cea5e9a9044d3817713c34f15c SHA512 868509b0475b87513023cbd17653176230a3229638d28811040cd05c316b32623b117aefbbaf7d669c5adf2c1518c826c536d8d77efdd295946c39dc821172d6 WHIRLPOOL 152813329c8c75e8440fa214392cc3945afdda7f1c4a874e766aa0d67cac762ea8d3f15c9a69f15dad600ec631b4ba68af96a5b9b5e160a0e0846be8ae5dcef0
+MISC ChangeLog 3985 SHA256 c94fa7fff7679838d42ba57514f9000ec975d1f60f1539986c42cd3be8159683 SHA512 37547a37a042814214214cf144cf5de9512ee65492fb61e5211631b65b01c916d6c677056e7f1e0b02fca2db077ec73abce5f972273536413bb6c4ce9f031cb9 WHIRLPOOL 7b4759788c8b51f1244a1ebe1b740684357d02458003ad233b2847846d9980ecbc27bb7980cb1f6811505a4e0b378e18f07eefd5373ac94d69daf977b6a8bb08
 MISC metadata.xml 501 SHA256 1ec93db46654eccb75248fbe7c26c4245e3e95ab4d1332306608505887fbb474 SHA512 4785e71b2b8458b37388e541dcae27d50b91229b24cf46da95f40b4bd91fadf129164ee2c72d59c2f419d79fdb4f6d02370669f37f88986bb7d2178bc0301f3c WHIRLPOOL 629b372d7504a2536214de155a718abf822632e55f0428b5b5a3f4861decc2b11cdcc956e100d4228a211f408b73a784408b827ed14bdcea8b25afa361305a7d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVfGZcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5+rsP/2Fvza5kmTnGpf0+ub0oK9Nb
+2ZEhvfASkVFf4McC/u95qT37k4w4FtN3Aame/Kv+VgKflM0R7WaWb49aVbvOoQej
+i1/PoVnVZBXjTmgoJg5ai/ZBqx7NzJBxxe3OQQi3Dyvkhm1SS5dA8n4EYMk8YMGm
+K28aOAgMnqQvNSwOqpCfZqaoxF38A3JWxitTzM6gm8hE62ZetLnaHJetg6idp6IR
+Ur+aBJL0Sq/VpNJ+sWSuQBhwLl2a3bvUHJpgVpN3atGGxC0Iahaj4UhqBeijhrud
+7NjwydWK58orY3MGzJjp3eAWM+o8sbFcoW/nHJ1EyXgc1zf/HF8SYPejacaJRubz
+7W4cAjwjb7Xxlg4tIRrKvNXWVET+38r13Jt1kI7V/gRaVceAwiQbPM5MQ32mhWTn
+eJRIMczr2bhjhXkm9RYwOGgeADFjegUHIuRn1IlSz5cDxBxX4YAGUooOEUkdWNnc
++Jn6NToO/QeKAOBNnqgJNtYDImjWDlu82sPbhfN0lbKOPdpOVDaqZk7qG+7ryL93
+jKgu0Ml7JcfgKsVGCRY6K+n24AbBHtMl8seo3UJ7QKi6wZVON7iWJG8/ok7KX55E
+ENrvaGi/k48a9crZhRgE6avl6K54/slrTd0n6MHSBuDGW4Tx9B5mIsqNPp3mYo8h
+SLhrzoKP/J/UUXSf0h41
+=e7i4
+-----END PGP SIGNATURE-----
diff --git a/www-apps/ikiwiki/ikiwiki-3.20140227.ebuild b/www-apps/ikiwiki/ikiwiki-3.20140227.ebuild
index 9d41cd9c3956..9d3b25622c67 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20140227.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20140227.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20140227.ebuild,v 1.1 2014/06/12 14:04:09 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20140227.ebuild,v 1.2 2015/06/13 17:20:27 dilfridge Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ EXTRA_RDEPEND="
 "
 
 SUGGESTED_RDEPEND="
-	virtual/perl-CGI
+	dev-perl/CGI
 	>=dev-perl/CGI-FormBuilder-3.0202
 	>=dev-perl/CGI-Session-4.14
 	dev-perl/Mail-Sendmail
diff --git a/www-apps/ikiwiki/ikiwiki-3.20140916.ebuild b/www-apps/ikiwiki/ikiwiki-3.20140916.ebuild
index faa8bd7600a6..a6f8371c4725 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20140916.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20140916.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20140916.ebuild,v 1.1 2014/10/08 13:27:40 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20140916.ebuild,v 1.2 2015/06/13 17:20:27 dilfridge Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ EXTRA_RDEPEND="
 "
 
 SUGGESTED_RDEPEND="
-	virtual/perl-CGI
+	dev-perl/CGI
 	>=dev-perl/CGI-FormBuilder-3.0202
 	>=dev-perl/CGI-Session-4.14
 	dev-perl/Mail-Sendmail
diff --git a/www-apps/ikiwiki/ikiwiki-3.20150107.ebuild b/www-apps/ikiwiki/ikiwiki-3.20150107.ebuild
index a479f6df17c2..e019ed95bae8 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20150107.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20150107.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20150107.ebuild,v 1.1 2015/02/08 16:00:34 alicef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20150107.ebuild,v 1.2 2015/06/13 17:20:27 dilfridge Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ EXTRA_RDEPEND="
 "
 
 SUGGESTED_RDEPEND="
-	virtual/perl-CGI
+	dev-perl/CGI
 	>=dev-perl/CGI-FormBuilder-3.0202
 	>=dev-perl/CGI-Session-4.14
 	dev-perl/Mail-Sendmail
diff --git a/www-apps/mod_survey/ChangeLog b/www-apps/mod_survey/ChangeLog
index a4a4e8bec90e..cd49f631563a 100644
--- a/www-apps/mod_survey/ChangeLog
+++ b/www-apps/mod_survey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/mod_survey
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v 1.9 2015/03/14 00:10:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v 1.10 2015/06/13 17:20:49 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  mod_survey-3.2.5.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
   14 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -mod_survey-3.2.4.ebuild:
   Remove old.
diff --git a/www-apps/mod_survey/Manifest b/www-apps/mod_survey/Manifest
index aa9158473733..a28d13d64d9b 100644
--- a/www-apps/mod_survey/Manifest
+++ b/www-apps/mod_survey/Manifest
@@ -1,9 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 98_mod_survey.conf 4327 SHA256 b55acb2bec39e3875d68e2e30b02720a72889fef26e20d7a17ad89a5780a64f2 SHA512 37c6b7eb96eafa32ea3eb67d1c74f9139d81f2a9b8bc08ccbd40b7f1c94479e9a6f7ac1bff593238567be352fe1b39f8da8bdac40ea45e56bd6ca931c478b689 WHIRLPOOL 18279f90d1aa1313ee939dea574811d8085dc204392e9277691c45af3d240796136ff28e5ded142eb5f98824ba50e552e24ae072bd817024959d8cbf1463eed3
 AUX language-list.txt 15 SHA256 8390c1de74985e4afe829a5d872796e83ce732503a789a74b2fd22e345facffa SHA512 7705f67769e9b128f314b091215fab1654c50b1fc9d2305b4771c8141699920c9578a1b1dc40caf76e0915beb926876c1fdd42306f031bbbf5cea6086c839938 WHIRLPOOL aae0f8934d4bbb1c5561abaa8a5657eb9f87f59cc30ed8bd5982f340527317c340d41b9269b8386bd3fdb6843b0b0f117587d631a6757ae79b1270a27d1751af
 AUX postinstall-en.txt 158 SHA256 d879718ca7eafb8b61f86f00d2f9360be231e27f4d762688b371d5d113697c4a SHA512 3ab80ff0fa4ccdec9707cae97ac2c47c556f93e93d321864463d2e957821542d0bd1a1465036e50636078baf2caa012cd109e25525b8387599a03c49013cf9d5 WHIRLPOOL 90fde916679a53c57d02ce64d2b2a383fc671b27523747f4010540432efd170c63c8643866cb55e4d5c22c9dcd9338d5e8f59ee4391b1dea36e231a0e037837a
 AUX reconfig 304 SHA256 40f8ddfd701c7be72dbe0346fe57484f39b9cd65c8d3de18b5ceabb57cd12216 SHA512 4a836365109edc6172ee85a883c592f9e9778260f80ea1878c6fe4fda5dba5d830ae353de63cfcaa4753b9b1d527001cbf25882995e5bd5b78404488dbeaeae0 WHIRLPOOL a44ddae064b7c443ce945ed899ddcc1203c09738e3bbe48d2426d9a5987ef34130bd281c4fd664156be448c877f2ab053eefe1470c54df03c9b82c300a8c4de0
 DIST modsurvey-3.2.5.tgz 508271 SHA256 5ad6f0de509e09a6842e3a56372f40122800397befed10dd78b37c4c0676e47b
 DIST modsurvey-docs-3.2.5.tgz 678356 SHA256 53c0e0d4335ded221c30fa52c4202793b86aef370d7b92341fb4fcaac12c1fd6
-EBUILD mod_survey-3.2.5.ebuild 2455 SHA256 1475e955231836f099e792f896146112bef57699e12463e978472b03df96ac83 SHA512 4b0e2e572aecaa63b46e6e7d0c75689dbf054ee88ee7b184d0fbd973ee21e0722259f0b7866ff16056f9de3540f63e28513c47f857f9acc8e89fba8dfb54d5d3 WHIRLPOOL 43a7ec780416c09526010571cb883d30c191445a083aafefafe8e2bd63cc97ae52d7a3a30b49b5a0e1ae0d373393ad5245fbf66fa2bc865b8c92be21f2ca4ebb
-MISC ChangeLog 4059 SHA256 8a3bc817c2eb97920f710f4d244ee1ccc515ab8b19710fbe35da9a562d30e93f SHA512 6b74327a3536d353a5468d84fcf585ce1bc971abaefa7b0332009cbe2ae09687147c94eac669fad67f896dda539fc94c4069334dcec744d683288e3eabd6cd15 WHIRLPOOL 3a3ba33d6047f654c5823b5a4057b1d5914805baf7c03e415456d8151bad2f5ec473dd8f7caa8e085d5b2965e76cbf8d5573a161c072cbfcbfd91f396df4f65f
+EBUILD mod_survey-3.2.5.ebuild 2454 SHA256 588e903ebf89a10212de2dcc33e9dd75a0d4a9aedbf2a38e4379347c5265c7ee SHA512 773c9ee3c5a97e5355ca658c50456911054350a6e7bcf19cdad230f8d3f59ccd66e7411587f77fa63009ff0470364e5c38c1083a04399c4a61fd26314755db65 WHIRLPOOL 096e1a9c009301ccb701dc3ca64da33d8ae88fb46c18b879159c05faea8c940782e4e00f61c92bb974da3cce25df5302554c976159d4a732bf2c08879c8899fc
+MISC ChangeLog 4228 SHA256 0308898a3bb80aad2eae8caac673eb3a3fc3a059cf692f62cfd9162c2012f884 SHA512 f353b704e2672817575bd07931fd5852e55a3e59d033166d556966986ef0ba3d603b953538267bdb80a37c904dfdd48416bddece3d92591e01efc255e6cbe679 WHIRLPOOL 8d2047e46efb63e52b5ef540abf36ff0700f6cdc454e93f092beff57d8daf1d7f54d3911604bc2c83345e528784f7e9c999138b1ab9d9eb6a4ce78d2ff35a072
 MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVfGZyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d51pYQAItTFWFlVNfj0Zoz3yvHLT/O
+BVjwta8hdesS72frGtgJDIKGu0YOhPB6vCFoKSyLazBWcF0k3tZ8mFG4C3BTDjLC
+ye/fSDDfTWT2sQd16WwZOxXjwFjkdCKquKJRGLjoFUlvh8b/+Qr2IYtedMy5TrQj
+6LLtC1VBVF5aHWnCCS1U7+3kpQb3qH0EktaS8EhwFeWDq9MkhavzaX7Wd/GobnWw
+S579e8zzPU+/wXNdxLb3+dRr2v2ocUpr3C7fHzXs070oyvzh7zH1c1qb/eb8t7SC
+f7rH8FJ3Hi1rzaeXWNeU2a/C9YPIMKg2mWMYeimaAMEXP0dOGEIMAN+12ITV3Vs2
+h69W+/V0HsaLosAXXjJBWJ+sS4nG/9rgV3Iujh4h/FeSJCIiFrupfsnYiu58Bgvl
+bmoV71D6RqCVdGheRTVIO4/KcvcsK613XHXqAurWKr/3dp4twzPzXL283LVxtDTY
+JEWBd5J+dVnQth4UE9ARbDiAUezLDoIuqPmVjubxqENfimZtK5rjXNp+sK+/v9cM
++TdsIORUgo3aAlu2YwFk1vH1cn18TGJ9frrBre1RsvG1Kq+04i7M5vX9haHFToGT
+9DFlZSgwVo5oU+JjD7sVpZCvwiwJif71rS0fpGTIrEl4wciLkSYnBIqmT7nJ1YyM
+N3PqSwDr7wJNDoc7z0Jd
+=ZY1F
+-----END PGP SIGNATURE-----
diff --git a/www-apps/mod_survey/mod_survey-3.2.5.ebuild b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
index 5de9497de11f..efb57dbff775 100644
--- a/www-apps/mod_survey/mod_survey-3.2.5.ebuild
+++ b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.5.ebuild,v 1.3 2014/08/10 20:13:58 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.5.ebuild,v 1.4 2015/06/13 17:20:49 dilfridge Exp $
 
 inherit depend.apache webapp
 
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 	>=www-apache/mod_perl-1.99
 	postgres? ( >=dev-perl/DBI-1.38 dev-perl/DBD-Pg )
 	mysql? ( >=dev-perl/DBI-1.38 dev-perl/DBD-mysql )
-	>=virtual/perl-CGI-3.0.0"
+	>=dev-perl/CGI-3.0.0"
 
 S="${WORKDIR}"/${MY_PN}-${PV}
 
diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index f8d9669802d7..f1e436a5b793 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/otrs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.75 2014/12/07 20:08:00 k_f Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.76 2015/06/13 17:21:28 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org> otrs-3.2.7.ebuild,
+  otrs-3.2.8.ebuild, otrs-3.2.9.ebuild, otrs-3.2.10.ebuild, otrs-3.2.12.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
   07 Dec 2014; Kristian Fiskerstrand <k_f@gentoo.org> -otrs-3.2.4.ebuild,
   -otrs-3.2.5.ebuild, -otrs-3.2.6.ebuild:
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 0e95039a6b8d..87ef03c1764f 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -10,26 +10,29 @@ DIST otrs-3.2.12.tar.bz2 18866640 SHA256 f69e4ffc10dc4ecf733a20ed79e1c65e03bbe01
 DIST otrs-3.2.7.tar.bz2 18505492 SHA256 f47925d8d671577de054c4aabf8de6ca486d45994aa021dac3f59f29acd8e357 SHA512 272005f54fd09ff30e138d270026ddc6632ba3624f1430650637475ef30fb4ac7c11273836d7294a4211eae36a1348997507f87556a931adbd2a0599cbf8f4e3 WHIRLPOOL 1975f33adacef2ba9a2a856be966525114573271f3ad751c8ceb63aeac1626f4b8745a4ea86d526b9282d0b50eb57132e10d1d15af6da67a0bf57c188e0923d9
 DIST otrs-3.2.8.tar.bz2 18736484 SHA256 1144b512a880d13d27622f3c0dabd15341ead7b40348d37c543216b30dd66f46 SHA512 ab795342a65bfa426b5a857d4dbf79a356f821eb0d1cc00929a685456855c63b487606cf0775e0378552d1156c39e8b4a688cb66266647143168180845be4e96 WHIRLPOOL 5024902ba15f2aa8b599bab34939017ed984793910c65d7c04e6e205be9bfc7e6cedd5eebca723ad069e36b1ccc4c3045d8b0e86bbcad58ee5adbee950215bde
 DIST otrs-3.2.9.tar.bz2 18747419 SHA256 a94edec491d68382d321f8b0464ccaaca1c383b4024799e251226ec524aedf69 SHA512 7c1f6efc5887a92dc1acf864c1f8efbcac50ec2790defbd038fb6b24c6721abae5c7a071b514a3960865304aa767027a9f47fe61bf40cf2e05f5af24a53b5f14 WHIRLPOOL 7fc6096c5f1a6eea1cfafee8cc2b67a344845285ddf3c0c36ad0a70cdc4d7be26d849c9f2308ceae1c74bce0a65d85d57b0a169a9d00b861260673d83a06813c
-EBUILD otrs-3.2.10.ebuild 4104 SHA256 36f808d7549cb43c2e80770632f9165454006a59ee4279ab4027c2f7f8629037 SHA512 daaac310e181bd5598ddb40ac37fa03ebf93d6d831a95da0367dc7616a4df96c7b8df9ca59f27f858af0bc5dc21259c73644ff983263425bd53a79787855d05f WHIRLPOOL c4093c2aa95c6f77fe955602498e9d15ad30a8b99c7c7b257dc047796c7a622e11761de34316106edc838167ef99435013de0414f2a5c5a45be8446fee9761ef
-EBUILD otrs-3.2.12.ebuild 4104 SHA256 544eac6252cee841d0cef8bac7d0244a049771217d617a55f3fc74951369eaa0 SHA512 f40a816572ed169c1deacb638729bc1a6184d9bdd2269e533c18db76ac821e5241b37f1883ab72cb59dfe684c90662fc29d786fd6e2408b4739d997d706b05ac WHIRLPOOL 59832a413643d83413bd859b0edf476fb3f5c2a2da34015f5c234cc81484fbc082785aa03bf1ed06a57a1d87d6236663fb0c659852b6db20391943103321f48f
-EBUILD otrs-3.2.7.ebuild 4103 SHA256 27053fc12fe74adeb8f86592360aec9a018af7d24dfdaef681c4f59d2a57bb75 SHA512 d5a5288674854afaabccc5c61cd19cc4684d065f2b6fbe9f1e11a59605925f3d20f62775c6f4e9ffda2d5ecbe3d5fe43cff108558a98e927efe04e41f2070a4d WHIRLPOOL 711ba1b79ef7a177cdc54c18ed1fd65fe1c896557d799e0be7934a4bef49adb28ae5034c32235c2cb2f56bb8c864d28f5b17e20d18f902b72448817a8863db44
-EBUILD otrs-3.2.8.ebuild 4103 SHA256 f15fd97d855f341ad38b9239b10444b2fa21f78e5a868643c6f8d350cecef1e2 SHA512 90cf0c447f4f7d59f68854c24e703173b3eabfd0353178824e8b1c0132ef5bb3fb58789180f676ee1eddcfc07b38125dc1e3f19e310a69a845e3bf752d8b95aa WHIRLPOOL e2ad18abe14f78ce9d1a6df3923fe99cd4c5d105ddeb50e7580d437e6877682e378bdbee5572c50a610d975a308947fa2afdd6bf7f9d307e3035ef3af0ad63ed
-EBUILD otrs-3.2.9.ebuild 4103 SHA256 a61b6b74293b06cf0eff6cc38b30b93b2f4046d513d5100c15bbfe2c7be4ebc4 SHA512 80b1288233a3462210a5a38cb8bc17f17133c9e08fd6719413319fa053d42db605d6dd5b55a8f48ed3135a438f5703ec9c7154f796b049f04b92e2444184cb90 WHIRLPOOL 8b7099bb27da6088ef185ffda59e37e3c11831b4198948409c850db8c98c56762903ffc7e58cff0dc4ae773726b4443b7afe5add3f8fa01af431c2b0a09b3447
-MISC ChangeLog 10467 SHA256 583d178ca2afdb145ee82f329aeb879db5f6b1929f8fee98e526638324dba84b SHA512 a03d4b905580bcfaef6795b52e50060b5c3c7e3a7b0aa6e2aea94843f69a95b56321f1d01e05e771df12597e0aca3542075619ef00cffaaa4fd75b64eeb4d90d WHIRLPOOL b347a534f8b45a0a668d808ab23fa81f082146c717544257b11d5fb41ee4591d01c783df529ec963f806fbc62535832d7e56dc929c09fe273d7dd391c20a1b61
+EBUILD otrs-3.2.10.ebuild 4102 SHA256 716dad1ad141b35c1e73c357a0b6c11f63e012e3f26c886c672cb140ce28bd4d SHA512 e0cdf3f446f5f0be61a6805222913c35219b34f84b95a77ab519725b2f623d24001bf1448fdd223be8347901b8c1a3afbd621a92bb7137d9dab9f8324ab5517d WHIRLPOOL d86977e5697d0b5bfcfb43cc7aed816ce6ca7ab12f4a358eed3a31624b4694325f4ae85c9e0e1d4cb78ec47525c12c564fab89631cfc0d1a7923bb55eb5122b1
+EBUILD otrs-3.2.12.ebuild 4102 SHA256 e97d1470ff69baa42eb2e804afcd5144228cfd110f4234a9a4249d1586cbc17d SHA512 7d55adc2ae1310f9924b3d29d3f45586d7702a0f5af34d2788009656488ac89aef7acd93b038847b3070dc1e8bf9721f0550a3f0dcbb938c5d83526bf991c3bc WHIRLPOOL 929aaed834a04cbd1628ce82c3113dcd68b8d1f4e9995e3bbc9a027ec273b0a9ffd8276f208efcc3989f37502d8073f54c2dfa60f1c71650a3ed6e855dbb23d8
+EBUILD otrs-3.2.7.ebuild 4101 SHA256 f62571b79ac43e90fe33ba6ab811fe6235f4228986088be1fd89266aa3b6e358 SHA512 94c34c92866dca78b434d3a1a16b17fb36926f25d01c5e85ce6ae60d852b21cb7cd9a8899a38d7a9b2a6be3fad06ea96b832c85f06270fd2a9f7ad7c0f7f723a WHIRLPOOL f2cf39c5865c803330f57090f3ec37a0ef740097272f081445b088ad8752be5283949eb3d812fcb773e0f861c59ea1011bb88621decf283b94ca686d6bf6a7f2
+EBUILD otrs-3.2.8.ebuild 4101 SHA256 0ef43a9e28f2ee6a7cd3b992d85ad7cf7daeacc1ec75a5fc98f46d50c06a0d4a SHA512 2942f4869a9fa931c2b5730f3344cc9db1bfd0a920987803fbe511e7a9a7d56a28c838f377c374f2457246570e74451de8f01410ee9f44fa646af6f6a31b432b WHIRLPOOL 5351e074d46fec902e773749a33931ee961a5694e4f4962e5b717c8aac23a80ccedcbeaede704216cd5fb543efdf6c556611a55c2576301e39e9fceee46187a0
+EBUILD otrs-3.2.9.ebuild 4101 SHA256 17cc06e9476075282c6e3e26de263d4c325fc97d5ef5fc0b9cf6aa2a3f2765d0 SHA512 b554d30b84ddab36f145ff6beb96f8f4eb90419d55842b43b11d320aec1b2f93cc61ce35707e947ed93384b192043f78ec9dfb741b3fbaa27e22ba6af1e8cb06 WHIRLPOOL c59c8debd5b04f38bc442b713fc846666dfc98de7052aeb62adf8b10ccff62d18a8a0feb7622266ce0ea2c56e409e9d448aa9a18fe37b93f2902ad2d32c25f4b
+MISC ChangeLog 10709 SHA256 5ee7fc3393392b4ff75703ebb4d6214ea0839b8fc9d6c0c3eac291a003b01828 SHA512 de527d4f0d42ba6262ff08f7bdb5204daa779e87c35dc5d445d94000c4001cf486335c7764fc275517aa9cc17e8a09fcfcb5aa59128c67ce32e0ae9a2028312a WHIRLPOOL 7b833e228a4ffb5865b36d1bac0b110aa1b4f197317c7415c980cc55b4dbd911c18d8459f81bc32a4236791a1d2df5114906be8748d6af2b1733a37b56010e19
 MISC metadata.xml 408 SHA256 83cd0c36f1d093461fc9cf081c3801102671ff3da66ed48c5222117daf1c50ca SHA512 b1620943f9b37afbbf4df56c3442647298f6dfdb9426ab8c1e5e90f536e9a27912a98f9a3cd828de3d6397e3613bab1bd996210c1908d9f81ac9ef03dd65e490 WHIRLPOOL 9608a3b2702b408a097786644cc24e85bdf0cdf877a55d136bfd4ed85c05ce4c36f14fd899758cc778b074af223a1e44b9842848337a217f5a88d13519dad07e
 -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUhLOgAAoJEPw7F94F4TagNSYP/0d6P+Mcfrs1mxGtVQT8P2XK
-LFvGwNoY14YZS8BpM+GvhPBXUVB2/PHoNa/j7FN8XL+hCJuZONfVeWwCp1OCqLiq
-KPYU+hAIRoSCa9AJ8TUEaAavgIzxKWVCTQBVeugBUbTG8TYVHg9jvE+26xFRMbLi
-Huxxb09FlYdJOn3hPpj0x/Wy9+/xJ6vrJjEEYiyyQ3N/wzkgWwuUJAbu481cy0nc
-hOMdKA1sh6/TK4rC4GYPNTuyxpXl26OkkCH1B2QsYkUtLRMfdM0SZ9pOo6H2B5yG
-6w7MUTQiUyZbFfOzrsv44gwo/UAhwqK88y70O4vNcCySdjYpQrImAgZjtX3IQ7Oy
-3IsZj0Ud6ErvQhadogUXgBnwTi4i/F/ekY9nkDRqfXBxflgu6tfGZNwWNWdhkzBz
-QYxNnmm8ZBC+gp0X/egkmjPOuAD5CL57Q/vwyMHiIAVVyeMBITvTOspQYwQ9Qx6H
-MpyBqeFkuQfuWw4XingFS+AB+hwcQ6jpVjlW0sjtY3AkqClw+wuoIEtRXrJUOJIM
-E26r+BdqGqOhMgwL4epnyIsIN0xnoCATB9BgciwD/COeuTUcBSt0mUScNIpkFZoR
-BfXvoR9W/xQj1hs3dE7eAZhyr22MHUhiGUgNxTvy0MoivafRgg5kD5GIXXzhqs/8
-oi39MEUWbjtSW2tF9vgb
-=oMEM
+iQJ8BAEBCABmBQJVfGaZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5Cd8P/jZUPKbgP91nBKS8XSAwct4s
+Vkps8tcMMOSj+7hwmUqqg1kS+alpnjrNhYqQAQeTRYDHFFVcApfvSN+VTNXYlzda
+82RZ0xaChnshAbVE37O3qYmVkMPCrjAcM59fH6XMcxhFd/duthKdTmdah66K3tIy
+BzvMHbxr5pf+aFmNv/Lak8wdYIyymYDiZZXJfsLiExOcx8MXcm6jT1myMHy29s+r
+JdTZADYL6y+gf/HvBMhD4IbJ2L39BBpLCxuJlGQYOOg2zUWyx3igyLRvYD4ofIOc
+qfS5jm0mP6QyBJQ1SqvVjuR3ffMnIIKAbPrkjvVZBG9dcN80eJfrIoRvsvmAQ1Tr
+6Ysw+ktQO/yZg/XybnfmKJg1DKMJaOT5swx2nxnhITDCLexxcGLILHZQpEH5g1cZ
+AFLsuXHb3inEaW2Y5SFdXxIuaQ0nDEbff5/gF9Q/tKGoInKzBAQsDjKKbThiAsiG
+6l5xb34KJMs+KP4kk7w6N3SJKI0YQ5mihDASNw5LeAwtvtgf0Me1ruACsn/7d2Rl
+xY1l8twzoKVVjOc3hHluQ2qfr3GrNbrIlnrUmaZhaSM7HXP8fvwJWfNO/heNNGFg
+9gU+Q1GljOO1bMB5iZbCQlfhp/TdgWsWaDZ4pqS0nAA7/vgbj4rnS8PoNlN+gw6S
+9TS3lIriWtJ5IRGhQxyo
+=LLI/
 -----END PGP SIGNATURE-----
diff --git a/www-apps/otrs/otrs-3.2.10.ebuild b/www-apps/otrs/otrs-3.2.10.ebuild
index 11d1fc0c0316..bb8c62b028fe 100644
--- a/www-apps/otrs/otrs-3.2.10.ebuild
+++ b/www-apps/otrs/otrs-3.2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.10.ebuild,v 1.1 2013/09/04 07:19:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.10.ebuild,v 1.2 2015/06/13 17:21:28 dilfridge Exp $
 
 EAPI=2
 
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 	dev-perl/XML-Parser
 
 	virtual/perl-MIME-Base64
-	>=virtual/perl-CGI-3.33
+	>=dev-perl/CGI-3.33
 	virtual/perl-libnet
 	virtual/perl-Digest-MD5
 	>=virtual/perl-Digest-SHA-5.48
diff --git a/www-apps/otrs/otrs-3.2.12.ebuild b/www-apps/otrs/otrs-3.2.12.ebuild
index 0058465720e0..94a57b9f1784 100644
--- a/www-apps/otrs/otrs-3.2.12.ebuild
+++ b/www-apps/otrs/otrs-3.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.12.ebuild,v 1.1 2013/12/02 05:47:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.12.ebuild,v 1.2 2015/06/13 17:21:28 dilfridge Exp $
 
 EAPI=2
 
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 	dev-perl/XML-Parser
 
 	virtual/perl-MIME-Base64
-	>=virtual/perl-CGI-3.33
+	>=dev-perl/CGI-3.33
 	virtual/perl-libnet
 	virtual/perl-Digest-MD5
 	>=virtual/perl-Digest-SHA-5.48
diff --git a/www-apps/otrs/otrs-3.2.7.ebuild b/www-apps/otrs/otrs-3.2.7.ebuild
index 062330f61a73..0f07043abb7c 100644
--- a/www-apps/otrs/otrs-3.2.7.ebuild
+++ b/www-apps/otrs/otrs-3.2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.7.ebuild,v 1.1 2013/06/03 03:44:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.7.ebuild,v 1.2 2015/06/13 17:21:28 dilfridge Exp $
 
 EAPI=2
 
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 	dev-perl/XML-Parser
 
 	virtual/perl-MIME-Base64
-	>=virtual/perl-CGI-3.33
+	>=dev-perl/CGI-3.33
 	virtual/perl-libnet
 	virtual/perl-Digest-MD5
 	>=virtual/perl-Digest-SHA-5.48
diff --git a/www-apps/otrs/otrs-3.2.8.ebuild b/www-apps/otrs/otrs-3.2.8.ebuild
index 14bfcf2a19e0..9f0a53bad375 100644
--- a/www-apps/otrs/otrs-3.2.8.ebuild
+++ b/www-apps/otrs/otrs-3.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.8.ebuild,v 1.1 2013/06/25 07:27:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.8.ebuild,v 1.2 2015/06/13 17:21:28 dilfridge Exp $
 
 EAPI=2
 
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 	dev-perl/XML-Parser
 
 	virtual/perl-MIME-Base64
-	>=virtual/perl-CGI-3.33
+	>=dev-perl/CGI-3.33
 	virtual/perl-libnet
 	virtual/perl-Digest-MD5
 	>=virtual/perl-Digest-SHA-5.48
diff --git a/www-apps/otrs/otrs-3.2.9.ebuild b/www-apps/otrs/otrs-3.2.9.ebuild
index 381235a41e51..09075d74840f 100644
--- a/www-apps/otrs/otrs-3.2.9.ebuild
+++ b/www-apps/otrs/otrs-3.2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.9.ebuild,v 1.1 2013/07/18 08:04:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.2.9.ebuild,v 1.2 2015/06/13 17:21:28 dilfridge Exp $
 
 EAPI=2
 
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 	dev-perl/XML-Parser
 
 	virtual/perl-MIME-Base64
-	>=virtual/perl-CGI-3.33
+	>=dev-perl/CGI-3.33
 	virtual/perl-libnet
 	virtual/perl-Digest-MD5
 	>=virtual/perl-Digest-SHA-5.48
diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 5467afcc7af2..aca9922b09ee 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.95 2015/05/19 15:49:08 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.96 2015/06/13 17:21:59 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org> rt-4.2.11.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
 *rt-4.2.11 (19 May 2015)
 
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 9b703cb5fe72..9d0d02777f0c 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -8,13 +8,25 @@ AUX rt-makefile-serialize-install-prereqs.patch 596 SHA256 2fb732ffb622e2c6d8a96
 AUX rt.conf.d.2 336 SHA256 f41dd245b73b65de21c04307994048c6517523deb36dd753891cce510ee3ea53 SHA512 1e76183290a92fee036e8fb0dc095a2c9ad2fa3494be8546123119fad00d5c882152be97b8e84e77dc2e3eae5dbad0906a1ef65f1802333b7f0937d97e11a510 WHIRLPOOL 9caed3c35b495bc0226305daaa01687e8096b57437a9515845ac7c6a8ea1a909bc555954244cf00bcc1ddbfb874f7aab82e4e5eb4148c0ce46a4e3fa85efe3b3
 AUX rt.init.d.2 1424 SHA256 dcaddd4045fbc05f44b78505ebd6429026602910a65851eaab0ddca078ab282e SHA512 908459752c1837900d3c64bd8d88b7c46c73d4db22eaf4bd72d2cc016f0c06e2fc78d0c0bc4f0ce28c005f717372e4ba46060269d2177bf6148f8db87766483f WHIRLPOOL a2e44bf6be10a9b8d9cb7ece05dfb7ea38d0eddecca6d5792ef06b9f9414df95953c09acb2101e742c8a8565549d473de41432dc53861144bb4eb6d486935b9e
 DIST rt-4.2.11.tar.gz 7537515 SHA256 dc07f32dd04a50bd9d0ff86a1f9fe3cd1a128f01cbbd018e5fa23a41ddfb87e6 SHA512 dec4db4c2e3ec8c167e6fde16817fb07441a297cbdf6e035f100aa94d9eb1831f11b8d4dbfb8376a5da689ff2378647de2a52683692f91d3ab6b1044aecd9c43 WHIRLPOOL aefeac9dd7cbf343f5a20f467a5b86d10a07e742475dc4d397b61c7499245862d9c67bd3406e419bccefa069a69aa3375b0e9fe0879d7a67899f99f978fb782a
-EBUILD rt-4.2.11.ebuild 7462 SHA256 0ce9110d833132ca630517c01f17e86175241a69f0bdeb2cd43d2b68db493735 SHA512 f887c363b8586cf52a534931c3914e1d99f8b9e18cb054a96956a338ccf1535e5885fb7fae2ba354e5cdb5066c11008bc476baed4f6a4545e1460feb11ce1046 WHIRLPOOL 42c4769cff969ba2c58dba95bc77c901800ebfaf8444d991a02e44c30aeeda2478ec5603619a621e824e69ea7282bb7ce5ed35b83eb7be80045861dc21e0d21c
-MISC ChangeLog 15656 SHA256 878001dee9a09e5eff9e5cfe412480e7b8cf01b49ef12f987e4386be8c67f88a SHA512 32c3bfbe91f13e2dd7cfa328331536cdda6051b28b9ee177c1eb0a84b174672b17268755269e0663b3cc360c4e49f848943944b258f808894a2e552a9b2bebc7 WHIRLPOOL e462f720a7c618b18b6e2d1c80395d8aff164481bb76f098915c5fa50f8837fd59f9e22fe44a1b9971ea59d02d33df105b1e5c1d0c60ecc8d291c08c8c0f5d58
+EBUILD rt-4.2.11.ebuild 7457 SHA256 e9234f50727e4812ed5af2214e026d0673fdd80499016eaf8bc9d668d547772e SHA512 001325b6f72bafd36ade886ef84a5baac2b08aed2f8b8ff63a24cae4163b39d55ed39d793be4629c788d875b5381b39872a0223f1cfe8911bb29f78cec1e1605 WHIRLPOOL fdd2760495f23e0db6de1533fd726f741860359180883db0bad4b80f1be773afed232d857a6a39f7e716be6f4f67370adc29b581a7b000e1d49e6a3db8f2c223
+MISC ChangeLog 15810 SHA256 cd1fbabc990840117b8e3a56055fa8a1c0ff4b234392f88fbfcf5355b1b300e3 SHA512 003a294f81581ee64b9cf41c2abf8ca44815afcae95bf9f5961c87650b872ec2af55dbb2548c1f87b19a4db6d5e339199875b0631354923c80b1fe2ab380ac32 WHIRLPOOL 0ea08e643fcf8f7a7e81aaef9c9ec32d3641d4960a9eec2c98be6013d5ca118205a7e1eca7941808e841ff36bd1d020105a6e0ffaedcce3a63e2af2821a3b1bd
 MISC metadata.xml 564 SHA256 a261da27b08561f8a52676e849b12974d6aa01ee8a6ca2d3ba8269d96332db94 SHA512 30ea53c1bd6bdb1e11573723c32324181e278e6006a06b9b17d9c22ab99ff5e1db963be09e073c2f7842b0bb30024a62629984fecff759e3b883a8da97998aa0 WHIRLPOOL d06b6e5a42dab1fc118ab71438b7e4a905dcea6f0084dca6c4e47d1d3ccbaa167430cefedb11046603671948c2dff56ea4ef0495afd5cc654fd3e5b31b24e410
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlVbW3YACgkQVxOqA9G7/aA1egD/SkqSKCX1zD7sErOY4YwSYlh4
-njlhWCg65VBGWErb8zcA/1CyBv0wQ/76E0EUlZZLTkJ39zQl2NFZIlw20oNjNJsI
-=DO7a
+iQJ8BAEBCABmBQJVfGa4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5yY0P/2VftOrYBOWaonV+VczdrCIK
+6lLgKY0w8AHuTeM8CbpSYVG+i4injqvHzWPgPnG6EGoecvu4elxAlErDsxmSz9bi
+TdIAvQAfMakrRPxs5mNOnlO8hTwFYxa10003MNLJI4CEHhaZJo86COvwuvGspgzb
+QdIz9jkbARKh4ofRsPsJSBzPxnERX2VuBlfUCV2rmj8j38DaIYibHNUXKanxn1/2
+kbk0Vtdr+OskyimQUrcZK2ji3sgo2Lq+12AQp6FeRXy1v0ufDhTTnKu6QLrcTP1I
+wVrFD5LCa2nBW9vNRxnZ0doML8I9EQXUuDp/ioZhsW4jauhBdsnlgr5YL0LpkVA3
+J4kqe7YRShlK9QJDXKE9lPSromGN7EsbbFWoZR3Tv5Eep7KJsVOKvSbMg2Y3y6Nr
+cFKile+6VqMhIQihbA2h2D2oqijhFqfxczsDXfd01iIHVngnNDGLsgpaOmjBRiOb
+cQguxLNShOid7/TmRAvtGYnaZlXTh5Y1f3Sd30U7HdXRL+DfpPhGCL2OBWpaeEY9
+KVyYeOYepl7WJtoo4OuDtAqPUZoUD/oPTiOL34LPQeY56+Wo5d2guLaKpYWYAfXB
+8/Nb8I0hLpEu10JU640Q4BzyM+PW/6X1rzdsp5m+sQRnK7mn+Uusszbvnpsqhv1a
+MymWEhtJfeh7AvuMzpfs
+=SzN5
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/rt-4.2.11.ebuild b/www-apps/rt/rt-4.2.11.ebuild
index c6765dd756ba..054f5e460a81 100644
--- a/www-apps/rt/rt-4.2.11.ebuild
+++ b/www-apps/rt/rt-4.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.11.ebuild,v 1.1 2015/05/19 15:49:08 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.11.ebuild,v 1.2 2015/06/13 17:21:59 dilfridge Exp $
 
 EAPI=5
 
@@ -45,7 +45,7 @@ DEPEND="
 	>=dev-perl/XML-RSS-1.05
 	>=dev-perl/dbix-searchbuilder-1.660.0
 	>=dev-perl/locale-maketext-lexicon-0.32
-	>=virtual/perl-CGI-4
+	>=dev-perl/CGI-4
 	>=virtual/perl-Digest-MD5-2.27
 	>=virtual/perl-Encode-2.730.0
 	>=virtual/perl-File-Spec-0.8
diff --git a/www-apps/webdavcgi/ChangeLog b/www-apps/webdavcgi/ChangeLog
index 0246e83d893a..f6bf611ffcf1 100644
--- a/www-apps/webdavcgi/ChangeLog
+++ b/www-apps/webdavcgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/webdavcgi
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/ChangeLog,v 1.7 2014/08/10 20:15:51 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/ChangeLog,v 1.8 2015/06/13 17:22:20 dilfridge Exp $
+
+  13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  webdavcgi-0.8.3.ebuild, webdavcgi-0.8.4.ebuild:
+  The CGI module is no longer part of core Perl and has been moved to dev-perl
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> webdavcgi-0.8.3.ebuild,
   webdavcgi-0.8.4.ebuild:
diff --git a/www-apps/webdavcgi/Manifest b/www-apps/webdavcgi/Manifest
index 0ea36ef35d2a..5ca32ba983b9 100644
--- a/www-apps/webdavcgi/Manifest
+++ b/www-apps/webdavcgi/Manifest
@@ -10,14 +10,26 @@ AUX reconfig-suid 602 SHA256 dcb3e341cfd4bffe52adfa687b603043d73c989724a3a25b9ab
 AUX webdav-0.8.conf 2872 SHA256 abc1831ad50a8ee44ee324b428aaf6ec1ede9353d631999dbb39ee0c1c6d4841 SHA512 1b1d8c1eb53689e02180fb0e59b0ec992da4f6656d0f9965ebeb483bf4f829da6971273d368b0a1cf8bf9df65089720bc57db76f7f8a8b85e0cf645662a2b869 WHIRLPOOL 9b8308ad7911a9da2a0fc124cbb12ce9194bb8545fbb3bb08a914b4bbafe37f43619eb748f9300e78fd1e5efb3057e9490b9e43e3e50b1a992b6cf40b1d54dcd
 DIST webdavcgi-0.8.3.tar.bz2 1190975 SHA256 d8ca7feb1f25f6acce67a5ea769a089edd404660c85633dfbd6303696f1cd294 SHA512 f50e6bb1e78a88ab6bc6452c04f2e5d0cec86f6641d1813556ae3b06c33e2c9250e623926bf1a71ea10f6ca3912e708cb54cd0956b344329de1499887e48e784 WHIRLPOOL e05d0b2e5d6905d3c86e807c1f6b7544c1fa9629f310496648088c2a1a5bb491e507e492b80fa4beb6ab43f9f1d1bbfd095d1b670e3ca88e89b3605f5d790743
 DIST webdavcgi-0.8.4.tar.bz2 1195935 SHA256 d04438a515a770502117b4219ebb5406ed1ab949420802d0ce623fe3f61038ef SHA512 17d9dcfe68012820bf809bc3bd54a881fc9e66a9ddfd87d9381ec0cb08abe3f81638afba4d28ab3079ed56cf1e263b4a764b8348691f17a06743bb1ddf3a2a4e WHIRLPOOL 86d65aad94cd6461f72c39d39f1beb0c24b049a50072ef3b4e16629b388ec562136ee0cb2f93674eaf9342feac077540e98f78b22ad186cf4592cf8d53cbc530
-EBUILD webdavcgi-0.8.3.ebuild 2886 SHA256 3e0e6cc3e2147de425107eff36e7ab6c0935f0d4296a776f2bf14936e227c3b1 SHA512 04a1de94f6ecb00c218b9774f4d22a2c42a92f69e5bf2ef2a12a84b9d786c3d4bbbf9eae16eb153e2cef91c293b30d312fbf0d38119e5cd45f37c743112ff503 WHIRLPOOL 0745fedf1bf614d9fe8fa95591dcab4e3318e94a3f61c229a58911d0e8b3f6549fe6537483c0493280c8c23a6c86517d0383559360961c85aa5e6a91ab1a2b30
-EBUILD webdavcgi-0.8.4.ebuild 4901 SHA256 2facfb642924938badcf407290e3849da33d525fb20c1a07c14fe2ad7f7d7a6a SHA512 ac0e32a97b580574fd9d4217ca48af27a763f71afd2bdcad55b41561462e861dad60ec7f08854ad588fbaa6d011a783ce013140301383609575d60c44bd06ccc WHIRLPOOL 84fb5a4b426fb9e25464f5a83ebb73c26b2bd4a5cd0b83f8a7f6d026dd9de82a396dee0a74b171fa167e46ff983b2e24460d7b29b08984fbcf5274d3378ee8c0
-MISC ChangeLog 1788 SHA256 6c85ebb19d7179f247a6051421dd740a40eed5fb87716a3e271f3387f3023893 SHA512 1ecc26658f32ce7bd869739d2acefdde4b61a8333a5f31c428b56ce702023f0fb4f833d147958197f8283aafec63a0091f342e4d447eaa2bc68322fa0bb54e97 WHIRLPOOL 6b5731cd88770c89a3c59c51ddf00d424fa07930370cb304ce99284428e6a167ff5265a6011c93a312f79e06bfb94659ef5298ecc76a89af0b734e7b50cc5940
+EBUILD webdavcgi-0.8.3.ebuild 2885 SHA256 a3031f8d274afd8f6b27f190bde55083bbddd8d5a4ea86b8285f0a9b5e362e5c SHA512 b1618fba58a121979bc2272b3a72a5fa093eab395506fe189aca6e84d7d7c1872c629d973719b3248b6b9125dfd5aa55cd913c51bd946a1719cff498a54985d4 WHIRLPOOL 74063d08192e945a0b14cf25e32af602454301b51b9f1158fb63300d57efc9123234c852ef807d7e935e939926fc9f3dba70ef083c39e7c73358c65ee0521cca
+EBUILD webdavcgi-0.8.4.ebuild 4900 SHA256 5974e455b1bdc1ec8bd370978993af75bb18ebefec7c6350f8ee202b47bb081f SHA512 195907d1f554fc4476cfa2e5279ac562c2ff11bf1e508dc2d0987497fcb52c6dfabf452ee3865fa798af6b3b8441c5abbd1ddcaf0b96ffa4827acad17fdd6478 WHIRLPOOL 44aed83bc3d9dfa900250b4c4ac163777de0031210c3d446b53e0e33a7f7d5a749c0499b625bc9e7bcb67351604b789cfcc497021d8de1d6cd62840266406c18
+MISC ChangeLog 1978 SHA256 e2a39719fcf914428621008401a76bc5e12cc77c4688f606251abc29a08759d0 SHA512 2354fd7fbad9f75c8414b879f435d83f04536beca1241cec686c06780f7140e605268bf5dcedc7dbe2257f905f7c50d447ab52ee9685843b3722d2f856e1c528 WHIRLPOOL e57e1bacc674ba6d32cd316b23e9ef4084475b94fbca6a80ec6bc43fa4000b7f819f69434ebb9b2b423d6267e9899168ab5744334bf103bf1ba73e6983093f72
 MISC metadata.xml 1105 SHA256 a1c5025cc11deb711421033d0c2bc63255c59a54e5f99de47a5dd3ff3e9c45c3 SHA512 e07516031b617eef5649a0bde4458e0f43d55e56039982e006ab9f74aa933d7d528f81b0c904b850cd223951adca04fc2fb4a302b43a746fcb8a04906422058d WHIRLPOOL 6af3e10132fc8c1f5f83e3ab1df25b2a1521d5180b31c276463b9bdd3b9f53b274749a158f009b9cf09780aa7b5f5a49eb9d9192b56be77a12225ef461daea12
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0vcACgkQcaHudmEf86oe2QCfcMUW8hc9ucpz8XvpbqVB1sYG
-v7IAn1eFid/OA+T6ygIrVafPlscZ88rA
-=Fl1T
+iQJ8BAEBCABmBQJVfGbNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5JkoQALs0iPqnCst+D9khItJr+nmB
+4Pe9lWPEotKSx6hsHPeuu8TpeRWMZAC2W8xpduCEHyMTErsAiFRa0IGqWlEhIZ7+
+bvFLv26tfQwsrWGf362ibpklvzmf8yTRv1Ef51BkwX/BaPb+FuGKsOYO3/L3pI0H
+7EEOmfyni9PZuciH6dkD8Ym3BkoYUcnR/OghOEptk0KzcFeLdlPOtUI5T1ljSvJT
+NX6adAu1LqJ3MdSdbaurKfp8PsChksNju/c9qGdy63OrjWrwlNBnhkdFrVJGNeuY
+paF+HxiQfSKGuQxL09l7s8PR7fSRk9kHFZi1HYvPk3rIhIU2HeXoJFtBiVylZ3Xh
+nE5BEjJdETWxsvkJ6vtbD3DKuQR+OlMNAj6a5OsBi4OCoYeUklmhKmipZswJ+RG2
+oQiKwtJEUUawh1qiXinWeOo5e5Hpy7zsZr4XJkRHCVtmh3RJt0S7+nfbcTEbo01r
+SZWpsibtGShac3833wMKqDi44cvdk+2V5dDx5KHWHwZY1T6nAlcL5dEyVoMTULzg
+/o5gcLfcq8MOIxkg7nYOEDCFkldDB7XE1oYCv89BGWi6hrEna/9Fz9w/jnxEwhXm
+M4w7nprEi4lqh4jbTb+3EMEfezV83O/Qxit3/63A7okkp6U9/B0dJ00RMoW65ApO
+mC9qUxgYdnMV8tp6hhxe
+=yEGT
 -----END PGP SIGNATURE-----
diff --git a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
index cd30f2baa110..25b1da3f91f2 100644
--- a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
+++ b/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild,v 1.4 2014/08/10 20:15:51 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild,v 1.5 2015/06/13 17:22:20 dilfridge Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ RDEPEND="dev-perl/Archive-Zip
 	rcs? ( dev-perl/Rcs )
 	samba? ( dev-perl/Filesys-SmbClient )
 	sqlite? ( dev-perl/DBD-SQLite )
-	virtual/perl-CGI
+	dev-perl/CGI
 	virtual/perl-File-Spec"
 
 need_httpd_cgi
diff --git a/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
index 2845816ec516..22b8649efc06 100644
--- a/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
+++ b/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild,v 1.3 2014/08/10 20:15:51 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild,v 1.4 2015/06/13 17:22:20 dilfridge Exp $
 
 EAPI=5
 
@@ -40,7 +40,7 @@ RDEPEND="!www-apps/webdavcgi:0
 	rcs? ( dev-perl/Rcs )
 	samba? ( dev-perl/Filesys-SmbClient )
 	sqlite? ( dev-perl/DBD-SQLite )
-	virtual/perl-CGI
+	dev-perl/CGI
 	virtual/perl-File-Spec
 	|| ( virtual/httpd-cgi virtual/httpd-fastcgi )"