From ed69e2bec5e3e09a7bbab7fc0e49f6b133ff8316 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sat, 17 Nov 2018 14:07:34 +0100
Subject: [PATCH] texlive-full: add dependency for subpackages

---
 packages/texlive/build.sh                     |  4 ++-
 packages/texlive/parse_tlpdb.py               | 15 ++++++++--
 .../texlive/texlive-bibtexextra.subpackage.sh |  2 +-
 .../texlive/texlive-context.subpackage.sh     |  2 +-
 .../texlive/texlive-fontsextra.subpackage.sh  |  2 +-
 .../texlive-formatsextra.subpackage.sh        |  2 +-
 packages/texlive/texlive-full.subpackage.sh   |  4 +--
 .../texlive/texlive-humanities.subpackage.sh  |  2 +-
 .../texlive/texlive-langchinese.subpackage.sh |  2 +-
 .../texlive/texlive-langcjk.subpackage.sh     |  2 +-
 .../texlive-langcyrillic.subpackage.sh        |  2 +-
 .../texlive-langczechslovak.subpackage.sh     |  2 +-
 .../texlive-langjapanese.subpackage.sh        |  2 +-
 .../texlive/texlive-langkorean.subpackage.sh  |  2 +-
 .../texlive/texlive-latexextra.subpackage.sh  |  2 +-
 .../texlive-latexrecommended.subpackage.sh    |  2 +-
 .../texlive/texlive-mathscience.subpackage.sh |  2 +-
 .../texlive/texlive-pictures.subpackage.sh    |  2 +-
 .../texlive/texlive-pstricks.subpackage.sh    |  2 +-
 packages/texlive/web2c-texmf.cnf              | 30 +++++++++++++++++++
 20 files changed, 64 insertions(+), 21 deletions(-)
 create mode 100644 packages/texlive/web2c-texmf.cnf

diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index 727af535d..4aeb57be7 100644
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_VERSION=${_MAJOR_VERSION}
 TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=ftp://ftp.tug.org/texlive/historic/${TERMUX_PKG_VERSION:0:4}/texlive-$_MAJOR_VERSION-texmf.tar.xz
 TERMUX_PKG_SHA256=bae2fa05ea1858b489f8138bea855c6d65829cf595c1fb219c5d65f4fe8b1fad
-TERMUX_PKG_DEPENDS="perl, texlive-bin (>= 20180414)"
+TERMUX_PKG_DEPENDS="perl, texlive-bin (>= 20180414-6)"
 TERMUX_PKG_CONFLICTS="texlive (<< 20170524-5), texlive-bin (<< 20180414)"
 TERMUX_PKG_RECOMMENDS="texlive-tlmgr"
 TERMUX_PKG_FOLDERNAME="texlive-$_MAJOR_VERSION-texmf"
