fix mkluatexfontdb with luatex 0.65, bug #357931 by Tiziano M�ller

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

4 files changed, 85 insertions, 10 deletions

diff --git a/dev-texlive/texlive-luatex/ChangeLog b/dev-texlive/texlive-luatex/ChangeLog
index afffdf827d6e..57035f061078 100644
--- a/dev-texlive/texlive-luatex/ChangeLog
+++ b/dev-texlive/texlive-luatex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-texlive/texlive-luatex
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-luatex/ChangeLog,v 1.11 2010/10/24 18:12:02 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-luatex/ChangeLog,v 1.12 2011/05/18 14:35:20 aballier Exp $
+
+*texlive-luatex-2010-r1 (18 May 2011)
+
+  18 May 2011; Alexis Ballier <aballier@gentoo.org>
+  +texlive-luatex-2010-r1.ebuild, +files/lualibs.patch:
+  fix mkluatexfontdb with luatex 0.65, bug #357931 by Tiziano Muller
 
 *texlive-luatex-2010 (24 Oct 2010)
 
@@ -11,7 +17,7 @@
   01 Jun 2010; Joseph Jezak <josejx@gentoo.org> texlive-luatex-2009.ebuild:
   Marked ~ppc for bug #300526.
 
-  13 May 2010; Raúl Porcel <armin76@gentoo.org> texlive-luatex-2009.ebuild:
+  13 May 2010; Raúl Porcel <armin76@gentoo.org> texlive-luatex-2009.ebuild:
   Add ~sparc wrt #300526
 
   12 May 2010; Brent Baude <ranger@gentoo.org> texlive-luatex-2009.ebuild:
@@ -20,10 +26,10 @@
   10 May 2010; Markus Meier <maekke@gentoo.org> texlive-luatex-2009.ebuild:
   add ~arm, bug #300526
 
-  13 Feb 2010; Raúl Porcel <armin76@gentoo.org> texlive-luatex-2009.ebuild:
+  13 Feb 2010; Raúl Porcel <armin76@gentoo.org> texlive-luatex-2009.ebuild:
   Add ~sh wrt #300526
 
-  13 Feb 2010; Raúl Porcel <armin76@gentoo.org> texlive-luatex-2009.ebuild:
+  13 Feb 2010; Raúl Porcel <armin76@gentoo.org> texlive-luatex-2009.ebuild:
   Add ~alpha/~ia64 wrt #300526
 
   03 Feb 2010; Jonathan Callen <abcd@gentoo.org> texlive-luatex-2009.ebuild:
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index 209cdb4661b0..901ce102ae6f 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lualibs.patch 2073 RMD160 d6fe7c49389f0aa4ee51337f52f3057cd7a03c25 SHA1 eef1e2bb0f62d86b67683d763e35ed0988d4b701 SHA256 992704dd7b6b3ba658157bb58ea4eddf7742d585e0be7d0c23dee20497c6a28d
 DIST texlive-module-collection-luatex-2009.tar.xz 404 RMD160 d5670d221b4fb7bd6f32170b1265929ddce7e1bc SHA1 5e7e67a3bb86c013804fab7915c09a7e021d5596 SHA256 4e3f9cd411e67a43eb1148b6e6d497704cab489f82af7c1adbc55ccd57906d8e
 DIST texlive-module-collection-luatex-2010.tar.xz 412 RMD160 6e9581b96888227bfb1390ced9625c5089e87b62 SHA1 bb8cca5733c6df8c7cebf8c573b71509ce572e1f SHA256 9bcac622b67d3349ccb6794d2a475536480840930f3b4457da6804bd64f7c391
 DIST texlive-module-luainputenc-2009.tar.xz 5356 RMD160 2bad88840e157c2088b72f5a7361bbafdfcf702d SHA1 9f85adf1b1ea2cb44884c7bd6d94d16fdcca1e6b SHA256 c4e7d1072e115e48e1fd9c70d166ab434997f0379b978da99f92c0626cbe6900
@@ -34,13 +35,14 @@ DIST texlive-module-luatextra.doc-2010.tar.xz 270124 RMD160 21d30430c6660f35cf46
 DIST texlive-module-luatextra.source-2009.tar.xz 26476 RMD160 a6e4d0c18038cfbfe5088ac0ec49a12d2c5104a7 SHA1 4787df66d968def867503a4bcdc7ffc82b73b43e SHA256 145667e5cacde14c3c61c449b2f1971590b7a12d1715d931be20481485d10851
 DIST texlive-module-luatextra.source-2010.tar.xz 12368 RMD160 f979ba4929728c43fc2deb9f85916e91c3534d79 SHA1 6e04a755f0124ff939a6738ec301b3ec5aa99116 SHA256 0221e6db6c1f39d4bb30cb1a5e7e219cdb1e53259f602a85c0b3111606adb4eb
 EBUILD texlive-luatex-2009.ebuild 821 RMD160 2163eed449d613ef88bc9392dddbff73d2f5718f SHA1 31e2c805d1847a8f7087b33ee69a51414a59150d SHA256 4ff700235676b27a47ef1d558328347e06488e13e7c702c5158f7f8a7d53e368
