Version bump, wrt bug #287557. Fix building with new lex, wrt bug #442482

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

6 files changed, 169 insertions, 16 deletions

diff --git a/app-text/linuxdoc-tools/ChangeLog b/app-text/linuxdoc-tools/ChangeLog
index fdb119dc46aa..28b074622f5a 100644
--- a/app-text/linuxdoc-tools/ChangeLog
+++ b/app-text/linuxdoc-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/linuxdoc-tools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/ChangeLog,v 1.18 2012/11/16 09:40:59 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/ChangeLog,v 1.19 2013/03/20 10:09:38 pinkbyte Exp $
+
+*linuxdoc-tools-0.9.68 (20 Mar 2013)
+
+  20 Mar 2013; Sergey Popov <pinkbyte@gentoo.org>
+  +linuxdoc-tools-0.9.68.ebuild, +files/linuxdoc-tools-0.9.68-compiler.patch,
+  +files/linuxdoc-tools-0.9.68-letter.patch,
+  +files/linuxdoc-tools-0.9.68-lex.patch:
+  Version bump, wrt bug #287557. Fix building with new lex, wrt bug #442482
 
   16 Nov 2012; Ulrich Müller <ulm@gentoo.org>
   linuxdoc-tools-0.9.21_p11.ebuild:
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index d8bc02ce3e76..e0ca06381942 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -5,24 +5,23 @@ AUX linuxdoc-tools-0.9.13-letter.patch 1130 SHA256 509af3d0f8570d7501e65366d7c72
 AUX linuxdoc-tools-0.9.20-lib64.patch 400 SHA256 f681347bc2e59647bc7667d323825579ca325cef973250fb5192e01e16e14587 SHA512 e45d277f0a3ed17e9777544fa8c3dec44155815c284fa5b5f41b76b2730dff93787dbee6f8dfadbbab3a284dac9a0a6651ddb0343b89fb63ef7a35c48ec35390 WHIRLPOOL 66097233147949667c7d20bea820157b6759802270978d20bf821303d85747bf495f9785fc6220f6d40cc0297d99486e2a124eadefc965e4c7d5cbdabcf61991
 AUX linuxdoc-tools-0.9.21-ldflags.patch 343 SHA256 2581d4a561cc32b932032c2bec308be039cf86944cd1d1c056455f8f4d59f324 SHA512 8b4dfe079ba63e31662f28426e066e386e0a53bf307164adfb864c6dd480811acf31d6b9054496a59d61d655a0bcb35d8479ac4f67c5de4a7f78a0d746790ef9 WHIRLPOOL 9c7598d8a827dd3e366e815e2f4375de0299a712d05836ea167f38dfafd9cde20d95d471b1a7c6a530744ea4be0869936e38aadd945635b76eeee61c716ab894
 AUX linuxdoc-tools-0.9.21-malloc.patch 319 SHA256 37739ab14bb0e2f7c89be84043c865eefe7d9f5473284ddd97fb1c05dd7916a3 SHA512 07b573a6f1426ff798d8931749ac42350f0f9b7e3a8dce726268f81b6fa9cc942ce6a2f23214b0c70b115a233843b0a41ebd908f018cde06a9c5b3bac5dd6b18 WHIRLPOOL 3569c3fb1ca99b81f3bc9d0d204187670fdc4a5bba99cd4b577c15c447236529af5591dc9a85b67496983eda01476c4467c490adcbcd19e21ca3b2faa093e2bc
