[gentoo-commits] proj/musl:master commit in: dev-tex/luatex/files/, dev-tex/luatex/

[Aric Belsito]

commit:     0696956512de88836d4cecf22eaa99cb4eb32453
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Mar  2 19:09:54 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Mar  2 19:13:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=06969565

dev-tex/luatex: sync with upstream

drop r99 suffix

 dev-tex/luatex/Manifest                            |  3 +-
 dev-tex/luatex/files/poppler026-backport.patch     | 99 ++++++++++++++++++++++
 ...x-0.70.1-r99.ebuild => luatex-0.70.1-r2.ebuild} |  8 +-
 3 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest
index 3982cff..ff78bc4 100644
--- a/dev-tex/luatex/Manifest
+++ b/dev-tex/luatex/Manifest
@@ -3,8 +3,9 @@ AUX kpathsea2012.patch 944 SHA256 afb87b3c1cb9317666a7f45b6ecd6ad1078896d56b91fc
 AUX poppler018.patch 5041 SHA256 98317c41cab055cde67fd1eefa6c79fa8ec0ac2b36d93a094abe9eb8e834221c SHA512 e8b1660cb6674a8d2f68f29022d0ea33ca00795c8360a9656c5ad84776c86d3ab0a3c0895632957c5ed93fcab96e11e6bc7eb1a03df518122fcc3fa574b095ee WHIRLPOOL 0a14b110479acbe5d31a40642b53e0bcf03226acac19596f5dc885ff8a7a9c83895d8409044e96630bc66cf77ea915ce41f580a43dc48df423519dc0a9226335
 AUX poppler020.patch 2909 SHA256 ffec5fd2e311841ee355deabfe13b37fdaea781608e95a2a5ab037d1cdd04ea8 SHA512 9517efce4ede9b792f27647ec4ed95d447572a9cbb3ee58e089b658ccc55bbb6a7843768b5962a4535ed77ab364e73f4fd1248e92a5a480ce30429303664f385 WHIRLPOOL db89a3e07ace603aea4abf71a97cd26f0b16c60b939f0c361db77d8af22c03b0003440e38164a0052258a8fbaceb283bac401a8254fa0b42e71179b715151f06
 AUX poppler022.patch 12617 SHA256 4b19ef98d1142e775efa4ea3911b720f9d524c813a512d7673c8441a34e2488c SHA512 998c948bc02014bf1e79e9c8ee2c7681568b827c467f15eed0ec90342d65f43ec36b9acaf7cdf51404234eab14337122d330adc647ce97b3c299a2c368bf9a9a WHIRLPOOL 5a4c34a509c9368d5235ff5674ed243c78e16c0fafc5134da95884f7d18dc4678e7126e6cfccf9a27eac96bcae23b8c96a6b1aa84c60bf3efdf2249461d7dff8
+AUX poppler026-backport.patch 3914 SHA256 e5c0d7a2c9b8cc280b21edf831ebee19c734a787c3c53a3d7692b61dee7ad829 SHA512 fbeae638e8cb0f75b3ced8c2db813d47dd8701665861f6c0ec3c25f21de842f8978a2dccf54531b8f446dd6b4bb39f2e6c90d72f52ffedbc0404ae7c45432569 WHIRLPOOL 0815b0b7394afa35a663a1b2a9c83885160f9d34c8f4fe1141e2ff13931e2a48ff789edac5e89505dc1f0b68bc9fb2b3cf4cdff547a8d0fc67979e5ee91cda43
 AUX remove-zlib-version-check.patch 938 SHA256 5c569bab0ccecc38e89f0bfeeaeabb921ce2fe38e17ecd0d7da11a75c0ed9d19 SHA512 1d19fb396af846a2ffa9ab7ffcf20d363956921cec92d6b03e499e26bac3802a8ca874b982c25ef99a560af48f0d85b0a36ac5786f7c3129abba3b8d9e38c780 WHIRLPOOL 2b06826e5f8bd2bc50b933a7636b5185bd21b44e2c5aad54e4e641bd39c74a29235928f3a6e36d551b679dac6ca2fa8c969447c520805807a487b6bd0b82c79c
 DIST luatex-beta-0.70.1-doc.tar.bz2 1048489 SHA256 4f1d24777725a606efbf5d7a59064245c46fb29b8066236c6b48fb423a595606 SHA512 eb4de91a80a6afccf5cca5cb05d5c1378a60ec35763e5ef5e9dbadaa2a276758a446e01d66e76a78e91442274778c10c73458b513af903e7221d90beb644afa9 WHIRLPOOL 97142a3a3c23d01f3b21963690f7362edf0c7f0de1ad77295361122a81c92459cb2ecd36baaea3588b7ad4f8b81c5dfa81d22df7a5529cb5b8b2b39fe6ce84be
 DIST luatex-beta-0.70.1.tar.bz2 8181155 SHA256 c641a4ba1535ede6ee8e2a958d8c4b436f5979c5be6f3f51d3dec5b4df6bb6ed SHA512 e04a9b96f349bf9036ef4c01746dee96ebf245cd4da6b719f546223e05cb98fb844e20878a64f80f42c77e220fac01ee2d97ad56939c1fb3af44faab53c603cb WHIRLPOOL 63dfdf182d3f1aadd6fc802e424b3791eda4df7eb8d707ad719d2ad0f97946b365316f6b9caed2362d5827280e9ddf2e750c8beeb61277dac72bffaed06a4fc9
