Fixed building with >=perl-5.18 (bug #484022)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 57 insertions, 19 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 61d55298c45e..d8fb701fbe69 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.176 2013/06/05 00:33:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.177 2013/11/04 06:38:44 polynomial-c Exp $
+
+  04 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> wget-1.14.ebuild,
+  +files/wget-1.14-texi2pod.patch:
+  Fixed building with >=perl-5.18 (bug #484022).
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 38ea7dd4ae34..337aa996e1ef 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -9,6 +9,7 @@ AUX wget-1.12-sni.patch 3668 SHA256 6178e1d56f5d86e6915d22247e07d23946cfceea76a9
 AUX wget-1.13-static-link-libz.patch 897 SHA256 ab054e459334f64709e5d2cbf3e7c3251ab4c98a68ceea91c3f56d51e2098251 SHA512 4a22981640072747c1605391735d253798a38d6c0329da778d97bf7a602065c8af1dc832c2a0e82f3d4f153855510beac53f17b0df88d622161be9448b02b6e9 WHIRLPOOL 0203648195ce55dfc2b2b181ddb1c690812acf7e99f828702c7fd4ba1de4269b1add16da2efdf02e7689b508c787968c0f8e8b679f5a5887a4968c1f690f6cc8
 AUX wget-1.13.4-no-gets.patch 734 SHA256 fd08eafc7239247e0eeb24abf964b1c436415e94e47bf701a1121b911cf350a4 SHA512 a74889255aa34c109106807785094277f291b142f18e8c3ab098947c1090e6e3b4853f9621928b8fadcc014a3d63d2b2c680f9348d7618b1a24f69ad8d2355fe WHIRLPOOL 2851e4865ebb7bbeb98d07cd926f51489113e63e3555f9f85ffaf3e76bb9b990483cd866862219a0c724c2b5d61eda0006adf5a72b8e74c20136ea7f2cf91968
 AUX wget-1.13.4-openssl-pkg-config.patch 765 SHA256 c592ee602f88c1eac2d88decc8862cd0f435193ad9cd8059f810dd0b661690f4 SHA512 15b352e07ae1519d06890604a2f83bb00e9a0d797a2c816db8d112ca76951da259373da45575137554d0decc7550103ae789b780c298fe7c5ff33ac147538344 WHIRLPOOL 833f9a93b09c83b80b274dc571d4fa2abfd1596d6d2911b113ef0b074d1272fc843be02b475fdc698930f40b4faddea9ac5498d5cf10a5bcf52c9a70e3e532b3
+AUX wget-1.14-texi2pod.patch 969 SHA256 b494c2a97b0c993621a38f63f3053854bba00c8ed555dc9df4a6dcbdf84dc8ab SHA512 1c04cb24067a89f37e53232c9262b3e462c0ba019474a8459dcb705fa273c8db0dea81d9fe788a554785a5fe713a02b8c0c93f179fa952d002e8a39142a6d4d3 WHIRLPOOL 549c027e1d79750e1d50460622bef414425f1dfc4914f408e87a52aa3b4b4c2b5c0a83d81c1507e3abc4860b3337221c870212247527a6db1b100a01db9723c3
 AUX wgetrc-ipv6 54 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518 SHA512 e9573a33fe834298db78e83ff1c08b6e0f0f148e9fe6baf7dd43c8b668ea3da2e98c70a9d9e5c6cc0b9cf64aa44b44af749079e232674ef3dbeaf6ee987268d3 WHIRLPOOL 4ed1f3727ddcace8c2413363aa328f05c54b559a4a4a5dc6885fae6b3fe83975c89920de3cf8994d6493561d75da72151f612d8da51cbf9088aa35da5519ad05
 DIST wget-1.12.tar.bz2 1609032 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a SHA512 d2cadfe3049858ffb073e3bbc43b18c93e298143a29b6504c832df1f8145c4f8b0fdf6f80236975d42655358894d1ea757fa9ae3793457783408614d1fc67e0f WHIRLPOOL 678e074966559cadb1504968bf8ab3719c87697987f5fddba7795d5e53fdd179e442913a96a0184c04f3367ef5f9bc83127a6bb36ac6814e4a315eee7319598e
 DIST wget-1.13.3.tar.xz 1448908 SHA256 8d8346caec575a0d4953b5a16dcdf37fedcb739f4d5db85307749996375489ba SHA512 b433c91ee09b3f0252f514575dcefab17dcefcb75bf8b23d3f09b269814a70c18bb52797820fd27d9367404978254b597133d847ca4afd3783cdea729889aa58 WHIRLPOOL 4f6c7373edd3b61d8d03e67d5842521cb729ab14243b8b91264f5316f3d1e8406329e13488fba8157b2ac53565b508c5baa058de404602106c159204f85deb19
@@ -18,23 +19,23 @@ EBUILD wget-1.12-r3.ebuild 2250 SHA256 db1f22e3f8f61d94d7702f7d6788bcd1512b8e11a
 EBUILD wget-1.13.3-r2.ebuild 1967 SHA256 06af5aaa52d01364b8978bf62af02d3a071897445d1bcb8a97ca485c059b7014 SHA512 db829fcf3e699d893f5185aab26ffe79a732fe474af70921649f817c7d1c465e1323610a8cd9591912682537a1f5f9a8525666c9730c27f9c82d68a4b7bb8e08 WHIRLPOOL 2d7522d9abf06145b19c8e628a988fc81fa23cfb8784d8eab61745ae4425490128333a3e91fb6398f3e70b4c74ecc6c579127eb1f9553eb2a265433169cca673
 EBUILD wget-1.13.4-r1.ebuild 2442 SHA256 b6f997227853f3e0859b4042fa0ac83c5ff49aaf345591f30b0d1d2240a30d87 SHA512 393758f65f3763071580056badbff18093088635470c38e03b3d09530ff07d4c26812d5d3c9644bd72a01bc52ca6b63627d4224da8902dad240321f9a5cd722e WHIRLPOOL 709f1150ff7bf6886abf2f31486bb99b644657655f295b8dd483749bbde95986f63e25b8d8a8312e10b6291cef3dc833dcdb688841e7213a741557d15240407c
 EBUILD wget-1.13.4.ebuild 1901 SHA256 05e56751c8c5a74a1fb3a27ad9c6062acc1b4685e7ab2440ea9513cf889a2cb8 SHA512 29d8f383dfea8b209ffe9944bfa4c5e9403c8af64a30ccaa96e7a5a97036ad5ae04cc9d809b6e09acaac3f8934877038fd788d9ac892636ef6ca280a1bdceab4 WHIRLPOOL e2b0b778a9beb5f2b5a54521ca44848a1fa600a1d00f4a77fa06c3322a7a091fb04f227f3045903b24a0292ec272ab2a87dfa8ad07166f3c5f3836fb27643adb
-EBUILD wget-1.14.ebuild 2592 SHA256 90c59bf5fd9b28d04ec7bc80662ecfcb5dd1719294c52760257e1699f54e06fd SHA512 18b7c8da0cfb48050bf439ec6e29105a6571a773d3e46f27af9695d18e141add1072024a66d7e7ade1005a2d2d30510e41fe2062666c67aa163b987daf9157a1 WHIRLPOOL 4e3b08aad552b87d7b7699dacb8e02c4237a7c0f6984b08720dd63354937a7563e82289bf4f7cefbec12a48cf5be8305e11ce6e9f3c8db55a9b8f9d03e15bc0d
-MISC ChangeLog 25921 SHA256 5b23dd6c139a3658b35909ad30d896a0afac4cf0bf16c693cad4aee799d75e48 SHA512 9cca9efaed31df5075ac4f8a5e6b616b864d838a424d7e7a80a839007d5ecd6d2e00472fb95d17910abe092e516cd1b80a0e3e7f4376b7bac5808e39b264e836 WHIRLPOOL 809e94019a2b15d0e8606bd7c55a89261eae339a70512a17b0573958f6d04b5b020c8072c483a226435bca9948d1b980c62a69891cb4dd53a2c73224d31d5972
+EBUILD wget-1.14.ebuild 2636 SHA256 ba9ed66d4455a91468daa0a99af7e7af7257bdf1f4e2ca9107038e43488206e6 SHA512 85ba12e3e7dcdf9765d798b11f051fa3a185c07b533f5f52bea0d0a8191399312745ba0491052c613fbcea52c5cdfeb060d50944bf2c9a4bb9ad63a5e0916d26 WHIRLPOOL 9b80a2dfe5929ed94fa7bbd14fe6f82a34913dc06fbc0524379804cb92b89c6c66e533c92898542e8a80b79fbdbee2731736a8e871b7259c21ac8cb67a61b02b
+MISC ChangeLog 26084 SHA256 efafb741aef090fdac9a5cd95dba6f0eb0eae18a071429acb10a5035f1d874f9 SHA512 07fac7039c39cae5665feab835ea4e5c02fadea1297433cbe6a780212054e5389719315b515fe9a68791053378ebb196c53a0838b1587b3b9e39945a7e02c0ff WHIRLPOOL caee8ac7b67fb2bd8bb40876ca0fc6ddd22a5d25ff005e51ce20cec700e1fee5845b749ffb72e78c0538e3be700ad922e2e52536964380380fa9c113ace32912
 MISC metadata.xml 480 SHA256 623ea871cdd741de1f7b1bdde73f38d222d489ed7496694a3b8f2fff7d49cf44 SHA512 4dae8e65a95c5f03e0434fce20012581fb75e33310598ef6b099b11ad611dfdbc5043b0223b1cd791500b1d4dcd19c52ab94142587508b2ed362b11cc7acddb1 WHIRLPOOL 189bc2a775087a96010a7426b562cf55e9426bad2da13e085d14dcf713631466ee4fe9c3dffe1ee578482d7d5bf0e4cac2510af431a4ef1ec21626770fe284b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRrodUAAoJELEHsLL7fEFW9swP/ieT+8PF9bQJcY2V6bediZaF
-ef0emTMy22vHEoURZajV8KhkhflSlfT+8Yw/rFcjtfNDdGrflscJd94d5c0zngPW
-PfNnxTXxHBbU5mXK510dDWYhB+k0edMqRfsP7bx+0uKWObqqXO+xyGmlSXBbA3CH
-hsJonipkponVviDaClqKMyscAlGx8x2d5YtQv3rsZFallzWnXL06LZ/azizaPYev
-vfhj8bVvtZk1z70kd8+cAcPG3Olc3zko7fWbrKI8ZP6sQjiHYefD4E4yCDgNJxw9
-gX72+xooOhKc0mU3XTSoPi3y3W4lto0eWBl5CO//li8gRmDzNzTVTYh+Od/4iiax
-EwgC15v99C41GvXPQdm3enERnarXXG8nwn+1pkogiyQ9H2GWA2cEfjwHVzu1TzBJ
-c8UJPTg5X7DXO5tdgbmU9AvU3hMgOEhvhs6AoTyvAdKt7pjEijuPlIO1pzEYMlg3
-5paetl/KIxNv8V4EuHavLLrQqzgewIfKz/hcw9dFMWSrxw5kUquAfPp+bh8vGP08
-kgfJ7YelS9WxD58PM8qaZUI+BRsTSof4wmclOIkrEXWJhqJJm0tcOdBLAYRC77gU
-cQDMamI9O5++EXlpK9z6SP+G6ChZTQmHOC+SBcyMMLCAN4ob3dXi3P9iro75NQtf
-6X2D1eYaTXyGMSJdzVU+
-=TLx0
+iQIcBAEBCAAGBQJSd0D1AAoJEPiazRVxLXTFSWsP/iHKFhghLVbiJr9EYeP0qJ5G
+XblpWI7E4Pe+4p5EIk4pPDoj0dyEnEiTEM8Dgkl6DqkRYPm5i08k60nYH69ol96Y
+eaoRjLuMp41k68fhgb3F6j7zvTp48GOnFIHfWUw2cxPfiOPWJejmkpG6j+ntACJY
+3vxJQVIKXKOvNw7yiQDWQA9s9q4yHInTVGXPT0GqsgBb4PaDDgApUU7WzBb+dFRu
+EC89dkmJUJQ6s/8vGryPE/NNbkQZNlwbPy9XZ8syqoXLB+Niz4n0V3LwhGJMDRVW
+wPZU/pVW/BDMoB4E/UqlRwgSq92uh8Hr/ethlpjBK11PL9Ssw8prnxgHt3jy/nfB
+yVMw29f++serb+mBTd7yYqXgqABisI2RPs96TbtFr1SW4jbHAreRMrCXOWooy+di
+bHRAY3j50YJJbN9lSqB//F6INz6PKG7RV3a2RHOTncS8KChyXOX4lJfDUt8QSxQR
+OiPoZfpa6RF+5c1sXoDMcS7iy5f2762gWib26ZFm3mQV6fZJm3H59Fkfg8ZwhP3/
+QQtgJlthQXRxpgp5oFmpMRh5hi3ynuCuvRSGUbj2a5qxuy4B3VkU2ZspMsrJGxrL
+GMpOX4khlm1FSsEqXN98RhbPA9c1KvsYhDHe+D4rKDPSGWXgAl0NFQz8mMXc6QkX
+D06QeefoxD+QS+64cPaU
+=D/Vb
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wget/files/wget-1.14-texi2pod.patch b/net-misc/wget/files/wget-1.14-texi2pod.patch
new file mode 100644
index 000000000000..700242bf4414
--- /dev/null
+++ b/net-misc/wget/files/wget-1.14-texi2pod.patch
@@ -0,0 +1,32 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2013-06-18
+Initial Package Version: 1.14
+Upstream Status: Submitted
+Origin: Arch
+Description: Build with perl-5.18.
+
+http://lists.gnu.org/archive/html/bug-wget/2013-06/msg00046.html
+
+From 2ed1707b5d8be66feb80cccfe8e11e719b52b99a Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 17 Jun 2013 23:31:46 +0530
+Subject: [PATCH] Fix error in texi2pod intriduced with Perl 5.18
+
+---
+
+diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
+index 86c4b18..9db6de1 100755
+--- a/doc/texi2pod.pl
++++ b/doc/texi2pod.pl
+@@ -291,7 +291,7 @@ while(<$inf>) {
+ 	if (defined $1) {
+             my $thing = $1;
+             if ($ic =~ /\@asis/) {
+-                $_ = "\n=item $thing\n";
++                $_ = "\n=item C<$thing>\n";
+             } else {
+                 # Entity escapes prevent munging by the <> processing below.
+                 $_ = "\n=item $ic\&LT;$thing\&GT;\n";
+-- 
+1.8.3.1
+
diff --git a/net-misc/wget/wget-1.14.ebuild b/net-misc/wget/wget-1.14.ebuild
index 5bd95eec4f20..ec9071442bae 100644
--- a/net-misc/wget/wget-1.14.ebuild
+++ b/net-misc/wget/wget-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.14.ebuild,v 1.12 2013/03/03 03:28:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.14.ebuild,v 1.13 2013/11/04 06:38:44 polynomial-c Exp $
 
 EAPI="4"
 
@@ -35,7 +35,8 @@ REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.13.4-openssl-pkg-config.patch
+	epatch "${FILESDIR}"/${PN}-1.13.4-openssl-pkg-config.patch \
+		"${FILESDIR}"/${P}-texi2pod.patch
 	eautoreconf
 }