26 files changed, 136 insertions, 84 deletions
diff --git a/user/acpid/APKBUILD b/user/acpid/APKBUILD
index a806b93de..4a46b0c93 100644
--- a/user/acpid/APKBUILD
+++ b/user/acpid/APKBUILD
@@ -7,8 +7,8 @@
 # Contributor: multiplexd <multi@in-addr.xyz>
 
 pkgname=acpid
-pkgver=2.0.31
-pkgrel=1
+pkgver=2.0.32
+pkgrel=0
 pkgdesc="Daemon for handling ACPI power management events"
 url="https://sourceforge.net/projects/acpid2/"
 arch="all"
@@ -24,7 +24,6 @@ source="http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar
 	acpid.confd"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,7 +36,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m 755 -D "$srcdir"/acpid.initd \
@@ -50,7 +48,7 @@ package() {
 		"$pkgdir"/etc/acpi/handler.sh
 }
 
-sha512sums="05eb96cdae698731b14caa89aa01239a0f16ce732f897d295447753aab7c8d49227c9b9ce901c6fd3bfdb117688e6ed80ec61aea0f64d75c9c0afe2aea2aa91a  acpid-2.0.31.tar.xz
+sha512sums="c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7  acpid-2.0.32.tar.xz
 42e8a66c4fd4de3bf0b6adc359c5d5a08e45bf38fc2945c75ab0bf38058c10906e2c84f50895bb85b38e1a19646d91e40a875f2b45f67e07a9336d27bfa2dcd8  handler.sh
 2ca236168ce6aaa56c980568c781d6e51590870b7a7936c74bf72532ef3f6c60a369f37597202f3a236d60637fd0daa6611d4ae0348484011ff71871a9914246  default
 7381d30b5c6478cdbf5dff93ae95baa0b3b1fe0a04b02cf491831f1657d6f71b8eef121b7e78f3201d11a5856bfb30df0a57437c76e6fbe05ad88cd45e86ae64  acpid.initd
diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index d46268780..9a484828f 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=cups-filters
-pkgver=1.25.5
+pkgver=1.25.6
 pkgrel=0
 pkgdesc="OpenPrinting CUPS filters and backends"
 url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