-EBUILD luatex-0.70.1-r99.ebuild 3518 SHA256 19a9eb1defc2f3a17ce028e3dc8aeb67191e1e657410401c36e25be1ca6569da SHA512 77644be89db52395c8b48b895ac352307fd779cb3f134e410c3056ac803bef750f1b1d5394e346714b5f313820f1ed2f0ac45d89b07ee64a66ca93dd8211b2be WHIRLPOOL 1d6e5da5ee3d18f3b1da4bec683f10dcacfdad9180f8c599973cbabef185bf7c8a43f3d00972799d511f25312d9bcd88692903b58f802a4175318274ae30f754
+EBUILD luatex-0.70.1-r2.ebuild 3776 SHA256 16ecd792296114ca835f90ae5c0cf347dfae8582b760b263d4739ea9789fd7c1 SHA512 75e89c2ecb3196570d277104cd9fd1f7ff21453e0a8b5a326b6b00a77120e5a9620c9e5a5963caf7d986160c01a0300b299dc5a8a4811d5ed31baaf09706a3a5 WHIRLPOOL 2b8e09f8d30c5c22748ac617eecbe718f1b520c1d3e18a00c3b6a78685b8fb91c2c37454f8e9e0f4bc731e3ca63aef75083289416e1769ab0f6676baa54753d9
 MISC metadata.xml 425 SHA256 9b879fed8cecdfbf714206f555603d5e2fc6f32608013002b7629538eb42b5f3 SHA512 9442b997ff504c7aef4e129b3c3fbc5212e6b7838b53059cfd16764bff66b025d39e6c9565f932295118393b8b648a489066d85e6bdb5e09380ec02a384addd9 WHIRLPOOL 2fb229e3f3d2d5a9e5f5c59275fd2596c8f4d04650f15f994a4c23d20eb947193eab0c41c1217e90a0f8730c90093168c1eb865811d61b89d18453129a05a680

