Fix warnings with newer Perl, bug 523610

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

4 files changed, 94 insertions, 2 deletions

diff --git a/app-text/code2html/ChangeLog b/app-text/code2html/ChangeLog
index 5c2ec9f2ef03..b632f3c76889 100644
--- a/app-text/code2html/ChangeLog
+++ b/app-text/code2html/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/code2html
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/code2html/ChangeLog,v 1.27 2014/08/06 07:09:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/code2html/ChangeLog,v 1.28 2014/12/07 17:17:58 dilfridge Exp $
+
+*code2html-0.9.1-r2 (07 Dec 2014)
+
+  07 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +code2html-0.9.1-r2.ebuild, +files/code2html-0.9.1-scalar.patch:
+  Fix warnings with newer Perl, bug 523610
 
   06 Aug 2014; Patrick Lauer <patrick@gentoo.org> code2html-0.9.1-r1.ebuild:
   Make description more repoman-happy
diff --git a/app-text/code2html/Manifest b/app-text/code2html/Manifest
index 36bcae7a0966..1fcd23c3415b 100644
--- a/app-text/code2html/Manifest
+++ b/app-text/code2html/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX code2html-0.9.1-prefix.patch 1393 SHA256 f07c9463f086a1afc4d672178ec37c55e1141393d248dd0580f0287290c9f3b8 SHA512 3331c0590e992b098548cc10deffc270b4ed7cb790b747124a2053ba8a96274bcdaa08eaf8513f24a6ec8d9fb6b9bb93f8690a55d00e767085c005dc2e5f7ca4 WHIRLPOOL 9ea0837fbc5259c967f1f58d84454223df7c32b75000ef70fe65ed6d84ec97ef1fed07479a576db8d2216e0ed483c32b68da2f7e3cd10038fce3d69b17dd6be7
+AUX code2html-0.9.1-scalar.patch 1435 SHA256 ef9872b3e5bba28d8678785b5efaffc10f4c877cf6ac7f596a9c85af64c3b779 SHA512 5e7124876b2888b24792d351d958efc09daee90422cf457a2a820920d6185df0d53dbd68f79acb084e4b4fed45fece8dcfc642ae94f0def78567e4f8366022b6 WHIRLPOOL 8cef153944f6788ec3e3c04eb031816359d9e5bc3018844ed928bc46fceb4cea34bf112a8c38043962002c9c1ac06ebdc293390cb954fffebabfd01ef8c29bb2
 DIST code2html-0.9.1-gentoo_patches.tar.bz2 2666 SHA256 e1a1ff10d861db2d52435e29707a7de0e779f0afeb6277cecde438cb98f12092 SHA512 cd478b53f0c11b9b4838a842bd8cb344698c85b1c3e09f03a75214f4002f4748a15f995530d6b6c743a4edb784c8aa703786ec10d3bda971b9485153e7090fdc WHIRLPOOL 7b7cbd9401a7cf1c7e815add7fb21c64927b80799a3cb3884968002f847145bf2d8417481190b217f6c1b3ae2e5bda09ffc8e71c9becf8f9e649f748dc8bab3a
 DIST code2html-0.9.1.tar.gz 39811 SHA256 f2fde58ba378766a21affc692eeac622aa1c6434f05c993aedf53203edec2d84 SHA512 97fb8cadfe64a389711c58b13b7b5d977849f3a242c32a2456f93d7abd39f5d0a4152416f5c73aa05f151316ea0d8486b2b9923a5390eefec3e9d8253cc0b2d3 WHIRLPOOL 949dea088ef02753b59b114d930bf02c4ae7ef14d23b2cc2df6d4dfd06e79b4e40cde043927ca9ab68f45edeb9b7ef25b6605ef2011d2af2b9cb09d9b69d8952
 EBUILD code2html-0.9.1-r1.ebuild 1089 SHA256 9769adef2ad0367283139503083c3b542967cf58af393d66178898b07d4be95f SHA512 250a5e31b96aa5229ed8a17165c75551fd74bd57e7f397330a8356a0bdd278ade6a2e2fbeedce0bb0e81c182be9d1cee2bc91412d658fb7090febbb55a69fe8f WHIRLPOOL 21945c7c35874c58f5eae624af5fed42392c357cdf4b0df7293a8e8f15254f71fe9b0bdd977331d10ed34aaa0371eee50ff576830619bf08ecf00e169a1b1f8e
