Fix building with texinfo-5 - bug #465016

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 45 insertions, 17 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index bbf9f266fd8e..0e66b8a59fd6 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.210 2013/03/11 11:51:43 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.211 2013/04/08 13:47:50 eras Exp $
+
+  08 Apr 2013; Eray Aslan <eras@gentoo.org> +files/heimdal_texinfo-5.patch,
+  heimdal-1.5.3.ebuild:
+  Fix building with texinfo-5 - bug #465016
 
   11 Mar 2013; Eray Aslan <eras@gentoo.org> -files/CVE-2011-4862.patch,
   -files/heimdal-kadmind.initd-r1, -files/heimdal-kdc.initd-r1,
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 4ab7120787da..0112b6bb6fb7 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -14,25 +14,26 @@ AUX heimdal_disable-check-iprop.patch 577 SHA256 b2ab6f335b5a756856a5df635df8248
 AUX heimdal_link_order.patch 1164 SHA256 794560047c549a996d03140ebcbd0476646f4a8e9e36d0cfe6cbaddba611e754 SHA512 f3e411592a87ef49695641ccc30d2ff9d08310df6a157dfc4c366f0a909340a7a5c2667b57dc5f736e8b0e76d13461770191dbe826fdf179023547d15fcb30cf WHIRLPOOL e2e66bd92ca5e5e1a53372c5bf542cebea665bd32a3d281cb858a36bda98932cc1506c32d874cf9126d156d06f1bf481cda13ebad8853c121676cf6dde792f6d
 AUX heimdal_missing-include.patch 255 SHA256 1ad9d71d01776e2d2dd49da5951f6f02630ce137be910ff8484968e8327837c3 SHA512 18f4a5b0c74ae11fbd8874d2954639f36d480655d978af2b2dd19a8ec2b206057ef4be5861d8daca0725926b295604daeaa895b6024b2098922cd189d3e4484b WHIRLPOOL 346f1117fb5558203e0b01bb5f35596fd9e89b3fc0b8ddee58e331fada9024f9cf6b8dde20773f26079a4d9d4f9e1fe224d4a24a1c51ac6d9475f3519dd5a521
 AUX heimdal_missing_symbols.patch 821 SHA256 f8ef2353ce328e444dc48e211a32e77af16b5877e9d3679bf36825e7e37911fd SHA512 75847162665a575424ac7f5dd743120b44b3b11747542c61a5605000bbf94672747b12b82a60afd080fa0b1cbf80611078f38bfd5e6a6992748ade70a1610cbf WHIRLPOOL 7219d08c36811e734f6ea1b51416a1dc08d57ea7234bd5937754bdc8151da5bf0bf4658c854bbd4efd8461a44d80734bf66ab6b7bb8bac5220fc0931dc146134
+AUX heimdal_texinfo-5.patch 637 SHA256 b83d42d405fa3eb8d15b0ccc8f4e4127604d204597b1e3f3859d85fab5de9e8b SHA512 85ccf698d26bebf308e70265cb39593e942388c96c308aee0c6976a449449c857e3546e4a59447397bc28316ea2703df7a047460597e354d4093572db02378e6 WHIRLPOOL fde676ebf165cce2a5cb71e95a45695032270f8b55963174db518d4ce4e1eb30008e8d0e385651a060e9516048864e5abf8faf5e6af7061138d0057a780b41e8
 AUX krb5.conf 424 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38 WHIRLPOOL 43526f52aee4dfb456058001bc553a81e478edd315c7c7ce8e639958afdb3049ccaa686234066b17b2edfc5aee0b4af95596e0fbebd0e66455ff0599de1af5f4
 DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
