texlive subpackages: conflict with texlive 2018

6 years ago · f03f6cce7e
38 changed files with 75 additions and 38 deletions
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=ftp://ftp.tug.org/texlive/historic/${TERMUX_PKG_VERSION:0:4}/t
 TERMUX_PKG_SHA256=c2ec974abc98b91995969e7871a0b56dbc80dd8508113ffcff6923e912c4c402
 TERMUX_PKG_DEPENDS="perl, texlive-bin (>= 20190410)"
 TERMUX_PKG_CONFLICTS="texlive (<< 20170524-5), texlive-bin (<< 20190410), texlive-tlmgr (<< 20190410)"
-TERMUX_PKG_REPLACES="texlive-bin (<< 20190101), texlive-tlmgr (<< 20190410)"
+TERMUX_PKG_REPLACES="texlive-bin (<< 20190410), texlive-tlmgr (<< 20190410)"
 TERMUX_PKG_RECOMMENDS="texlive-tlmgr"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 TERMUX_PKG_HAS_DEBUG=no
--- a/packages/texlive/texlive-bibtexextra.subpackage.sh
+++ b/packages/texlive/texlive-bibtexextra.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-bibtexextra"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py bibtexextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-binextra.subpackage.sh
+++ b/packages/texlive/texlive-binextra.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-binextra"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py binextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-context.subpackage.sh
+++ b/packages/texlive/texlive-context.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-context"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py context $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-fontsextra.subpackage.sh
+++ b/packages/texlive/texlive-fontsextra.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-fontsextra"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py fontsextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-fontsrecommended.subpackage.sh
+++ b/packages/texlive/texlive-fontsrecommended.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-fontsrecommended"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py fontsrecommended $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-fontutils.subpackage.sh
+++ b/packages/texlive/texlive-fontutils.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-fontutils"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py fontutils $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-formatsextra.subpackage.sh
+++ b/packages/texlive/texlive-formatsextra.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-formatsextra"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py formatsextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-games.subpackage.sh
+++ b/packages/texlive/texlive-games.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-games"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py games $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-humanities.subpackage.sh
+++ b/packages/texlive/texlive-humanities.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-humanities"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py humanities $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langarabic.subpackage.sh
+++ b/packages/texlive/texlive-langarabic.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langarabic"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langarabic $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langchinese.subpackage.sh
+++ b/packages/texlive/texlive-langchinese.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langchinese"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langchinese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langcjk.subpackage.sh
+++ b/packages/texlive/texlive-langcjk.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langcjk"
 TERMUX_SUBPKG_DEPENDS="texlive, 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langcjk $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langcyrillic.subpackage.sh
+++ b/packages/texlive/texlive-langcyrillic.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langcyrillic"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langcyrillic $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langczechslovak.subpackage.sh
+++ b/packages/texlive/texlive-langczechslovak.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langczechslovak"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langczechslovak $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langenglish.subpackage.sh
+++ b/packages/texlive/texlive-langenglish.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langenglish"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langenglish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langeuropean.subpackage.sh
+++ b/packages/texlive/texlive-langeuropean.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langeuropean"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langeuropean $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langfrench.subpackage.sh
+++ b/packages/texlive/texlive-langfrench.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langfrench"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langfrench $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langgerman.subpackage.sh
+++ b/packages/texlive/texlive-langgerman.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langgerman"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langgerman $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langgreek.subpackage.sh
+++ b/packages/texlive/texlive-langgreek.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langgreek"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langgreek $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langitalian.subpackage.sh
+++ b/packages/texlive/texlive-langitalian.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langitalian"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langitalian $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langjapanese.subpackage.sh
+++ b/packages/texlive/texlive-langjapanese.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langjapanese"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langjapanese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langkorean.subpackage.sh
+++ b/packages/texlive/texlive-langkorean.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langkorean"
 TERMUX_SUBPKG_DEPENDS="texlive, texlive-langjapanese, texlive-langcjk, 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langkorean $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langother.subpackage.sh
+++ b/packages/texlive/texlive-langother.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langother"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langother $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langpolish.subpackage.sh
+++ b/packages/texlive/texlive-langpolish.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langpolish"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langpolish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langportuguese.subpackage.sh
+++ b/packages/texlive/texlive-langportuguese.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langportuguese"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langportuguese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-langspanish.subpackage.sh
+++ b/packages/texlive/texlive-langspanish.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langspanish"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py langspanish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-latexextra.subpackage.sh
+++ b/packages/texlive/texlive-latexextra.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-latexextra"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py latexextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-latexrecommended.subpackage.sh
+++ b/packages/texlive/texlive-latexrecommended.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-latexrecommended"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py latexrecommended $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-luatex.subpackage.sh
+++ b/packages/texlive/texlive-luatex.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-luatex"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py luatex $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-mathscience.subpackage.sh
+++ b/packages/texlive/texlive-mathscience.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-mathscience"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py mathscience $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-metapost.subpackage.sh
+++ b/packages/texlive/texlive-metapost.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-metapost"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py metapost $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-music.subpackage.sh
+++ b/packages/texlive/texlive-music.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-music"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py music $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-pictures.subpackage.sh
+++ b/packages/texlive/texlive-pictures.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-pictures"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py pictures $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-plaingeneric.subpackage.sh
+++ b/packages/texlive/texlive-plaingeneric.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-plaingeneric"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py plaingeneric $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-pstricks.subpackage.sh
+++ b/packages/texlive/texlive-pstricks.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-pstricks"
 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)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py pstricks $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-publishers.subpackage.sh
+++ b/packages/texlive/texlive-publishers.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-publishers"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py publishers $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
--- a/packages/texlive/texlive-xetex.subpackage.sh
+++ b/packages/texlive/texlive-xetex.subpackage.sh
@ -1,3 +1,4 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-xetex"
 TERMUX_SUBPKG_DEPENDS="texlive"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py $(echo $SUB_PKG_NAME | awk -F"-" '{print $2}') $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_SCRIPTDIR/packages/texlive/parse_tlpdb.py xetex $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"