-MISC ChangeLog 3200 SHA256 7d04c6ce8ff65902b0b2c6feaf354b405c945d9f7a21a2b55cc5f17dae16ec05 SHA512 8d95a3b4c95be762ad94e7aef8d56e8be36f9b9b7ade9349050f3bf222eb169f171d0a4e6ca9b085b1e59c8130c94f3413fc8667a63576ada3ee4aa5b765e0d9 WHIRLPOOL 6e28cedbfd6d199c5cc78d1009dc2dea928d127715e216bce9eb181d6a63f66c8097c306e8cf5f33adcba82c2c29b453531f5fbbe32460e59133f8c70b1f4ea7
+EBUILD code2html-0.9.1-r2.ebuild 1166 SHA256 6795385e8c64ea17a6c579d9dc0c3a1499a9022182bf9a476a508ce8145a9844 SHA512 8e95e378d05bff0af04927e21e0be8ce1c18e8cff917baeca6a1971a3bf3c92241ef4c46ade2448a8226e759236dafb2f1cbc16affe258224390971fa83c99d4 WHIRLPOOL c174986b6d86bd6e19d229fd5397afcf1e3aad627300ceadd9112c4917c70e68d1c717e6603c1389e6ae62d3fcb3a3f09bab50c7437e9aab6bf5a2df5f544062
+MISC ChangeLog 3405 SHA256 bbcf6b74eb7a3c02f8a609f34201ff2fbef1284f15152779c27cbc6d9625da00 SHA512 0927256a05a63b666844322482a8deceaf4e4b70d172ea1521f9ba3fabe567c1c5cf989dbc19e8a5d0218580674fcd584e88e5a31f2e4ffcc4ecf4eea2046724 WHIRLPOOL bf84b82a254c8eb84dfe20940d391284d59d4741404d53ba2d49ba031457dd443a771350f8679c3d492652729718b31a36f93e4b8017c22148dc97c57f2f7ef4
 MISC metadata.xml 409 SHA256 44e5684c94829cdd58dced6dd5e50dacea89942e3e1b34c46153b99888ca9161 SHA512 6aa21108e724518b0ca059dff1ed3d3390b45b199c98544892d1fa78316bfae25a1e9c158d22ec583db6f28a356ab3d04cae28bc6096006f13e4acbb09847f14 WHIRLPOOL 948ada224f49aec0c316fc78550faeb741fab53c8bb28b7958fc290feb3456807a6afc17e00c79c577eee7434b1b4a5ac04fe8f3126d70b1a9ccff9831bafae0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUhIwPAAoJEJS/30SErRQvaTQP/3Y4bv/AyFByX8ah2ovW7HyY
+jvI/wMiDcy9lrctTI2LqVudVXHUERokBEqx52eFG2t6svu2vt1cnJkTt7Ov5vqMz
+MD8Z2ao5pGPeQS6N/HFEGKM2/5ZQKw4mTOvNiUG+uSJaLsR8+B5ZWmEXaTCgPOrt
+WrV8OqrvdmpWc86tqDSrnjqJ8bTtNsr9TtQI8lhNCiAxtzp5HwI4keRcr5Y9RFoS
+rlSZ76HztxFdqoHnLcypEBDoDVwmLo5Ja0/TQ+yySB+nVL3Jqktmb4X9WiMxCF/m
+sN71RjH7NTxLZTf2A/ne9yv/ksPRYeap+ILEkFCpS0jYaQA8nTMy/02n9JZaDDoJ
+1FdyU0EjNpuOwYX5O7vm6hZq0yJs055nEANJ7FSbaqgZaR6pr1lQd5qHXfFrQqJH
+8cv3LW0ctxBR1PUVrsx53W0ogm+Ypppd+gsGbMnbj+rxTivv1te/XbFnTLZJdVWt
+tnLOk6xxzIp4NukzpZcbOvaUUb6AZbHzLHp+T2z7AWBvuwCULtssy8dK5mm2LhIu
+O+dBnNqS8qbiO7TgVqd5UDZH7QmHtiwCfO62XPETr5LwQ4qwxuRV5x+naXlp38HB
+zVaheUbLfm4llGbesc43s3Wwdn7L0J9IYmnHAzoJ15Fk8dVmrcrIbQcNusjQOpYq
+OL6isSDL6pDWpB7Iylzl
+=WJXM
+-----END PGP SIGNATURE-----
diff --git a/app-text/code2html/code2html-0.9.1-r2.ebuild b/app-text/code2html/code2html-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..ad64a7699148
--- /dev/null
+++ b/app-text/code2html/code2html-0.9.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/code2html/code2html-0.9.1-r2.ebuild,v 1.1 2014/12/07 17:17:58 dilfridge Exp $
+
+EAPI="3"
+
+inherit eutils prefix
+
+DESCRIPTION="Converts source files to colored HTML output"
+HOMEPAGE="http://www.palfrader.org/code2html/"
+SRC_URI="http://www.palfrader.org/code2html/all/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo_patches.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5"
+
+src_prepare() {
+	# Be consistent in color codes (bug #119406)
+	epatch "${WORKDIR}"/${P}-lowercase_color_codes.patch
+
+	# Improved C++ support (bug #133159)
+	epatch "${WORKDIR}"/${P}-cpp_keywords.patch
+
+	# Improved Ada support (bug #133176)
+	epatch "${WORKDIR}"/${P}-ada_identifiers.patch
+
+	# For prefix paths
+	epatch "${FILESDIR}"/${P}-prefix.patch
+	eprefixify code2html
+
+	# For newer Perl, bug 523610
+	epatch "${FILESDIR}"/${P}-scalar.patch
+}
+
+src_install() {
+	dobin code2html
+	dodoc ChangeLog CREDITS README
+	doman code2html.1
+}
diff --git a/app-text/code2html/files/code2html-0.9.1-scalar.patch b/app-text/code2html/files/code2html-0.9.1-scalar.patch
new file mode 100644
index 000000000000..eddc89a6a8f7
--- /dev/null
+++ b/app-text/code2html/files/code2html-0.9.1-scalar.patch
@@ -0,0 +1,20 @@
+--- code2html.orig	2002-01-12 22:17:02.000000000 +0100
++++ code2html	2014-09-24 13:52:52.000000000 +0200
+@@ -1357,7 +1357,7 @@
+ 								   my @lines = split ( /\n/, $_[0] );
+ 
+                                                                    my $nr = 0;
+-                                                                   my $lengthofnr = length(@lines);
++                                                                   my $lengthofnr = length(scalar(@lines));
+                                                                    my $format = qq{<a name="$_[1]line%u">%${lengthofnr}u</a> %s\n} ;
+ 					                           join ('', map (  {$nr++; sprintf ( $format , $nr, $nr, $_ )} @lines));
+ 					                           },
+@@ -1367,7 +1367,7 @@
+ 								   my @lines = split ( /\n/, $_[0] );
+ 
+                                                                    my $nr = 0; 
+-                                                                   my $lengthofnr = length(@lines);
++                                                                   my $lengthofnr = length(scalar(@lines));
+                                                                    my $format = qq{<a name="$_[1]line%u" href="#$_[1]line%u">%$ {lengthofnr}u</a> %s\n};
+                                                                    join ('', map (  {$nr++; sprintf ( $format , $nr, $nr, $nr, $_ )} @lines));
+ 					                           }