testing/texlive: upgrade to 20170524

1 files changed, 27 insertions, 31 deletions

diff --git a/testing/texlive/APKBUILD b/testing/texlive/APKBUILD
index 779ddbee8e4..7824f18cf35 100644
--- a/testing/texlive/APKBUILD
+++ b/testing/texlive/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Isaac Dunham <ibid.ag@gmail.com>
 # Maintainer:
 pkgname=texlive
-pkgver=20160523b
-pkgrel=6
+pkgver=20170524
+pkgrel=0
 pkgdesc="Comprehensive TeX document production system"
 url="http://tug.org/texlive/"
 arch="all"
@@ -15,7 +15,7 @@ makedepends="freetype-dev libpng-dev poppler-dev icu-dev harfbuzz-dev
 install=""
 subpackages="$pkgname-dev $pkgname-doc xdvik:xdvi $pkgname-xetex:xetex $pkgname-luatex:lua $pkgname-full:meta"
 source="ftp://ftp.tug.org/texlive/historic/${pkgver:0:4}/texlive-$pkgver-source.tar.xz"
-builddir="$srcdir"/texlive-${pkgver/b}-source
+builddir="$srcdir"/texlive-${pkgver}-source
 
 _luatex="dvilualatex dviluatex lualollipop"
 _pdftex="amstex cslatex csplain eplain etex jadetex latex lollipop mex
@@ -87,29 +87,28 @@ build() {
 		--with-system-zziplib \
 		--with-x-dvi-toolkit=motif \
 		--without-texinfo \
-		$EXTRA \
-		|| return 1
-	make || return 1
+		$EXTRA
+	make
 }
 
 package() {
 	cd "$builddir"/build
 
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 
 	cp -rf ../texk/tests/TeXLive \
-		"$pkgdir"/usr/share/texmf-dist/scripts/texlive || return 1
+		"$pkgdir"/usr/share/texmf-dist/scripts/texlive
 
 	local texcmd; for texcmd in $_pdftex; do
-		ln -s pdftex "$pkgdir"/usr/bin/$texcmd || return 1
+		ln -s pdftex "$pkgdir"/usr/bin/$texcmd
 	done
-	ln -s eptex "$pkgdir"/usr/bin/platex || return 1
-	ln -s euptex "$pkgdir"/usr/bin/uplatex || return 1
+	ln -s eptex "$pkgdir"/usr/bin/platex
+	ln -s euptex "$pkgdir"/usr/bin/uplatex
 
 	sed -i -e 's:SELFAUTOPARENT:TEXMFROOT:' \
-		"$pkgdir"/usr/share/texmf-dist/scripts/texlive/tlmgr.pl || return 1
+		"$pkgdir"/usr/share/texmf-dist/scripts/texlive/tlmgr.pl
 	sed -i -e 's:^\(TEXMFROOT *= *\)$SELFAUTOPARENT$:\1/usr/share:g' \
-		"$pkgdir"/usr/share/texmf-dist/web2c/texmf.cnf || return 1
+		"$pkgdir"/usr/share/texmf-dist/web2c/texmf.cnf
 }
 
 xetex() {
@@ -117,11 +116,11 @@ xetex() {
 	pkgdesc="TeX typesetting engine supporting modern typography and bidirectional text"
 	depends="$pkgname"
 
-	install -d -m 0755 "$subpkgdir"/usr/bin || return 1
-	mv "$pkgdir"/usr/bin/xetex "$subpkgdir"/usr/bin/ || return 1
+	install -d -m 0755 "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/xetex "$subpkgdir"/usr/bin/
 
 	local texcmd; for texcmd in $_xetex; do
-		ln -s xetex "$subpkgdir"/usr/bin/$texcmd || return 1
+		ln -s xetex "$subpkgdir"/usr/bin/$texcmd
 	done
 }
 
@@ -136,21 +135,20 @@ lua() {
 	pkgdesc="LuaTeX is an extended version of pdfTeX, scriptable in Lua"
 	depends="bash $pkgname"  # lua2dox_filter is a bash script
 
-	mkdir -p "$subpkgdir" && cd "$subpkgdir" || return 1
+	mkdir -p "$subpkgdir" && cd "$subpkgdir"
 
 	install -d -m 0755 usr/bin usr/lib \
-		usr/share/texmf-dist/scripts/context/stubs/unix || return 1
+		usr/share/texmf-dist/scripts/context/stubs/unix
 
-	mv "$pkgdir"/usr/bin/*lua* "$subpkgdir"/usr/bin/ || return 1
-	mv "$pkgdir"/usr/lib/lib*lua*.so.* "$subpkgdir"/usr/lib/ || return 1
+	mv "$pkgdir"/usr/bin/*lua* "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/lib/lib*lua*.so.* "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/share/texmf-dist/scripts/*lua* \
-		"$subpkgdir"/usr/share/texmf-dist/scripts/ || return 1
+		"$subpkgdir"/usr/share/texmf-dist/scripts/
 	mv "$pkgdir"/usr/share/texmf-dist/scripts/context/stubs/unix/luatools \
-		"$subpkgdir"/usr/share/texmf-dist/scripts/context/stubs/unix/luatools \
-		|| return 1
+		"$subpkgdir"/usr/share/texmf-dist/scripts/context/stubs/unix/luatools
 
 	local texcmd; for texcmd in $_luatex
-		do ln -s luatex "$subpkgdir"/usr/bin/$texcmd || return 1
+		do ln -s luatex "$subpkgdir"/usr/bin/$texcmd
 	done
 	cd -
 
@@ -175,14 +173,12 @@ xdvi() {
 	pkgdesc="Xdvi from texlive, using the texlive libraries"
 	provides="xdvi"
 
-	mkdir -p "$subpkgdir" && cd "$subpkgdir" || return 1
+	mkdir -p "$subpkgdir" && cd "$subpkgdir"
 
-	install -d -m 0755 usr/bin usr/share/texmf-dist/ || return 1
+	install -d -m 0755 usr/bin usr/share/texmf-dist/
 
-	mv "$pkgdir"/usr/bin/xdvi "$pkgdir"/usr/bin/xdvi-* usr/bin/ || return 1
-	mv "$pkgdir"/usr/share/texmf-dist/xdvi usr/share/texmf-dist/ || return 1
+	mv "$pkgdir"/usr/bin/xdvi "$pkgdir"/usr/bin/xdvi-* usr/bin/
+	mv "$pkgdir"/usr/share/texmf-dist/xdvi usr/share/texmf-dist/
 }
 
-md5sums="1e75db3412b3e2945fa94b0a423a29c7  texlive-20160523b-source.tar.xz"
-sha256sums="a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed  texlive-20160523b-source.tar.xz"
-sha512sums="915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e  texlive-20160523b-source.tar.xz"
+sha512sums="18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa  texlive-20170524-source.tar.xz"