user/*: Modernise / fix syntax / deps

user/ffmpegthumbnailer/APKBUILD

@@ -7,12 +7,12 @@ pkgdesc="Thumbnail generator based on FFMPEG"
 url="https://github.com/dirkvdb/ffmpegthumbnailer"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="ffmpeg-dev libjpeg-turbo-dev libpng-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/$pkgver/ffmpegthumbnailer-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -25,17 +25,15 @@ build() {
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DENABLE_GIO=True \
 		-DENABLE_THUMBNAILER=True \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 

user/libass/APKBUILD

@@ -7,13 +7,12 @@ pkgdesc="Portable library for rendering (Advanced) Substation Alpha subtitles"
 url="https://github.com/libass/libass"
 arch="all"
 license="ISC"
+depends=""
 makedepends="freetype-dev fribidi-dev fontconfig-dev harfbuzz-dev"
 subpackages="$pkgname-dev"
 source="https://github.com/libass/libass/releases/download/$pkgver/libass-$pkgver.tar.xz"
-sha512sums="0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6  libass-0.14.0.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
+sha512sums="0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6  libass-0.14.0.tar.xz"

user/libcdr/APKBUILD

@@ -9,8 +9,8 @@ arch="all"
 license="MPL-2.0"
 depends=""
 depends_dev="boost-dev"
-makedepends="$depends_dev doxygen icu-dev lcms2-dev zlib-dev librevenge-dev"
 checkdepends="cppunit-dev"
+makedepends="$depends_dev doxygen icu-dev lcms2-dev zlib-dev librevenge-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
 
@@ -20,7 +20,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \

user/libertine-fonts/APKBUILD

@@ -12,11 +12,9 @@ depends="fontconfig"
 makedepends=""
 subpackages=""
 source="https://downloads.sourceforge.net/linuxlibertine/LinLibertineOTF_${pkgver}_2012_07_02.tgz"
-builddir="$srcdir/"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf
 }
 
 sha512sums="a441a127fb56413a69de3a435f3c5870b53ef2d3b6c341f7bf14e112f90d698ed2e7f9b002e0fcf951b93fa7f29be229bd796f8679f0b610d06705f02e01a6c7  LinLibertineOTF_5.3.0_2012_07_02.tgz"

user/libetonyek/APKBUILD

@@ -7,10 +7,11 @@ pkgdesc="Import filter and tools for Apple iWork documents"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 arch="all"
 license="MPL-2.0"
+depends=""
 depends_dev="glm boost-dev"
+checkdepends="cppunit-dev"
 makedepends="$depends_dev librevenge-dev liblangtag-dev zlib-dev
 	libxml2-dev gperf doxygen mdds~1.4"
-checkdepends="cppunit-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
 

user/liblangtag/APKBUILD

@@ -8,8 +8,8 @@ url="https://bitbucket.org/tagoh/liblangtag"
 arch="all"
 license="LGPL-3.0+ OR MPL-2.0"
 depends=""
-makedepends="glib-dev gobject-introspection-dev libtool libxml2-dev"
 checkdepends="check-dev"
+makedepends="glib-dev gobject-introspection-dev libtool libxml2-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://bitbucket.org/tagoh/$pkgname/downloads/$pkgname-$pkgver.tar.bz2"
 

user/libodfgen/APKBUILD

@@ -8,13 +8,12 @@ url="https://sourceforge.net/p/libwpd/wiki/libodfgen/"
 arch="all"
 license="MPL-2.0 OR LGPL-2.1+"
 depends=""
-depends_dev="boost-dev librevenge-dev"
-makedepends="$depends_dev doxygen"
+depends_dev="boost-dev"
+makedepends="$depends_dev doxygen librevenge-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://sourceforge.net/projects/libwpd/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir/test"
-	make launch_all
+	make -C test launch_all
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 

user/librevenge/APKBUILD

@@ -9,14 +9,12 @@ arch="all"
 license="(MPL-2.0 OR LGPL-2.1+) AND BSD-3-Clause"
 depends=""
 depends_dev="boost-dev zlib-dev"
-makedepends="$depends_dev doxygen"
 checkdepends="cppunit-dev"
+makedepends="$depends_dev doxygen"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://sourceforge.net/projects/libwpd/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 

user/libvisio/APKBUILD

@@ -7,9 +7,9 @@ pkgdesc="Import filter and tools for MS Visio diagrams"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
 arch="all"
 license="MPL-2.0"
-depends_dev="librevenge-dev"
-makedepends="$depends_dev boost-dev icu-dev libxml2-dev doxygen gperf perl"
+depends=""
 checkdepends="cppunit-dev"
+makedepends="boost-dev icu-dev librevenge-dev libxml2-dev doxygen gperf perl"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
 

user/libwps/APKBUILD

@@ -9,13 +9,11 @@ arch="all"
 options="!check"  # No test suite.
 license="(MPL-2.0 OR LGPL-2.1+) AND BSD-3-Clause"
 depends=""
-depends_dev="librevenge-dev"
-makedepends="$depends_dev doxygen"
+makedepends="doxygen librevenge-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,7 +26,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 

user/lohit-ttf/APKBUILD

@@ -14,8 +14,7 @@ subpackages=""
 source="https://releases.pagure.org/lohit/lohit-ttf-$pkgver.tar.gz"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
 }
 
 sha512sums="b622be55e16a8ccbad0d2fc6e546c072e0af1954a36095a00f31e09e6dd80e86e98a36f4a4a7b8adf21a3f380f816e6fe77ef2e61f15521abfd9f7f4b8c06cbc  lohit-ttf-20140220.tar.gz"

user/mdds/APKBUILD

@@ -8,11 +8,11 @@ url="https://gitlab.com/mdds/mdds"
 arch="noarch"
 license="MIT"
 depends=""
-makedepends=""
 checkdepends="boost-dev"
+makedepends=""
 subpackages="$pkgname-doc"
-source="http://kohei.us/files/$pkgname/src/$pkgname-$pkgver.tar.bz2"
 replaces="$pkgname-dev"
+source="http://kohei.us/files/$pkgname/src/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	./configure \

user/montecarlo/APKBUILD

@@ -15,8 +15,6 @@ source="http://www.bok.net/MonteCarlo/downloads/MonteCarlo-PCF.tgz"
 builddir="$srcdir/MonteCarlo-PCF"
 
 package() {
-	cd "$builddir"
-	local _font
 	for _font in *.pcf; do
 		gzip -9 $_font
 		install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/misc/ $_font.gz

user/otf-culmus/APKBUILD

@@ -6,9 +6,10 @@ pkgrel=0
 pkgdesc="Culmus collections of Hebrew font families"
 url="http://culmus.sourceforge.net/"
 arch="noarch"
-options="!check" # No tests
+options="!check"  # No test suite.
 license="MIT AND GPL-2.0-only WITH font-exception"
 depends="fontconfig"
+makedepends=""
 source="https://downloads.sourceforge.net/culmus/culmus-$pkgver.tar.gz"
 builddir="$srcdir"/${pkgname#*-}-$pkgver
 

user/otf-exo/APKBUILD

@@ -11,12 +11,10 @@ license="OFL-1.1"
 depends="fontconfig"
 makedepends=""
 source="http://ndiscovered.com/archives/exo-$pkgver.zip"
-builddir="$srcdir"
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
-	for i in *.otf; do
+	for i in "$srcdir"/*.otf; do
 		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	done
 }

user/otf-office-code-pro/APKBUILD

@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Monospaced font family for programming and console users"
 url="https://github.com/nathco/Office-Code-Pro"
 arch="noarch"
-options="!check" # No tests
+options="!check"  # No test suite.
 license="OFL-1.1"
 depends="fontconfig"
 makedepends=""

user/otf-proggy-vector/APKBUILD

@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Monospaced font family for programming"
 url="https://github.com/bluescan/proggyfonts"
 arch="noarch"
-options="!check" # No tests
+options="!check"  # No test suite.
 license="MIT AND Custom"
 depends="fontconfig"
 makedepends=""

user/otf-source-code-pro/APKBUILD

@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Monospaced font family for user interfaces and programming"
 url="https://adobe-fonts.github.io/source-code-pro/"
 arch="noarch"
-options="!check" # No tests
+options="!check"  # No test suite.
 license="OFL-1.1"
 depends="fontconfig"
 makedepends=""

user/otf-source-sans-pro/APKBUILD

@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Sans serif font family for user interfaces"
 url="https://adobe-fonts.github.io/source-sans-pro"
 arch="noarch"
-options="!check" # No tests
+options="!check"  # No test suite.
 license="OFL-1.1"
 depends="fontconfig"
 makedepends=""

user/otf-source-serif-pro/APKBUILD

@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Serif font family for typesetting"
 url="https://adobe-fonts.github.io/source-serif-pro/"
 arch="noarch"
-options="!check" # No tests
+options="!check"  # No test suite.
 license="OFL-1.1"
 depends="fontconfig"
 makedepends=""