@@ -59,4 +59,4 @@ libs() {
 	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="4e7126f4c439cb7392484dd3531023da5a1c885c7a6c7377260e7cccc2f3f51e3d0aa879965ecdb2625217d6f9ee1ca9c860c4fc05a7959697cd269696f10f59  cups-filters-1.25.5.tar.xz"
+sha512sums="14c958bcb98e4addde84c3c0d27e7056f1b4790b8502f5fb0c23c1e2cf80a6fd22fa39816a2f2e6c0501272a57cfcc84ce939a8614563e795e5d2ae035972f33  cups-filters-1.25.6.tar.xz"
diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD
index f9366a4de..bb270f035 100644
--- a/user/enchant/APKBUILD
+++ b/user/enchant/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: 
 pkgname=enchant
-pkgver=2.2.5
+pkgver=2.2.7
 pkgrel=0
 pkgdesc="Generic library for spell checking"
 url="https://abiword.github.io/enchant/"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cc4d00ea2c94fcf2cef0281e13b86c49cfbff74c60315126bab8b1d91d8da1fb8fd0dc215a1eb44b07d8be33bc54cb9e63107874ef1caa04714fbe4b7484280f  enchant-2.2.5.tar.gz"
+sha512sums="696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6  enchant-2.2.7.tar.gz"
diff --git a/user/ethtool/APKBUILD b/user/ethtool/APKBUILD
index 03ca23eb3..be9d4e369 100644
--- a/user/ethtool/APKBUILD
+++ b/user/ethtool/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=ethtool
-pkgver=5.2
+pkgver=5.3
 pkgrel=0
 pkgdesc="Utility for controlling network drivers and hardware"
 url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -39,4 +39,4 @@ bashcomp() {
 	mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/
 }
 
-sha512sums="6b59923d67727895748438d6fb02542dad108aa30fa1ae684af6b6493dbf5eb63fe56fa3fada062c8c7d78efa3dc3c574f874fa13efd81262b59725b193aa2c8  ethtool-5.2.tar.xz"
+sha512sums="ad3651f74850e6773489baec27c51d077e3c080eb1d536a585ae05c618304880caf7598df5c9b1416c47ae9c4eac301032f6ea65fe47650dd9ecb7603c1857b0  ethtool-5.3.tar.xz"
diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD
index 6bce7e08f..20a76707d 100644
--- a/user/fuse3/APKBUILD
+++ b/user/fuse3/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=fuse3
 _pkgname=fuse
-pkgver=3.6.2
+pkgver=3.7.0
 pkgrel=0
 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
 url="https://github.com/libfuse/libfuse"
@@ -71,6 +71,6 @@ openrc() {
 	install_if="openrc fuse-common=$pkgver-r$pkgrel"
 }
 
-sha512sums="e5eb10c66e8585d47430e289d059a3a58ebf3823304fa35e9be413c8d194401ff5093fac82c7c6911b3c5afde6c1c156aa671d333b193d2d739a7ed1632c4bd8  fuse-3.6.2.tar.xz
+sha512sums="512ac1fff38fa3fbe768ac02a6b138bb5c58ae9c0c898fde237faab9ecb48dafcb063879942d3845cd85af1f5fbe068626401e7da9afbd7ef2f0820757393585  fuse-3.7.0.tar.xz
 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b  fix-realpath.patch
 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1  fuse.initd"
diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD
index 9b7b14844..78da2678b 100644
--- a/user/gtk+3.0/APKBUILD
+++ b/user/gtk+3.0/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: 
 pkgname=gtk+3.0
-pkgver=3.24.10
+pkgver=3.24.12
 pkgrel=0
 pkgdesc="The GTK+ Toolkit (v3)"
 url="https://www.gtk.org/"
@@ -23,7 +23,6 @@ source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
 builddir="$srcdir"/gtk+-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -45,7 +44,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	# use gtk-update-icon-cache from gtk+2.0 for now
@@ -53,4 +51,4 @@ package() {
 	rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1
 }
 
-sha512sums="1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498  gtk+-3.24.10.tar.xz"
+sha512sums="97554657d83db71ff8b3ea5f650ad38b1ffcc3e8d620be876b5ca435f693e229dffc7341a84bde71bdae13293f2c1d3b2ab1b80a02791132c8a7693cdc21f612  gtk+-3.24.12.tar.xz"
diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD
index 98fd59e1c..489f85cb5 100644
--- a/user/haveged/APKBUILD
+++ b/user/haveged/APKBUILD
@@ -3,22 +3,19 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer:
 pkgname=haveged
-pkgver=1.9.4
-pkgrel=1
+pkgver=1.9.8
+pkgrel=0
 pkgdesc="Entropy harvesting daemon using CPU timings"
 url="http://www.issihosts.com/haveged/"
 arch="all"
 license="GPL-3.0+"
-subpackages="$pkgname-doc $pkgname-openrc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
 makedepends="linux-headers"
-source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/$pkgver.tar.gz
-	fix-cpu-cache-size-detection.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/v$pkgver.tar.gz
 	haveged.initd
 	haveged.confd"
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,13 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	rm "$pkgdir"/usr/lib/libhavege.la
@@ -45,7 +39,6 @@ package() {
 		"$pkgdir"/etc/conf.d/haveged
 }
 
-sha512sums="20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d  haveged-1.9.4.tar.gz
-6279296b057f19daf25020ac14997268230af4b11510d6e5c4a86989c119d6b081d2501069af198772302d5cce1464514c749033a4928fb95671268825a84ba8  fix-cpu-cache-size-detection.patch
+sha512sums="6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db  haveged-1.9.8.tar.gz
 5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64  haveged.initd
 58fa2c513e26291047b60ea6d6355ad837c1cb07750a2dfb2a5ebf90cc504a4b6ebf3573869410a06cac85d9b634b3df988e8b033921394da8a5abeee574c822  haveged.confd"
diff --git a/user/haveged/fix-cpu-cache-size-detection.patch b/user/haveged/fix-cpu-cache-size-detection.patch
deleted file mode 100644
index 07da2b46d..000000000
--- a/user/haveged/fix-cpu-cache-size-detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Some ARM cpus does not report the cache size or say it is -1
-
-diff --git a/src/havegetune.c b/src/havegetune.c
-index f1a99f2..de39c53 100644
---- a/src/havegetune.c
-+++ b/src/havegetune.c
-@@ -795,6 +795,8 @@ static int vfs_configInfoCache(
-          ctype = vfs_configFile(pAnchor, path, vfs_configType);
-          strcpy(path+plen, "size");
-          size  = vfs_configFile(pAnchor, path, vfs_configInt);
-+	 if (size == -1)
-+		 size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE;
-          cfg_cacheAdd(pAnchor, SRC_VFS_INDEX,  pArgs[1], level, ctype, size);
-          }
-      }
diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD
index 1f2106f48..7fdc018b7 100644
--- a/user/imagemagick/APKBUILD
+++ b/user/imagemagick/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: 
 pkgname=imagemagick