diff --git a/dev-tex/luatex/files/poppler026-backport.patch b/dev-tex/luatex/files/poppler026-backport.patch
new file mode 100644
index 0000000..ee151a3
--- /dev/null
+++ b/dev-tex/luatex/files/poppler026-backport.patch
@@ -0,0 +1,99 @@
+diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h
+--- luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h	2011-05-19 07:38:37.000000000 +0200
++++ luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h	2014-10-11 12:17:00.028331243 +0200
+@@ -33,6 +33,7 @@
+ #  include <sys/stat.h>
+ #  include <dirent.h>
+ #  include <poppler-config.h>
++#  include <StructTreeRoot.h>
+ #  include <goo/GooString.h>
+ #  include <goo/gmem.h>
+ #  include <goo/gfile.h>
+diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc
+--- luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc	2014-10-11 12:24:52.509357663 +0200
++++ luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc	2014-10-11 12:42:03.665415321 +0200
+@@ -48,23 +48,24 @@
+ 
+ //**********************************************************************
+ 
+-#define M_Annot            "Annot"
+-#define M_Annots           "Annots"
+-#define M_Array            "Array"
+-#define M_Catalog          "Catalog"
+-#define M_Dict             "Dict"
+-#define M_GooString        "GooString"
+-#define M_LinkDest         "LinkDest"
+-#define M_Link             "Link"
+-#define M_Links            "Links"
+-#define M_Object           "Object"
+-#define M_Page             "Page"
+-#define M_PDFDoc           "PDFDoc"
+-#define M_PDFRectangle     "PDFRectangle"
+-#define M_Ref              "Ref"
+-#define M_Stream           "Stream"
+-#define M_XRefEntry        "XRefEntry"
+-#define M_XRef             "XRef"
++#define M_Annot            "epdf.Annot" /* ls-hh: epdf.* gives better protection in registry */
++#define M_Annots           "epdf.Annots"
++#define M_Array            "epdf.Array"
++#define M_Catalog          "epdf.Catalog"
++#define M_Dict             "epdf.Dict"
++#define M_GooString        "epdf.GooString"
++#define M_LinkDest         "epdf.LinkDest"
++#define M_Link             "epdf.Link"
++#define M_Links            "epdf.Links"
++#define M_Object           "epdf.Object"
++#define M_Page             "epdf.Page"
++#define M_PDFDoc           "epdf.PDFDoc"
++#define M_PDFRectangle     "epdf.PDFRectangle"
++#define M_Ref              "epdf.Ref"
++#define M_Stream           "epdf.Stream"
++#define M_StructTreeRoot   "epdf.StructTreeRoot"
++#define M_XRef             "epdf.XRef"
++#define M_XRefEntry        "epdf.XRefEntry"
+ 
+ //**********************************************************************
+ 
+@@ -92,6 +93,7 @@
+ new_poppler_userdata(PDFRectangle);
+ new_poppler_userdata(Ref);
+ new_poppler_userdata(Stream);
++new_poppler_userdata(StructTreeRoot);
+ new_poppler_userdata(XRef);
+ 
+ //**********************************************************************
+@@ -565,7 +567,11 @@
+ 
+ m_poppler_get_GOOSTRING(Catalog, getBaseURI);
+ m_poppler_get_GOOSTRING(Catalog, readMetadata);
++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
+ m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
++#else
++m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
++#endif
+ 
+ static int m_Catalog_findPage(lua_State * L)
+ {
+@@ -2048,14 +2054,22 @@
+ 
+ static int m_PDFDoc_getStructTreeRoot(lua_State * L)
+ {
++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
+     Object *obj;
++#else
++    StructTreeRoot *obj;
++#endif
+     udstruct *uin, *uout;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
+         obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
+         uout = new_Object_userdata(L);
++#else
++        uout = new_StructTreeRoot_userdata(L);
++#endif
+         uout->d = obj;
+         uout->pc = uin->pc;
+         uout->pd = uin->pd;

diff --git a/dev-tex/luatex/luatex-0.70.1-r99.ebuild b/dev-tex/luatex/luatex-0.70.1-r2.ebuild
similarity index 90%
rename from dev-tex/luatex/luatex-0.70.1-r99.ebuild
rename to dev-tex/luatex/luatex-0.70.1-r2.ebuild
index 23cc30b..8b0884d 100644
--- a/dev-tex/luatex/luatex-0.70.1-r99.ebuild
+++ b/dev-tex/luatex/luatex-0.70.1-r2.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
 inherit libtool eutils texlive-common
 
-DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language."
+DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language"
 HOMEPAGE="http://www.luatex.org/"
 SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/392/1730/${PN}-beta-${PV}.tar.bz2
 	http://foundry.supelec.fr/gf/download/frsrelease/392/1732/${PN}-beta-${PV}-doc.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-libs/zziplib
@@ -33,6 +32,7 @@ src_prepare() {
 	has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
 	has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
 	has_version '>=app-text/poppler-0.22.0:0' && epatch "${FILESDIR}/poppler022.patch"
+	has_version '>=app-text/poppler-0.26.0:0' && epatch "${FILESDIR}/poppler026-backport.patch"
 	epatch "${FILESDIR}/kpathsea2012.patch" \
 		"${FILESDIR}/remove-zlib-version-check.patch" \
 		"${FILESDIR}/jmpbuf.patch"