texlive: simplify

common/shlibs

@@ -4131,9 +4131,9 @@ libfrrcares.so.0 libfrr-7.3.1_1
 libhugetlbfs.so.0 libhugetlbfs-2.22_1
 libmonocypher.so.4 monocypher-4.0.1_1
 libkpathsea.so.6 texlive-20200406_1
-libtexluajit.so.2 texlive-LuaTeX-20200406_1
-libtexlua53.so.5 texlive-LuaTeX-20200406_1
-libptexenc.so.1 texlive-20200406_1
+libtexluajit.so.2 texlive-20260301_3
+libtexlua53.so.5 texlive-20260301_3
+libptexenc.so.1 texlive-20260301_3
 libsynctex.so.2 libsynctex-20200406_3
 libdolphinvcs.so.6 dolphin-24.02.0_1
 libocl.so.2019.07 opencamlib-2019.07_1

srcpkgs/R/template

@@ -16,7 +16,7 @@ makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel libdeflate-devel
  $(vopt_if openblas openblas-devel 'blas-devel lapack-devel')"
 depends="xdg-utils less which"
-checkdepends="texlive texlive-fontsextra texinfo"
+checkdepends="texlive texinfo"
 short_desc="System for statistical computation and graphics"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="GPL-2.0-or-later"

srcpkgs/asymptote/template

@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 configure_args="--with-latex=/usr/share/texmf/tex/latex
  --with-context=/usr/share/texmf/tex/context/third"
-hostmakedepends="bison flex texlive texlive-dvi texinfo pkg-config cmake
+hostmakedepends="bison flex texlive texinfo pkg-config cmake
  python3-PyQt5-devel-tools"
 makedepends="fftw-devel gc-devel gsl-devel zlib-devel libtirpc-devel
  glm libfreeglut-devel libcurl-devel

srcpkgs/doxygen/template

@@ -4,7 +4,7 @@ version=1.14.0
 revision=1
 build_style=cmake
 hostmakedepends="perl python3 flex"
-checkdepends="libxml2 texlive-BibTeX"
+checkdepends="libxml2 texlive"
 short_desc="Source code documentation generator tool"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"

srcpkgs/removed-packages/template

@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20260823
+version=0.1.20260906
 revision=1
 metapackage=yes
 short_desc="Uninstalls packages removed from repository"
@@ -973,6 +973,13 @@ replaces="
  tepl<=6.8.0_2
  terminal_markdown_viewer<=1.6.3_4
  tewi-font<=2.0.2_3
+ texlive-XeTeX<=20260301_2
+ texlive-LuaTeX<=20260301_2
+ texlive-LuaTeX-devel<=20260301_2
+ texlive-ConTeXt<=20260301_2
+ texlive-PythonTeX<=20260301_2
+ texlive-BibTeX<=20260301_2
+ texlive-dvi<=20260301_2
  text-engine-demo<=0.1.1_1
  text-engine-devel<=0.1.1_1
  text-engine<=0.1.1_1

srcpkgs/texlive-basic/template

@@ -1,13 +1,10 @@
 # Template file for 'texlive-basic'
 pkgname=texlive-basic
-version=2023.0
-revision=2
+version=20260301.0
+revision=1
 metapackage=yes
 _year=${version%.*}
-depends="texlive>=20230313
- texlive-BibTeX>=20230313
- texlive-LuaTeX>=20230313
- texlive-dvi>=20210313
+depends="texlive>=${_year}
  texlive-core>=${_year}"
 short_desc="TeX Live - Metapackage including some simple packages"
 maintainer="Orphaned <orphan@voidlinux.org>"

srcpkgs/texlive/template

