version bump, bug #500296; import patch from fedora to fix doc build, bug #468086

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 97 insertions, 7 deletions

diff --git a/dev-tex/latex2rtf/ChangeLog b/dev-tex/latex2rtf/ChangeLog
index dd6a8d43ca2a..bb55be8951ef 100644
--- a/dev-tex/latex2rtf/ChangeLog
+++ b/dev-tex/latex2rtf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tex/latex2rtf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/ChangeLog,v 1.44 2013/03/10 10:22:41 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/ChangeLog,v 1.45 2014/12/03 16:14:16 aballier Exp $
+
+*latex2rtf-2.3.8 (03 Dec 2014)
+
+  03 Dec 2014; Alexis Ballier <aballier@gentoo.org> +latex2rtf-2.3.8.ebuild,
+  +files/texinfo5.patch:
+  version bump, bug #500296; import patch from fedora to fix doc build, bug
+  #468086
 
 *latex2rtf-2.3.3 (10 Mar 2013)
 
diff --git a/dev-tex/latex2rtf/Manifest b/dev-tex/latex2rtf/Manifest
index f5c36d958e96..4d77fe37d924 100644
--- a/dev-tex/latex2rtf/Manifest
+++ b/dev-tex/latex2rtf/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX texinfo5.patch 654 SHA256 4042b2b4acdb74c9aab7b906771d94124bfe94aefac172b2c1029a3daeb6b3d4 SHA512 0100fb4c0283938244291e595ec8cc74a05dff5cc4032717024822f04d6c924e7459fa8a6cb8e564c296d90c0f36f9777e829466679db98fca5ec3f5643abfaf WHIRLPOOL e2f8f21b4da94acf7a3948e5ab11ff87cc229606dd2b3122d2d7ab0024576ac626e861c4a50ebaf4070a69f4010e30ec4f98d5e625190e013a24f00ef19d60b0
 DIST latex2rtf-2.2.1b.tar.gz 1357814 SHA256 d4c062a0b95cfa9ed4169ffd8c9ed67d65649227a19d6a9991597550e3e227a2 SHA512 943a667d65d84db744030f859500eb68095563be3f7fe9ad60201753058185360907557362e48931e37251f8ae9e40ec904ebb90e96c3bdd36c7abf8e9f2956b WHIRLPOOL cfef462a7dce753662ffe8e5ff12971a51fda26b49a891db519412c2e29c65f644545d08c8a43e3d107aaffc9321f53795e859499311c4a601b35eb671d13369
 DIST latex2rtf-2.3.1.tar.gz 1581829 SHA256 38ecf64d2ca1a8cc4e7f17b71e1780c8b96387f5f492ffb0b52d28313d6441be SHA512 0906c310e9b869bfa694fe044f8ec4cbba86f93caa05b22ec3688ecd4088e773c948dc64c7394a082306a6900b8a94f14ad990675132eef30fad6715bacd8220 WHIRLPOOL 6214a99f6ffc195f03c38ef9f8a17b4ab669eb5f892f73745d2af60e283320514736cc1f2feb1e3250688658f7d449236e4d419d8af699e99afd65c2b2d38389
 DIST latex2rtf-2.3.3.tar.gz 1583178 SHA256 f3c75f9e0d22506a005f38805b807ddc77a1cdd0961cf91a1ca3df31cb8fdcc3 SHA512 d14f2ef526cc938438366dd9ced239099a735389fa9515bb62f04038343c43ec64edc45f5df3eb7ded3adb5bc1e7a2ffd0cc3c4d7bfe4af97cd7f6256e66aca0 WHIRLPOOL bded2056cbc6c056aac75621a3a1354296444218f33bbb4a8ffafb7ccc81378d9e4351b1fc0752eb71fda1a5a8f614c98bfd2a4210449d5edf8b38fe4a5ec148
+DIST latex2rtf-2.3.8.tar.gz 1579721 SHA256 5484530de16e96ce76aedf969c464656a5f8834e748849d9009049e26f8c4143 SHA512 c4f0bdca7f1b3e605a07a015bad68193698e43ff2dd561e34eed397d8c92fccc52801fd1c3592592dd63c92a6b60a066904f60f2c4e41778702cc996b9113b0b WHIRLPOOL 6c1372abf67dcfa7c01453c4ded1e69f769d2c6adf544dd0c74211aea2181d45e0917e88ebc378b503c8f323a617ddbfdcc2a817ec72a7eb5b9acb9a323546cd
 EBUILD latex2rtf-2.2.1b.ebuild 1305 SHA256 d55ebbf11a05c5a173f3a6bd4d5f99e11e05231ce8fb9a1cc8177b8696e5e2b0 SHA512 35bb8c4b326aa0723809ab12ec5ecc8f6f7cc447f030a0d0f0d77e25291dde9793f4f01b78e8d31858399116c1485b194d856067393f74bac9bb16e5532d1c53 WHIRLPOOL 463543d31eba88615acc8d768c33e772919630bbb9d7d34b3fd7c845040964913315526de5f5128e80881ba07481d7a1ad689caee587420801e8ccd3a5b02a81
 EBUILD latex2rtf-2.3.1.ebuild 1239 SHA256 bf5d1839bdc77c667d2bea794465e8ba4938508f885d5cdb578f933532b2446b SHA512 329533d4898077bde6650817a95e27918b3d896a29ea05dad4031aa672ce98e8c0b971d319a1ad74aabef79a6b73dda497896a0232d1a038cf28deccd151199d WHIRLPOOL 80d20f10a490c7849c4306d93ab431977d25f6bda90e107129d9fd5a4c27ec9adaa60bd52f6ac90508db5ecda6914b460f48c2f40f77e38b984d2960c527b132
 EBUILD latex2rtf-2.3.3.ebuild 1239 SHA256 6543d7fa39adb8f4c5ad08b1d4de5b47f707f8ad710366f9a58a93eed63ae6b5 SHA512 59b0579b160d230ee449af8185fba858bade57442365a7ab4f1b32a25e8c1de3f84ed084be581ce1077a5036c3d6f3e5443b73fc964c504bc0f1c23c69c4eff0 WHIRLPOOL 274c9dc3ed59318bda4cff5be4c448eb933b0ca3787c5f256b6f420c25251f9e096988627d4ebe69a0fd5d1c27d3f6cfb5a4bd0bc816211b11540f2f5c16d929
