update 2022

2 files changed, 50 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7d8ed6063c4..07b8f03df938 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,20 @@
 pkgbase = texlive-full
 	pkgdesc = This packages provides texlive-full in /opt. It also tricks ArchLinux into thinking it has its texlive packages installed.
-	pkgver = 20220220
+	pkgver = 2022.20220405
 	pkgrel = 1
+	epoch = 1
 	url = http://www.tug.org/texlive/
 	arch = x86_64
 	license = custom
 	makedepends = rsync
 	depends = libxcrypt-compat
-	provides = texlive-bin
+	provides = asymptote
+	provides = git-latexdiff
+	provides = haskell-citeproc
+	provides = psutils
+	provides = t1utils
 	provides = texlive-bibtexextra
+	provides = texlive-bin
 	provides = texlive-core
 	provides = texlive-fontsextra
 	provides = texlive-formatsextra
@@ -27,12 +33,13 @@ pkgbase = texlive-full
 	provides = texlive-langjapanese
 	provides = texlive-langkorean
 	provides = texlive-htmlxml
-	provides = asymptote
-	provides = git-latexdiff
-	provides = psutils
-	provides = t1utils
-	conflicts = texlive-bin
+	conflicts = asymptote
+	conflicts = git-latexdiff
+	conflicts = haskell-citeproc
+	conflicts = psutils
+	conflicts = t1utils
 	conflicts = texlive-bibtexextra
+	conflicts = texlive-bin
 	conflicts = texlive-core
 	conflicts = texlive-fontsextra
 	conflicts = texlive-formatsextra
@@ -51,13 +58,9 @@ pkgbase = texlive-full
 	conflicts = texlive-langjapanese
 	conflicts = texlive-langkorean
 	conflicts = texlive-htmlxml
-	conflicts = asymptote
-	conflicts = git-latexdiff
-	conflicts = psutils
-	conflicts = t1utils
 	options = !strip
-	source = https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz
-	source = LICENSE::http://texlive.tug.org/texlive/LICENSE.TL
+	source = install-tl-unx-2022.20220405.tar.gz::https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz
+	source = LICENSE.2022.20220405::http://texlive.tug.org/texlive/LICENSE.TL
 	sha256sums = SKIP
 	sha256sums = e8f070b2d1a9bad00af9d6cb94e687f2120591d092c8dab8727249b70adc96d0
 
diff --git a/PKGBUILD b/PKGBUILD
index 381cbc95e7db..fc8d6815817c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,32 @@
 # Contributor: Butui Hu <hot123tea123@gmail.com>
 
 pkgname=texlive-full
-pkgver=20220220
+pkgver=2022.20220405
 pkgrel=1
+epoch=1
 pkgdesc="This packages provides texlive-full in /opt.  It also tricks ArchLinux into thinking it has its texlive packages installed."
 url="http://www.tug.org/texlive/"
 arch=("x86_64")
-license=("custom")
+license=('custom')
 makedepends=('rsync')
 depends=('libxcrypt-compat')
-provides=('texlive-bin'  'texlive-bibtexextra' 'texlive-core' 'texlive-fontsextra' 'texlive-formatsextra' 'texlive-games' 'texlive-humanities' 'texlive-latexextra' 'texlive-music' 'texlive-pictures' 'texlive-pstricks' 'texlive-publishers' 'texlive-science' 'texlive-langchinese' 'texlive-langcyrillic' 'texlive-langextra' 'texlive-langgreek' 'texlive-langjapanese' 'texlive-langkorean'
-
-'texlive-htmlxml'
-'asymptote' 'git-latexdiff' 'psutils' 't1utils'
-)
-conflicts=('texlive-bin'  'texlive-bibtexextra' 'texlive-core' 'texlive-fontsextra' 'texlive-formatsextra' 'texlive-games' 'texlive-humanities' 'texlive-latexextra' 'texlive-music' 'texlive-pictures' 'texlive-pstricks' 'texlive-publishers' 'texlive-science' 'texlive-langchinese' 'texlive-langcyrillic' 'texlive-langextra' 'texlive-langgreek' 'texlive-langjapanese' 'texlive-langkorean'
-
-'texlive-htmlxml'
-'asymptote' 'git-latexdiff' 'psutils' 't1utils'
-)
-source=("https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz"
-"LICENSE::http://texlive.tug.org/texlive/LICENSE.TL"
+provides=('asymptote' 'git-latexdiff' 'haskell-citeproc' 'psutils' 't1utils'
+'texlive-bibtexextra' 'texlive-bin' 'texlive-core' 'texlive-fontsextra'
+'texlive-formatsextra' 'texlive-games' 'texlive-humanities' 'texlive-latexextra'
+'texlive-music' 'texlive-pictures' 'texlive-pstricks' 'texlive-publishers'
+'texlive-science' 'texlive-langchinese' 'texlive-langcyrillic' 'texlive-langextra'
+'texlive-langgreek' 'texlive-langjapanese' 'texlive-langkorean' 'texlive-htmlxml')
+conflicts=('asymptote' 'git-latexdiff' 'haskell-citeproc' 'psutils' 't1utils'
+'texlive-bibtexextra' 'texlive-bin' 'texlive-core' 'texlive-fontsextra'
+'texlive-formatsextra' 'texlive-games' 'texlive-humanities' 'texlive-latexextra'
+'texlive-music' 'texlive-pictures' 'texlive-pstricks' 'texlive-publishers'
+'texlive-science' 'texlive-langchinese' 'texlive-langcyrillic' 'texlive-langextra'
+'texlive-langgreek' 'texlive-langjapanese' 'texlive-langkorean' 'texlive-htmlxml'
 )
+source=("install-tl-unx-${pkgver}.tar.gz::https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz"
+    "LICENSE.$pkgver::http://texlive.tug.org/texlive/LICENSE.TL")
 sha256sums=('SKIP'
-'e8f070b2d1a9bad00af9d6cb94e687f2120591d092c8dab8727249b70adc96d0'
-)
+            'e8f070b2d1a9bad00af9d6cb94e687f2120591d092c8dab8727249b70adc96d0')
 #PKGEXT='.pkg.tar'
 options=(!strip)
 