-EBUILD heimdal-1.5.3.ebuild 3671 SHA256 6330f4e4c94d55897d422cdcac933392f8f51c79d918c7182806281524267c55 SHA512 29b36debb43d4ad0250e5b19d45b047c647347114598a963d2b6614b25bf15ca2ac6d6f37f3bcf70fd9b05a1842acc59491ffa9970c53904c9fcf7bd29e71138 WHIRLPOOL 0c8991fa347d4a3441781bff9b373892f04a5099036579f62dc8d9205fa7913b83e085c6edcaea369711b8a8435904869f93c806c2d1e57d5c999ebf57fa19d2
-MISC ChangeLog 33754 SHA256 93077bb298c81925b53332a39e656ac17aa17e656f316369bf9f9ee844d30617 SHA512 0058edd1e3154ba3871981a2d96ed6b8e0192a30be182a483583fdbdf8cba43d77e9c40dabebd095b6ccee2df93a4edfda36a9fe4df133d04f70fe29c36ec8c6 WHIRLPOOL c154197e45ff3e6683de56ff44d5c7bd88097d8d7df78a183268dc17296efea6ffbf342241e1c53164bf171065cdb47289adf9f4d887ca68a1afba80e2dea402
+EBUILD heimdal-1.5.3.ebuild 3718 SHA256 fba540cd1aa8e9faa4bc84f57c65508f48f724b79d0c290e18c4cfdfffd82295 SHA512 232b4302ba9de3ec32dd932753f397db75c29f156e09ecad418eab1e55a16da7a6ae59023fe0d538ccb606544341cfa2fcac3b7ff1ed447b2af7194e75673944 WHIRLPOOL 02b0f50c671857339e3fcd1accd246666273e0f7a4cd4032a986beae546f7fd86e61388e503e5e02e88de0b83dc1b5e88f0647eeb390828d355cc20241facb05
+MISC ChangeLog 33899 SHA256 8cef3f4c432f6915bbe169409d3b7ca7de540a5d32ed030986c952142dd9a95a SHA512 04fe10a8a3b160a9e5c1a3032a0dec64e7d31b1087607acc08dbebc0e4f461d63328cb5940d13c34f058241dea683e887accfdd521c552e5a260bbe88ba500b9 WHIRLPOOL d3cd2fbde2f7d73dc839a9c1bbd14e5e20d57ebbbd0b8bb2bbf90e6a06ff2d5f6fd30ad5a715ece3aec89f7ca4d0be9d174ed81e741ac2a8507adaec509b49ef
 MISC metadata.xml 469 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad SHA512 726af6834fd00706fceef63690c5605bd9d80930d707e6186bc19b7b0b325fe5edb8c71792c555d128efe7e95d4b9319d4f85cebe98261995b2d8280cf3735d3 WHIRLPOOL a873152dd611446f88202324526de306f5d6be8a6224aa9f28a4af963f9cecd4ba9c08b317ce51653e579dfe51c2ecca12b3f5ace910be83ada0cf6ae493669b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRPcVaAAoJEHfx8XVYajsfKoQQAJ4Al/1STmgvLgEUCI8qJc2U
