Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/aballier:master commit in: scripts/texlive/tlpsrc/
Date: Thu, 30 Jul 2015 15:52:10
Message-Id: 1438271517.2726f222411f7647064a2406fb47e5aaed4cf6f9.aballier@gentoo
1 commit: 2726f222411f7647064a2406fb47e5aaed4cf6f9
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 30 15:51:57 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 15:51:57 2015 +0000
6 URL: https://gitweb.gentoo.org/dev/aballier.git/commit/?id=2726f222
7
8 add support for -preinherit.ebuild and make luajittex optional in texlive-basic, bug #542620
9
10 scripts/texlive/tlpsrc/Makefile | 4 ++++
11 scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild | 1 +
12 scripts/texlive/tlpsrc/texlive-basic.extradeps | 2 +-
13 3 files changed, 6 insertions(+), 1 deletion(-)
14
15 diff --git a/scripts/texlive/tlpsrc/Makefile b/scripts/texlive/tlpsrc/Makefile
16 index 80b335a..1918297 100644
17 --- a/scripts/texlive/tlpsrc/Makefile
18 +++ b/scripts/texlive/tlpsrc/Makefile
19 @@ -110,6 +110,9 @@ clean:
20 %.extrardepend:
21 touch $@
22
23 +%-preinherit.ebuild:
24 + touch $@
25 +
26 %.ebuild: %.desc %.deps %.list %.doclist %.srclist %.gentoolicense %-post.ebuild %.extrardepend
27 cat $(PORTDIR)/header.txt > $@
28 printf "EAPI=\"5\"\n\n" >> $@
29 @@ -122,6 +125,7 @@ clean:
30 echo -n "TEXLIVE_MODULE_SRC_CONTENTS=\"" >> $@
31 cat $(@:%.ebuild=%.srclist) >> $@
32 echo "\"" >> $@
33 + cat $(@:%.ebuild=%-preinherit.ebuild) >> $@
34 echo "inherit $(EXTRA_INHERIT) texlive-module" >> $@
35 cat $< >> $@
36 echo "" >> $@
37
38 diff --git a/scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild b/scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild
39 new file mode 100644
40 index 0000000..b718b89
41 --- /dev/null
42 +++ b/scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild
43 @@ -0,0 +1 @@
44 +TEXLIVE_MODULE_OPTIONAL_ENGINE="luajittex"
45
46 diff --git a/scripts/texlive/tlpsrc/texlive-basic.extradeps b/scripts/texlive/tlpsrc/texlive-basic.extradeps
47 index c6dc694..0cb4e70 100644
48 --- a/scripts/texlive/tlpsrc/texlive-basic.extradeps
49 +++ b/scripts/texlive/tlpsrc/texlive-basic.extradeps
50 @@ -1,4 +1,4 @@
51 -!<app-text/texlive-core-2009
52 !<dev-texlive/texlive-latex-2009
53 !<dev-texlive/texlive-latexrecommended-2009
54 !dev-texlive/texlive-documentation-base
55 +>=app-text/texlive-core-2015[luajittex?]