+EBUILD texlive-luatex-2010-r1.ebuild 1118 RMD160 d1f759d6aa0fb2ef0630c6cbd41067be932bbfa9 SHA1 6dba704ddf8c00295973c8d96babf82baafe353e SHA256 c39a259f69c212b6bbfc2399adf00e97b2056517a3b94e1dfd5d4fb8f4e4392c
 EBUILD texlive-luatex-2010.ebuild 976 RMD160 c137314b83bdc900e475f5f040ae8d2d84aa801c SHA1 3d13202e544791e7f9263074a27e835885aec8fb SHA256 3514e928ef0c9d8d69090081d4fde5b9857bb749d80c2e073e585c63c3b02a75
-MISC ChangeLog 1504 RMD160 3a8c02d7b0308098f6fb92a957830ebc6e7de4f3 SHA1 7b7a555b29dad7328c5a243f969256d47d221664 SHA256 23c586216d1272f7e739d21b7f67758af90b04b6620f40f85b9df516661df51f
+MISC ChangeLog 1727 RMD160 d9fa53b97ab76a9165b78df75ed098b6a785418a SHA1 0232a100615d9a3514418101a1e91c5a9286a610 SHA256 8246afc3a25b222e83f98446ecf828c64d45c66dc6a99ed112431e7a36e3c484
 MISC metadata.xml 437 RMD160 899f33fcd162627af1fb5b3e033f5010c2199c06 SHA1 64b95270d220a156e19f3d5776b46d0f70fcd7c8 SHA256 9405cbb057d65e8fd985488d9a39c64ce3c4ab781d8915de95f3d42257f288a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzEd3MACgkQvFcC4BYPU0pbRACfRU0k2gUfat/Dg+QHJee+xH+E
-/NEAnikM1UzI6JJ+N38bGtikdqaZthfR
-=RhVD
+iEYEARECAAYFAk3T2S4ACgkQvFcC4BYPU0qtmACfXhlEGk5+qrr68pqYOJCTA6VI
+SrwAoJZV2w/sUkU9Izm81KjsKioi0Shd
+=VsPJ
 -----END PGP SIGNATURE-----
diff --git a/dev-texlive/texlive-luatex/files/lualibs.patch b/dev-texlive/texlive-luatex/files/lualibs.patch
new file mode 100644
index 000000000000..f62d3bea44ca
--- /dev/null
+++ b/dev-texlive/texlive-luatex/files/lualibs.patch
@@ -0,0 +1,43 @@
+--- texmf-dist/tex/luatex/lualibs/lualibs-dir.lua	2010-05-29 02:25:56.000000000 -0700
++++ texmf-dist/tex/luatex/lualibs/lualibs-dir.lua	2011-01-13 22:05:56.766564001 -0800
+@@ -26,15 +26,15 @@
+ local walkdir    = lfs.dir
+ 
+ local function glob_pattern(path,patt,recurse,action)
+-    local ok, scanner
++    local ok, scanner, dirobj
+     if path == "/" then
+-        ok, scanner = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe
++        ok, scanner, dirobj = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe
+     else
+-        ok, scanner = xpcall(function() return walkdir(path)      end, function() end) -- kepler safe
++        ok, scanner, dirobj = xpcall(function() return walkdir(path)      end, function() end) -- kepler safe
+     end
+     if ok and type(scanner) == "function" then
+         if not find(path,"/$") then path = path .. '/' end
+-        for name in scanner do
++        for name in scanner, dirobj do
+             local full = path .. name
+             local mode = attributes(full,'mode')
+             if mode == 'file' then
+@@ -51,16 +51,16 @@
+ dir.glob_pattern = glob_pattern
+ 
+ local function collect_pattern(path,patt,recurse,result)
+-    local ok, scanner
++    local ok, scanner, dirobj
+     result = result or { }
+     if path == "/" then
+-        ok, scanner = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe
++        ok, scanner, dirobj = xpcall(function() return walkdir(path..".") end, function() end) -- kepler safe
+     else
+-        ok, scanner = xpcall(function() return walkdir(path)      end, function() end) -- kepler safe
++        ok, scanner, dirobj = xpcall(function() return walkdir(path)      end, function() end) -- kepler safe
+     end
+     if ok and type(scanner) == "function" then
+         if not find(path,"/$") then path = path .. '/' end
+-        for name in scanner do
++        for name in scanner, dirobj do
+             local full = path .. name
+             local attr = attributes(full)
+             local mode = attr.mode
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2010-r1.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2010-r1.ebuild
new file mode 100644
index 000000000000..1ad163712c69
--- /dev/null
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2010-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-luatex/texlive-luatex-2010-r1.ebuild,v 1.1 2011/05/18 14:35:20 aballier Exp $
+
+EAPI="3"
+
+TEXLIVE_MODULE_CONTENTS="luainputenc lualibs luamplib luaotfload luatexbase luatextra collection-luatex
+"
+TEXLIVE_MODULE_DOC_CONTENTS="luainputenc.doc lualibs.doc luamplib.doc luaotfload.doc luatexbase.doc luatextra.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="luainputenc.source lualibs.source luamplib.source luaotfload.source luatexbase.source luatextra.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive LuaTeX packages"
+
+LICENSE="GPL-2 GPL-2 public-domain "
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=dev-texlive/texlive-basic-2010
+>=dev-tex/luatex-0.45
+
+"
+RDEPEND="${DEPEND} "
+TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/luaotfload/mkluatexfontdb.lua"
+PATCHES=( "${FILESDIR}/lualibs.patch" )