make luajittex optional, bug #542620

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 18 insertions, 20 deletions

diff --git a/dev-texlive/texlive-basic/ChangeLog b/dev-texlive/texlive-basic/ChangeLog
index 7614f98b26f1..4157793737b0 100644
--- a/dev-texlive/texlive-basic/ChangeLog
+++ b/dev-texlive/texlive-basic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-texlive/texlive-basic
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-basic/ChangeLog,v 1.86 2015/07/22 19:37:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-basic/ChangeLog,v 1.87 2015/07/30 15:52:35 aballier Exp $
+
+  30 Jul 2015; Alexis Ballier <aballier@gentoo.org> texlive-basic-2015.ebuild,
+  metadata.xml:
+  make luajittex optional, bug #542620
 
   22 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
   texlive-basic-2014.ebuild:
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index 1029ab6db877..dfa7e6768ceb 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -215,23 +215,13 @@ DIST texlive-module-texlive-scripts.doc-2015.tar.xz 23248 SHA256 a19a4ea140cd888
 EBUILD texlive-basic-2012.ebuild 1614 SHA256 a077bf11885e1487c9f713ca6dcb732c150b852b783c0c15004bc2417a27eaa8 SHA512 c72fdd5b0d3a48714601a4a17f1897f08e8995fc1091b40429bf58b0eb9c258f42dcb18e31dfa42e71c8293c32c0ee36c6efa54d5a92f8761e012bfe03a4fd60 WHIRLPOOL e578484b8044b56b589ee44d287954244a813623593c8eb900aea70c649194e9be105e477abbf8fcca39bf1a55557f4cfecf428c111b7535fd76127dc36e7657
 EBUILD texlive-basic-2013.ebuild 1830 SHA256 748cd35b11830df9a89b3e5aa2319dca3bcf95825b1efc90ab4719525f8304f8 SHA512 fcdfa0ef04966cb7b6dfce4de7d5424862a43dbb89f0be314917152b3d8c353163069e2b268c519bffe6604928fa0ecb1a867d7cf076cad3c3d1bf36855d5de2 WHIRLPOOL 046217e064149592f82989560c0f3ef5cad87425fd230495d77ca6cd7aeefbc61a7893e6573cadb8766a58550389af7d8f1aba912739f1d5f969872924db9de9
 EBUILD texlive-basic-2014.ebuild 1799 SHA256 5a011c32a77104afa9fd806acdef0bcaff631cd6314c6c0b5dd62f69d00fab70 SHA512 73e188247d796b4b00c3018ea851683aa67235e2730cc8693c248ac7bb6e9b23fe2f5b313ca72b8c42d665e87e7ddb4d6c53d1d829168524abdcccb3138dd663 WHIRLPOOL 45a2c97520dca9a6dc5969ad12dac644ae1ee74a25a81040fa735b60d31f7882c9f3567cd27c9da9a5bbb1bcb0bc9910c4e7fb878ce139e9a45b13ab6fcec1f0