@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20260301
-revision=2
+revision=3
 _year=${version%${version#????}}
 _svn_tag=svn78399
 build_wrksrc="build"
@@ -66,12 +66,11 @@ configure_args="
  --with-system-zlib
  --with-system-zziplib
  --with-xdvi-x-toolkit=Xaw"
-hostmakedepends="pkg-config perl lua52-BitOp texinfo libXaw-devel"
+hostmakedepends="pkgconf perl lua52-BitOp texinfo libXaw-devel"
 makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel
  harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
  pixman-devel libteckit-devel zlib-devel zziplib-devel libXaw-devel"
-depends="dialog ghostscript perl-Tk texlive-core>=${version}_1 xbps-triggers
- texlive-latexmk latexindent"
+depends="dialog ghostscript texlive-core>=${version}_1 texlive-latexmk latexindent"
 checkdepends="diffutils"
 short_desc="TeX Live"
 maintainer="dkwo <npiazza@disroot.org>"
@@ -83,6 +82,13 @@ python_version=3
 # Virtual package cares only about year part of version
 provides="tex-${_year}_1"
 triggers="texmf-dist"
+replaces="texlive-XeTeX>=0
+ texlive-LuaTeX>=0
+ texlive-LuaTeX-devel>=0
+ texlive-ConTeXt>=0
+ texlive-PythonTeX>=0
+ texlive-BibTeX>=0
+ texlive-dvi>=0"
 
 if [ -n "${CROSS_BUILD}" ] ; then
 	# Tangle is required for cross compile
@@ -167,80 +173,32 @@ post_install() {
 	rm -f ${DESTDIR}/usr/bin/tlmgr
 }
 
-subpackages="texlive-XeTeX texlive-LuaTeX texlive-LuaTeX-devel texlive-Xdvi
- libsynctex texlive-devel texlive-ConTeXt texlive-PythonTeX texlive-latexmk
- latexindent texlive-BibTeX texlive-dvi"
-
-texlive-XeTeX_package() {
-	depends="${sourcepkg}>=${version}_${revision} texlive-dvi"
-	short_desc+=" - engine supporting modern typography"
-	pkg_install() {
-		vmove usr/bin/xetex
-		vmove usr/share/man/man1/xe*.1
-		vmove usr/bin/xelatex
-		vmove usr/bin/xelatex-dev
-	}
-}
-
-texlive-dvi_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - tools for dvi based workflow"
+libsynctex_package() {
+	short_desc+=" - libsynctex"
 	pkg_install() {
-		for i in afm2tfm bbox tl-extractres tl-includeres tl-psbook tl-psjoin \
-				 tl-psnup tl-psresize tl-psselect tl-pstops ; do
-			vmove "usr/bin/${i}"
-			vmove "usr/share/man/man1/${i}.1"
-		done
-		vmove usr/bin/dvi*
-		for _i in xdvipdfmx extractbb ebb ; do
-			vmove "usr/bin/${_i}"
-		done
-		vmove usr/share/man/man1/xdvipdfmx.1
+		vmove "usr/lib/libsynctex.so.*"
 	}
 }
 
-texlive-LuaTeX_package() {
-	depends="${sourcepkg}>=${version}_${revision} bash"
-	short_desc+=" - extended pdfTeX using Lua"
+libsynctex-devel_package() {
+	depends="libsynctex>=${version}_${revision}"
+	short_desc+=" - libsynctex development files"
 	pkg_install() {
-		if [ "$build_option_luajit" ] ; then
-			for i in luajittex luajithbtex mfluajit mfluajit-nowin texluajit \
-					 texluajitc ; do
-				vmove "usr/bin/${i}"
-			done
-		fi
-		for i in checkcites citeproc-lua cllualatex cluttex clxelatex \
-			 diadia digestif dvilualatex dvilualatex-dev dviluatex \
-			 explcheck getmapdl l3build l3sys-query llmk \
-			 luacsplain luafindfont luahbtex lualatex lualatex-dev luaotfload-tool \
-			 luatex lwarpmk makeglossaries-lite markdown2tex mflua \
-			 mflua-nowin musixflx musixtex optex pmxchords \
-			 ppmcheckpdf ptex2pdf rungs runtexfile runtexshebang \
-			 show-pdf-tags texfindpkg texlua texluac xindex ; do
-			vmove "usr/bin/${i}"
-		done
-		for i in dviluatex dvilualatex-dev luahbtex luajittex lualatex-dev luatex texlua texluac ; do
-			vmove "usr/share/man/man1/${i}.1"
-		done
-		vmove "usr/lib/libtexlua*.so.*"
-		if [ -f "${DESTDIR}/usr/bin/xdvipsk" ]; then
-			vmove usr/bin/xdvipsk
-			vmove usr/share/man/man1/xdvipsk.1
-		fi
+		vmove usr/include/synctex
+		vmove usr/lib/libsynctex.a
+		vmove usr/lib/libsynctex.so
+		vmove usr/lib/pkgconfig/synctex.pc
 	}
 }
 
-texlive-LuaTeX-devel_package() {
-	depends="${sourcepkg}-devel>=${version}_${revision}
-	 ${sourcepkg}-LuaTeX>=${version}_${revision}"
-	short_desc+=" - extended pdfTeX using Lua - development files"
+texlive-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
-		for i in texlua53 $(vopt_if luajit texluajit); do
-			vmove "usr/include/${i}"
-			vmove "usr/lib/lib${i}.a"
-			vmove "usr/lib/lib${i}.so"
-			vmove "usr/lib/pkgconfig/${i}.pc"
-		done
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
 	}
 }
 
@@ -251,58 +209,16 @@ texlive-Xdvi_package() {
 		for i in xdvi xdvi-xaw ; do
 			vmove "usr/bin/${i}"
 		done
-		for i in xdvi ; do
-			vmove "usr/share/man/man1/${i}.1"
-		done
+		# vmove usr/share/man/man1/xdvi.1
 		vmove usr/share/applications/xdvi.desktop
-	}
-}
-
-libsynctex_package() {
-	short_desc+=" - libsynctex"
-	pkg_install() {
-		vmove "usr/lib/libsynctex.so.*"
-	}
-}
-
-texlive-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		for i in kpathsea ptexenc synctex; do
-			vmove "usr/include/${i}"
-			vmove "usr/lib/lib${i}.a"
-			vmove "usr/lib/lib${i}.so"
-			vmove "usr/lib/pkgconfig/${i}.pc"
-		done
-	}
-}
-
-texlive-BibTeX_package() {
-	depends="${sourcepkg}>=${version}_${revision} bash"
-	replaces="texlive-bibtexextra<=2024_1"
-	short_desc+=" - reference management software"
-	pkg_install() {
-		for i in bbl2bib ctanbib ; do
-			vmove "usr/bin/${i}"
-		done
-		vmove usr/bin/bib*
-		vmove usr/share/man/man1/bibtex.1
-	}
-}
 
