aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarian Buschsieweke <marian.buschsieweke@ovgu.de>2020-07-28 12:09:46 +0200
committerRasmus Thomsen <oss@cogitri.dev>2020-07-28 18:56:44 +0000
commit79f975492ca89cff7ab465d665691ad6deb25176 (patch)
tree563d4b96cb9497a964ab3612bbb9f4aa04e13fe3
parentd97221e669b5893060c6ecaa986eca5ed9960b95 (diff)
downloadaports-79f975492ca89cff7ab465d665691ad6deb25176.tar.gz
aports-79f975492ca89cff7ab465d665691ad6deb25176.tar.bz2
aports-79f975492ca89cff7ab465d665691ad6deb25176.tar.xz
community/texmf-dist: Drop ugly workaround
Previously, texlive provided some files in texmf-dist, resulting in conflicts. These were solved by deleting the duplicates. With texlive no longer providing texmf-dist, this workaround is no longer needed.
-rw-r--r--community/texmf-dist/APKBUILD27
-rw-r--r--community/texmf-dist/duplicates.txt222
2 files changed, 12 insertions, 237 deletions
diff --git a/community/texmf-dist/APKBUILD b/community/texmf-dist/APKBUILD
index a899c23d95..e2fea87538 100644
--- a/community/texmf-dist/APKBUILD
+++ b/community/texmf-dist/APKBUILD
@@ -20,7 +20,7 @@ _pstricks=2020.55289
_publishers=2020.55415
_science=2020.55390
pkgver=$_core
-pkgrel=0
+pkgrel=1
pkgdesc="TeX Live texmf core distribution"
url="http://tug.org/texlive/"
arch="noarch"
@@ -67,7 +67,6 @@ source="
https://sources.archlinux.org/other/texlive/texlive-pstricks-$_pstricks-src.zip
https://sources.archlinux.org/other/texlive/texlive-publishers-$_publishers-src.zip
https://sources.archlinux.org/other/texlive/texlive-science-$_science-src.zip
- duplicates.txt
"
# This is a data only package; no unit tests to run
options="!check"
@@ -101,11 +100,16 @@ package() {
find . -type d -mindepth 1 -exec mkdir -p "$pkgdir/usr/share/texmf-dist/"{} \;
find . -type f -exec mv {} "$pkgdir/usr/share/texmf-dist/"{} \;
- # Remove files already provided by texlive* packages
- cd "$pkgdir/usr/share/texmf-dist"
- while IFS= read -r file; do
- rm -f $file
- done < "$srcdir/duplicates.txt"
+ # Fix paths
+ sed -i -e 's:^\(TEXMFROOT *= *\)$SELFAUTOPARENT$:\1/usr/share:g' \
+ "$pkgdir"/usr/share/texmf-dist/web2c/texmf.cnf
+ sed -i -e 's:\$TEXMFROOT/tlpkg:\$TEXMFROOT/texmf-dist/tlpkg:g' \
+ "$pkgdir"/usr/share/texmf-dist/scripts/texlive/updmap.pl \
+ "$pkgdir"/usr/share/texmf-dist/scripts/texlive/fmtutil.pl \
+
+ # Remove tlmgr, users should use apk to manage packages
+ rm "$pkgdir"/usr/share/texmf-dist/scripts/texlive/tlmgr.pl
+ rm "$pkgdir"/usr/share/texmf-dist/scripts/texlive/tlmgrgui.pl
rm -rf "$srcdir/pkgs-packed" "$srcdir/pkgs-unpacked"
}
@@ -125,12 +129,6 @@ pack_subpkg() {
find . -type d -mindepth 1 -exec mkdir -p "$subpkgdir/usr/share/texmf-dist/"{} \;
find . -type f -exec mv {} "$subpkgdir/usr/share/texmf-dist/"{} \;
- # Remove files already provided by texlive* packages
- cd "$subpkgdir/usr/share/texmf-dist"
- while IFS= read -r file; do
- rm -f $file
- done < "$srcdir/duplicates.txt"
-
rm -rf "$srcdir/pkgs-packed" "$srcdir/pkgs-unpacked"
}
@@ -275,5 +273,4 @@ cdafbcb12b300c0f18c9131930ce14912c62c24371a50b4402c86ead3eb9c274fd9ecb4b0caa1226
8fba8f1a7fdeac0799915402bc1e7363bc7d57dcd39b6707e83da3da8a95e573e09b5c514860b9b2324d4acded098784dd8b5b078d8a204d435a2452cf4cdece texlive-pictures-2020.55342-src.zip
fa3172cdddb43e9242414272328f4eda069c18d3f7c7fa4acdbef6409fd364b65d4f12ddafdacde30bcf51d5c56a1f7e1aeabe915a31eeab1a438dc64338e50f texlive-pstricks-2020.55289-src.zip
f8f034a8131660dedb54196973f01be657fb24473c614cc123e9ab7bf86e84848f24b4af2b576a08036bc6167f62eda158b578ec8ad2c338e02c704a04f2b900 texlive-publishers-2020.55415-src.zip
-8253eccdda5abbbc7f90a6bab88719187acbc99d9b279159bc8cc53ef9bcfe4a49a5d2375c5590319248065b9eee184fd590c9f30bd0ac7ac95d60577b581dc1 texlive-science-2020.55390-src.zip
-05f2a8fa6326a9d82c3ab975a6d75c482900be9abcfc810654218b5bd795de0dd0011905203f7b7c5f0ca2bbefa02298e0183cded4eaa17cb0dc7bf03ce40cac duplicates.txt"
+8253eccdda5abbbc7f90a6bab88719187acbc99d9b279159bc8cc53ef9bcfe4a49a5d2375c5590319248065b9eee184fd590c9f30bd0ac7ac95d60577b581dc1 texlive-science-2020.55390-src.zip"
diff --git a/community/texmf-dist/duplicates.txt b/community/texmf-dist/duplicates.txt
deleted file mode 100644
index 2e0cb87ea1..0000000000
--- a/community/texmf-dist/duplicates.txt
+++ /dev/null
@@ -1,222 +0,0 @@
-./dvipdfmx/dvipdfmx.cfg
-./dvips/base/color.pro
-./dvips/base/crop.pro
-./dvips/base/finclude.pro
-./dvips/base/hps.pro
-./dvips/base/special.pro
-./dvips/base/tex.pro
-./dvips/base/texc.pro
-./dvips/base/texps.pro
-./dvips/gsftopk/render.ps
-./dvips/xdvi/config.xdvi
-./fonts/cmap/dvipdfmx/EUC-UCS2
-./fonts/map/dvipdfmx/cid-x.map
-./fonts/map/glyphlist/glyphlist.txt
-./fonts/map/glyphlist/pdfglyphlist.txt
-./psutils/paper.cfg
-./scripts/a2ping/a2ping.pl
-./scripts/accfonts/mkt1font
-./scripts/accfonts/vpl2ovp
-./scripts/accfonts/vpl2vpl
-./scripts/adhocfilelist/adhocfilelist.sh
-./scripts/arara/arara.sh
-./scripts/authorindex/authorindex
-./scripts/bib2gls/bib2gls.sh
-./scripts/bib2gls/convertgls2bib.sh
-./scripts/bibexport/bibexport.sh
-./scripts/bundledoc/arlatex
-./scripts/bundledoc/bundledoc
-./scripts/cachepic/cachepic.tlu
-./scripts/checkcites/checkcites.lua
-./scripts/checklistings/checklistings.sh
-./scripts/cjk-gs-integrate/cjk-gs-integrate.pl
-./scripts/cluttex/cluttex.lua
-./scripts/context/perl/mptopdf.pl
-./scripts/context/stubs/unix/context
-./scripts/context/stubs/unix/contextjit
-./scripts/context/stubs/unix/luatools
-./scripts/context/stubs/unix/mtxrun
-./scripts/context/stubs/unix/mtxrunjit
-./scripts/context/stubs/unix/texexec
-./scripts/context/stubs/unix/texmfstart
-./scripts/convbkmk/convbkmk.rb
-./scripts/crossrefware/bbl2bib.pl
-./scripts/crossrefware/bibdoiadd.pl
-./scripts/crossrefware/bibmradd.pl
-./scripts/crossrefware/biburl2doi.pl
-./scripts/crossrefware/bibzbladd.pl
-./scripts/crossrefware/ltx2crossrefxml.pl
-./scripts/ctan-o-mat/ctan-o-mat.pl
-./scripts/ctanbib/ctanbib
-./scripts/ctanify/ctanify
-./scripts/ctanupload/ctanupload.pl
-./scripts/de-macro/de-macro
-./scripts/diadia/diadia.lua
-./scripts/dosepsbin/dosepsbin.pl
-./scripts/dtxgen/dtxgen
-./scripts/dviasm/dviasm.py
-./scripts/dviinfox/dviinfox.pl
-./scripts/ebong/ebong.py
-./scripts/epspdf/epspdf.tlu
-./scripts/epspdf/epspdftk.tcl
-./scripts/epstopdf/epstopdf.pl
-./scripts/exceltex/exceltex
-./scripts/fig4latex/fig4latex
-./scripts/findhyph/findhyph
-./scripts/fontools/afm2afm
-./scripts/fontools/autoinst
-./scripts/fontools/ot2kpx
-./scripts/fragmaster/fragmaster.pl
-./scripts/getmap/getmapdl.lua
-./scripts/glossaries/makeglossaries
-./scripts/glossaries/makeglossaries-lite.lua
-./scripts/installfont/installfont-tl
-./scripts/jfmutil/jfmutil.pl
-./scripts/kotex-utils/jamo-normalize.pl
-./scripts/kotex-utils/komkindex.pl
-./scripts/kotex-utils/ttf2kotexfont.pl
-./scripts/l3build/l3build.lua
-./scripts/latex-git-log/latex-git-log
-./scripts/latex-papersize/latex-papersize.py
-./scripts/latex2man/latex2man
-./scripts/latex2nemeth/latex2nemeth
-./scripts/latexdiff/latexdiff-vc.pl
-./scripts/latexdiff/latexdiff.pl
-./scripts/latexdiff/latexrevise.pl
-./scripts/latexfileversion/latexfileversion
-./scripts/latexindent/latexindent.pl
-./scripts/latexmk/latexmk.pl
-./scripts/latexpand/latexpand
-./scripts/lilyglyphs/lily-glyph-commands.py
-./scripts/lilyglyphs/lily-image-commands.py
-./scripts/lilyglyphs/lily-rebuild-pdfs.py
-./scripts/listbib/listbib
-./scripts/listings-ext/listings-ext.sh
-./scripts/ltxfileinfo/ltxfileinfo
-./scripts/ltximg/ltximg.pl
-./scripts/lua2dox/lua2dox_filter
-./scripts/luaotfload/luaotfload-tool.lua
-./scripts/lwarp/lwarpmk.lua
-./scripts/m-tx/m-tx.lua
-./scripts/make4ht/make4ht
-./scripts/makedtx/makedtx.pl
-./scripts/match_parens/match_parens
-./scripts/mathspic/mathspic.pl
-./scripts/mf2pt1/mf2pt1.pl
-./scripts/mkgrkindex/mkgrkindex
-./scripts/mkjobtexmf/mkjobtexmf.pl
-./scripts/mkpic/mkpic
-./scripts/multibibliography/multibibliography.pl
-./scripts/musixtex/musixflx.lua
-./scripts/musixtex/musixtex.lua
-./scripts/oberdiek/pdfatfi.pl
-./scripts/pax/pdfannotextractor.pl
-./scripts/pdfbook2/pdfbook2
-./scripts/pdfcrop/pdfcrop.pl
-./scripts/pdfjam/pdf180
-./scripts/pdfjam/pdf270
-./scripts/pdfjam/pdf90
-./scripts/pdfjam/pdfbook
-./scripts/pdfjam/pdfflip
-./scripts/pdfjam/pdfjam
-./scripts/pdfjam/pdfjam-pocketmod
-./scripts/pdfjam/pdfjam-slides3up
-./scripts/pdfjam/pdfjam-slides6up
-./scripts/pdfjam/pdfjoin
-./scripts/pdfjam/pdfnup
-./scripts/pdfjam/pdfpun
-./scripts/pdflatexpicscale/pdflatexpicscale.pl
-./scripts/pdftex-quiet/pdftex-quiet
-./scripts/pdfxup/pdfxup
-./scripts/pedigree-perl/pedigree.pl
-./scripts/perltex/perltex.pl
-./scripts/petri-nets/pn2pdf
-./scripts/pfarrei/a5toa4.tlu
-./scripts/pfarrei/pfarrei.tlu
-./scripts/pkfix-helper/pkfix-helper
-./scripts/pkfix/pkfix.pl
-./scripts/pmxchords/pmxchords.lua
-./scripts/ps2eps/ps2eps.pl
-./scripts/pst-pdf/ps4pdf
-./scripts/pst2pdf/pst2pdf.pl
-./scripts/psutils/extractres.pl
-./scripts/psutils/includeres.pl
-./scripts/psutils/psjoin.pl
-./scripts/ptex-fontmaps/kanji-config-updmap-sys.sh
-./scripts/ptex-fontmaps/kanji-config-updmap-user.sh
-./scripts/ptex-fontmaps/kanji-config-updmap.pl
-./scripts/ptex-fontmaps/kanji-fontmap-creator.pl
-./scripts/ptex2pdf/ptex2pdf.lua
-./scripts/purifyeps/purifyeps
-./scripts/pygmentex/pygmentex.py
-./scripts/pythontex/depythontex.py
-./scripts/pythontex/pythontex.py
-./scripts/rubik/rubikrotation.pl
-./scripts/simpdftex/simpdftex
-./scripts/splitindex/splitindex.pl
-./scripts/srcredact/srcredact.pl
-./scripts/sty2dtx/sty2dtx.pl
-./scripts/svn-multi/svn-multi.pl
-./scripts/tex4ebook/tex4ebook
-./scripts/texcount/texcount.pl
-./scripts/texdef/texdef.pl
-./scripts/texdiff/texdiff
-./scripts/texdirflatten/texdirflatten
-./scripts/texdoc/texdoc.tlu
-./scripts/texdoctk/texdoctk.pl
-./scripts/texfot/texfot.pl
-./scripts/texlive/TeXLive/TLConfig.pm
-./scripts/texlive/TeXLive/TLUtils.pm
-./scripts/texlive/allcm.sh
-./scripts/texlive/allneeded.sh
-./scripts/texlive/dvi2fax.sh
-./scripts/texlive/dvired.sh
-./scripts/texlive/e2pall.pl
-./scripts/texlive/fmtutil-sys.sh
-./scripts/texlive/fmtutil-user.sh
-./scripts/texlive/fmtutil.pl
-./scripts/texlive/fontinst.sh
-./scripts/texlive/kpsetool.sh
-./scripts/texlive/kpsewhere.sh
-./scripts/texlive/ps2frag.sh
-./scripts/texlive/pslatex.sh
-./scripts/texlive/rubibtex.sh
-./scripts/texlive/rumakeindex.sh
-./scripts/texlive/rungs.tlu
-./scripts/texlive/texconfig-dialog.sh
-./scripts/texlive/texconfig-sys.sh
-./scripts/texlive/texconfig.sh
-./scripts/texlive/texlinks.sh
-./scripts/texlive/tlmgr.pl
-./scripts/texlive/updmap-sys.sh
-./scripts/texlive/updmap-user.sh
-./scripts/texlive/updmap.pl
-./scripts/texliveonfly/texliveonfly.py
-./scripts/texloganalyser/texloganalyser
-./scripts/texosquery/texosquery-jre5.sh
-./scripts/texosquery/texosquery-jre8.sh
-./scripts/texosquery/texosquery.sh
-./scripts/thumbpdf/thumbpdf.pl
-./scripts/tlcockpit/tlcockpit.sh
-./scripts/tlshell/tlshell.tcl
-./scripts/typeoutfileinfo/typeoutfileinfo.sh
-./scripts/ulqda/ulqda.pl
-./scripts/urlbst/urlbst
-./scripts/vpe/vpe.pl
-./scripts/webquiz/webquiz.py
-./scripts/wordcount/wordcount.sh
-./scripts/xindex/xindex.lua
-./scripts/yplan/yplan
-./texconfig/tcfmgr
-./texconfig/tcfmgr.map
-./web2c/fmtutil.cnf
-./web2c/mktex.opt
-./web2c/mktexdir
-./web2c/mktexdir.opt
-./web2c/mktexnam
-./web2c/mktexnam.opt
-./web2c/mktexupd
-./web2c/texmf.cnf
-./xdvi/XDvi
-./xdvi/pixmap/toolbar.xpm
-./xdvi/pixmap/toolbar2.xpm