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

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

4 files changed, 116 insertions, 5 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/Manifest b/dev-texlive/texlive-context/Manifest
index c75219c88cf7..e59b3751bb4a 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX luacnfspec.patch 1814 SHA256 6807199143c0c0339c5a22ee90e4da204540f85c37bd1567a3b3678f4e984e66 SHA512 ec2b303eee7e34d04a03a4c6502b342c3ae6f86a271ef941e6db019c64db0de1d88b5be677554763381c23a45489d832d8d95bd0ed123d86570934afbbced611 WHIRLPOOL 43505a9876a318d4f7086a3ec25c672373dabebd05dcabfa21b779befddcaeff4fe8db67a32778d4ba7bcbd9d6db246b250bdc935504d217e28012da4604eeed
 DIST texlive-module-collection-context-2011.tar.xz 528 SHA256 f1c9374e3382d3d8dd8c68c652784a017069a195f5b82304acd41c6523c41ad7 SHA512 d920719bf9056396ddf55d359bc857e5529efc90913fe1e01599fd007cb5909fafccd576199ddd8157f1f3e68d109e2794f1ada1b134856057f4b58da0429751 WHIRLPOOL b38e51eea838ad1f6ead11d5553dbd0f02221ccb2453ab85cad4d673b77e9cdc33335bdf13e1c1df70fdf0b9d22979e5180acf47b57076dbd3e7d638b3b56a0b
 DIST texlive-module-collection-context-2012.tar.xz 528 SHA256 f3534056aba869980047849baca4889129070eb6a620ed4b9bbbf4ebcdf5dc3f SHA512 ee0c478f080fab119953feef3de7aa6c292db8f378a39ac3201db0e9206772b4576e20b19d4d606312823132ff9248545cf1d73e3e58cfa2ed86be60f7eab63a WHIRLPOOL 9871714f2373201fdb4a582400b0d06479466472407d710fde3c0b7239cfdcc20fe09f83c5acfa953913df4af7420dceb8b954afb9acfe730fe20bf1672f3c08
 DIST texlive-module-context-2011.tar.xz 4379740 SHA256 550bb5fd19eca71db1e1b613f343c35f070e0ae2a81c5fffc75997c51772681f SHA512 6c331a64ed8244974fa9ae6241bbfb686981d299d019d0ae8267d5eeca2b2b55b78eace42a47467f984b24cdcfadd2d49969fa2e42b01cb9db61fae1acdbd6d2 WHIRLPOOL f309c22b191e561ff0f03a9a73c0f47547ad94f38a7c83b5a254a8bb60aa530bc73c96c0767bebb4fbc9538f853472070eaa357621874c731c1feedcb6a46223
@@ -111,13 +112,14 @@ DIST texlive-module-jmn-2012.tar.xz 40020 SHA256 a1618523f2db82c620eacccd528bae4
 DIST texlive-module-lmextra-2011.tar.xz 32928 SHA256 5e0b037139cd6f7e373af7e54b53abda3ef6e2fc814df48597ca0614da72dc31 SHA512 9a06433d9f629ce7b4e1a8b4de835eba236e556058350146ff30663d3e5a7b9f9e69d1288ec9016e7e18bbe77339480982b04f92e1ffd127cb1bf10a7bdd14d8 WHIRLPOOL 2f6b2b2f323b253c75210978a26174cc52a447faac636e075212eb3a915598456d8acc08fe268fc6c0b0862465e8cb4a3aa5fb05dde5b73553dfa8fdc9db61ff
 DIST texlive-module-lmextra-2012.tar.xz 32928 SHA256 5e0b037139cd6f7e373af7e54b53abda3ef6e2fc814df48597ca0614da72dc31 SHA512 9a06433d9f629ce7b4e1a8b4de835eba236e556058350146ff30663d3e5a7b9f9e69d1288ec9016e7e18bbe77339480982b04f92e1ffd127cb1bf10a7bdd14d8 WHIRLPOOL 2f6b2b2f323b253c75210978a26174cc52a447faac636e075212eb3a915598456d8acc08fe268fc6c0b0862465e8cb4a3aa5fb05dde5b73553dfa8fdc9db61ff
 EBUILD texlive-context-2011.ebuild 2908 SHA256 e5e9a714374db3da930a106ba5b69c7bad42fafb0602417189e8b1396b63f471 SHA512 d16a7452e8812727f565a7124d1e74c74adc5b8723b8109b46c0d0fcc8269350d0aa446297139b7da040bf487753fbd29103da0634969d8d1fa2a86cb87173d7 WHIRLPOOL 7ed00e58c463c3a4c7c25314c49cbfb3ca22bbe5bbe60452a09370dc1f037c5f9625782930968f645defb42a6bb3a1db18ef1f1411270132c004c469901ec684