-pnmIsZjI5zZg8tz4u74xCwZ32/3sIPzV979yctRM2bZH7j005CMQadmlWycQ+Cyl
-kyq+0lkQCDvm2me7czzg5RiL6eXgKwW25xnXvoKYgWw1RGxLhrxJGCbKrtTWx5rD
-8tjmjDR1NCBBJ0WnmlBLZSGBxB6Vk6vXI94Om4K8c0R9SV+d81mDYgB5PPNeZzMz
-EIMBq1YPAJN9xeCNxqak21As+BB2v322Xy8mq7g0tVjWKwgdEqHIZDjio5SlJMz3
-D7DqfjLdLfj38K7Oi1c2sdPzT3ZzfRxdp3NW3YdmdmmWe8z1aOIGUiP6wrKN6CpL
-km5lH6rY0ovQ8soEmsGqO0lhx3/62+O/GGYh5DDnjl27Ql0K0eDqeFpB2VfKGgiS
-Pb4k/kSY+mmS23aVWlNZrFUXmwlkhOaU3LGWkYML3nN0MEb78Kgo9zFFG6UC03Bu
-tYg76AYKh0DWQw/k5hbd4Kac2241RlOzjY0lJpoCqBO3zJ8GXJfamZN6KiyPRkkY
-pOQAI/FLW0gzAvRq+r123YbbW0e56s87qCZM3j7rfir03fNxglUrfK0UKz6wJguD
-WxfArVscu+xMl4uJ4enW8YXlqxXROSmtPw1aKkW8D2vF0QpujlmmaOQ5IMlrVdYK
-j+7y1YM4SMYYo8T2/0VX
-=O2S1
+iQIcBAEBCAAGBQJRYsqTAAoJEHfx8XVYajsfoLgQAJZ7zFyI4yK90L1GLq2vM3qm
+qQm0yvRU3/80qWg5yIPbQcMjUxTDdA+T1RZLmlWI3qgQWDMpAdT78uq92Hw35UYU
+6VD8xcY0iluDdVEfKkF1+TSEZXA1SFgeXOauxUxZl+ncbeywPv+b196sUVu6PN51
+hOPK3Nq6mk17KYd+vi/auYr4URRwuQlOMJsMfSkEwQECxAdIBHfKbb3Yj4yF0HxU
+cXeUdvVCBJR8ovJqiBkpvJq56RYfi5eR4i1pc0nCIQkMCErPy7hBLxelHg3VWEyb
+nXb0cTiaCznaZN8MeuidPPJxQh6dNmHTgKh9IWYSlfOzRHjMgdpXfutl6z1OXDM3
+t5D4R45s7eSjjQTwA2n5+lG16IIPOiVtb8WvRbbTCzLscbDX530TkfcqxnFhSLKY
+PYqEMcrNAxBzAfU9D15ZI++0Rf6LPY93V6hwRjhIkY/sSOydoIy7V0jb6sVGaZHt
+4jPGZULdtEF6SEUnS2WO9F6zp4ECT7DPsGHMO5Hplckx/wKEADZGVOJCfbqqqjVa
+TUnvfOKN1ern5I3B5otfHbRGtrkaRdS0+mLP0yH05hZ91t9fYW30AbZ3UX0pWi/u
+v48R5Mp7v/3ihts4IotVND6RHBVeV4TY952cLmfB1/gHtmMj5A7OSlgGJm43vmGP
+tOfsCLhm2yX1UEGprDUT
+=8CMV
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/heimdal/files/heimdal_texinfo-5.patch b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
new file mode 100644
index 000000000000..3aaf2122d9b6
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
@@ -0,0 +1,22 @@
+--- a/doc/whatis.texi	2012-12-10 00:06:44.000000000 +0200
++++ b/doc/whatis.texi	2013-04-08 15:11:44.646165777 +0300
+@@ -36,8 +36,8 @@
+ @end ifinfo
+ 
+ @tex
+-@def@xsub#1{$_{#1}$}
+-@global@let@sub=@xsub
++@@def@@xsub#1@{$_@{#1@}$@}
++@@global@@let@@sub=@@xsub
+ @end tex
+ 
+ @ifhtml
+--- a/doc/win2k.texi	2012-12-10 00:06:44.000000000 +0200
++++ b/doc/win2k.texi	2013-04-08 16:17:21.316961234 +0300
+@@ -311,4 +311,5 @@
+ 
+ @itemize @bullet
+ @item pwdump2
+-@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize
++@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}
++@end itemize
diff --git a/app-crypt/heimdal/heimdal-1.5.3.ebuild b/app-crypt/heimdal/heimdal-1.5.3.ebuild
index be99e866f83a..71ebfcdc8493 100644
--- a/app-crypt/heimdal/heimdal-1.5.3.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.3.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/app-crypt/heimdal/heimdal-1.5.3.ebuild,v 1.13 2013/03/11 07:38:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3.ebuild,v 1.14 2013/04/08 13:47:50 eras Exp $
 
 EAPI=4
 # PYTHON_BDEPEND="2"
@@ -51,6 +51,7 @@ src_prepare() {
 	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
 	epatch "${FILESDIR}/heimdal_link_order.patch"
 	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
+	epatch "${FILESDIR}/heimdal_texinfo-5.patch"
 	eautoreconf
 }