@@ -34,6 +34,8 @@ termux_step_make() {
 	sed -i "s% RELOC/% texmf-dist/%g" $TERMUX_PKG_TMPDIR/texlive.tlpdb
 	cp -r $TERMUX_PKG_BUILDDIR/* $TL_ROOT/
 	perl -I$TL_ROOT/tlpkg/ $TL_ROOT/texmf-dist/scripts/texlive/mktexlsr.pl $TL_ROOT/texmf-dist
+	mkdir $TL_ROOT/tlpkg
+	cp $TERMUX_PKG_TMPDIR/texlive.tlpdb $TL_ROOT/tlpkg/
 }
 
 termux_step_create_debscripts() {
diff --git a/packages/texlive/parse_tlpdb.py b/packages/texlive/parse_tlpdb.py
index 2ddc01ec3..6c28297cc 100755
--- a/packages/texlive/parse_tlpdb.py
+++ b/packages/texlive/parse_tlpdb.py
@@ -109,5 +109,16 @@ def get_conflicting_pkgs(package):
         return ["latex"]
     else:
         raise ValueError(sys.argv[1]+" isn't a known package name")
-print("\n".join(["share/texlive/"+line for line in
-                 list( set(Files([sys.argv[1]])) - set(Files(get_conflicting_pkgs(sys.argv[1]))) )]))
+
+if len(sys.argv) > 2 and sys.argv[-1] == "print_names":
+    """Generate dependencies to put into TERMUX_SUBPKG_DEPENDS"""
+    # Strip latex and basic since those collections are part of termux package "texlive"
+    dependencies = ["texlive-"+pkg for pkg in get_conflicting_pkgs(sys.argv[1]) if not pkg in ["latex", "basic"]];
+    if len(dependencies) > 0:
+        print("texlive, "+", ".join(dependencies))
+    else:
+        print("texlive")
+else:
+    """Print files which should be included in the subpackage"""
+    print("\n".join(["share/texlive/"+line for line in
+                     list( set(Files([sys.argv[1]])) - set(Files(get_conflicting_pkgs(sys.argv[1]))) )]))
diff --git a/packages/texlive/texlive-bibtexextra.subpackage.sh b/packages/texlive/texlive-bibtexextra.subpackage.sh
index f4359058d..bcf309d2f 100644
--- a/packages/texlive/texlive-bibtexextra.subpackage.sh
+++ b/packages/texlive/texlive-bibtexextra.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-bibtexextra"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-binextra"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-context.subpackage.sh b/packages/texlive/texlive-context.subpackage.sh
index 3415cbc29..ebde4ac29 100644
--- a/packages/texlive/texlive-context.subpackage.sh
+++ b/packages/texlive/texlive-context.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-context"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-mathscience, texlive-fontsrecommended, texlive-metapost, texlive-xetex"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-fontsextra.subpackage.sh b/packages/texlive/texlive-fontsextra.subpackage.sh
index bf35eb154..04d6e5e18 100644
--- a/packages/texlive/texlive-fontsextra.subpackage.sh
+++ b/packages/texlive/texlive-fontsextra.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-fontsextra"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-plaingeneric"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-formatsextra.subpackage.sh b/packages/texlive/texlive-formatsextra.subpackage.sh
index 33a685f06..1eefb12d4 100644
--- a/packages/texlive/texlive-formatsextra.subpackage.sh
+++ b/packages/texlive/texlive-formatsextra.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-formatsextra"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-langcyrillic, texlive-mathscience, texlive-fontsrecommended, texlive-plaingeneric"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-full.subpackage.sh b/packages/texlive/texlive-full.subpackage.sh
index 90dd4c725..f23e0fa67 100644
--- a/packages/texlive/texlive-full.subpackage.sh
+++ b/packages/texlive/texlive-full.subpackage.sh
@@ -1,4 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive-full, meta package that depends on all texlive-collections"
-TERMUX_SUBPKG_DEPENDS="texlive, texlive-bibtexextra, texlive-binextra, texlive-context, texlive-fontsextra, texlive-fontsrecommended, texlive-fontutils, texlive-formatsextra, texlive-games, texlive-humanities, texlive-langarabic, texlive-langchinese, texlive-langcjk, texlive-langcyrillic, texlive-langczechslovak, texlive-langenglish, texlive-langeuropean, texlive-langfrench, texlive-langgerman, texlive-langgreek, texlive-langitalian, texlive-langjapanese, texlive-langkorean, texlive-langother, texlive-langpolish, texlive-langportuguese, texlive-langspanish, texlive-latexextra, texlive-latexrecommended, texlive-luatex, texlive-mathscience, texlive-metapost, texlive-music, texlive-pictures, texlive-plaingeneric, texlive-pstricks, texlive-publishers, texlive-xetex"
+TERMUX_SUBPKG_DEPENDS="texlive-binextra, texlive-context, texlive-fontsextra, texlive-fontsrecommended, texlive-fontutils, texlive-formatsextra, texlive-games, texlive-humanities, texlive-langarabic, texlive-langchinese, texlive-langcjk, texlive-langcyrillic, texlive-langczechslovak, texlive-langenglish, texlive-langeuropean, texlive-langfrench, texlive-langgerman, texlive-langgreek, texlive-langitalian, texlive-langjapanese, texlive-langkorean, texlive-langother, texlive-langpolish, texlive-langportuguese, texlive-langspanish, texlive-latexextra, texlive-latexrecommended, texlive-luatex, texlive-mathscience, texlive-metapost, texlive-music, texlive-pictures, texlive-plaingeneric, texlive-pstricks, texlive-publishers, texlive-xetex"
 TERMUX_SUBPKG_CONFLICTS="texlive-tlmgr"
-
+TERMUX_SUBPKG_INCLUDE="share/texlive/tlpkg/texlive.tlpdb"
diff --git a/packages/texlive/texlive-humanities.subpackage.sh b/packages/texlive/texlive-humanities.subpackage.sh
index 4142a3661..16b7489da 100644
--- a/packages/texlive/texlive-humanities.subpackage.sh
+++ b/packages/texlive/texlive-humanities.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-humanities"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-latexextra"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-langchinese.subpackage.sh b/packages/texlive/texlive-langchinese.subpackage.sh
index 6e0194768..452d0a983 100644
--- a/packages/texlive/texlive-langchinese.subpackage.sh
+++ b/packages/texlive/texlive-langchinese.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langchinese"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-langcjk, texlive-fontutils"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-langcjk.subpackage.sh b/packages/texlive/texlive-langcjk.subpackage.sh
index 4f618b2f5..e5a65a45b 100644
--- a/packages/texlive/texlive-langcjk.subpackage.sh
+++ b/packages/texlive/texlive-langcjk.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langcjk"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-langkorean, texlive-langother"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-langcyrillic.subpackage.sh b/packages/texlive/texlive-langcyrillic.subpackage.sh
index 674c72bc8..2d0826672 100644
--- a/packages/texlive/texlive-langcyrillic.subpackage.sh
+++ b/packages/texlive/texlive-langcyrillic.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langcyrillic"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-fontsextra, texlive-fontsrecommended, texlive-langgreek, texlive-latexrecommended"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-langczechslovak.subpackage.sh b/packages/texlive/texlive-langczechslovak.subpackage.sh
index 18f9eea2e..58eab24b2 100644
--- a/packages/texlive/texlive-langczechslovak.subpackage.sh
+++ b/packages/texlive/texlive-langczechslovak.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langczechslovak"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-fontsextra, texlive-luatex"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-langjapanese.subpackage.sh b/packages/texlive/texlive-langjapanese.subpackage.sh
index c2fedb16e..40cb812b1 100644
--- a/packages/texlive/texlive-langjapanese.subpackage.sh
+++ b/packages/texlive/texlive-langjapanese.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langjapanese"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-langcjk, texlive-langchinese"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-langkorean.subpackage.sh b/packages/texlive/texlive-langkorean.subpackage.sh
index 678ca0139..4261ed2bc 100644
--- a/packages/texlive/texlive-langkorean.subpackage.sh
+++ b/packages/texlive/texlive-langkorean.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langkorean"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-langjapanese, texlive-latexrecommended"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-latexextra.subpackage.sh b/packages/texlive/texlive-latexextra.subpackage.sh
index 5264e6d62..8c87961b1 100644
--- a/packages/texlive/texlive-latexextra.subpackage.sh
+++ b/packages/texlive/texlive-latexextra.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-latexextra"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-fontsextra"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-latexrecommended.subpackage.sh b/packages/texlive/texlive-latexrecommended.subpackage.sh
index dec3f48b2..c2f295bbc 100644
--- a/packages/texlive/texlive-latexrecommended.subpackage.sh
+++ b/packages/texlive/texlive-latexrecommended.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-latexrecommended"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-fontsrecommended, texlive-latexextra, texlive-pictures, texlive-plaingeneric"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-mathscience.subpackage.sh b/packages/texlive/texlive-mathscience.subpackage.sh
index 6d8b2ddca..c626dfa31 100644
--- a/packages/texlive/texlive-mathscience.subpackage.sh
+++ b/packages/texlive/texlive-mathscience.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-mathscience"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-langgreek"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-pictures.subpackage.sh b/packages/texlive/texlive-pictures.subpackage.sh
index 3c2c444a6..2405bce37 100644
--- a/packages/texlive/texlive-pictures.subpackage.sh
+++ b/packages/texlive/texlive-pictures.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-pictures"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-latexextra"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/texlive-pstricks.subpackage.sh b/packages/texlive/texlive-pstricks.subpackage.sh
index 72d585e7a..946620e7a 100644
--- a/packages/texlive/texlive-pstricks.subpackage.sh
+++ b/packages/texlive/texlive-pstricks.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-pstricks"
-TERMUX_SUBPKG_DEPENDS="texlive"
+TERMUX_SUBPKG_DEPENDS="texlive, texlive-plaingeneric"
 TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
diff --git a/packages/texlive/web2c-texmf.cnf b/packages/texlive/web2c-texmf.cnf
new file mode 100644
index 000000000..36cde20a7
--- /dev/null
+++ b/packages/texlive/web2c-texmf.cnf
@@ -0,0 +1,30 @@
+--- ../texmf.cnf.orig	2018-04-30 17:07:05.796733785 +0000
++++ ./texk/kpathsea/texmf.cnf	2018-04-30 17:36:18.883441637 +0000
+@@ -58,7 +58,7 @@
+ % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
+ % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
+ % Sorry for the off-by-one-generation names.
+-TEXMFROOT = $SELFAUTOPARENT
++TEXMFROOT = $SELFAUTODIR/share/texlive
+ 
+ % The main tree of distributed packages and programs:
+ TEXMFDIST = $TEXMFROOT/texmf-dist
+@@ -68,7 +68,7 @@
+ TEXMFMAIN = $TEXMFDIST
+ 
+ % Local additions to the distribution trees.
+-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
++TEXMFLOCAL = $TEXMFROOT/texmf-local
+ 
+ % TEXMFSYSVAR, where *-sys store cached runtime data.
+ TEXMFSYSVAR = $TEXMFROOT/texmf-var
+@@ -524,6 +524,9 @@
+ $SELFAUTODIR/share/texmf-local/web2c,\
+ $SELFAUTODIR/share/texmf-dist/web2c,\
+ $SELFAUTODIR/share/texmf/web2c,\
++$SELFAUTODIR/share/texlive/texmf-local/web2c,\
++$SELFAUTODIR/share/texlive/texmf-dist/web2c,\
++$SELFAUTODIR/share/texlive/texmf/web2c,\
+ $SELFAUTODIR/texmf-local/web2c,\
+ $SELFAUTODIR/texmf-dist/web2c,\
+ $SELFAUTODIR/texmf/web2c,\