Fix help text (thanks Thomas J. Moore, bug 476724), update live build.

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

9 files changed, 19 insertions, 78 deletions

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index c5479edf8cd0..cbdf843537ea 100644
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/llpp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.47 2013/06/16 22:26:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.48 2013/07/13 23:16:59 xmw Exp $
+
+  13 Jul 2013; Michael Weber <xmw@gentoo.org>
+  -files/llpp-9999-fz_drop_display_list.patch,
+  -files/llpp-9999-fz_new_text_page.patch,
+  -files/llpp-9999-mupdf-split-headers.patch,
+  -files/llpp-9999-mupdf_trailer.patch, llpp-12.ebuild,
+  llpp-13_p20121123.ebuild, llpp-15.ebuild, llpp-9999.ebuild:
+  Fix help text (thanks Thomas J. Moore, bug 476724), update live build.
 
   16 Jun 2013; Michael Weber <xmw@gentoo.org> llpp-15.ebuild, llpp-9999.ebuild:
   Add -lpthread for shared builds
diff --git a/app-text/llpp/files/llpp-9999-fz_drop_display_list.patch b/app-text/llpp/files/llpp-9999-fz_drop_display_list.patch
deleted file mode 100644
index ad2634537411..000000000000
--- a/app-text/llpp/files/llpp-9999-fz_drop_display_list.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Required by http://git.ghostscript.com/?p=mupdf.git;a=commit;f=fitz/dev_list.c;h=f85653219a85a9f91cb14471485611ca5f6b25ba
-
---- llpp-9999/link.c
-+++ llpp-9999/link.c
-@@ -571,7 +571,7 @@
-         free (page->slinks);
-     }
-     page->freepage (page->u.ptr);
--    fz_free_display_list (state.ctx, page->dlist);
-+    fz_drop_display_list (state.ctx, page->dlist);
-     free (page);
- }
- 
diff --git a/app-text/llpp/files/llpp-9999-fz_new_text_page.patch b/app-text/llpp/files/llpp-9999-fz_new_text_page.patch
deleted file mode 100644
index ad32d54a3f01..000000000000
--- a/app-text/llpp/files/llpp-9999-fz_new_text_page.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- llpp-9999/link.c
-+++ llpp-9999/link.c
-@@ -1463,7 +1463,7 @@
-     found:
- 
-         sheet = fz_new_text_sheet (state.ctx);
--        text = fz_new_text_page (state.ctx, &fz_infinite_rect);
-+        text = fz_new_text_page (state.ctx);
-         tdev = fz_new_text_device (state.ctx, sheet, text);
- 
-         switch (state.type) {
-@@ -2522,7 +2522,7 @@
-         fz_matrix ctm;
-         fz_device *tdev;
- 
--        page->text = fz_new_text_page (state.ctx, &fz_infinite_rect);
-+        page->text = fz_new_text_page (state.ctx);
-         page->sheet = fz_new_text_sheet (state.ctx);
-         tdev = fz_new_text_device (state.ctx, page->sheet, page->text);
-         ctm = pagectm (page);
diff --git a/app-text/llpp/files/llpp-9999-mupdf-split-headers.patch b/app-text/llpp/files/llpp-9999-mupdf-split-headers.patch
deleted file mode 100644
index c62a58b48ad0..000000000000
--- a/app-text/llpp/files/llpp-9999-mupdf-split-headers.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- llpp-9999/work/llpp-9999/link.c
-+++ llpp-9999/work/llpp-9999/link.c
-@@ -30,12 +30,10 @@
- #include <caml/memory.h>
- #include <caml/unixsupport.h>
- 
--#include <fitz.h>
--#include <mupdf.h>
--#include <mupdf-internal.h>
--#include <muxps.h>
--#include <muxps-internal.h>
--#include <mucbz.h>
-+#include <mupdf/cbz.h>
-+#include <mupdf/fitz.h>
-+#include <mupdf/pdf.h>
-+#include <mupdf/xps.h>
- 
- #include FT_FREETYPE_H
- 
diff --git a/app-text/llpp/files/llpp-9999-mupdf_trailer.patch b/app-text/llpp/files/llpp-9999-mupdf_trailer.patch
deleted file mode 100644
index b119aa437f15..000000000000
--- a/app-text/llpp/files/llpp-9999-mupdf_trailer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- llpp-9999/link.c
-+++ llpp-9999/link.c
-@@ -523,7 +523,7 @@
-         printd ("info PDF version\t%d.%d",
-                 state.u.pdf->version / 10, state.u.pdf->version % 10);
- 
--        infoobj = pdf_dict_gets (state.u.pdf->trailer, "Info");
-+        infoobj = pdf_dict_gets (pdf_trailer(state.u.pdf), "Info");
-         if (infoobj) {
-             int i;
-             char *s;
diff --git a/app-text/llpp/llpp-12.ebuild b/app-text/llpp/llpp-12.ebuild
index 51d13ff8c97e..818f882c2974 100644
--- a/app-text/llpp/llpp-12.ebuild
+++ b/app-text/llpp/llpp-12.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-text/llpp/llpp-12.ebuild,v 1.6 2013/06/07 00:14:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-12.ebuild,v 1.7 2013/07/13 23:16:59 xmw Exp $
 
 EAPI=4
 
@@ -33,7 +33,7 @@ src_prepare() {
 }
 
 src_compile() {
-	ocaml str.cma keystoml.ml KEYS > help.ml || die
+	ocaml str.cma keystoml.ml < KEYS > help.ml || die
 	printf 'let version ="%s";;\n' ${PV} >> help.ml || die
 
 	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
diff --git a/app-text/llpp/llpp-13_p20121123.ebuild b/app-text/llpp/llpp-13_p20121123.ebuild
index bda7d18d69c3..cdb8feabb4b9 100644
--- a/app-text/llpp/llpp-13_p20121123.ebuild
+++ b/app-text/llpp/llpp-13_p20121123.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-text/llpp/llpp-13_p20121123.ebuild,v 1.6 2013/06/07 00:14:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-13_p20121123.ebuild,v 1.7 2013/07/13 23:16:59 xmw Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 src_compile() {
-	ocaml str.cma keystoml.ml KEYS > help.ml || die
+	ocaml str.cma keystoml.ml < KEYS > help.ml || die
 	printf 'let version ="%s";;\n' ${PV} >> help.ml || die
 
 	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
diff --git a/app-text/llpp/llpp-15.ebuild b/app-text/llpp/llpp-15.ebuild
index da2f8b08958c..3f52b433eefc 100644
--- a/app-text/llpp/llpp-15.ebuild
+++ b/app-text/llpp/llpp-15.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-text/llpp/llpp-15.ebuild,v 1.7 2013/06/16 22:26:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.8 2013/07/13 23:16:59 xmw Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.2:=[static-libs]
-	<=app-text/mupdf-9999[static-libs]
+	<app-text/mupdf-9999[static-libs]
 	media-libs/openjpeg:0[static-libs]
 	media-libs/freetype:2[static-libs]
 	media-libs/jbig2dec[static-libs]
@@ -66,7 +66,7 @@ src_compile() {
 	fi
 
 	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose ocaml str.cma keystoml.ml KEYS > help.ml
+	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
 	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
 	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
 	verbose ${ocaml} -c -o help.${cmo} help.ml
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index 71e2f61e83be..e21743431a29 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.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-text/llpp/llpp-9999.ebuild,v 1.25 2013/06/26 19:55:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.26 2013/07/13 23:16:59 xmw Exp $
 
 EAPI=5
 
@@ -37,11 +37,7 @@ DEPEND="${RDEPEND}
 RESTRICT="!ocamlopt? ( strip )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch \
-		"${FILESDIR}"/${P}-mupdf_trailer.patch \
-		"${FILESDIR}"/${P}-fz_new_text_page.patch \
-		"${FILESDIR}"/${P}-mupdf-split-headers.patch \
-		"${FILESDIR}"/${P}-fz_drop_display_list.patch
+	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
 }
 
 src_compile() {
@@ -69,7 +65,7 @@ src_compile() {
 	fi
 
 	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose ocaml str.cma keystoml.ml KEYS > help.ml
+	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
 	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
 	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
 	verbose ${ocaml} -c -o help.${cmo} help.ml