From 8dc09d6e2bbcc53d764114bf81cc70e8a9ce1ed4 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 30 Apr 2019 21:08:38 +0200 Subject: [PATCH] texlive subpackages: conflict with texlive 2018 --- packages/texlive/build.sh | 2 +- packages/texlive/texlive-bibtexextra.subpackage.sh | 3 ++- packages/texlive/texlive-binextra.subpackage.sh | 3 ++- packages/texlive/texlive-context.subpackage.sh | 3 ++- packages/texlive/texlive-fontsextra.subpackage.sh | 3 ++- packages/texlive/texlive-fontsrecommended.subpackage.sh | 3 ++- packages/texlive/texlive-fontutils.subpackage.sh | 3 ++- packages/texlive/texlive-formatsextra.subpackage.sh | 3 ++- packages/texlive/texlive-games.subpackage.sh | 3 ++- packages/texlive/texlive-humanities.subpackage.sh | 3 ++- packages/texlive/texlive-langarabic.subpackage.sh | 3 ++- packages/texlive/texlive-langchinese.subpackage.sh | 3 ++- packages/texlive/texlive-langcjk.subpackage.sh | 3 ++- packages/texlive/texlive-langcyrillic.subpackage.sh | 3 ++- packages/texlive/texlive-langczechslovak.subpackage.sh | 3 ++- packages/texlive/texlive-langenglish.subpackage.sh | 3 ++- packages/texlive/texlive-langeuropean.subpackage.sh | 3 ++- packages/texlive/texlive-langfrench.subpackage.sh | 3 ++- packages/texlive/texlive-langgerman.subpackage.sh | 3 ++- packages/texlive/texlive-langgreek.subpackage.sh | 3 ++- packages/texlive/texlive-langitalian.subpackage.sh | 3 ++- packages/texlive/texlive-langjapanese.subpackage.sh | 3 ++- packages/texlive/texlive-langkorean.subpackage.sh | 3 ++- packages/texlive/texlive-langother.subpackage.sh | 3 ++- packages/texlive/texlive-langpolish.subpackage.sh | 3 ++- packages/texlive/texlive-langportuguese.subpackage.sh | 3 ++- packages/texlive/texlive-langspanish.subpackage.sh | 3 ++- packages/texlive/texlive-latexextra.subpackage.sh | 3 ++- packages/texlive/texlive-latexrecommended.subpackage.sh | 3 ++- packages/texlive/texlive-luatex.subpackage.sh | 3 ++- packages/texlive/texlive-mathscience.subpackage.sh | 3 ++- packages/texlive/texlive-metapost.subpackage.sh | 3 ++- packages/texlive/texlive-music.subpackage.sh | 3 ++- packages/texlive/texlive-pictures.subpackage.sh | 3 ++- packages/texlive/texlive-plaingeneric.subpackage.sh | 3 ++- packages/texlive/texlive-pstricks.subpackage.sh | 3 ++- packages/texlive/texlive-publishers.subpackage.sh | 3 ++- packages/texlive/texlive-xetex.subpackage.sh | 3 ++- 38 files changed, 75 insertions(+), 38 deletions(-) diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh index ad1fa71d8..0c91eea4f 100644 --- 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 diff --git a/packages/texlive/texlive-bibtexextra.subpackage.sh b/packages/texlive/texlive-bibtexextra.subpackage.sh index bcf309d2f..43ec7d2b8 100644 --- 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)" diff --git a/packages/texlive/texlive-binextra.subpackage.sh b/packages/texlive/texlive-binextra.subpackage.sh index 30f38fccc..f1f6316db 100644 --- 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)" diff --git a/packages/texlive/texlive-context.subpackage.sh b/packages/texlive/texlive-context.subpackage.sh index ebde4ac29..9336eb023 100644 --- 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)" diff --git a/packages/texlive/texlive-fontsextra.subpackage.sh b/packages/texlive/texlive-fontsextra.subpackage.sh index 04d6e5e18..c4f88a197 100644 --- 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)" diff --git a/packages/texlive/texlive-fontsrecommended.subpackage.sh b/packages/texlive/texlive-fontsrecommended.subpackage.sh index 297041c5a..7eeb9c92f 100644 --- 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)" diff --git a/packages/texlive/texlive-fontutils.subpackage.sh b/packages/texlive/texlive-fontutils.subpackage.sh index 552dc21df..dac4fd0ef 100644 --- 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)" diff --git a/packages/texlive/texlive-formatsextra.subpackage.sh b/packages/texlive/texlive-formatsextra.subpackage.sh index 1eefb12d4..5fa84ed7d 100644 --- 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)" diff --git a/packages/texlive/texlive-games.subpackage.sh b/packages/texlive/texlive-games.subpackage.sh index ba3ed7921..ea310730e 100644 --- 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)" diff --git a/packages/texlive/texlive-humanities.subpackage.sh b/packages/texlive/texlive-humanities.subpackage.sh index 16b7489da..26cd24399 100644 --- 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)" diff --git a/packages/texlive/texlive-langarabic.subpackage.sh b/packages/texlive/texlive-langarabic.subpackage.sh index 8475e1f27..6072a5703 100644 --- 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)" diff --git a/packages/texlive/texlive-langchinese.subpackage.sh b/packages/texlive/texlive-langchinese.subpackage.sh index 452d0a983..333f03d46 100644 --- 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)" diff --git a/packages/texlive/texlive-langcjk.subpackage.sh b/packages/texlive/texlive-langcjk.subpackage.sh index 3181b6da0..f79c79ac2 100644 --- 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)" diff --git a/packages/texlive/texlive-langcyrillic.subpackage.sh b/packages/texlive/texlive-langcyrillic.subpackage.sh index 2d0826672..6eb511806 100644 --- 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)" diff --git a/packages/texlive/texlive-langczechslovak.subpackage.sh b/packages/texlive/texlive-langczechslovak.subpackage.sh index 58eab24b2..c382f5431 100644 --- 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)" diff --git a/packages/texlive/texlive-langenglish.subpackage.sh b/packages/texlive/texlive-langenglish.subpackage.sh index 1db95b684..d264ea723 100644 --- 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)" diff --git a/packages/texlive/texlive-langeuropean.subpackage.sh b/packages/texlive/texlive-langeuropean.subpackage.sh index bfb62ec4b..7886c8364 100644 --- 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)" diff --git a/packages/texlive/texlive-langfrench.subpackage.sh b/packages/texlive/texlive-langfrench.subpackage.sh index dd28e0111..3bb460133 100644 --- 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)" diff --git a/packages/texlive/texlive-langgerman.subpackage.sh b/packages/texlive/texlive-langgerman.subpackage.sh index d8bf1686d..b862b4192 100644 --- 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)" diff --git a/packages/texlive/texlive-langgreek.subpackage.sh b/packages/texlive/texlive-langgreek.subpackage.sh index ba35335a4..3056a7232 100644 --- 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)" diff --git a/packages/texlive/texlive-langitalian.subpackage.sh b/packages/texlive/texlive-langitalian.subpackage.sh index 64056eb46..9fe382cc3 100644 --- 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)" diff --git a/packages/texlive/texlive-langjapanese.subpackage.sh b/packages/texlive/texlive-langjapanese.subpackage.sh index 40cb812b1..a2cab7c0b 100644 --- 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)" diff --git a/packages/texlive/texlive-langkorean.subpackage.sh b/packages/texlive/texlive-langkorean.subpackage.sh index b1208baa0..4b329c003 100644 --- 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)" diff --git a/packages/texlive/texlive-langother.subpackage.sh b/packages/texlive/texlive-langother.subpackage.sh index e681fb79c..cf5ab1490 100644 --- 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)" diff --git a/packages/texlive/texlive-langpolish.subpackage.sh b/packages/texlive/texlive-langpolish.subpackage.sh index 151e9c64c..9bdbf9e71 100644 --- 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)" diff --git a/packages/texlive/texlive-langportuguese.subpackage.sh b/packages/texlive/texlive-langportuguese.subpackage.sh index bd84335d2..e0129afa6 100644 --- 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)" diff --git a/packages/texlive/texlive-langspanish.subpackage.sh b/packages/texlive/texlive-langspanish.subpackage.sh index f5346d195..71640c936 100644 --- 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)" diff --git a/packages/texlive/texlive-latexextra.subpackage.sh b/packages/texlive/texlive-latexextra.subpackage.sh index 8c87961b1..c694dd567 100644 --- 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)" diff --git a/packages/texlive/texlive-latexrecommended.subpackage.sh b/packages/texlive/texlive-latexrecommended.subpackage.sh index c2f295bbc..596c25085 100644 --- 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)" diff --git a/packages/texlive/texlive-luatex.subpackage.sh b/packages/texlive/texlive-luatex.subpackage.sh index 2ad45265e..8e142120a 100644 --- 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)" diff --git a/packages/texlive/texlive-mathscience.subpackage.sh b/packages/texlive/texlive-mathscience.subpackage.sh index c626dfa31..921f992ba 100644 --- 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)" diff --git a/packages/texlive/texlive-metapost.subpackage.sh b/packages/texlive/texlive-metapost.subpackage.sh index ca73146e1..b677545d7 100644 --- 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)" diff --git a/packages/texlive/texlive-music.subpackage.sh b/packages/texlive/texlive-music.subpackage.sh index 48d74a89a..0520bbb9f 100644 --- 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)" diff --git a/packages/texlive/texlive-pictures.subpackage.sh b/packages/texlive/texlive-pictures.subpackage.sh index 2405bce37..2866621e2 100644 --- 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)" diff --git a/packages/texlive/texlive-plaingeneric.subpackage.sh b/packages/texlive/texlive-plaingeneric.subpackage.sh index 3554e0331..70ba172f2 100644 --- 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)" diff --git a/packages/texlive/texlive-pstricks.subpackage.sh b/packages/texlive/texlive-pstricks.subpackage.sh index 946620e7a..e80ec62dd 100644 --- 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)" diff --git a/packages/texlive/texlive-publishers.subpackage.sh b/packages/texlive/texlive-publishers.subpackage.sh index a8ccf381c..28a6d6d39 100644 --- 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)" diff --git a/packages/texlive/texlive-xetex.subpackage.sh b/packages/texlive/texlive-xetex.subpackage.sh index 1411d2026..37d92a89e 100644 --- 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)"