@@ -38,7 +40,9 @@ _mirror='rsync.dante.ctan.org/CTAN/systems/texlive/tlnet/'
 _syncdir="CTAN/tlnet"
 
 pkgver(){
-    ls  | grep -E '[0-9]+' -o | sort -r | head -1
+    _year=$(cat ${srcdir}/install-tl-${_tldate}/release-texlive.txt| grep -E '[0-9]+' -o)
+    _tldate=$(ls  | grep -E '[0-9]+' -o | sort -r | head -1)
+    echo "${_year}.${_tldate}"
 }
 prepare(){
     # TeXLive release year
@@ -53,32 +57,31 @@ prepare(){
     echo "TEXMFHOME ~/.config/texlive/texmf" >> "${srcdir}/texlive.profile"
     echo "TEXMFCONFIG ~/.config/texlive/${_year}/texmf-config" >> "${srcdir}/texlive.profile"
     echo "TEXMFVAR ~/.config/texlive/${_year}/texmf-var" >> "${srcdir}/texlive.profile"
-    
+
     # syncing repository
     mkdir -p ${_syncdir}
     msg2 "Syncing local mirror"
     rsync -av --delete --info=progress2 --info=name0 rsync://${_mirror}  ${_syncdir}
-    
+
 }
 
 package() {
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
     _tldate=$(ls  | grep -E '[0-9]+' -o | sort -r | head -1)
     _year=$(cat ${srcdir}/install-tl-${_tldate}/release-texlive.txt| grep -E '[0-9]+' -o)
     # find installer path automatically.
     _installer_dir=install-tl-${_tldate}
-    
+
     # start the installer and install
     _timestamp=$(date "+%m%d%H%M")
     "${srcdir}/${_installer_dir}/install-tl" \
         -profile "${srcdir}/texlive.profile" -repository ${_syncdir} -logfile "/tmp/install-tl-${_timestamp}.log"
-    
+
     msg2 'Stripping $srcdir'
     find ${pkgdir}/* -type f -print0 | xargs -0 sed -i "s|${srcdir}||g"
-    
+
     msg2 'Stripping $pkgdir'
     find ${pkgdir}/* -type f -print0 | xargs -0 sed -i "s|${pkgdir}||g"
-    
+
     msg2 "Linking manpage"
     mkdir -p ${pkgdir}/usr/share/man/{man1,man5}
     for mann in {man1,man5}
@@ -89,7 +92,7 @@ package() {
             ln -s "/opt/texlive/${_year}/texmf-dist/doc/man/$mann/${man}"  "${pkgdir}/usr/share/man/$mann/"
         done
     done
-    
+
     msg2 "Linking info"
     cd ${pkgdir}/opt/texlive/${_year}/texmf-dist/doc/info/
     mkdir -p ${pkgdir}/usr/share/info
@@ -97,7 +100,7 @@ package() {
     do 
         ln -s "/opt/texlive/${_year}/texmf-dist/doc/info/${info}" "${pkgdir}/usr/share/info/"
     done
-    
+
     msg2 "Linking binary"
     cd ${pkgdir}/opt/texlive/${_year}/bin/${arch}-linux/
     mkdir -p ${pkgdir}/usr/bin
@@ -105,13 +108,16 @@ package() {
     do 
         ln -s "/opt/texlive/${_year}/bin/${arch}-linux/${bin}" "${pkgdir}/usr/bin/"
     done
-    
+
     # remove profile file and installation log, and wrong man link.
     rm -rf ${pkgdir}/usr/bin/man
     rm -vf "${pkgdir}/opt/texlive/${_year}/tlpkg/texlive.profile"
-    
+
     msg2 "Removing files for Windows"
     rm -rf ${pkgdir}/opt/texlive/${_year}/texmf-dist/scripts/context/stubs/{win64,mswin}/*
     find -H ${pkgdir} -name "*.bat" -print0 | xargs -0 rm -rf
+
+    msg2 "Install license file"
+    install -Dm644 "$srcdir"/LICENSE.* "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE.TL
 }
 # vim:set ts=2 sw=2 et: