Revision bump to add Perl 5.18 compatibility patch, bug 521824

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 104 insertions, 26 deletions

diff --git a/www-apps/cvsweb/ChangeLog b/www-apps/cvsweb/ChangeLog
index ed5aecf22a00..7840bad9882c 100644
--- a/www-apps/cvsweb/ChangeLog
+++ b/www-apps/cvsweb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/cvsweb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cvsweb/ChangeLog,v 1.2 2010/06/19 00:58:35 abcd Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cvsweb/ChangeLog,v 1.3 2014/09/11 08:26:50 dilfridge Exp $
+
+*cvsweb-3.0.6-r1 (11 Sep 2014)
+
+  11 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cvsweb-3.0.6-r1.ebuild, +files/cvsweb-3.0.6-perl518.patch:
+  Revision bump to add Perl 5.18 compatibility patch, bug 521824
 
   19 Jun 2010; Jonathan Callen <abcd@gentoo.org> cvsweb-3.0.5.ebuild,
   cvsweb-3.0.6.ebuild:
diff --git a/www-apps/cvsweb/Manifest b/www-apps/cvsweb/Manifest
index d12001d86c21..5ea6bfad9904 100644
--- a/www-apps/cvsweb/Manifest
+++ b/www-apps/cvsweb/Manifest
@@ -1,30 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX postinstall-en.txt 35 RMD160 6e379b6b279435d9ccf70f26335c4e50994e6e58 SHA1 a98765cac7f4d90de324af840bb78748cf79d063 SHA256 1f0dd317eb5e367a5a9a281967a9842859a251134268ba9043869bdf8fc0128a
-AUX reconfig 381 RMD160 5c43766f73d8b058568d1b69877a159a853f23b4 SHA1 e47f8a3b31e8fb9c1b32e80e75123b25291122b4 SHA256 cf9e8d281abff2be46b265f504381c0aabb950d803ab513ff9d9942ac551bffd
-DIST cvsweb-1.112.tar.gz 37239 RMD160 f606c9721be04035427a420194dfe42ea7484f38 SHA1 4dc996712c365f064a8b8d26a69b3df083ecac0a SHA256 55656465590231d8ead238cb2b7def59a9f00ad5f126176c15f2a9e340812fa4
-DIST cvsweb-3.0.5.tar.gz 72199 RMD160 cb15a893c6f7fc2ca6892c612523cd96f8d3c2f0 SHA1 520c1bd1f295663665b4ab85843f3b321ff804ea SHA256 ab1acebde0b4f2c75932bab529150c8280cf881deba81323d71733d81c28643c
-DIST cvsweb-3.0.6.tar.gz 72484 RMD160 e933c3814ea52c7fb9cec65e088c9ab778da2fee SHA1 6a9c9d2cc120bc0f0b3c2652a06f587bce8845a8 SHA256 07391ee70212ae42e54b8f6d5e613623ef2aad5fd7474899a102fcca48d213c2
-EBUILD cvsweb-1.112.ebuild 823 RMD160 87e151fc2213fc01d8a3c408872d985aa90c17f3 SHA1 a42a469feb988a66994c2209220dd785fa6af14b SHA256 9894a67c496408307dcca0803f4416544456d8e788609affc604d81023ead15a
-EBUILD cvsweb-3.0.5.ebuild 1035 RMD160 6d4739da52862d92d83cc916f4c175cf27351290 SHA1 f82e6c7cae0bf069431ec49a3ca89bc56d8515c8 SHA256 a1fdc57ad4d3113f68e044f6039fed3a3d5df10f3eb4503c4cae0ac7c77fb901
-EBUILD cvsweb-3.0.6.ebuild 1040 RMD160 442ccf1b14988336ad64663314cc1a2735fe90c4 SHA1 f17acc1caffdf080380481fc2b00ba6804d59016 SHA256 c52d130b79c4e2c755c50e487d2ecfe1a3584f356efec8649c3fb1c4f57732be
-MISC ChangeLog 2748 RMD160 56b7e3045f3172830e02dbff1448bc2ce1d69df3 SHA1 87e04653c2ea21185a64d3c8061d85a099758a23 SHA256 9fb7ba0ff7f69bbbe69a8cd2dc0e9415925ea189fd0f45f06486527f270cdba6
-MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+AUX cvsweb-3.0.6-perl518.patch 791 SHA256 67d58cf9447050a8db26e56f836e1c74417a58d3d9d88ea1dd86fb3e9df81693 SHA512 9cdd1f92974dd35c70280913301050b6d2f0a6d37e19bd87834aefd78985469f508262f7e63d282d0ab98446dc4687626fd8b166a1c59a20e2098d23c45cf145 WHIRLPOOL 1e43665d43cc3eb01a72062709e82ee463be6008ca7bad398ea2e1b30d21cb9683092869fc6cd51e4a6e6e6f7112d6d3ee78438875bfe028dcd7c8584bb0cd2b
+AUX postinstall-en.txt 35 SHA256 1f0dd317eb5e367a5a9a281967a9842859a251134268ba9043869bdf8fc0128a SHA512 ba2ac529a8b20dfbe9110559a33d80dbe2b846af99b49bb8602520084e24474ef89ea2dd309287455ca94f9d9332ac8f36b2b7a2082dfb063e46456f1d11ca74 WHIRLPOOL 475ee106f736f3b175a1b4761a1aac74acf6fd2f25ad5dcfff648ad0651e1a29cf9888b846a69f5e398e9f52f814f5979cec56eaccdb37e325497d00d2182ce0
+AUX reconfig 381 SHA256 cf9e8d281abff2be46b265f504381c0aabb950d803ab513ff9d9942ac551bffd SHA512 73883f035c7d82de255a9aad5cc58d20b614e70eec86d5b524783e28e34e60888a0215923fd956aa851a42be31a3eb27634ad5d693148722160b569ea73b749b WHIRLPOOL d4b123b68a8fa44744434eccea682110f35cc7bdae3f83fa09bcd71a71186ed626211289b96f685a8124379452daa7937c20e55806ec0cc64ea80b76d6a5e0f7
+DIST cvsweb-1.112.tar.gz 37239 SHA256 55656465590231d8ead238cb2b7def59a9f00ad5f126176c15f2a9e340812fa4
+DIST cvsweb-3.0.5.tar.gz 72199 SHA256 ab1acebde0b4f2c75932bab529150c8280cf881deba81323d71733d81c28643c
+DIST cvsweb-3.0.6.tar.gz 72484 SHA256 07391ee70212ae42e54b8f6d5e613623ef2aad5fd7474899a102fcca48d213c2 SHA512 32ac58bcb025746e4cc20bdc12d1bd915e2286a4093afebf8d60cb94a70ac614301f9b7f0a175458b14262a03d3d2eb8c29eabaf9127bef1aa6847905f331cc6 WHIRLPOOL becd4a96f21b178595be2083f8117e84b6203508fca09a9a74891cc324f8086b6a2b273eabfbb50301864a0f5f53a84374f7e3e0c9a1a32b0e7bd08a1a60aaa3
+EBUILD cvsweb-1.112.ebuild 823 SHA256 9894a67c496408307dcca0803f4416544456d8e788609affc604d81023ead15a SHA512 440660f82e317620f229bac685395adc7d783ea588d897626af2a092a04d9e7bdb3cc5b83f3ba3e7eae11f810957abd69b3e585c46e5f3df14b4f5f0d8bc5b64 WHIRLPOOL 777df6c449e69923f0082acc9178229a823c48d2c742f7c9ca4844af6f2c428346b3851f2899e5105105516666d03ad9620151552798636d9aecc2dfb61b4984
+EBUILD cvsweb-3.0.5.ebuild 1035 SHA256 a1fdc57ad4d3113f68e044f6039fed3a3d5df10f3eb4503c4cae0ac7c77fb901 SHA512 41982befc634796e28bfe8c6950f49418aa703b9db88c8ffc7350a9921e85574f2f7733c7f357c74ff74f36bdea26dc807fecdeee6c5e67ebe4a06debe92c3d6 WHIRLPOOL 0adc70b9d04360a5481ef6a4d1f5ba14e7970b0cd96fe63e2b28930bc0eb62dee6601a0753a6546f0cf1ecbdc199c3be1b8c199917849652735daa9da62c7902
+EBUILD cvsweb-3.0.6-r1.ebuild 1125 SHA256 83376e38218c59e777e3827c16968e15fd9f40c3ed2c6cdfeef9199778b3d5df SHA512 9f205a68482ee8e8601ceb0bb258b0390cf7135f98a2e3349057722a87700d1d7e2d5545e295f4118456614c20a31081cbcd179adf75b39e2ac85a8ee3fa4f68 WHIRLPOOL 2d6b0711a9c8b8498bef449c02799c3ab62fb639f7cd4f07e2824ca4dca95b4e36d685d52db9f1aaa42d1439ebc463e0a1058792a83d64521d1afbba6abbb7f3
+EBUILD cvsweb-3.0.6.ebuild 1040 SHA256 c52d130b79c4e2c755c50e487d2ecfe1a3584f356efec8649c3fb1c4f57732be SHA512 67e6da910f277f8579254c151a679322b6509f8bdc2165f72e243d338bddab36d769f8746a9b2335358ec0e4b27d5fabb3fb32e39edc3984d466a99298cc46d1 WHIRLPOOL c3b7a024cf0c14c082226e0eb370eabc0eb4f00f4dab741721535f00369e833889e0fcb4244f7f1d613607e97fd66a0fef65da8556ee34bf879a6a56f0b470e3
+MISC ChangeLog 2970 SHA256 c7d88c77119fd79ba7a11a2cfdc49265a46fc338ea961afb43ea67fa6c020020 SHA512 18b003c20da90e581008f72cb5d4e04cb463d040b75a31beb6aa8bf0c891421fe6f259f75b0a8dc6eed549adc8055b4636092e701fd94e35a11c05392d3d0978 WHIRLPOOL f10f3b495d0d1b5f52a17864e0b953c45deb8ac14a15355128a31b365a275bc49565aae26f15258df562869be5f799d7e175ca202b769baffc8b6c247d928cb8
+MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJMHBZBAAoJELHSF2kinlg4fHsP/A6L+kDtii6DNNv5c4FFC1og
-QrTeVI1SVpr0M0gRn4TixrjImqqTpRjSszjl/oW1hMybO+fCSFwsvzsrjsfypnvv
-bCLdJ98SCaT0oAAXHLo8pUmKxB7MYs+XC4GzBeni/rpE93jJRn4kC/uYpOzQ4dYp
-OkjeZvcmyppqvvecrfp0GkkT4CIs+fcfNJCPkiOY2cYH21xBQ2g2JeXI9N+wEhgZ
-ms2qcE8dICt54FHzmpmUuVUYcDyTAl096ov/3zvOVyVA7tOW4zFEPyGIrj32lkW3
-1ljQjg3tTRv7sHqs0Dl9kwjSn5p+cQ9iJ1rR5DJvhM6/NiAvKNBYf+GKdeInaBoH
-807bH3zPPEutXF5LESx8SyY5rPla7afI3ZL7qPla/UU88Yc9wuPYQ+by4I1Xbwb1
-VDWiqxfalvEj9JL/EGYRmxUxkeP5Ps5/QMBjTga58Ot0fFVj8zK7DgMsCsQMQ5XJ
-W5eAZhp5Fo+jfSI1C+qGMSIfdKe/V+qSO/r2feXZg1PHZw2k6hwhnRDsAM01xoak
-OWtB0EV+gZyRlEiSXjXA5/SzTsN57dQeqquC4ElrjUyYdStLPe/3rY6rZ6VrXgt2
-a3l7T2e44yYT8mt3WDK/zUqVbC5EN5W20EKgf/voG0zNOtHjs7OpjHoEo0Pc8nrf
-EWe7qQ8LIOjJFzqKVzt7
-=1rZi
+iQIcBAEBCAAGBQJUEVzQAAoJEJS/30SErRQvm+AP+gNMVRMJ2gBjSo4HgLmQ1Ain
+7pZi2egzZParlSvqJZf2YnSa543gkPmE3I3QZO5v/iYFeGv8ep1Hz3/tEYvzYTTI
+1L97tDtDDALc1JuIq0aheVZ2xio5fGnTeBykkochyG+x86JgKsc2Xea2vcNndV75
+jGgoYLsT/JETVpJSaVHXsX5+Jn/6uIRssYMmwd5JCzn+yzxFEn05lOgC0R/BbN1F
+47w/Qqo9A23znRgaClAQTUHk8vD8le3wl98uKm/ImjHCGDOSHZTlHMc8nRgke3ZC
+hCrY5MNHXlUlD8I9CPuo10ayJNjes5vdhjC2u53ULfSusACDngYa15XVGizL4LPY
+HXJ+03NXZ/1vIwp/dcwAlnVgQ2jMscmYJ0wZyP18RCIjXz3y62BamDkKTBuPbW9a
+F6GZqr9elGxjFSEv89DUNgf7dKQV/Rtpw+4LoYM7O/dqUIO7/EXWDtMHfWFVIK0A
+GIZG0JfAyi5fETNouNwbPlzwQfcnzVYyB3Nko5ED2k3fpoPxztQSbupJJekRROK2
+E0NwoWOFXucTm6TNgfRdosn085EwnY2PVE1qnOdCWDIPeEw+uTVGye72t86xfZIi
+tc5fKvkX96yWB49ltrRGZFZT9ELoiv99gAR1FSi0P1p4DpgE5yqWNg/zHvNep2TT
+uaCBxvN2qXYfxfpQDPlp
+=1e51
 -----END PGP SIGNATURE-----
