Fix default search path for texmfcnf.lua so that it is found out of the box, bug #428556 by Martin Scholz

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 110 insertions, 1 deletions

diff --git a/dev-texlive/texlive-context/ChangeLog b/dev-texlive/texlive-context/ChangeLog
index f25f0157d532..4072921bf998 100644
--- a/dev-texlive/texlive-context/ChangeLog
+++ b/dev-texlive/texlive-context/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-texlive/texlive-context
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-context/ChangeLog,v 1.59 2012/07/27 01:29:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-context/ChangeLog,v 1.60 2012/07/31 13:35:42 aballier Exp $
+
+*texlive-context-2012-r1 (31 Jul 2012)
+
+  31 Jul 2012; Alexis Ballier <aballier@gentoo.org>
+  +texlive-context-2012-r1.ebuild, +files/luacnfspec.patch:
+  Fix default search path for texmfcnf.lua so that it is found out of the box,
+  bug #428556 by Martin Scholz
 
 *texlive-context-2012 (27 Jul 2012)
 
diff --git a/dev-texlive/texlive-context/files/luacnfspec.patch b/dev-texlive/texlive-context/files/luacnfspec.patch
new file mode 100644
index 000000000000..8fe3d068f03e
--- /dev/null
+++ b/dev-texlive/texlive-context/files/luacnfspec.patch
@@ -0,0 +1,36 @@
+We install texmfcnf.lua in a different location than TeX Live so default
+heuristics fail. Help it.
+
+--- texmf-dist/scripts/context/stubs/unix/mtxrun.old	2012-07-31 09:17:57.580364255 -0400
++++ texmf-dist/scripts/context/stubs/unix/mtxrun	2012-07-31 09:19:50.801292839 -0400
+@@ -12466,7 +12466,7 @@
+     resolvers.luacnfspec = environment.default_texmfcnf
+ else
+  -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c"
+-    resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}"
++    resolvers.luacnfspec = "selfautodir:share{/local,}/texmf/web2c"
+ end
+ 
+ resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec
+--- texmf-dist/tex/context/base/data-res.lua.old	2012-07-31 09:23:01.459021878 -0400
++++ texmf-dist/tex/context/base/data-res.lua	2012-07-31 09:23:27.395248684 -0400
+@@ -94,7 +94,7 @@
+     resolvers.luacnfspec = environment.default_texmfcnf
+ else
+  -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c"
+-    resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}"
++    resolvers.luacnfspec = "selfautodir:share{/local,}/texmf/web2c"
+ end
+ 
+ resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec
+--- texmf-dist/scripts/context/lua/mtxrun.lua.old	2012-07-31 09:24:19.319697670 -0400
++++ texmf-dist/scripts/context/lua/mtxrun.lua	2012-07-31 09:24:41.327886068 -0400
+@@ -12466,7 +12466,7 @@
+     resolvers.luacnfspec = environment.default_texmfcnf
+ else
+  -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c"
+-    resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}"
++    resolvers.luacnfspec = "selfautodir:share{/local,}/texmf/web2c"
+ end
+ 
+ resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec
diff --git a/dev-texlive/texlive-context/texlive-context-2012-r1.ebuild b/dev-texlive/texlive-context/texlive-context-2012-r1.ebuild
new file mode 100644
index 000000000000..1e73a993a22c
--- /dev/null
+++ b/dev-texlive/texlive-context/texlive-context-2012-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-context/texlive-context-2012-r1.ebuild,v 1.1 2012/07/31 13:35:42 aballier Exp $
+
+EAPI="4"
+
+TEXLIVE_MODULE_CONTENTS="context jmn lmextra context-account context-algorithmic context-bnf context-chromato context-construction-plan context-degrade context-filter context-fixme context-french context-fullpage context-games context-gantt context-gnuplot context-letter context-lettrine context-lilypond context-mathsets context-notes-zh-cn context-rst context-ruby context-simplefonts context-simpleslides context-typearea context-typescripts context-vim collection-context
+"
+TEXLIVE_MODULE_DOC_CONTENTS="context.doc context-account.doc context-bnf.doc context-chromato.doc context-construction-plan.doc context-degrade.doc context-filter.doc context-fixme.doc context-french.doc context-fullpage.doc context-games.doc context-gantt.doc context-gnuplot.doc context-letter.doc context-lettrine.doc context-lilypond.doc context-mathsets.doc context-notes-zh-cn.doc context-rst.doc context-ruby.doc context-simplefonts.doc context-simpleslides.doc context-typearea.doc context-typescripts.doc context-vim.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="context-fixme.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive ConTeXt format"
+
+LICENSE="GPL-2 as-is BSD GPL-1 GPL-2 public-domain "
+SLOT="0"
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=dev-texlive/texlive-basic-2012
+>=dev-texlive/texlive-latex-2010
+!<dev-texlive/texlive-latex-2010
+>=app-text/texlive-core-2010[xetex]
+>=dev-texlive/texlive-metapost-2010
+"
+RDEPEND="${DEPEND} dev-lang/ruby
+"
+PATCHES=( "${FILESDIR}/luacnfspec.patch" )
+
+TL_CONTEXT_UNIX_STUBS="context luatools mtxrun texexec texmfstart"
+
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/context/ruby/ctxtools.rb
+	texmf-dist/scripts/context/ruby/pstopdf.rb
+	texmf-dist/scripts/context/ruby/rlxtools.rb
+"
+
+for i in ${TL_CONTEXT_UNIX_STUBS} ; do
+TEXLIVE_MODULE_BINSCRIPTS="${TEXLIVE_MODULE_BINSCRIPTS} texmf-dist/scripts/context/stubs/unix/$i"
+done
+
+# This small hack is needed in order to have a sane upgrade path:
+# the new TeX Live 2009 metapost produces this file but it is not recorded in
+# any package; when running fmtutil (like texmf-update does) this file will be
+# created and cause collisions.
+
+pkg_setup() {
+	if [ -f "${ROOT}/var/lib/texmf/web2c/metapost/metafun.log" ]; then
+		einfo "Removing ${ROOT}/var/lib/texmf/web2c/metapost/metafun.log"
+		rm -f "${ROOT}/var/lib/texmf/web2c/metapost/metafun.log"
+	fi
+}
+
+# These comes without +x bit set...
+src_prepare() {
+	chmod +x texmf-dist/scripts/context/ruby/ctxtools.rb \
+		texmf-dist/scripts/context/ruby/pstopdf.rb \
+		texmf-dist/scripts/context/ruby/rlxtools.rb
+	base_src_prepare
+}
+
+TL_MODULE_INFORMATION="For using ConTeXt mkII simply use 'texexec' to generate
+your documents.
+If you plan to use mkIV and its 'context' command to generate your documents,
+you have to run 'luatools --generate' as normal user before first use.
+
+More information and advanced options on:
+http://wiki.contextgarden.net/TeX_Live_2011"