+EBUILD texlive-context-2012-r1.ebuild 3312 SHA256 97bbc3173628bbce3035a60be78ce255522d8d3616251afb6f053afbdb3355f1 SHA512 c140765f13468c4ed3e6f5abbf409880a0409148497835218076f0d73bfa11d3768159d3e537e27ce9583ff585706be51b2fa81b8a5341f46ab6340e65111d93 WHIRLPOOL 24d7691112b5b9fc5512d8b16093402cd77dcb94e1395f53ae58ab88690090435c0ed7ed2c3746159ca21d91b4001a807fa86ed0242be61f1422b26cc6282007
 EBUILD texlive-context-2012.ebuild 3247 SHA256 207852febee0ecd2ccb2cd34f031a1776f1e6bf6f58f85d13c2e0685aaa01dcd SHA512 badb8b3a549da344e04beddd7467cdf097ac7755156fca14fee0c49808c467ef1a3bef4bbe1ddcd497e920027fdc63ff1fc91e6ce4338ea597589bd123e0dc39 WHIRLPOOL 2e1588cee3b12d249bef7b5eb00b554eec598a064940f643dcddda07c56ae63127300626a1982f41e497fefb7a3cee23329b1bb344dd0d62170b37bbdd20d493
-MISC ChangeLog 8079 SHA256 53e9f141c0297864360f8119b2e473777c7cf840b4276ef18670f726d88b38da SHA512 f24f1d2719d395ce8a9e75771900846f4a8d8f94c98c8d29d0e7fca0333f030ca55c28f50b7ccf3336b79bf6693e77346b6817ed3c74caa2f678e744ea6ef95f WHIRLPOOL 28562d3052e89ce9d71541c7510878ac58b44b45c7e8a5567066243a51712f3ae74eca85285a6295b4a141aeb1a1bb1aec4b06d311ba8cf89b7e469abe82b58d
+MISC ChangeLog 8342 SHA256 eb116528500b97869f0266295303b0efcbc21e79ecd394c67e8423962496511a SHA512 ba7309e3cfe7b215dcdbf8bdc50a57d0350247f6e9f709fce223fc3dd041f9bd0f874684dad30389345892fc65d79f528ec8659e39a7986cb6bc6672f213c1fe WHIRLPOOL c429ffc07e066d3597d7afb4ccc2368210125887e5801b5b44bdc5bb25d520fb4df99767272e71d470b2904dec4b994f99d2f18f1f38c657174c59189824731e
 MISC metadata.xml 405 SHA256 630e3f8dfc55066adf0204c02e0789f4601d0b6ff08df376c71c156320dde947 SHA512 a7c870fd189961dde82268ad7e1673a25fd3417ace5b39c1f0646f1d943190e363cbf90e339f03a7c2c4a9c45d9b0096c2cf46ec4d102b2fbe5ae545c2c18a91 WHIRLPOOL 08122f75298dc95d71a5db7e0f5b91c56f061e12bc1889ccaaa36c9c338193ebd2791c7cbf57c0afe05cda5606abe661680fdd0b3fa63147aa652e3e42f81414
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAR7wIACgkQvFcC4BYPU0rM/QCfTaXHLCbDAm+DrY0Xl0vhLlg/
-+UgAn1PUvRupViZ/kygaeZYM+tOzdcK0
-=P7cy
+iEYEAREIAAYFAlAX3zQACgkQvFcC4BYPU0o6VgCgk2ph4Myy9+1DeOle0GCh9TWj
+oy0AoLYBgaURqu4D5qmuVWFANeNXoYcv
+=r+vS
 -----END PGP SIGNATURE-----
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"