+AUX linuxdoc-tools-0.9.68-compiler.patch 814 SHA256 dbe1bf3a4086be22c2a9b2c59f9b3c438501cb2defcbd79ce794127475fc086c SHA512 f2cb803af818912af6800d78f25a183189905fb84fa1a8653b9166235006554de691211213676eeb61581eb775c8aea96a280e1d8411103ff647b3691b2b75a2 WHIRLPOOL 4f00354e14045e56c4e0d7d98640be3b4e4cee916bd0bea31606194b5b4c562ec0494cd4fa2a34ae084f06a5baebc0e063f9a86554ce33c454fc513c3f3e1cfb
+AUX linuxdoc-tools-0.9.68-letter.patch 1140 SHA256 ca22bd48b7ab13dd2be4bf637c40f7026f838f71cc3045fcb5306d27e43f0911 SHA512 3254cf2b1f8453b0629f209ebff2b7a07813a343efdca3b7642f9f128ebb5ba09f96de4c9e45509667c05c8b9964e55a73c1f4de7e5c6c5f2f718bdfbbbbf5b7 WHIRLPOOL 404d5af538ae33d60288a0d9547c3f2909a6f67c367f6bd227c8703469fea70a50db71b42c4123e78b321e146bcdc78d17322f83f659cffb1d4fd429dd23adb6
+AUX linuxdoc-tools-0.9.68-lex.patch 271 SHA256 cb3d5728e643910fad510b2273027d01f3809734b2aa6e92daaeb00053ccf90b SHA512 8e73139ede24a0eeb4646e5cdb3205e7d1758a457598cddd3abfd38b49c2db3b2ad06b593fe74e33f5e990002a779ea3a63aa23a6107ceb6472e3c58e83d3c18 WHIRLPOOL 36ea5c33f276344ff380139e5d344f814388c690c8ec715cc8f1225a82855d95419c1c0bbac9a9d648951b9460f1719280401183d5ecb97ef38f47b489f48fa5
 DIST linuxdoc-tools_0.9.21-0.11.tar.gz 592246 SHA256 021324e1ca3940c2baff5c2cf872ddb1991207f39e170a9fe558ef2ffe35ac1c SHA512 b039c76d81556e6453c4181cea24bf15ec5a4f1780b3d48a72fde82e8f4d517cb8242f0f5151c6ff0d89ca911a4767bd9aa2da2b13b411e616d0cd628d51ac75 WHIRLPOOL 15b354b22cf5944c7f1ca5ca03f02b13de97a1d8223670548873a9308162794850b01a03233bb4b7ccf3e2a226afddfe9e3cb34495a5f130b1375bc2c5be6b8c
+DIST linuxdoc-tools_0.9.68.tar.gz 619242 SHA256 3b8611683d61480a60cdd2497132f15ca15fb583c9fe5543f6750d187a5dee67 SHA512 a78c662f4bf69b68530af0176fb6b35328c004a80cc73e7ed1151d46da3a7868e4a8a61094f8c4081a686f1ed0c58bd19c2c5ad5a2b6677ddc7c686e67a71df7 WHIRLPOOL 966e47e081bf5eb35de546f7cd0522396aba306d8afbeeba55afb91f360c196b196c3271b84ae8a98d7f9a4d0460558986a8a32a824940b0340236c705490676
 EBUILD linuxdoc-tools-0.9.21_p11.ebuild 2095 SHA256 1ab1c43467738193c070bfe332227132b428f013561dfb6d7b6d3a24a381593f SHA512 6c0d2013afa318938fd4c6869a7dc88a20e1ba626c6f9483c90bc386a469602d8ef12f4564a6a292b18acbff868aea959188ebaa94fbd437f7cfd2c551b3dbce WHIRLPOOL 0b9ab24c96f78b1c88be9e1a90c217079c4780fb1924169a2c8d1fe3271eadd6a6fe12d9eea13f9aa2a208da7f252c093b7edf11fb070d0e6d8900c405703f28
-MISC ChangeLog 3110 SHA256 dc2c767fed5c806843ca5912e615aa1f0dad1aada80010acf11c696db5d95578 SHA512 5966b5e2d49d3b3088f29448a3e1cf7254dbf5ffaba77f04838b731bab8f5780a195f72e22edfa38d5dadfbbf099ba5e46a79d016d0ae4f47a74ab2ee48a372e WHIRLPOOL 8387c513db273facfb8f4204dce3d80171f491dad42068c84643532222fce124a9dcf2ebc1feb2fcdce7d78dd55c3603b9784fa9992d252a717bfebc507185fc
+EBUILD linuxdoc-tools-0.9.68.ebuild 1973 SHA256 473f9f1eccee7610c177d2702b2ccbf0d7db46b06556e6e84b511b0bb64d7284 SHA512 6c200d4359a84fa71349df9dde63b0afe92a1054987c3878fd361692b4665851c51e79753b8a36ef47e4eb754a25aa8def8b6cef0be2bf0710df34e8addc91f2 WHIRLPOOL c76a0715c847945fe67340f6f01944a2baeccdf9542818abc2b4946b16514b5dc5dffec472e69073d320d0e39e02dcb0b6cd111be2af47299f4090476895a2d8
+MISC ChangeLog 3445 SHA256 ed34ee7129432829fe9bece0353d23a514c6fd5deee6b609ef18e726b2a9cb24 SHA512 f4890d04898b82982d87bef1e16d65d46ea45e3562c88fc29c46f62bbf49cd1e8469e62ce2a5f8a25cd9b0def83865dfef34b90b501ea643b769c0d71db22c5f WHIRLPOOL 1ed05618b556dbd013f97cd399c899fa8dce3b590c9cc759cac6b85f3e05cbac73552402f3ec96f8caf1a2847dd64bb763e686bad2650e613f3da13085064dff
 MISC metadata.xml 641 SHA256 5129c9100b7958babe2481818497efcd9dc01828334b5d69d3301c5b3946ffc3 SHA512 ca7b0fa067f15c378beda603aca118b34831564c3464463236d8f7f66696e20627ac4a4895f1df7b67daa5e481cc8d442f992872a9e8af6c451f4ce88cce5d9d WHIRLPOOL 8ef2a7580c1cc9330aa3f7dfa060a57fc545841e5d3e518ebeb1f51af5783a3fcdd992f94dba7297e61478ab9119039b523b301dda5574d0ea640ef960f3ad21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQpgphAAoJEDxpGckxwJCBEfcQAKe/EGc7+mKo1bRC3LaF28mL