diff --git a/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild b/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..ad7c38128496
--- /dev/null
+++ b/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild,v 1.1 2014/09/11 08:26:50 dilfridge Exp $
+
+EAPI=5
+
+inherit eutils webapp
+
+DESCRIPTION="WWW interface to a CVS tree"
+HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8
+	>=dev-vcs/cvs-1.11
+	>=dev-vcs/rcs-5.7
+	>=dev-perl/URI-1.28
+	dev-perl/IPC-Run
+	dev-perl/MIME-Types
+	dev-perl/String-Ediff
+	>=dev-vcs/cvsgraph-1.4.0
+	>=app-text/enscript-1.6.3"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-perl518.patch"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp cvsweb.conf "${D}"/${MY_HOSTROOTDIR}
+	cp css/cvsweb.css "${D}"/${MY_HTDOCSDIR}
+	exeinto ${MY_CGIBINDIR}
+	doexe cvsweb.cgi
+	chmod +x "${D}"/${MY_CGIBINDIR}/cvsweb.cgi
+
+	dodoc README TODO NEWS ChangeLog
+
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch b/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
new file mode 100644
index 000000000000..ba1195ae9160
--- /dev/null
+++ b/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
@@ -0,0 +1,25 @@
+Source: 
+http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/cvsweb/patches/patch-cvsweb.cgi.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
+
+Fix warnings from newer perl versions
+
+--- cvsweb.cgi.orig	2013-07-30 12:49:33.268655300 +0000
++++ cvsweb.cgi
+@@ -1192,7 +1192,7 @@ EOF
+ <legend>General options</legend>
+ <input type="hidden" name="copt" value="1" />
+ EOF
+-    for my $v qw(hidecvsroot hidenonreadable) {
++    for my $v (qw(hidecvsroot hidenonreadable)) {
+       printf(qq{<input type="hidden" name="%s" value="%s" />\n},
+              $v, $input{$v} || 0);
+     }
+@@ -2951,7 +2951,7 @@ sub printLog($$$;$$)
+   print "<br />\n";
+ 
+   print '<i>';
+-  if (defined @mytz) {
++  if (@mytz) {
+     my ($est) = $mytz[(localtime($date{$_}))[8]];
+     print scalar localtime($date{$_}), " $est</i> (";
+   } else {