-EBUILD texlive-basic-2015.ebuild 1802 SHA256 e5d10902cfdab210c8f39762907030b6b4a1714873aeea5bce0abe63bba70431 SHA512 18ea4ceb748fd13e784a46617b3b8cfb63ae76f2e2d5111794e52c858f630ec9e257d29d24d05e985f3fb31e060acb001a88a9333c4520f6bedf4c9cd5ed5f2d WHIRLPOOL 1b66cdf518841113cf8e123243377b8cdcde0bf11f3aa58eed3b21acdb51128dd887fe6480dc6343c516d9fb2f7e6bd434ab1e92d0141836ecb95e94ffd1449c
-MISC ChangeLog 10901 SHA256 a0d88b9edce24899e1efde50ee82d0b579fabdb96458876372df9d83d681465d SHA512 eec9fdde571e7d879f9a3778ab024b93d45885e55f05bf3f57fe1c2f6d80454a275b1a6a752cae69f28186f8d0c5fe37af8da9dc1410f4b19e08c1f6d9d9b963 WHIRLPOOL a79bf8d89c676f48dca305eb4f8700ca3ad20f908e2658f556efe6cbdecd9e69b15618ffec2d85d05466a37f44ad2df76c127b85032de4f9039916b020813dba
-MISC metadata.xml 452 SHA256 53093d20e9a4327f9e7c848282a64a97e147e36fff0f6a5ff7637586eaacf3af SHA512 0f8ce30b53169a10d1f048e4b6d8549be7b021534c2b0706f22aec5df99aaf58a84172223798ef2bdc5759fd9593b68b716f1d5c64eaa4a74886a46b83cdd125 WHIRLPOOL 1a4bf6cf686e405573615073cafd82b49382a54874580ba98699a4410b4038c76475a978744dd67cde2495f5fc0ec469bd5d5dd3ce436fe69ade75a6bb6a4bfc
+EBUILD texlive-basic-2015.ebuild 1857 SHA256 3c8bcf2f697755bf4c3dd3b4b86ce5af63575f5ddc1706153970b34d76efd17f SHA512 2b782c711bd3e3f6abd78d99ebb342bb81b08d8bb93fa9b8a57913128b6567595e7cc9e8080b84f2eaa6205fe19e871d0fdd5548ac2037016fba7ad0f69aa7d5 WHIRLPOOL c6b5c4d7d4b860a16a711544ffc4759eeba1eedf12a4f32fbbbe89968396f642f267ddccdddd45d1278b330b6debb516d59b5b9249a747ff5a527aae3f4441c5
+MISC ChangeLog 11036 SHA256 dae00fd269c00acaac21de83f7c5989b112072c99feef993ba803f0cb309a09c SHA512 fcc81064e3e22c6ecff97296afccfc012b9d494d64106a52efc5fe1a1769e76c860b78c4c3dbc46933d48e6ca05b474167daede042ebdcaaaa7ad3c68557d23c WHIRLPOOL d4f1f7a5868d356575646b8a9a3a61389628598494db2c912e0056081f55b20bee73bdb2fef23d3d25645f1640465d1ec6fa33f6aa9ce1555068b0bc42798c5e
+MISC metadata.xml 575 SHA256 59052464a8a573839d0c417c42de1f64b8aa81fe7aebaa1f6c412ce920df9997 SHA512 db6ed7aeb08be48da549a56d29cdfd6ad927e0895b80354cec114fd46b7ded657b640f2216d331ad1b21c4efd2805b8156134221f44834875f03d16283ff3cce WHIRLPOOL 1ea8a1ea4951c69516a06a56351e736b2b391a5b65e612d637bb161231f153324faf6ed20665efdd97065f0c94c8f4342935662937fa9cf02d5e74005cd24ab4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVr/G3AAoJEJOE+m71LUu6d24QAJhOFOwv8Zjm+POEDmzxWzoT
-iyRPpZ2vQpvuzLVUYzUVNCr1rBlrDsj6b9dYVo1G3HB8GrWb1e+njAVb46xA8FkD
-9HmkJJcCvnlS6flK06e1QIQIM6zoOwwqu5gFX/7qmlbqUc1paI5uA7fhA+NqYrdF
-4wUiG9PLttfIUQE/nTSEzzfJ2+C6/cMS3O60jdDBfUFcVkcvydkn++t1pxBpbGmw
-oLGYExSnP/OgN4fxI/T+CjwWgsA2VGgey8iE5soqpwrBc17SJW1l2WaMFLk6oRBi
-PH26bGruXtyDplFnCkNsSbgI+bfZHKLk1f1fFlHzBjk23qU2KutV8GBJeTUhFsZ8
-CbCzbWzH4JMzyLmyFh83e5Du6F/CygXg7iOyX0/rs2OGjAC/NiG4OQa4XSyzowaU
-4S11lv9jaqKO+we8mdmCNqAJvjSi8obW7ssE/4hd/Is0xklETaDvLZ9aODPKYsvn
-f0bY66OXwlnhw4fs3Tld4db53AzUPgMmJ1X+C0pWL6duSF1gq/2eheDXJXI3eBVm
-xqjW/DrSE2weHT25EZlIET/WEoH8Ogzk8ASoYUoqLYtMX4teshss/LORWgmesfBl
-aehzDNGYA0P4XSsYTgg7ri8F+v7n1Y3tzziUXQ8OMV3Kiaw4Gb2Y15CEEoAPq0Jc
-tBjSt8HLQzXn3Pe5ijf/
-=Fm0Z
+iEYEAREIAAYFAlW6SEQACgkQvFcC4BYPU0qYiACggBdpDGx7x6hy4tLlZwdnw9nL
+Zq8An1bO6PITVoVbsrRg3HF907Gb9ekj
+=6MX0
 -----END PGP SIGNATURE-----
diff --git a/dev-texlive/texlive-basic/metadata.xml b/dev-texlive/texlive-basic/metadata.xml
index 0b0cd25ac038..863890adc8ec 100644
--- a/dev-texlive/texlive-basic/metadata.xml
+++ b/dev-texlive/texlive-basic/metadata.xml
@@ -11,4 +11,7 @@ These files are regarded as basic for any TeX system, covering
 plain TeX macros, Computer Modern fonts, and configuration for
 common drivers; no LaTeX.
 </longdescription>
+  <use>
+	<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-basic/texlive-basic-2015.ebuild b/dev-texlive/texlive-basic/texlive-basic-2015.ebuild
index 8c8451fa463a..25559830f462 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2015.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2015.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-basic/texlive-basic-2015.ebuild,v 1.1 2015/07/16 09:12:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-basic/texlive-basic-2015.ebuild,v 1.2 2015/07/30 15:52:35 aballier Exp $
 
 EAPI="5"
 
@@ -8,6 +8,7 @@ TEXLIVE_MODULE_CONTENTS="amsfonts bibtex cm dvipdfmx-def enctex etex etex-pkg hy
 "
 TEXLIVE_MODULE_DOC_CONTENTS="amsfonts.doc bibtex.doc cm.doc enctex.doc etex.doc etex-pkg.doc hyph-utf8.doc ifluatex.doc ifxetex.doc lua-alt-getopt.doc luatex.doc makeindex.doc metafont.doc mflogo.doc mfware.doc pdftex.doc tex.doc texlive-common.doc texlive-docindex.doc texlive-en.doc texlive-scripts.doc "
 TEXLIVE_MODULE_SRC_CONTENTS="amsfonts.source hyph-utf8.source ifluatex.source ifxetex.source mflogo.source "
+TEXLIVE_MODULE_OPTIONAL_ENGINE="luajittex"
 inherit  texlive-module
 DESCRIPTION="TeXLive Essential programs and files"
 
@@ -15,10 +16,10 @@ LICENSE=" GPL-1 GPL-2 LPPL-1.3 OFL TeX TeX-other-free "
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
-DEPEND="!<app-text/texlive-core-2009
-!<dev-texlive/texlive-latex-2009
+DEPEND="!<dev-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
 !dev-texlive/texlive-documentation-base
+>=app-text/texlive-core-2015[luajittex?]
 "
 RDEPEND="${DEPEND} "
 PATCHES=( "${FILESDIR}/texmfcnflua2015.patch" )