-qlYMhZM0nG9CkK8yHFaNEEMAZkIWOG58L8dciSVdZtYybkxqMSxbmd6hUMPoVDbH
-MRJRswpyMStKlj+4O1LWfIL07jUZlyKm1X2SaPn6MloTvKnmtt8d0kY1PgdX1kYk
-DmuVaR2ZUI2ESJPsIsyk7AQrpBMgeWH8MLkorGuAuAGkN7cWxkKD8fIeevSCbeW8
-hNfU9nLr3eFoEmc7d/k2+UZdPK7Wl8C1iKuhsu0ZOJ2awk5eyUS4k6OldJ89j23a
-LezU8B//CJZjT5ObvQqSVs4RRVoejPfbmZ/N7JZQN05dQOEnuXDz4rvIqnS+D9mg
-7l26bC5JXMzA0/wagxSh9phHMkwEP86ApwVXOKC8AU78kWfHuV2JZSscs8bqd7Fu
-lzAJaSS2Mxq2z7oWg2hgYBY188c2cfQBgh+sAa9R+TyVJvbiu732hsQUVyFjZtIR
-j592rk6vafVQJGNNobwpLtteMxesvPtY224g4XxND8BAFDOuHwyXSUy6RcR2Zhnd
-mHLq8QmdY7giYQA19giwZR+hbAxm/Kf1RSEX7gwuyl99zL0YB1aqnSoxOo+Yt4er
-/bTx44rHGzYtIuNyj5thyg142ur/LY/NgdzF77TP7U2bHFeNOXTjLr9udJlE5nm2
-0Rj4FM6eXTQzky0iTfxG
-=PRdu
+iQEcBAEBCAAGBQJRSYrgAAoJECo/aRed9267iuUIALaaRrESgT2U45/YrOP1MTlo
+jyYlxndg/AqQ4oyv62kokGxBW+CdnHcaSaNZCAb8zVIrYoSoOYdIR2+oLrd22+yX
+sYinC3NHiJCgIex5gOZC0TSdkkuF3J8megUtF561hbkxdHg3MKx2ofns1fmKHLOL
+5rzl8tL0O5lSrSXxEoZlrKl0oBM8PkxP8q4Waf3rU9ixDN2AgfcCnaE4oIo0agZY
+IJYIGjpYvS92kXVsY7aOX5ScfIwGml32atk2bezMtQHxy0qiwOlf6GjDBnGwLkPh
+U+z4viej7VxgWsagvhwFNMzsRP4MjkISO2wypMWV+MTu7uSH163982g6pOo0OUo=
+=rzWG
 -----END PGP SIGNATURE-----
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch
new file mode 100644
index 000000000000..9ba731bf5843
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch
@@ -0,0 +1,38 @@
+--- rtf-fix/Makefile.orig
++++ rtf-fix/Makefile
+@@ -1,6 +1,4 @@
+-CC=gcc
+ LEX=flex
+-CFLAGS=-O
+
+ all: rtf2rtf
+
+--- sgmls-1.1/Makefile.orig	2013-03-20 13:40:43.674880678 +0400
++++ sgmls-1.1/Makefile	2013-03-20 13:40:58.558881151 +0400
+@@ -15,14 +15,11 @@
+ # Permissions mode to use for man pages.
+ MANMODE=444
+ 
+-CC=gcc
+ PROFILE=
+ INCLUDE=
+ OPTIMIZE=-O
+ DEBUG=
+ WARN=
+-CFLAGS=$(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
+-LDFLAGS=$(DEBUG) $(PROFILE)
+ # Additional libraries needed.
+ # Ultrix needs -li
+ LIBS=
+
+--- Makefile.in.orig	2013-03-20 13:43:36.900886178 +0400
++++ Makefile.in		2013-03-20 13:43:49.783886587 +0400
+@@ -48,8 +48,6 @@
+ OPTIMIZE = -O
+ DEBUG    =
+ WARN     =
+-CFLAGS   = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
+-LDFLAGS  = $(DEBUG) $(PROFILE)
+ 
+ all:
+ ifeq ($(BUILD_SGMLSASP), true)
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch
new file mode 100644
index 000000000000..8e5048e34265
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch
@@ -0,0 +1,24 @@
+--- linuxdoc-tools-0.9.68/perl5lib/LinuxDocTools.pm.letter	Mon Nov 26 16:09:37 2001
++++ linuxdoc-tools-0.9.68/perl5lib/LinuxDocTools.pm	Mon Nov 26 16:09:49 2001
+@@ -108,7 +108,7 @@
+     { option => "pass",      type => "s", short => "P" }
+   ];
+   $global->{backend}   = "linuxdoc";
+-  $global->{papersize} = "a4";
++  $global->{papersize} = "letter";
+   $global->{language}  = "en";
+   $global->{charset}   = "ascii";
+   $global->{style}     = "";
+--- linuxdoc-tools-0.9.68/man/linuxdoc.1.letter	Mon Nov 26 16:10:04 2001
++++ linuxdoc-tools-0.9.68/man/linuxdoc.1	Mon Nov 26 16:10:42 2001
+@@ -46,8 +46,8 @@
+ format, but just output the usage of this suites.
+ Available formats are: html, info, latex, lyx, rtf, tex, check.
+ .IP "--papersize=\fIsize\fR, -p
+-Set the paper size.  Default is ``a4'' (European 297x210mm paper).
+-You may also specify ``letter'' size.
++Set the paper size.  Default is ``letter''.
++You may also specify ``a4'' size (European 297x210mm paper).
+ .IP "--language=\fIlang\fR, -l"
+ Specify the language of the document (this may change which style
+ files are used for formatting by a back end).  The default language is
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch
new file mode 100644
index 000000000000..9ee97432fdc9
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch
@@ -0,0 +1,11 @@
+--- rtf-fix/rtf2rtf.l.orig	2013-03-20 13:14:06.146829954 +0400
++++ rtf-fix/rtf2rtf.l	2013-03-20 13:14:28.193830654 +0400
+@@ -72,7 +72,7 @@
+ int skipnewline = 0;
+ 
+ extern char *yytext;
+-extern int yyleng;
++extern yy_size_t yyleng;
+ 
+ #define CHAPTER 1
+ #define SECTION 2
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild
new file mode 100644
index 000000000000..8c4b1cd1ed04
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild,v 1.1 2013/03/20 10:09:38 pinkbyte Exp $
+
+EAPI=2
+
+inherit eutils sgml-catalog toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="http://packages.qa.debian.org/l/linuxdoc-tools.html"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="MIT SGMLUG"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+DEPEND="app-text/openjade
+	app-text/opensp
+	app-text/sgml-common
+	dev-texlive/texlive-fontsrecommended
+	>=dev-lang/perl-5.004
+	sys-apps/gawk
+	sys-apps/groff
+	virtual/latex-base"
+
+RDEPEND="${DEPEND}"
+
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
+	"/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-letter.patch" \
+		"${FILESDIR}/${PN}-0.9.21-malloc.patch" \
+		"${FILESDIR}/${P}-compiler.patch" \
+		"${FILESDIR}/${P}-lex.patch"
+}
+
+src_configure() {
+	tc-export CC
+	econf --with-installed-iso-entities || die "./configure failed"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "Compilation failed"
+}
+
+src_install() {
+	# Else fails with sandbox violations
+	export VARTEXFONTS="${T}/fonts"
+
+	# Besides the path being wrong, in changing perl5libdir, it cannot find the
+	# catalog.
+	export SGML_CATALOG_FILES="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
+
+	eval `perl -V:installvendorarch`
+	einstall \
+		perl5libdir="${D}${installvendorarch}" \
+		LINUXDOCDOC="${D}/usr/share/doc/${PF}/guide" \
+		|| die "Installation failed"
+
+	# Wrong path for the catalog.
+	sed -i -e \
+		's,/iso-entities-8879.1986/iso-entities.cat,/sgml-iso-entities-8879.1986/catalog,' \
+		/usr/share/linuxdoc-tools/LinuxDocTools.pm || die 'sed failed'
+
+	insinto /usr/share/texmf/tex/latex/misc
+	doins "${S}"/lib/*.sty || die
+
+	dodoc ChangeLog README || die
+}