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

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

5 files changed, 156 insertions, 2 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/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
+}