-texlive-ConTeXt_package() {
-	metapackage=yes
-	short_desc+=" (transitional package)"
-	depends="texlive>=${version}_${revision}"
-}
-
-texlive-PythonTeX_package() {
-	depends="${sourcepkg}>=${version}_${revision} python3"
-	short_desc+=" - executing Python in LaTeX"
-	pkg_install() {
-		vmove usr/bin/*pythontex
-	}
+		# fixme: this lets us drop libX11 dep from main
+		vmove usr/bin/mf
+		if [ "$build_option_luajit" ] ; then
+			vmove usr/bin/mfluajit
+		fi
+		vmove usr/bin/mflua
+		}
 }
 
 texlive-latexmk_package() {

srcpkgs/zathura/template

@@ -1,13 +1,13 @@
 # Template file for 'zathura'
 pkgname=zathura
 version=2026.07.18
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsynctex=enabled"
 hostmakedepends="pkg-config gettext python3-Sphinx desktop-file-utils
  appstream-glib glib-devel librsvg-utils"
 makedepends="girara-devel sqlite-devel file-devel zlib-devel libseccomp-devel
- libglib-devel gtk4-devel texlive-devel xxHash-devel"
+ libglib-devel gtk4-devel libsynctex-devel xxHash-devel"
 checkdepends="AppStream gettext-devel xvfb-run weston"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"