-pkgver=7.0.8.61
+pkgver=7.0.8.68
 _abiver=7
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
@@ -16,7 +16,7 @@ makedepends="zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev
 	libxml2-dev librsvg-dev libraw-dev"
 checkdepends="freetype fontconfig lcms2 graphviz"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-c++:_cxx $pkgname-libs"
-source="https://distfiles.adelielinux.org/source/ImageMagick/ImageMagick-$_pkgver.tar.lz"
+source="https://dev.sick.bike/dist/ImageMagick-$_pkgver.tar.lz"
 builddir="$srcdir/ImageMagick-${_pkgver}"
 
 # secfixes:
@@ -82,4 +82,4 @@ _cxx() {
 	mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="e73b7dbb319ddef39613a4f306eb2d070c56c9a9953a75d9e12e0a7ab6c18fd0a0638eb84a6c2ea7873ba41b5aa0a1afb71cf77ccc9eec5c72a5da2faa72eeea  ImageMagick-7.0.8-61.tar.lz"
+sha512sums="575398c6894a2590f6bd2e1c318ce09b12f019f7b8fd0bec9d0d5ee3e94d4f364c493e2e3f37a219b651caa8cb2336a4873dde6da7b5711da096ab520adc2b23  ImageMagick-7.0.8-68.tar.lz"
diff --git a/user/lcov/APKBUILD b/user/lcov/APKBUILD
new file mode 100644
index 000000000..94bc30eb5
--- /dev/null
+++ b/user/lcov/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=lcov
+pkgver=1.14
+pkgrel=0
+pkgdesc="Graphical frontend for GCC GCov"
+url="http://ltp.sourceforge.net/coverage/lcov.php"
+arch="noarch"
+license="GPL-2.0+"
+depends="perl"
+makedepends=""
+subpackages="$pkgname-doc"
+source="https://downloads.sourceforge.net/ltp/lcov-$pkgver.tar.gz"
+
+build() {
+	make
+}
+
+check() {
+	make test
+}
+
+package() {
+	GIT_DIR= make PREFIX=/usr DESTDIR="$pkgdir" install
+}
+
+sha512sums="2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc  lcov-1.14.tar.gz"
diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD
index c58ebd06d..dcc71891e 100644
--- a/user/mutt/APKBUILD
+++ b/user/mutt/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=mutt
-pkgver=1.12.1
+pkgver=1.12.2
 pkgrel=0
 pkgdesc="Small but very powerful text-mode email client"
 url="http://www.mutt.org"  # No HTTPS
@@ -56,4 +56,4 @@ package() {
 		"$pkgdir"/etc/Muttrc.gpg.dist
 }
 
-sha512sums="0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538  mutt-1.12.1.tar.gz"
+sha512sums="a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd  mutt-1.12.2.tar.gz"
diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD
index 698c0c4d9..173f4da66 100644
--- a/user/netqmail/APKBUILD
+++ b/user/netqmail/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=netqmail
 pkgver=1.06
-pkgrel=5
+pkgrel=6
 pkgdesc="The qmail mail transfer agent (community version)"
-url="http://www.qmail.org/$pkgname/"
+url="http://www.netqmail.org/"
 arch="all"
 license="Public-Domain"
 provides=sendmail
@@ -14,7 +14,7 @@ makedepends="utmps-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 install="$pkgname.post-install $pkgname.pre-deinstall"
 provider_priority=1
-source="http://www.qmail.org/$pkgname-$pkgver.tar.gz
+source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz
 	0001-DESTDIR.patch
 	0002-qbiffutmpx-20170820.patch
 	0003-qmailremote-20170716.patch
diff --git a/user/os-prober/APKBUILD b/user/os-prober/APKBUILD
new file mode 100644
index 000000000..65ff5061b
--- /dev/null
+++ b/user/os-prober/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=os-prober
+pkgver=1.77
+pkgrel=0
+pkgdesc="Utility to detect operating systems on hard drives"
+url="http://joeyh.name/code/os-prober/"
+arch="all"
+options="!check"  # No test suite.
+license="GPL-2.0+ AND GPL-1.0+"
+depends="/bin/sh"
+makedepends=""
+subpackages=""
+source="http://deb.debian.org/debian/pool/main/o/os-prober/os-prober_$pkgver.tar.xz"
+
+build() {
+	make
+}
+
+package() {
+	case $CTARGET_ARCH in
+	i486|i586|pmmx|x86*)
+		PROBE_ARCH=x86;;
+	ppc*)
+		PROBE_ARCH=powerpc;;
+	sparc*)
+		PROBE_ARCH=sparc;;
+	*)
+		PROBE_ARCH=$CTARGET_ARCH;;
+	esac
+	for probes in os-probes os-probes/mounted os-probes/init \
+		      linux-boot-probes linux-boot-probes/mounted; do
+		mkdir -p "$pkgdir/usr/lib/$probes"
+		for file in $probes/common/*; do
+			install -Dm644 $file "$pkgdir/usr/lib/$probes"
+		done
+		if [ -e "$probes/${PROBE_ARCH}" ]; then
+			install -Dm644 $probes/${PROBE_ARCH}/* \
+				"$pkgdir/usr/lib/$probes"
+		fi
+	done
+	mkdir -p "$pkgdir"/usr/lib/os-prober "$pkgdir"/usr/bin
+	mkdir -p "$pkgdir"/usr/share/os-prober
+	install -Dm755 newns "$pkgdir"/usr/lib/os-prober/
+	install -Dm755 os-prober "$pkgdir"/usr/bin/
+	install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/
+	install -Dm644 common.sh "$pkgdir"/usr/share/os-prober/
+}
+
+sha512sums="4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066abbbbb78f593f2564314c9adbd43f60e39b  os-prober_1.77.tar.xz"
diff --git a/user/py3-attrs/APKBUILD b/user/py3-attrs/APKBUILD
index 0131140b4..5d3e04b20 100644
--- a/user/py3-attrs/APKBUILD
+++ b/user/py3-attrs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=py3-attrs
-pkgver=19.1.0
+pkgver=19.2.0
 pkgrel=0
 pkgdesc="Python classes without boilerplate"
 url="https://www.attrs.org"
@@ -27,4 +27,4 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="c7c13d1aa2c8f8b5459cda02dee8f311a22e3d198bda3d4c5508e6e1914004e53388d149fea61358784f28cebf8e712f7807018586eeaa87d31199085e59675a  py3-attrs-19.1.0.tar.gz"
+sha512sums="f7ad98edaf685e7ab85c26a93ab310d82e48927a64694a6fa947d110f6623103335a42e335ed9fd1d2bc61504e60ef8e8d0733603c980bf2c6c157f3429e8875  py3-attrs-19.2.0.tar.gz"
diff --git a/user/py3-importlib_metadata/APKBUILD b/user/py3-importlib_metadata/APKBUILD
index d642738f9..593099053 100644
--- a/user/py3-importlib_metadata/APKBUILD
+++ b/user/py3-importlib_metadata/APKBUILD
@@ -4,7 +4,7 @@ pkgname=py3-importlib_metadata
 _pkgname=importlib_metadata
 _p="${_pkgname#?}"
 _p="${_pkgname%"$_p"}"
-pkgver=0.19
+pkgver=0.23
 pkgrel=0
 pkgdesc="Python package metadata accessor"
 url="https://pypi.python.org/pypi/importlib_metadata"
@@ -13,6 +13,7 @@ arch="noarch"
 license="Apache-2.0"
 depends="python3 py3-importlib_resources py3-zipp"
 makedepends=""
+checkdepends="py3-packaging"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz
 	scm.patch"
 builddir="$srcdir/$_pkgname-$pkgver"
@@ -29,5 +30,5 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="2d0126e7430804b2295ec159778082806957cb86b5c7408c38064cc7c7e62229d382778284a5a231925ab336a7cc6da8e705f6bd7ae6da66f11acd1229bda17b  py3-importlib_metadata-0.19.tar.gz
-5aa0967a0c9e5c27434689586e51fcf3898a52f904d7ec92cf1eda15810da04b837ac0f5caea32d9f41733b13e826b06a1064b6f15e14c5fac5b2c4b6fd950c8  scm.patch"
+sha512sums="56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a  py3-importlib_metadata-0.23.tar.gz
+12021ed7d2a358aa87c98ef7d410cc9680f71b3f31cb577b0d510b1220de240c6317ed59eceebfcded6d42d07887c013a05ed399a460616dba25cea0c33111b8  scm.patch"
diff --git a/user/py3-importlib_metadata/scm.patch b/user/py3-importlib_metadata/scm.patch
index 1c33ab959..adab51e0e 100644
--- a/user/py3-importlib_metadata/scm.patch
+++ b/user/py3-importlib_metadata/scm.patch
@@ -15,4 +15,4 @@
  from setuptools import setup
  
 -setup(use_scm_version=True)
-+setup(version='0.19')
++setup(version='0.23')
diff --git a/user/py3-pillow/APKBUILD b/user/py3-pillow/APKBUILD
index 48d9a22dd..efc2a7b64 100644
--- a/user/py3-pillow/APKBUILD
+++ b/user/py3-pillow/APKBUILD
@@ -4,7 +4,7 @@ pkgname=py3-pillow
 _pkgname=Pillow
 _p="${_pkgname#?}"
 _p="${_pkgname%"$_p"}"
-pkgver=6.1.0
+pkgver=6.2.0
 pkgrel=0
 pkgdesc="A Python Imaging Library"
 url="https://pypi.org/project/Pillow"
@@ -50,5 +50,5 @@ doc() {
 	install -Dm644 LICENSE "$subpkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-sha512sums="6e9404eaa6a7d01642b9201a0733eb208422070993aa214691f549e261350e0baad6eb2bcde6d5edfa47c232d89457b9185de24e55e9536dde7790124ea34a0f  py3-pillow-6.1.0.tar.gz
+sha512sums="6eeb51d764c85a9b1f4eb0a59bbff41541852d5e2988c0e32b03acb56010b7d398f5761daaa56731bde278e52a551b44fab5b662988e096e8fd53e5d15d4e083  py3-pillow-6.2.0.tar.gz
 c01e83a7cef6653a33f60acbcbc737f0d40ff0dbc792ce0b2ce52f21092d3071845830fa0f64b27a1c5e679c53df57e0ec2e89867ee717f938d4e6f19db77790  py3-pillow-scripts-b24479c.tar.gz"
diff --git a/user/py3-pluggy/APKBUILD b/user/py3-pluggy/APKBUILD
index 2604e972f..b5a750e5f 100644
--- a/user/py3-pluggy/APKBUILD
+++ b/user/py3-pluggy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=py3-pluggy
 _pkgname=pluggy
-pkgver=0.12.0
+pkgver=0.13.0
 pkgrel=0
 pkgdesc="Plugin management and hook calling for Python"
 url="https://pypi.python.org/pypi/pluggy"
@@ -12,7 +12,7 @@ options="!check"  # Cyclic dependency with py3-pytest. Passes on x86_64
 license="MIT"
 depends="python3 py3-importlib_metadata"
 makedepends="python3-dev"
-#checkdepends="py3-pytest"
+checkdepends="py3-pytest"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz
 	scm.patch"
 builddir="$srcdir/$_pkgname-$pkgver"
@@ -29,5 +29,5 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="a3a64caefc797334b73b0614e467613b99909037a62dcbfbb0cf917788ee8d12af4f43d7c371634ac6eb6f32a5aa08e51aa8179e70b5998d4d055cd7f535129f  py3-pluggy-0.12.0.tar.gz
-7a5c4d3fe2d57b079c2589c2ca1b75d96ff2561cf5bfb7991b81828dd6de04f6b126633f248bb71a5f165174184792b5857f9c7678e694dd68e0ba2b1ffef627  scm.patch"
+sha512sums="82cf7d8aa4a0e09f8ba5048cd7ce038f34ca1453fe0c5a7926a2113e64528d0861955f8544035b4ffd61f0227e3d30d8d4180a05bf80e0de4809546e990bd4c7  py3-pluggy-0.13.0.tar.gz
+0d811c2ba311b64af7762d48f92d3df2d72e71398f5b42d4ae71a067810f6d4b6d0f0bc4a06529f7e335c54e70640cc8c82b00b5dccd54aee4310c24bfa5e7ce  scm.patch"
diff --git a/user/py3-pluggy/scm.patch b/user/py3-pluggy/scm.patch
index 733e8d297..b96f0720a 100644
--- a/user/py3-pluggy/scm.patch
+++ b/user/py3-pluggy/scm.patch
@@ -6,7 +6,7 @@
          long_description=long_description,
 -        use_scm_version={"write_to": "src/pluggy/_version.py"},
 -        setup_requires=["setuptools-scm"],
-+        version='0.12.0',
++        version='0.13.0',
          license="MIT license",
          platforms=["unix", "linux", "osx", "win32"],
          author="Holger Krekel",
diff --git a/user/py3-pytest/APKBUILD b/user/py3-pytest/APKBUILD
index 63616f400..e3d733947 100644
--- a/user/py3-pytest/APKBUILD
+++ b/user/py3-pytest/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=py3-pytest
 _pkgname=pytest
-pkgver=5.0.1
+pkgver=5.2.0
 pkgrel=0
 pkgdesc="A python test library"
 url="https://pypi.python.org/pypi/pytest"
@@ -13,7 +13,7 @@ license="MIT"
 depends="python3 py3-atomicwrites py3-attrs py3-more-itertools
 	py3-packaging py3-pluggy py3-py py3-six py3-wcwidth"
 makedepends="python3-dev"
-#checkdepends="py3-pytest py3-hypothesis"
+checkdepends="py3-pytest py3-hypothesis"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz
 	scm.patch"
 builddir="$srcdir/$_pkgname-$pkgver"
@@ -23,14 +23,14 @@ build() {
 }
 
 check() {
+	rm -f testing/test_junitxml.py
 	# You would think you could get away with "python3 -m pytest" but no...
 	PYTHONPATH="$builddir/build/lib:$PYTHONPATH" pytest
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db  py3-pytest-5.0.1.tar.gz
-c671edd19cf5bfe1502e2c42a1b301205417c5d4f564a8dd02ddad354021b0a8b4d01cc0f5d7c36b13d56583c18cd6a1db736b7d49634c0fb2d1159b429dafda  scm.patch"
+sha512sums="5c766c263cdafb5e1cdb65d883ac7f5b50da14356b074448f8458e78eda8916190142dbaf7006235c02647d600e40851848e5905df17f8dff0a9fb02a90bd78d  py3-pytest-5.2.0.tar.gz
+6c597ec2416017ebc0bf2e9df338234e3ab8ca187242bab2b8f411316cc04f3c29a9a939faab349b8201043c7c16ceefe614349793e2010e62f16d9e7aefa05f  scm.patch"
diff --git a/user/py3-pytest/scm.patch b/user/py3-pytest/scm.patch
index ef45821cd..e3b923f1d 100644
--- a/user/py3-pytest/scm.patch
+++ b/user/py3-pytest/scm.patch
@@ -6,7 +6,7 @@
          use_scm_version={"write_to": "src/_pytest/_version.py"},
 -        setup_requires=["setuptools-scm", "setuptools>=40.0"],
 +        setup_requires=["setuptools>=40.0"],
-+        version="5.0.1",
++        version="5.2.0",
          package_dir={"": "src"},
          # fmt: off
          extras_require={
diff --git a/user/py3-virtualenv/APKBUILD b/user/py3-virtualenv/APKBUILD
index bd609fdf2..1697099f9 100644
--- a/user/py3-virtualenv/APKBUILD
+++ b/user/py3-virtualenv/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=py3-virtualenv
 _pkgname=virtualenv
-pkgver=16.7.2
+pkgver=16.7.5
 pkgrel=0
 pkgdesc="Virtual Python Environment builder"
 url="https://pypi.org/project/virtualenv"
@@ -20,7 +20,7 @@ builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
 	python3 setup.py build
-  sed -ie "s/env python$/env python3/" virtualenv.py
+	sed -ie "s/env python$/env python3/" virtualenv.py
 }
 
 check() {
@@ -31,7 +31,7 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="63467cd2e577d0d56b5fb3529d9fb12a64f08f756a5f1310487f0d64da8452c4743872c6b620984e0877e0a98b3080efc6bb8c58cc64c4f120da8e67e91044cc  py3-virtualenv-16.7.2.tar.gz
+sha512sums="60b734f688eec1491fe5dcc3652d42f3e44df89d0809d3ab563c5dab1b5e340404894f34a08994a5ad4d8c0f7c8bb995d8211f9378906957d34031720bb3c390  py3-virtualenv-16.7.5.tar.gz
 22f05b9c3d35339a28f50f7a01d81df082a00609712a5c38b92fe5d5c98ea077ad76c7d5a5072968105622d06e40897a34878133a4b5fd895a62d1e0d9a8928e  python3-provides.patch
 f5e2a5036c7dfa124b71914981c46955466cb718392a90a4d8536dde4c153eb9cf3a8539c5cf870bb820b6e518c8b781025b825e11924ea4533890fa31e5a951  python3.patch
 a5545b1dd3b0465233b983fd90cdfbd4514350e32a7d312107b9cfa83c8755f961bd483796a48697c9938fd44a60171c4368aa3f4b2760be8d2d8e053f719529  tests.patch"
diff --git a/user/py3-zipp/APKBUILD b/user/py3-zipp/APKBUILD
index ba2673027..aa57d3dc3 100644
--- a/user/py3-zipp/APKBUILD
+++ b/user/py3-zipp/APKBUILD
@@ -5,14 +5,14 @@ pkgname=py3-zipp
 _pkgname=zipp
 _p="${_pkgname#?}"
 _p="${_pkgname%"$_p"}"
-pkgver=0.5.2
+pkgver=0.6.0
 pkgrel=0
 pkgdesc="Backport of Python 3.7's zip.Path"
 url="https://pypi.python.org/pypi/zipp"
 arch="noarch"
 # Certified net clean
 license="MIT"
-depends="python3"
+depends="python3 py3-more-itertools"
 makedepends=""
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz
 	scm.patch"
@@ -30,5 +30,5 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c  py3-zipp-0.5.2.tar.gz
-7e9061e3ba0e3ded95633f1baa1438f7bb7ea32cecd423001bcbafdfad93aca5bfe0a444035e41b31aeea66b31c86b22854b4f18b2cbbfda356986a2433ca677  scm.patch"
+sha512sums="18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052  py3-zipp-0.6.0.tar.gz
+6eee026c1a7a1a84c1b7584b86d4e95d1c7ba0cbed3554260196de842944a303be2f05a1c4492c95fb9592bef96906fbc643ce638a931d7d69f3e74a6647b935  scm.patch"
diff --git a/user/py3-zipp/scm.patch b/user/py3-zipp/scm.patch
index b7d0f690e..82c6f7e55 100644
--- a/user/py3-zipp/scm.patch
+++ b/user/py3-zipp/scm.patch
@@ -1,9 +1,9 @@
 --- zipp-0.5.2/setup.cfg	2019-07-07 17:14:00.000000000 -0400
 +++ zipp-0.5.2/setup.cfg	2019-08-06 05:03:34.500180967 -0400
 @@ -22,7 +22,7 @@ packages = find:
- include_package_data = true
  python_requires = >=2.7
  install_requires = 
+ 	more_itertools
 -setup_requires = setuptools_scm >= 1.15.0
 +setup_requires = 
  
@@ -16,4 +16,4 @@
  
  if __name__ == "__main__":
 -    setuptools.setup(use_scm_version=True)
-+    setuptools.setup(version='0.5.2')
++    setuptools.setup(version='0.6.0')
diff --git a/user/talloc/APKBUILD b/user/talloc/APKBUILD
index bf6cb12c8..4ed262975 100644
--- a/user/talloc/APKBUILD
+++ b/user/talloc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=talloc
-pkgver=2.2.0
+pkgver=2.3.0
 pkgrel=0
 pkgdesc="Memory pool management library"
 url="https://talloc.samba.org"
@@ -45,4 +45,4 @@ py3() {
 		"$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388  talloc-2.2.0.tar.gz"
+sha512sums="f0020d83520ea24711040c44600180fabae7b0e0668a961a66f5d4f77d89b09d799ddadf781ee2d044ad059b2d6a2e5232068fd77b300a8366592c0ce2289837  talloc-2.3.0.tar.gz"
diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD
index 953cc380c..335c0de4b 100644
--- a/user/youtube-dl/APKBUILD
+++ b/user/youtube-dl/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=youtube-dl
-pkgver=2019.08.13
+pkgver=2019.09.28
 pkgrel=0
 pkgdesc="Command-line program to download videos from YouTube and many other sites"
 url="https://youtube-dl.org"
@@ -63,4 +63,4 @@ fishcomp() {
 		"$subpkgdir/usr/share/fish/completions/"
 }
 
-sha512sums="0b5066f3ce93bc0ffa3f9c3aefe4154daae38e78449a8b5825ecf032252f8fafde893f1325809b3d9fecf28ca1c2539d941b90acf204c5bf68783e79fcd28c61  youtube-dl-2019.08.13.tar.gz"
+sha512sums="b5d5034f9ace17ee18b550b825431797b49d1f916963d483c95a737a3f2842c4c916f6d24f2056efbb786ed3c2ddf269f28f736a650a47b7ff0f94256aba4e94  youtube-dl-2019.09.28.tar.gz"