-MISC ChangeLog 6430 SHA256 a4585d1007c2cf3b52a31564290d5d9eb736bf50d8cb436a4f90f521dc0ea74b SHA512 3e68a91662bd88d0570f36c4800a03ccba57c12251b615903bf767ab223df7f45e6160a6a0e6edfef871501c182d97868f8b00d68d1372fbf48d3b188c24a9ab WHIRLPOOL b3857f3a66e5d1281359b1e5aa435801842d9f8411e004d185270d103e0ba99569a1eb98225dbc06a976cceb1449511aa9970a23befa95639c10edee0412bbcb
+EBUILD latex2rtf-2.3.8.ebuild 1339 SHA256 26e8c6e20a705963a60e531900bb679be27f4824925808031de678d8f79cf770 SHA512 cef94e3d1cb3456e468630d7ee491c6f4da5e47341cb5167ce674b061664ed65f396599bafa98cb5ca3b82b636b1f1b4c64b39b54bd7a9a2de9c25fd5b167f17 WHIRLPOOL aca4b8a03ff39adb431118ae71725fa748374d92d96a652bbace93b54849599728064f5a49997675485f1f362fb749f0fb81f5f649be5dadc88de0e9584bb2b5
+MISC ChangeLog 6651 SHA256 ace0fc3f67c0644e04c0c2c88f5002318472d38e534a7712c08a509d1dcc7e83 SHA512 55b874f8f740aadf1e457e5f7ab22dd16726619eb124e16bf1c75ae308d328adb2340b26e16d65ed18cdf3dba9fef48ebddb3f6968d80c7b400a32569ef2e730 WHIRLPOOL 2980802ae9a31ccda6ebe39a2fc388c16596d0bfaa521e87aa35d73e10d04e2a76018cf7a11007628f56daf6d4c4ac55a524d8a82f8d99989a7c493e375664dd
 MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlE8XvMACgkQvFcC4BYPU0rjXgCgyGaO7e6Zm3dRHP+s6afbins/
-WUgAoJJ0xEHoYQvnrKJMdpOTpFwX36mI
-=L4ib
+iEYEAREIAAYFAlR/NtoACgkQvFcC4BYPU0qTWgCbBY4tLdGo1pG9JMdNlLIrT/uO
+f00AoJYjaJN2ARnPmgY4XeM3OCLxOLOg
+=1Mup
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/latex2rtf/files/texinfo5.patch b/dev-tex/latex2rtf/files/texinfo5.patch
new file mode 100644
index 000000000000..d19b0306bf09
--- /dev/null
+++ b/dev-tex/latex2rtf/files/texinfo5.patch
@@ -0,0 +1,25 @@
+From 35224edbb3647c3d0a7828584c952f254ac4eb2d Mon Sep 17 00:00:00 2001
+From: Christopher Meng <i@cicku.me>
+Date: Thu, 28 Aug 2014 17:02:04 +0800
+Subject: [PATCH] Fix-latex2rtf-FTBFS-with-texinfo-5
+
+---
+ doc/latex2rtf.texi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/doc/latex2rtf.texi b/doc/latex2rtf.texi
+index 9da9180..b6b7a4f 100755
+--- a/doc/latex2rtf.texi
++++ b/doc/latex2rtf.texi
+@@ -1,6 +1,8 @@
++@iftex
+ \def\LaTeX{L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX}
+ \def\LaTeXe{\LaTeX\kern.15em 2$_\varepsilon$}
+ \def\BibTeX{B\kern-.05em{\sc i\kern-.025em b}\kern-.08em\TeX}
++@end iftex
+ 
+ \input texinfo  
+ @c -*-texinfo-*-
+-- 
+2.1.0
+
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.8.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.8.ebuild
new file mode 100644
index 000000000000..64e193ad0138
--- /dev/null
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/latex2rtf-2.3.8.ebuild,v 1.1 2014/12/03 16:14:16 aballier Exp $
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="LaTeX to RTF converter"
+HOMEPAGE="http://latex2rtf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/latex2rtf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="doc test"
+S="${WORKDIR}/${P%b}"
+
+RDEPEND="virtual/latex-base
+	media-gfx/imagemagick"
+DEPEND="${RDEPEND}
+	doc? ( virtual/texi2dvi )
+	test? (
+		dev-texlive/texlive-langgerman
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-tex/latex2html
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}/texinfo5.patch"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	tc-export CC
+	# Set DESTDIR here too so that compiled-in paths are correct.
+	emake DESTDIR="${EPREFIX}/usr" || die "emake failed"
+	if use doc; then
+		cd "${S}/doc"
+		emake realclean
+		emake -j1
+	else
+		touch "${S}/doc/latex2rtf.html"
+	fi
+}
+
+src_install() {
+	dodoc README* HACKING ToDo ChangeLog doc/credits
+	emake DESTDIR="${ED}/usr" -j1 install
+	# if doc is not used, only the text version is intalled.
+	if use doc; then
+		emake DESTDIR="${ED}/usr" install-info
+	fi
+}