358 files changed, 5373 insertions, 1271 deletions
diff --git a/user/.rootbld-repositories b/user/.rootbld-repositories
index b8c131a9a..dd670b51f 100644
--- a/user/.rootbld-repositories
+++ b/user/.rootbld-repositories
@@ -1,2 +1,2 @@
-https://distfiles.adelielinux.org/adelie/1.0-alpha6/system/
-https://distfiles.adelielinux.org/adelie/1.0-alpha6/user/
+https://distfiles.adelielinux.org/adelie/1.0-beta1/system/
+https://distfiles.adelielinux.org/adelie/1.0-beta1/user/
diff --git a/user/acpilight/APKBUILD b/user/acpilight/APKBUILD
index 97956accd..f81e93e37 100644
--- a/user/acpilight/APKBUILD
+++ b/user/acpilight/APKBUILD
@@ -1,21 +1,20 @@
 # Contributor: Max Rees <maxcrees@me.com>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=acpilight
-pkgver=1.0.1
+pkgver=1.1
 pkgrel=0
 pkgdesc="Control backlight brightness level"
-url="https://github.com/wavexx/acpilight"
+url="https://gitlab.com/wavexx/acpilight"
 arch="noarch"
-license="GPL-3.0"
+license="GPL-3.0+"
 depends="eudev python3"
 makedepends=""
 install="$pkgname.post-install"
 subpackages="$pkgname-doc"
 options="!check"  # Just a udev rule and a python script
-source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz
-	python3.patch
+source="https://gitlab.com/wavexx/acpilight/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
 	rules-warning.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 build() {
 	cd "$builddir"
@@ -31,6 +30,5 @@ package() {
 		"$pkgdir/usr/share/man/man1/xbacklight.1"
 }
 
-sha512sums="c9b5805f919172d4806942ba1987d0c11fda420a807c45c404eda83cbcfc6011729b09d7ae3113106e006d2ed65ab26e4932869305e48d9493514b597c6e9713  acpilight-1.0.1.tar.gz
-9ed3bc124a0120d7d4ea8831e7bef715c5c45b3e3389aed55261cf436db8cb123a8bffe463a29107cb27161a59ed6a31623e23f2b55797c99be92a2d26eabca0  python3.patch
-63521df95b943c941c6687960b69f4ca51f2b36c3d390ef50738034f13afbab175b0a69c7874bc47bc85a1b8d877a26427eba3a264803b700ff652c3c28cd2ad  rules-warning.patch"
+sha512sums="af10a538fec83315aaec3837647622ecea41cb936d38667e4e70689a2b8a968a786fc9ad2be136d5799fa091f07614886decc9044e71aec1e64765e90ddae439  acpilight-v1.1.tar.gz
+1b04e8c92bd39f2230b351fc15c63a303f71768ebce58fff5ed3d99fcbc38b417a61214227ab8612e6212d8db775dad2b5f9bad58fddf57452e2ff2cfa4fd077  rules-warning.patch"
diff --git a/user/acpilight/acpilight.post-install b/user/acpilight/acpilight.post-install
index 0e64cf725..958c8dbd3 100644
--- a/user/acpilight/acpilight.post-install
+++ b/user/acpilight/acpilight.post-install
@@ -1,8 +1,5 @@
 #!/bin/sh
-chgrp video /sys/class/backlight/*/brightness || true
-chmod g+w /sys/class/backlight/*/brightness || true
-chgrp video /sys/class/leds/*/brightness || true
-chmod g+w /sys/class/leds/*/brightness || true
+udevadm trigger -s backlight -c add
 
 echo "*"
 echo "* Any user wishing to use xbacklight must be in the 'video' group."
diff --git a/user/acpilight/python3.patch b/user/acpilight/python3.patch
deleted file mode 100644
index ab0ffe61f..000000000
--- a/user/acpilight/python3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- acpilight-1.0/xbacklight	2017-02-23 21:03:30.000000000 +0000
-+++ acpilight-1.0/xbacklight	2018-01-13 08:52:42.400000000 +0000
-@@ -1,9 +1,8 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- # xbacklight: control backlight and led brightness on linux using the sys
- #             filesystem with a backward-compatibile user interface
- # Copyright(c) 2016-2017 by wave++ "Yuri D'Elia" <wavexx@thregr.org>
- # -*- coding: utf-8 -*-
--from __future__ import print_function, division, generators
- 
- APP_DESC = "control backlight brightness"
- SYS_PATH = ["/sys/class/backlight", "/sys/class/leds"]
-@@ -99,7 +98,7 @@
- 
-     # set current operating controller
-     if args.ctrl is None:
--        ctrl = Controller(next(iter(ctrls.values())))
-+        ctrl = Controller(next(iter(list(ctrls.values()))))
-     else:
-         if args.ctrl not in ctrls:
-             error("unknown controller '{}'".format(args.ctrl))
diff --git a/user/acpilight/rules-warning.patch b/user/acpilight/rules-warning.patch
index 45c7abacb..749bf8ac8 100644
--- a/user/acpilight/rules-warning.patch
+++ b/user/acpilight/rules-warning.patch
@@ -1,8 +1,8 @@
---- acpilight-1.0/90-backlight.rules	2017-02-23 21:03:30.000000000 +0000
-+++ acpilight-1.0/90-backlight.rules	2018-01-13 09:14:11.290000000 +0000
+--- acpilight-v1.1/90-backlight.rules	2018-06-21 14:09:44.000000000 +0000
++++ acpilight-v1.1/90-backlight.rules	2018-09-04 00:12:34.839762243 +0000
 @@ -1,4 +1,5 @@
  # Allow video group to control backlight and leds
 +# do not edit this file, it will be overwritten on update
  SUBSYSTEM=="backlight", ACTION=="add", \
-   RUN+="/bin/chgrp video %S%p/brightness", \
-   RUN+="/bin/chmod g+w %S%p/brightness"
+   RUN+="/bin/chgrp video /sys/class/backlight/%k/brightness", \
+   RUN+="/bin/chmod g+w /sys/class/backlight/%k/brightness"
diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD
index 54bb1f8e1..c9d32132a 100644
--- a/user/akonadi-contacts/APKBUILD
+++ b/user/akonadi-contacts/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=akonadi-contacts
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Library for integrating contact lists with Akonadi"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3334bad8cf9ee9b79253260ec62cab527d8fe823131fdb212f1e2dcc120892715c24aaf0a5d977939a69d47e458034b405e8be4da27a12022b94488332ae7683  akonadi-contacts-18.04.3.tar.xz"
+sha512sums="d27e2acafc5b1395f670683730d6dba59481807dca8c773fcf5ab3de70982b5eff1bd3802a38853bda60331466ecc7aac77eb916effad1e871b24b456533517a  akonadi-contacts-18.08.1.tar.xz"
diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD
index 131dce60d..8f0c83a06 100644
--- a/user/akonadi-mime/APKBUILD
+++ b/user/akonadi-mime/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=akonadi-mime
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Libraries to implement basic MIME message handling"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="85160394bbf9e6d922148ae3adc9cec1d0204a826b05db3c291e81d076cb08a1c14aed1e7ef031da9e0bbf043524f4d314b7f5f23639717b41911cdc2f1c5de2  akonadi-mime-18.04.3.tar.xz"
+sha512sums="67abb50167b2c8e98126346bcacbd55943d2b199603853125578154c39a390cd6cb8be169e4acb356669730a86a65c2e3fb7d7610d466c2b1dce7f689b39fec1  akonadi-mime-18.08.1.tar.xz"
diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD
index 6158a1985..c9532814c 100644
--- a/user/akonadi/APKBUILD
+++ b/user/akonadi/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=akonadi
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Libraries and storage system for PIM data"
 url="https://community.kde.org/KDE_PIM/Akonadi"
@@ -49,5 +49,5 @@ package() {
 		"$pkgdir"/usr/share/config/akonadi
 }
 
-sha512sums="dc4111d2198c5ac8a11613c60e4cc330b1d337179c917354a059c3f843b218e5c465bb44ae924a9db712f985d0d044625a56634481faa474a0e92888d098e49c  akonadi-18.04.3.tar.xz
+sha512sums="50d5711e2b78ed512efa771c4852885c5464dc7cea3563cabd79bcbff7847906f300c453f863b1f1b6d3d3508a060eb2a69e3e94f75d2079eca66a0ff15c581c  akonadi-18.08.1.tar.xz
 b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab  akonadiserverrc"
diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD
index 28c1446cc..0555f6dcb 100644
--- a/user/analitza/APKBUILD
+++ b/user/analitza/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=analitza
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Mathematical object library"
 url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html"
@@ -12,8 +12,7 @@ depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev eigen-dev
 	qt5-qtsvg-dev qt5-qtdeclarative-dev"
 subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/analitza-$pkgver.tar.xz
-	pmmx-test-failure.patch"
+source="https://download.kde.org/stable/applications/$pkgver/src/analitza-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -42,5 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1eabdba287830723ad6d6c30299c6bebe902a5d0236c70c0435a9abb83442604010fdea064e91a023e7fc8a85e32c6ffc83dc9ae31d287cc71a828cd77dd83e9  analitza-18.04.3.tar.xz
-c38ce1f8265224aebfa8dcf8ef93a83bb2abd4eb757add3a7578660753bf9f16cbd497c9d696f22a6345602585a06bf4bad2bd89b2ea75e70baf9f8739198da9  pmmx-test-failure.patch"
+sha512sums="b04415ad46919a6c5e53a86218597d25648092058f8029947bf09cb9f0bd174314b76951d998bedf0ecc6e543ead91e14ec752c4a673c567a02ae7badc1450fc  analitza-18.08.1.tar.xz"
diff --git a/user/analitza/pmmx-test-failure.patch b/user/analitza/pmmx-test-failure.patch
deleted file mode 100644
index 6e1bce2d4..000000000
--- a/user/analitza/pmmx-test-failure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/analitza/commands/listcommands.cpp b/analitza/commands/listcommands.cpp
-index b77f49a9..2885169a 100644
---- a/analitza/commands/listcommands.cpp
-+++ b/analitza/commands/listcommands.cpp
-@@ -69,8 +69,9 @@ Expression RangeCommand::operator()(const QList<Analitza::Expression >& args)
-
-     Analitza::List *seq = new Analitza::List;
-         
--    for (double x = a; x <= b; x += h)
-+    for (double x = a; x < b || qFuzzyCompare(x, b); x += h) {
-         seq->appendBranch(new Analitza::Cn(x));
-+    }
-     
-     ret.setTree(seq);
diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD
index fad52d9dd..cd9c11879 100644
--- a/user/ark/APKBUILD
+++ b/user/ark/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ark
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Graphical file compression/decompression utility with support for multiple formats"
 url="https://utils.kde.org/projects/ark/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="39348d3cbd3ed044ecc40a235c3e93dacb638e3ea867f814c722630786fbf7ea48643f967fb46f3358c64966a250306f11ab2a76c9147bc135ba826bcce9d33d  ark-18.04.3.tar.xz"
+sha512sums="b4daf4f438a084df452063556a1754856a56a9a97db2c8379775d9803bc262447f7fed983c4a04e046f2a5e673ae43e4f3a902854912f79da14b9080c9970eaf  ark-18.08.1.tar.xz"
diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD
index 11a418c29..21e2974fc 100644
--- a/user/artikulate/APKBUILD
+++ b/user/artikulate/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=artikulate
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Pronunciation trainer for languages"
 url="https://www.kde.org/applications/education/artikulate/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4fa7c6d24d0dd13bb3810545426a626d1c84c72b083e410b70524aa4cbe621f577494b8f60c309dbecdab036353cc9fffb6c8fcf71a3607f13469001395f474f  artikulate-18.04.3.tar.xz"
+sha512sums="1f81e5ff112d0424550a7af09fc5bbbb4bc2eb926b7fc791493c34c2fa82f1e27e51d92467eed186ba4bcfa3e0f0bf65ad93b0c4c061067052eaa04a5c0bcc29  artikulate-18.08.1.tar.xz"
diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD
index c024b4e31..e66239fc5 100644
--- a/user/attica/APKBUILD
+++ b/user/attica/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=attica
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Qt 5-based implementation of Open Collaboration Services"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7e56a0236793d6028160cca56bf799f6042095e16853a9413795f1f123e7c09114b1bf688ea4534712f5db13554d91d7f5c1c991b8fc379efe9977bc453ae4f6  attica-5.48.0.tar.xz"
+sha512sums="026fcb7d5de01840dfaa8f28f007cd1fba142af0e1b471b5c4f5ef479e4d5b169108703ddf30998ba3e33c054bd8a833ee3f8bc4ebac25fafdba196f93166b07  attica-5.50.0.tar.xz"
diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD
index 407888b3e..50cc78724 100644
--- a/user/baloo/APKBUILD
+++ b/user/baloo/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=baloo
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Semantic desktop search framework"
 url="https://www.kde.org/"
@@ -56,5 +56,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ceebe025cb922836254831947005ed5b294e232395252054f316d7cc796bebf09ebdc2d8980c71b8959f9f7f89bd1f9f16418c67328b0224afd3bc1367ee3cd0  baloo-5.48.0.tar.xz
+sha512sums="e516ef4361ed24ec4f524bb46e1fd6e62edf2d497a56538c920d07090fe295ca8dd2fb5661a99879cdd47ee2c3037c727026838681525a6f3596ba70669b901d  baloo-5.50.0.tar.xz
 5622f1eb7a692c0ebd5d904b421612292375d3ea3f4ffdc4624fa8e2dc4a5fe56e5636f11a388224642be03c8fc28a678cffb9b167eb3de48ff4ae2979e6435e  initialise-variable.patch"
diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD
index bbb1acfc4..ebc355658 100644
--- a/user/blinken/APKBUILD
+++ b/user/blinken/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=blinken
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Memory enhancement game"
 url="https://www.kde.org/applications/education/blinken/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="55a02b9c1041c8cf554431f338f4117300a25c5976f01c6ba3a3b28e66f0ea9742fb0dcd4fd25cb69a3ba5c41ef3b7633ae1259672a8e8175687ff17130920cc  blinken-18.04.3.tar.xz"
+sha512sums="d5bc40e2a2aa9f0d0d350d6aef57456bebb5e91e9f1f512b90eba720bd4d4a58762a3e04378296b06374125c93820f201752939d4ca75cf81cffb023fa8591a7  blinken-18.08.1.tar.xz"
diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD
index 59c5e0b82..a31ebc6a5 100644
--- a/user/bomber/APKBUILD
+++ b/user/bomber/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bomber
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Arcade bombing game"
 url="https://www.kde.org/applications/games/bomber/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="40297bfa9c3fb543a8f8903a70fe7e7987d9fd5ba063ab1de2cf58801ced0249f4b9019aa7492ee30f027c74cde8c0fe268888835e37ae56b0621dcdf8f30811  bomber-18.04.3.tar.xz"
+sha512sums="17d09475097ed84a36da0eb769f1b77e2248ab253c4ce774e73b97146a08fbf7864e088af4e63cbafbdb3dd3aba5bb197af9451f9e767643faa5fe35d5cdd22f  bomber-18.08.1.tar.xz"
diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD
index 7454a2cc0..5d2346ded 100644
--- a/user/bovo/APKBUILD
+++ b/user/bovo/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bovo
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Gomoku or Connect Five game"
 url="https://www.kde.org/applications/games/bovo/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f2efdb2e1f929febc0c1e7ed896d0067e61b3f8cc08616396718e9b79c60737921ea352d8cd4450358ee7b06d74d7130f5890fa993a4b23ecc35681ca3fcee8c  bovo-18.04.3.tar.xz"
+sha512sums="fbd38aa34144aa2a7417b751cdc2b9c95aa8ddd1714b5d83e3fac0282f27d99dca32fcbafe493d5e8571268ebcb74142755fdaa56246fbe87eaadfbaa469d1d3  bovo-18.08.1.tar.xz"
diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD
index 835b2d1ad..10cd74567 100644
--- a/user/breeze-icons/APKBUILD
+++ b/user/breeze-icons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=breeze-icons
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Modern, coherent icon set for desktops"
 url="https://www.kde.org/"
@@ -46,4 +46,4 @@ dark() {
 	mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/
 }
 
-sha512sums="f1095293307080628e43aa452b22e897f22a4ba3b7654f19390ce0cb3ee7a0507eef7a394986c4b8d032fbadd716c79aa77487b44445ca056f4b03b12cd39d83  breeze-icons-5.48.0.tar.xz"
+sha512sums="b47061154606f60973a2232393aa36bf76d67936883bba6d55bb303450156cd07710c9436d91523cbcf347886e05975fcbb5cd3d7b6f6a30ae18dc89c2eb377c  breeze-icons-5.50.0.tar.xz"
diff --git a/user/clucene/APKBUILD b/user/clucene/APKBUILD
new file mode 100644
index 000000000..2c5e047e4
--- /dev/null
+++ b/user/clucene/APKBUILD
@@ -0,0 +1,79 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=clucene
+pkgver=2.3.3.4
+pkgrel=5
+pkgdesc="A C++ port of Lucene"
+url="http://www.sourceforge.net/projects/clucene"
+arch="all"
+license="(LGPL-2.1+ OR Apache-2.0) AND RSA-MD AND (LGPL-2.0+ OR Apache-2.0) AND Zlib AND Apache-2.0"
+depends=""
+depends_dev="zlib-dev boost-dev"
+makedepends="cmake $depends_dev"
+subpackages="$pkgname-dev $pkgname-contribs"
+source="http://downloads.sourceforge.net/clucene/clucene-core-$pkgver.tar.gz
+	pkgconfig.patch
+	install_contribs_lib.patch
+	usleep.patch
+	disable-threading.patch
+"
+builddir="$srcdir/$pkgname-core-$pkgver"
+
+prepare() {
+	default_prepare
+	cd "$builddir"
+	# Do not use bundled zlib or boost
+	sed -ie '/ADD_SUBDIRECTORY (src\/ext)/d' CMakeLists.txt
+	rm -rf src/ext
+}
+
+build() {
+	cd "$builddir"
+	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_CONTRIBS_LIB=BOOL:ON \
+		-DLIB_DESTINATION:PATH=/usr/lib \
+		-DLUCENE_SYS_INCLUDES:PATH=/usr/lib \
+		-DDISABLE_MULTITHREADING=BOOL:ON
+	make
+}
+
+check() {
+	cd "$builddir"
+
+	# clucene is not smart enough to delete files between successive checks,
+	# so let's remove them for it. Otherwise, if check is run a second time
+	# without clearing the files beforehand, a lot of tests will fail.
+	rm -rf "$builddir/tmp"
+	mkdir "$builddir/tmp"
+
+	# Need to force cmake to update - some sort of race condition
+	touch CMakeCache.txt
+	make cl_test
+
+	cd bin
+	TMP="$builddir/tmp" ./cl_test
+}
+
+package() {
+	cd "$builddir"
+	make install/fast DESTDIR="$pkgdir"
+	rm -r "$pkgdir"/usr/lib/CLuceneConfig.cmake
+}
+
+contribs() {
+	pkgdesc="Language specific text analyzers for CLucene"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libclucene-contribs*.so.* "$subpkgdir"/usr/lib/
+}
+
+dev()  {
+	default_dev
+	mv "$pkgdir"/usr/lib/CLucene/*.cmake "$subpkgdir"/usr/lib/CLucene/
+}
+
+sha512sums="1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4  clucene-core-2.3.3.4.tar.gz
+b357cb5a1c5d66219f3168724a71af3ebf5c45c752a612d3a69c170b739acc065dc17c261c3a730298ea6c637fe820637a100f73ab03d931734f80bb598fbf55  pkgconfig.patch
+0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3  install_contribs_lib.patch
+5de49cb5eba1f9033f28281e0e5ff0e29fe6842ea3e1cb246c12649dc12dedad15e1811b45ccc989a1b743657eb0eeb4937616aa19ec5ee482cd323f54431b99  usleep.patch
+3ded79aed693f6de35389377eddea0b4b0bb0cafd016f6f766986297c35912b18c1e90cedb1fb1d256765abdaab05ca2999aec2fe7ae309fa75231ac94c519a9  disable-threading.patch"
diff --git a/user/clucene/disable-threading.patch b/user/clucene/disable-threading.patch
new file mode 100644
index 000000000..87a5d1c91
--- /dev/null
+++ b/user/clucene/disable-threading.patch
@@ -0,0 +1,75 @@
+Adapted from https://sourceforge.net/p/clucene/bugs/197
+--- clucene-core-2.3.3.4/src/shared/CLucene/util/Misc.cpp	2011-03-16 20:21:07.000000000 -0400
++++ clucene-core-2.3.3.4/src/shared/CLucene/util/Misc.cpp	2018-05-20 19:24:09.219901243 -0400
+@@ -466,6 +466,7 @@
+ std::string Misc::toString(const bool value){
+   return value ? "true" : "false";
+ }
++#ifndef _CL_DISABLE_MULTITHREADING
+ std::string Misc::toString(_LUCENE_THREADID_TYPE value){
+   static int32_t nextindex = 0;
+   static std::map<_LUCENE_THREADID_TYPE, int32_t> ids;
+@@ -474,6 +475,7 @@
+   }
+   return toString(ids[value]);
+ }
++#endif
+ std::string Misc::toString(const int32_t value){
+   char buf[20];
+   TCHAR tbuf[20];
+--- clucene-core-2.3.3.4/src/shared/CLucene/util/Misc.h	2011-03-16 20:21:07.000000000 -0400
++++ clucene-core-2.3.3.4/src/shared/CLucene/util/Misc.h	2018-05-20 19:24:09.219901243 -0400
+@@ -67,7 +67,9 @@
+ 
+   static std::string toString(const int32_t value);
+   static std::string toString(const int64_t value);
++  #ifndef _CL_DISABLE_MULTITHREADING
+   static std::string toString(const _LUCENE_THREADID_TYPE value);
++  #endif
+   static std::string toString(const bool value);
+   static std::string toString(const float_t value);
+   static std::string toString(const TCHAR* s, int32_t len=-1);
+--- clucene-core-2.3.3.4/src/shared/CLucene/LuceneThreads.h	2011-03-16 20:21:07.000000000 -0400
++++ clucene-core-2.3.3.4/src/shared/CLucene/LuceneThreads.h	2018-05-20 19:28:05.999899570 -0400
+@@ -13,10 +13,10 @@
+ 
+ #if defined(_CL_DISABLE_MULTITHREADING)
+ 	#define SCOPED_LOCK_MUTEX(theMutex)
+-	#define DEFINE_MUTEX(x)
++	//#define DEFINE_MUTEX(x)
+ 	#define DEFINE_MUTABLE_MUTEX(x)
+ 	#define DEFINE_CONDITION(x)
+-	#define STATIC_DEFINE_MUTEX(x)
++	//#define STATIC_DEFINE_MUTEX(x)
+ 	#define CONDITION_WAIT(theMutex, theCondition)
+ 	#define CONDITION_NOTIFYALL(theCondition)
+ 	#define _LUCENE_CURRTHREADID 1
+@@ -25,11 +25,27 @@
+ 	#define _LUCENE_THREAD_FUNC_RETURN(val) return (int)val;
+ 	#define _LUCENE_THREAD_CREATE(func, arg) (*func)(arg)
+ 	#define _LUCENE_THREAD_JOIN(value) //nothing to do...
+-	#define _LUCENE_THREADMUTEX void*
++	//#define _LUCENE_THREADMUTEX void*
+ 
+   #define _LUCENE_ATOMIC_INC(theInteger) (++(*theInteger))
+   #define _LUCENE_ATOMIC_DEC(theInteger) (--(*theInteger))
+   #define _LUCENE_ATOMIC_INT int
++
++	#define _LUCENE_ATOMIC_INT_SET(x,v) x=v
++	#define _LUCENE_ATOMIC_INT_GET(x) x
++
++	struct CLUCENE_SHARED_EXPORT mutex_thread
++	{
++	void lock() {}
++	void unlock() {}
++	};
++	#define _LUCENE_THREADMUTEX CL_NS(util)::mutex_thread
++
++	#define DEFINE_MUTEX(theMutex) _LUCENE_THREADMUTEX theMutex;
++	#define STATIC_DEFINE_MUTEX(theMutex) static _LUCENE_THREADMUTEX theMutex;
++
++	#define CONDITION_WAIT(theMutex, theCondition)
++	#define CONDITION_NOTIFYALL(theCondition)
+ #else
+ 	#if defined(_LUCENE_DONTIMPLEMENT_THREADMUTEX)
+ 		//do nothing
diff --git a/user/clucene/install_contribs_lib.patch b/user/clucene/install_contribs_lib.patch
new file mode 100644
index 000000000..8fbb3c716
--- /dev/null
+++ b/user/clucene/install_contribs_lib.patch
@@ -0,0 +1,42 @@
+diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt
+--- clucene-core-2.3.3.4/CMakeLists.txt	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4-mod/CMakeLists.txt	2011-08-16 16:56:55.968268152 +0400
+@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS )
+   SET(BUILD_CONTRIBS_LIB 1)
+ ENDIF ( BUILD_CONTRIBS )
+ IF ( BUILD_CONTRIBS_LIB )
+-  ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
++  ADD_SUBDIRECTORY (src/contribs-lib)
+ ENDIF ( BUILD_CONTRIBS_LIB )
+ 
+ 
+diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt
+--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt	2011-08-16 17:14:13.499275499 +0400
+@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED
+ )
+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
+ 
++#install public headers.
++FOREACH(file ${HEADERS})
++	get_filename_component(apath ${file} PATH)
++	get_filename_component(aname ${file} NAME)
++	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
++	IF ( NOT aname MATCHES "^_.*" )
++		install(FILES ${file} 
++		        DESTINATION include/${relpath}
++		        COMPONENT development)
++	ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
+ #set properties on the libraries
+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
+     VERSION ${CLUCENE_VERSION}
+     SOVERSION ${CLUCENE_SOVERSION}
+     COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
++
++#and install library
++install(TARGETS clucene-contribs-lib 
++        DESTINATION ${LIB_DESTINATION}  
++        COMPONENT runtime )
diff --git a/user/clucene/pkgconfig.patch b/user/clucene/pkgconfig.patch
new file mode 100644
index 000000000..aff20d7b4
--- /dev/null
+++ b/user/clucene/pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
+--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes	2011-03-16 19:21:07.000000000 -0500
++++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake	2012-03-19 09:01:00.689263954 -0500
+@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i
+ Name: libclucene
+ Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
+ Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@
+-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
+-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
++Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@
+ ~
diff --git a/user/clucene/usleep.patch b/user/clucene/usleep.patch
new file mode 100644
index 000000000..d6cbac360
--- /dev/null
+++ b/user/clucene/usleep.patch
@@ -0,0 +1,12 @@
+Add missing include needed to run tests which use usleep
+
+--- clucene-core-2.3.3.4/src/test/test.h	2011-03-17 00:21:07.000000000 +0000
++++ clucene-core-2.3.3.4/src/test/test.h	2017-12-27 09:43:25.320000000 +0000
+@@ -23,6 +23,7 @@
+ #include <iostream>
+ #include <string.h>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
diff --git a/user/cppunit/APKBUILD b/user/cppunit/APKBUILD
new file mode 100644
index 000000000..f334d23f1
--- /dev/null
+++ b/user/cppunit/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=cppunit
+pkgver=1.14.0
+pkgrel=0
+pkgdesc="C++ unit testing framework"
+url="https://www.freedesktop.org/wiki/Software/cppunit/"
+arch="all"
+license="LGPL-2.1+"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$builddir"
+	LIBS="-ldl" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e  cppunit-1.14.0.tar.gz"
diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index 4f76f18b0..4a29feb9c 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=cups-filters
-pkgver=1.20.3
-pkgrel=1
+pkgver=1.21.2
+pkgrel=0
 pkgdesc="OpenPrinting CUPS filters and backends"
 url="https://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format"
 arch="all"
@@ -63,4 +63,4 @@ libs() {
 	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="402a53bf1ea12b14e6f8aa46f8f5e91b2caf9da3a8f14759568b5a45b9309f379fec542c843da5560cbcec2c4860babfee7e9c2f0c62f5fa6254025e9d867b31  cups-filters-1.20.3.tar.xz"
+sha512sums="07672737108e1593374fa95582e2c8ad7a3fec6202846ba85224c1c89f65b7b89de96ebf67841ec5d948fe556dddd06ae6a58ad6c5c0a25a82ce643c9384aaf0  cups-filters-1.21.2.tar.xz"
diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD
index 2c1353095..f5d8e5009 100644
--- a/user/cups/APKBUILD
+++ b/user/cups/APKBUILD
@@ -3,7 +3,7 @@ pkgname=cups
 pkgver=2.2.8
 pkgrel=1
 pkgdesc="The CUPS Printing System"
-url="http://www.cups.org/"
+url="https://www.cups.org/"
 arch="all"
 license="GPL-2.0-only AND LGPL-2.0-only"
 # cupsUTF8ToCharset(CUPS_EUC_JP) of utfdemo.txt: FAIL (UTF-8 to EUC-JP on line 1)
diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD
index 543e1ef32..2e44c3c38 100644
--- a/user/dbus/APKBUILD
+++ b/user/dbus/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dbus
-pkgver=1.12.8
+pkgver=1.12.10
 pkgrel=0
 pkgdesc="IPC/message bus system, allowing user applications to communicate"
 url="http://www.freedesktop.org/wiki/Software/dbus/"
@@ -12,7 +12,7 @@ license="AFL-2.1 OR GPL-2.0+"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc
 	$pkgname-x11"
 triggers="$pkgname.trigger=/etc/dbus-1/system.d"
-depends=
+depends=""
 depends_dev="util-linux-dev"
 makedepends="$depends_dev expat-dev libx11-dev autoconf automake libtool xmlto
 	libsm-dev"
@@ -63,5 +63,5 @@ x11() {
 	mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/
 }
 
-sha512sums="8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3  dbus-1.12.8.tar.gz
+sha512sums="36a16393af6630c32474b971fb8864ded0fb5fe08c5ff5243a4ca312b95af4f20335c5f166b72526a0b8162c1ccfe6542ad6953c5d21a0542d920d7cb4a9ac76  dbus-1.12.10.tar.gz
 df74e7d6a4f76f777d356e94bd23422b17656aa51a5b2d3c655fcabb32c84f2f06b9f5cd8827920d51842f89e8c0d968a6e723315e4bf216e55711fcda9b0ee9  dbus.initd"
diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD
index 3359a3e77..c3f98b3b3 100644
--- a/user/dolphin/APKBUILD
+++ b/user/dolphin/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dolphin
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Lightweight desktop file manager"
 url="https://www.kde.org/applications/system/dolphin/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21  dolphin-18.04.3.tar.xz"
+sha512sums="1ad302f332bbae523db78db5048b910b182ef396a4222da0718d5b280be1adb54eba6abeeaa9facc3ecc49353b91e1aa67bb6f7429446589d6b51d0458a726ae  dolphin-18.08.1.tar.xz"
diff --git a/user/dosbox/APKBUILD b/user/dosbox/APKBUILD
index 51fdf7284..58278e28b 100644
--- a/user/dosbox/APKBUILD
+++ b/user/dosbox/APKBUILD
@@ -20,7 +20,13 @@ builddir="$srcdir/dosbox-x-dosbox-x-wip-20180513-1316"
 build() {
 	cd "$builddir"
 	./autogen.sh
-	./configure --prefix=/usr --enable-debug --enable-core-inline --enable-sdl2
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-debug \
+		--enable-core-inline \
+		--enable-sdl2
 	make 
 }
 
diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD
index d06f9dd6a..8782ed974 100644
--- a/user/dracut/APKBUILD
+++ b/user/dracut/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dracut
 pkgver=048
-pkgrel=0
+pkgrel=1
 pkgdesc="Event-driven initramfs infrastructure"
 url="https://dracut.wiki.kernel.org/"
 arch="all"
@@ -10,9 +10,11 @@ options="!check"  # Test suite is for kernel developers only, requires ext3 root
 license="GPL-2.0+"
 depends="libarchive-tools musl-utils xz"
 makedepends="fts-dev kmod-dev"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch $pkgname-lvm::noarch"
+subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
+	$pkgname-crypt::noarch $pkgname-lvm::noarch"
 source="https://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.xz
 	header-fix.patch
+	mount-run-without-noexec.patch
 	"
 
 build() {
@@ -50,6 +52,12 @@ bashcomp() {
 		"$subpkgdir"/usr/share
 }
 
+crypt() {
+	depends="cryptsetup device-mapper dracut"
+	pkgdesc="$pkgname - LUKS / disk encryption support (crypt) module"
+	mkdir -p "$subpkgdir"
+}
+
 lvm() {
 	depends="device-mapper dracut lvm2"
 	pkgdesc="$pkgname - LVM2 module"
@@ -57,4 +65,5 @@ lvm() {
 }
 
 sha512sums="97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0  dracut-048.tar.xz
-988f03a3fd2e7ee62409d3c57e8029403513dcec5efb37e64633d989728e4c7b619ce5b8775a04c5a0b654f7f093777d94fe6e4098a99a690c353a94f537e24c  header-fix.patch"
+988f03a3fd2e7ee62409d3c57e8029403513dcec5efb37e64633d989728e4c7b619ce5b8775a04c5a0b654f7f093777d94fe6e4098a99a690c353a94f537e24c  header-fix.patch
+d7aa2b35def975ec2a9620d3e8c94da5fad5be51e81ac913b9f3497b3ca62beefb9d4cf8e4ba3b292f89b936373486d0e3184f65eb1eaed972f38d17424a32b1  mount-run-without-noexec.patch"
diff --git a/user/dracut/mount-run-without-noexec.patch b/user/dracut/mount-run-without-noexec.patch
new file mode 100644
index 000000000..2bb9f2ad4
--- /dev/null
+++ b/user/dracut/mount-run-without-noexec.patch
@@ -0,0 +1,17 @@
+--- dracut-048/modules.d/99base/init.sh.old	2018-07-06 08:37:51.000000000 +0000
++++ dracut-048/modules.d/99base/init.sh	2018-08-25 21:55:39.830000000 +0000
+@@ -64,12 +64,8 @@
+ 
+ if ! ismounted /run; then
+     mkdir -m 0755 /newrun
+-    if ! str_starts "$(readlink -f /bin/sh)" "/run/"; then
+-        mount -t tmpfs -o mode=0755,noexec,nosuid,nodev,strictatime tmpfs /newrun >/dev/null
+-    else
+-        # the initramfs binaries are located in /run, so don't mount it with noexec
+-        mount -t tmpfs -o mode=0755,nosuid,nodev,strictatime tmpfs /newrun >/dev/null
+-    fi
++    # s6 runscripts live in /run, so don't mount it with noexec
++    mount -t tmpfs -o mode=0755,nosuid,nodev,strictatime tmpfs /newrun >/dev/null
+     cp -a /run/* /newrun >/dev/null 2>&1
+     mount --move /newrun /run
+     rm -fr -- /newrun
diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD
index 5c45d6f70..8bc3d7880 100644
--- a/user/dragonplayer/APKBUILD
+++ b/user/dragonplayer/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dragonplayer
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Multimedia player with a focus on simplicity"
 url="https://www.kde.org/applications/multimedia/dragonplayer/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5dd3a0157cbac092a0bb224c38dab6706545fd78103e98b060860c5465c6454c4c3a2ea4e646a99f4683a61d8c1248e3a7d2c5f5e69f7e711d6f3ac16ab198fd  dragon-18.04.3.tar.xz"
+sha512sums="db226628077572d78622fc891cb201cad1983c4940c0f82f20ec4a578a58cc711ec84e6c31d6372ac8e1da14d43e7501f1eb09416f6f0530f6e4addadfeaf309  dragon-18.08.1.tar.xz"
diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD
index c8dbf7062..a7a22b7bc 100644
--- a/user/extra-cmake-modules/APKBUILD
+++ b/user/extra-cmake-modules/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=extra-cmake-modules
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="CMake modules needed for KDE development"
 url="https://www.kde.org/"
@@ -40,5 +40,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="52e52ef6b35f4ae34b7ef35270a05c1fec856b253007376e3c7707fd98ecdd228b1b305ecdff1863a735780bea27a5aa14dfb32f0fca4992f7f4edcff359f47b  extra-cmake-modules-5.48.0.tar.xz
+sha512sums="0e56b1137a9cd8ff6a25b7790986713fb2358d8ffa1a175ca87054790440e528a37f56e2785190b40a469fd4d32bc731d4d24f55d6557515c8edb311abf3a56c  extra-cmake-modules-5.50.0.tar.xz
 0af703a9d4696080bc52032d1d341e86fd142bef91f3c1afa9cf180e1cf2ff3bba2ea47fd36b8f52135f056a202c58a08e7c7525f671d6993839865ce6aef0f6  posix.patch"
diff --git a/user/figlet/APKBUILD b/user/figlet/APKBUILD
new file mode 100644
index 000000000..1d44369c4
--- /dev/null
+++ b/user/figlet/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Francesco Colista <francesco.colista@gmail.com>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=figlet
+pkgver=2.2.5
+pkgrel=0
+pkgdesc="A tool for making large ASCII art letters out of text"
+url="http://www.figlet.org/"
+arch="all"
+license="BSD-3-Clause"
+depends=""
+makedepends=""
+subpackages="$pkgname-doc"
+source="ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz
+        musl-fix-cplusplus-decls.patch"
+
+build() {
+	cd "$builddir"
+	make DEFAULTFONTDIR=/usr/share/figlet/fonts all
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="${pkgdir}" BINDIR=/usr/bin MANDIR=/usr/share/man \
+	     DEFAULTFONTDIR=/usr/share/figlet/fonts install
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+sha512sums="bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb  figlet-2.2.5.tar.gz
+4ac1788686ff89c27747fe10b43de90f43c2aaa40476610cf5af52ff43c00e180b91acc1646658330fd534d223cef4643ab3c7f7bf0f6c9b5861601b1d8a05fe  musl-fix-cplusplus-decls.patch"
diff --git a/user/figlet/musl-fix-cplusplus-decls.patch b/user/figlet/musl-fix-cplusplus-decls.patch
new file mode 100644
index 000000000..2a08327ea
--- /dev/null
+++ b/user/figlet/musl-fix-cplusplus-decls.patch
@@ -0,0 +1,22 @@
+--- figlet-2.2.5.orig/utf8.h
++++ figlet-2.2.5/utf8.h
+@@ -27,13 +27,17 @@
+ #define UTF8_IGNORE_ERROR		0x01
+ #define UTF8_SKIP_BOM			0x02
+ 
+-__BEGIN_DECLS
++#ifdef   __cplusplus
++extern "C" {
++#endif
+ 
+ size_t		utf8_to_wchar(const char *in, size_t insize, wchar_t *out,
+ 		    size_t outsize, int flags);
+ size_t		wchar_to_utf8(const wchar_t *in, size_t insize, char *out,
+ 		    size_t outsize, int flags);
+ 
+-__END_DECLS
++#ifdef   __cplusplus
++}
++#endif
+ 
+ #endif /* !_UTF8_H_ */
diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD
index 5a557d0ee..afe43f57c 100644
--- a/user/frameworkintegration/APKBUILD
+++ b/user/frameworkintegration/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=frameworkintegration
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="81029ec6e5536c12566cd36a344747461588de08ef45388ad67b57a8b6ac8a461bfc7f7cbaa162e1369763a0f89b57787f69a68b997285ec2c2d17027d9c1adf  frameworkintegration-5.48.0.tar.xz"
+sha512sums="e4efed63fc3fade085e68dd3dcef7c61d68a4fa2945ad4289c96acb1ce369a2fb763242a7d1ee205314560c5f6383018bceb0f7771da7fd2979cc375af22d61f  frameworkintegration-5.50.0.tar.xz"
diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD
index c90663bc4..e857bc2c5 100644
--- a/user/freetds/APKBUILD
+++ b/user/freetds/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=freetds
-pkgver=1.00.89
+pkgver=1.00.97
 pkgrel=0
 pkgdesc="Tabular Datastream Library"
 url="http://www.freetds.org/"
@@ -40,5 +40,5 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="44d9257cf3b2e80f192c3ff7f7356d06b1995ccfc738273e2474ecb154fb4cd7502cc37f7894cc4ec91ef9871c41e718dd12b612bbe2d6d2d80b9024279ac3eb  freetds-1.00.89.tar.gz
+sha512sums="4e185f96e77735675cf5a3d49d85da27f6813a34cd82fdc6ac534dd67d2d5f624855c5c1dc0d60dcd022bcd1a226fe19148bfca09ff83a322ebd24a70d064cb2  freetds-1.00.97.tar.gz
 d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6  fix-includes.patch"
diff --git a/user/fribidi/APKBUILD b/user/fribidi/APKBUILD
index 693aa0bc3..d729be4a2 100644
--- a/user/fribidi/APKBUILD
+++ b/user/fribidi/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=fribidi
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=0
 pkgdesc="Free Implementation of the Unicode Bidirectional algorithm"
 url="http://fribidi.org"
@@ -31,4 +31,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="435bd48c48ec3c2dc1f1266e401abdbd400d2202b55df6367dbe84580c21e4aa73205058324cf630dfec365733d3e0ac186d14608baa1c9f63231875fb7cc525  fribidi-1.0.4.tar.bz2"
+sha512sums="c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2  fribidi-1.0.5.tar.bz2"
diff --git a/user/gc/APKBUILD b/user/gc/APKBUILD
index 08c89d29a..96cb7d5ff 100644
--- a/user/gc/APKBUILD
+++ b/user/gc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gc
-pkgver=7.6.6
+pkgver=7.6.8
 pkgrel=0
 pkgdesc="A garbage collector for C and C++"
 url="http://hboehm.info/gc/"
@@ -48,5 +48,5 @@ libgccpp() {
 	mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="85be341132fa460fcad7ca323cf1c594f37e19430269d639ca796b9e3502b0d496822cdccb2b7ca77859f3d19a43165b963142b60fce6b1271ed9a3cccb6620b  gc-7.6.6.tar.gz
+sha512sums="525e84e3de0575a76dc994f746fb60f829c850442b6e4dbec5482000a478bb63b9e8d5ac6ddf677a341312207e228eb64442fd7b177223b86efbb9cef3e74aec  gc-7.6.8.tar.gz
 6439505931f0d023bf27d6ce0af90d09dc23bb9dd49b561566ec54b2cddc20642be9bd7b41203f643cb6efed3db2f54aef410b436f3acc2351fe4bb0a8791ea4  fix-boehm-gc.patch"
diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD
index 1608be81d..93ae26013 100644
--- a/user/glib-networking/APKBUILD
+++ b/user/glib-networking/APKBUILD
@@ -8,7 +8,7 @@ _min=${_min%%.*}
 _ver=$_maj.$_min
 pkgrel=0
 pkgdesc="Networking support for GLib"
-url="http://www.gnome.org/"
+url="https://www.gnome.org/"
 arch="all"
 license="LGPL-2.1+"
 depends="ca-certificates"
diff --git a/user/glm/APKBUILD b/user/glm/APKBUILD
new file mode 100644
index 000000000..93a6d15e7
--- /dev/null
+++ b/user/glm/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=glm
+pkgver=0.9.9.0
+pkgrel=0
+pkgdesc="C++ header-only mathematics library for graphics programming"
+url="https://glm.g-truc.net/"
+arch="noarch"
+license="MIT OR Custom:Happy-Bunny"
+makedepends="cmake"
+source="https://github.com/g-truc/glm/releases/download/$pkgver/$pkgname-$pkgver.zip
+	be.patch"
+builddir="$srcdir/$pkgname"
+replaces="glm-dev"
+
+build() {
+	cd "$builddir"
+	mkdir build
+	cd build
+
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DGLM_TEST_ENABLE=bool:ON
+	make
+}
+
+check() {
+	cd "$builddir"/build
+	make test
+}
+
+package() {
+	cd "$builddir"/build
+	make install DESTDIR="$pkgdir"
+}
+
+sha512sums="ac256e8ba515a0a57e27cb9dc79325af7a6f014341c11ba34af604fc2df03ada6979c39c0e5a3fd7526a5dc6dd4af99586e60cefe13bb134ad4df2212193a253  glm-0.9.9.0.zip
+954495cc875b9e70f1957f54cdaa44738268a5a1104036edcdfd74736f8a3385725f29032a533f2a5acbdbfa19d2fe4bc80ef9fdb49d3e8bdc5dc00db86c813a  be.patch"
diff --git a/user/glm/be.patch b/user/glm/be.patch
new file mode 100644
index 000000000..ee229322d
--- /dev/null
+++ b/user/glm/be.patch
@@ -0,0 +1,167 @@
+--- glm-0.9.9.0/test/gtc/gtc_packing.cpp
++++ glm-0.9.9.0/test/gtc/gtc_packing.cpp
+@@ -3,6 +3,7 @@
+ #include <glm/gtc/epsilon.hpp>
+ #include <cstdio>
+ #include <vector>
++#include <arpa/inet.h>
+ 
+ void print_bits(float const& s)
+ {
+@@ -155,7 +156,7 @@
+ 
+ 	glm::u8vec4 const v0(0xff, 0x77, 0x0, 0x33);
+ 	glm::uint32 const p0 = *reinterpret_cast<glm::uint32 const*>(&v0[0]);
+-	glm::uint32 const r0 = 0x330077ff;
++	glm::uint32 const r0 = htonl(0xff770033);
+ 
+ 	Error += p0 == r0 ? 0 : 1;
+ 
+--- glm-0.9.9.0/glm/gtc/packing.inl
++++ glm-0.9.9.0/glm/gtc/packing.inl
+@@ -9,6 +9,9 @@
+ #include "../detail/type_half.hpp"
+ #include <cstring>
+ #include <limits>
++extern "C" {
++#include <endian.h>
++}
+ 
+ namespace glm{
+ namespace detail
+@@ -183,9 +186,15 @@
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 3;
+ 			uint y : 3;
+ 			uint z : 2;
++#else
++			uint z : 2;
++			uint y : 3;
++			uint x : 3;
++#endif
+ 		} data;
+ 		uint8 pack;
+ 	};
+@@ -194,8 +203,13 @@
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 4;
+ 			uint y : 4;
++#else
++			uint y : 4;
++			uint x : 4;
++#endif
+ 		} data;
+ 		uint8 pack;
+ 	};
+@@ -204,10 +218,17 @@
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 4;
+ 			uint y : 4;
+ 			uint z : 4;
+ 			uint w : 4;
++#else
++			uint w : 4;
++			uint z : 4;
++			uint y : 4;
++			uint x : 4;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -216,9 +237,15 @@
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 5;
+ 			uint y : 6;
+ 			uint z : 5;
++#else
++			uint z : 5;
++			uint y : 6;
++			uint x : 5;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -227,10 +254,17 @@
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 5;
+ 			uint y : 5;
+ 			uint z : 5;
+ 			uint w : 1;
++#else
++			uint w : 1;
++			uint z : 5;
++			uint y : 5;
++			uint x : 5;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -239,10 +273,17 @@
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 10;
+ 			uint y : 10;
+ 			uint z : 10;
+ 			uint w : 2;
++#else
++			uint w : 2;
++			uint z : 10;
++			uint y : 10;
++			uint x : 10;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+@@ -251,10 +292,17 @@
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			int x : 10;
+ 			int y : 10;
+ 			int z : 10;
+ 			int w : 2;
++#else
++			int w : 2;
++			int z : 10;
++			int y : 10;
++			int x : 10;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+@@ -263,10 +311,17 @@
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 9;
+ 			uint y : 9;
+ 			uint z : 9;
+ 			uint w : 5;
++#else
++			uint w : 5;
++			uint z : 9;
++			uint y : 9;
++			uint x : 9;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD
index a78579eea..9cf3b093a 100644
--- a/user/gnupg/APKBUILD
+++ b/user/gnupg/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gnupg
-pkgver=2.2.9
-pkgrel=1
+pkgver=2.2.10
+pkgrel=0
 pkgdesc="GNU Privacy Guard 2 - PGP replacement"
 url="https://www.gnupg.org/"
 arch="all"
@@ -41,6 +41,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922  gnupg-2.2.9.tar.bz2
+sha512sums="a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd  gnupg-2.2.10.tar.bz2
 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7  0001-Include-sys-select.h-for-FD_SETSIZE.patch
 b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b  fix-i18n.patch"
diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD
index a931d0abd..862e0a22e 100644
--- a/user/granatier/APKBUILD
+++ b/user/granatier/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=granatier
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Clone of the classic Bomberman game"
 url="https://www.kde.org/applications/games/granatier/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c39fe20c1d88fd8d521e0db91df46535488efbaba27f48faef63e015d9806b3d66a81831edb9b8bb0508954f79822b70ed47b7c3409601a6102c8e7d32304339  granatier-18.04.3.tar.xz"
+sha512sums="94375800f3817158a81de3caf290cd6f0fedca920f42e65f10b573ba1f590ff16870219aafba95233f6862b434b0472e74699dca40b6486134840cf84d1555c6  granatier-18.08.1.tar.xz"
diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD
index ef995b168..3e7d8cca0 100644
--- a/user/gst-plugins-base/APKBUILD
+++ b/user/gst-plugins-base/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gst-plugins-base
-pkgver=1.14.1
+pkgver=1.14.2
 pkgrel=0
 pkgdesc="GStreamer multimedia framework - Base plugins"
 url="https://gstreamer.freedesktop.org/"
 arch="all"
 license="GPL LGPL"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-depends=
+depends=""
 replaces="gst-plugins-base1"
 makedepends="
 	alsa-lib-dev
@@ -66,4 +66,4 @@ doc() {
 	replaces="${pkgname}1-doc"
 }
 
-sha512sums="bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e  gst-plugins-base-1.14.1.tar.xz"
+sha512sums="35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f  gst-plugins-base-1.14.2.tar.xz"
diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD
index 7b8ff566a..c60def265 100644
--- a/user/gstreamer/APKBUILD
+++ b/user/gstreamer/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gstreamer
-pkgver=1.14.1
+pkgver=1.14.2
 pkgrel=0
 pkgdesc="GStreamer multimedia framework"
 url="https://gstreamer.freedesktop.org/"
@@ -47,4 +47,4 @@ doc() {
 	default_doc
 	replaces="${pkgname}1-doc"
 }
-sha512sums="9cf16d79774293dd7fa10c08f6628b83f4e77f0386bebbfd47ded0498e4abd48eee1aee164af53d59fbea2d395e42eb5a12ef4b8f631bc4fd5d4f69545191f9b  gstreamer-1.14.1.tar.xz"
+sha512sums="270dba318d15b54fff6e09d09d77dea13be55bbf82a5bb510efb43f954e234230505366cc6f19f5431e2dd24f5a7734daf5a89d9bd94de8302ed722df0e1eb84  gstreamer-1.14.2.tar.xz"
diff --git a/user/gtk+/APKBUILD b/user/gtk+/APKBUILD
index 6fde28216..157afe4e7 100644
--- a/user/gtk+/APKBUILD
+++ b/user/gtk+/APKBUILD
@@ -4,7 +4,7 @@ pkgname=gtk+
 pkgver=2.24.32
 pkgrel=0
 pkgdesc="Metapackage for GTK+ runtime and development"
-url="http://www.gtk.org/"
+url="https://www.gtk.org/"
 arch="all"
 license="LGPL-2.0+"
 options="!check !dbg"
diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD
index 91e8e1d45..020b5a3b6 100644
--- a/user/gvim/APKBUILD
+++ b/user/gvim/APKBUILD
@@ -5,7 +5,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=gvim
 _pkgreal=vim
-pkgver=8.1.0204
+pkgver=8.1.0346
 pkgrel=0
 pkgdesc="advanced text editor"
 url="http://www.vim.org"
@@ -74,4 +74,4 @@ package() {
 	ln -s gvim rgvim
 }
 
-sha512sums="e2629dc44a9cf6c73b589508c35a7f068fb22ae9f0802dbe7b6efa2b104598e1c1a9c0a8abacc256fee9f72b64a68ab984c443f27c57c8129c2754d49e099587  vim-8.1.0204.tar.gz"
+sha512sums="ce27d6d9215e80d84661aec4062f4730e4ed95cfbcedfdd46e73b5a5a1599ea709664c967c5e17ad3515341f79b59fb5c3ddc851cc84cd5717c0e68c6c82961c  vim-8.1.0346.tar.gz"
diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD
index 90c95de1c..daf6e20ec 100644
--- a/user/gwenview/APKBUILD
+++ b/user/gwenview/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gwenview
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Fast and easy image viewer by KDE"
 url="https://www.kde.org/applications/graphics/gwenview/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a1c36a05e4ae3ee9aff74f4a56eb10c2c27aa89e10886d14dd6753e42329653550e8716965156ec5f50915e320224757bf52d1178986ef10d039e3c622c01a7f  gwenview-18.04.3.tar.xz"
+sha512sums="6fb57a1c872198fd8c7afdfc1df49be7b01a086d2e890479ded3ac0e0fe48748055c30e2678a9e7ad0141c5b7435db01aa03f8d4f11193a65eff42960474a732  gwenview-18.08.1.tar.xz"
diff --git a/user/heirloom-devtools/APKBUILD b/user/heirloom-devtools/APKBUILD
deleted file mode 100644
index c774e66ac..000000000
--- a/user/heirloom-devtools/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=heirloom-devtools
-pkgver=070527
-pkgrel=0
-pkgdesc="Development tools compatible with UNIX"
-url="http://heirloom.sourceforge.net/devtools.html"
-arch="all"
-options="!check"  # No test suite.
-license="CDDL-1.0"
-depends=""
-makedepends=""
-subpackages="$pkgname-dev"
-source="https://superb-sea2.dl.sourceforge.net/project/heirloom/heirloom-devtools/$pkgver/heirloom-devtools-$pkgver.tar.bz2
-	configure.patch
-	deauto.patch
-	lex-compiler.patch
-	make-no-rpc.patch
-	$pkgname-$pkgver-solaris.patch
-	$pkgname-$pkgver-64-bit.patch"
-
-build() {
-	cd "$builddir"
-	make -j1 CXXFLAGS="${CXXFLAGS} -DMAXNETNAMELEN=255"
-}
-
-package() {
-	cd "$builddir"
-	make ROOT="$pkgdir" install
-}
-
-sha512sums="1f1f10a7b49402053172cc028bbd939a46fcf933994cb867fa40e8c5bbd7b1291575b3bac254cd79dc4fce3e3a2c88fe0f890449888fda16169c8e6a2540f055  heirloom-devtools-070527.tar.bz2
-7670995fb469b2613029d52514b95a0506728c09d2daf640c4e0d0fc63b82bc7a1a35a361bd4686b065cec35a072d0b329257e424f118b834367f9761efd5321  configure.patch
-ebe4ae6af3b49290bdb50b396ff23973b3d6ba1429953563fe2b0e43312c1cca85dd754a140aa65bb2163a8307fd68a9dce3e3c4d1fa08d2d908e49df952f730  deauto.patch
-ac29808a3bd5439fe4d8e8765bddc4944951ac53c91cb24f60c117fe2441a234bd0d8c1dcc59ed996d9c220789cb03eade03ab858c07d673797fac295eb80b5a  lex-compiler.patch
-b3c5d271f2edd5a8f331bfaf88b2f75a639cc79005c489d04fed90b2b6dfb1286dcc3084f0c7729519da06f0d0318c91f5e30c08f849c8c548b0b622221f4aba  make-no-rpc.patch
-335fdabef9b9a8b93ffa6eab2b66d2db11af29b24989c4b64ea64695cfadd4471c31a865c2fcb823c1f4c11eebc1babb53ab83c9c2bdf83c05f497faf16e3f1c  heirloom-devtools-070527-solaris.patch
-5523e670c9c9d57f0415e30d1aab4dfcd7d8ad74e2535136afbbe4c6e407c713e7801cbcbf7ddbe798ab2790fc196a2fdbf9d5295fa8c475c73360f5e3a27066  heirloom-devtools-070527-64-bit.patch"
diff --git a/user/heirloom-devtools/configure.patch b/user/heirloom-devtools/configure.patch
deleted file mode 100644
index 614adf94f..000000000
--- a/user/heirloom-devtools/configure.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- heirloom-devtools-070527/mk.config.old	2007-05-27 11:56:51.000000000 -0500
-+++ heirloom-devtools-070527/mk.config	2017-11-24 21:27:26.961471332 -0600
-@@ -17,12 +17,12 @@
- #
- # A BSD-compatible install command.
- #
--INSTALL=/usr/ucb/install
-+INSTALL=/usr/bin/install
- 
- #
- # Prefix.
- #
- PREFIX=/usr/ccs
- 
- #
- # Where to place binaries.
-@@ -32,7 +32,7 @@
- #
- # Where to place additional binaries that aim at POSIX conformance.
- #
--SUSBIN=/usr/5bin/posix
-+SUSBIN=$(PREFIX)/bin
- 
- #
- # Where to place libraries.
-@@ -47,7 +47,7 @@
- #
- # Binaries are stripped with this command after installation.
- #
--STRIP=strip
-+STRIP=true
- 
- #
- # C++ compiler.
-@@ -57,8 +57,8 @@
- #
- # Compiler flags.
- #
--CFLAGS=-O
--CXXFLAGS=-O
-+CFLAGS ?= -O
-+CXXFLAGS ?= -O
- 
- #
- # C preprocessor flags.
-@@ -76,7 +76,7 @@
- #
- # Linker flags.
- #
--LDFLAGS=
-+LDFLAGS ?=
- 
- #
- # Additional libraries to link with.
diff --git a/user/heirloom-devtools/deauto.patch b/user/heirloom-devtools/deauto.patch
deleted file mode 100644
index 76e98f2d4..000000000
--- a/user/heirloom-devtools/deauto.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- heirloom-devtools-070527/make/bsd/bsd.cc.old	2007-01-21 20:11:25.000000000 -0600
-+++ heirloom-devtools-070527/make/bsd/bsd.cc	2017-12-12 04:18:01.749422384 -0600
-@@ -50,13 +50,13 @@
- extern SIG_PF
- bsdsignal (int Signal, SIG_PF Handler)
- {
--  auto SIG_PF                   previous_handler;
-+  SIG_PF                   previous_handler;
- #ifdef SUN5_0
- #ifdef sun
-   previous_handler = sigset (Signal, Handler);
- #else
--  auto struct sigaction         new_action;
--  auto struct sigaction         old_action;
-+  struct sigaction         new_action;
-+  struct sigaction         old_action;
- 
-   new_action.sa_flags = SA_SIGINFO;
-   new_action.sa_handler = (void (*) ()) Handler;
diff --git a/user/heirloom-devtools/heirloom-devtools-070527-64-bit.patch b/user/heirloom-devtools/heirloom-devtools-070527-64-bit.patch
deleted file mode 100644
index d6c3cd7a5..000000000
--- a/user/heirloom-devtools/heirloom-devtools-070527-64-bit.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/make/vroot/lock.cc	2007/01/18 15:06:32	1.1
-+++ b/make/vroot/lock.cc	2007/10/01 11:44:26	1.2
-@@ -31,7 +31,7 @@
- /*
-  * Portions Copyright (c) 2007 Gunnar Ritter, Freiburg i. Br., Germany
-  *
-- * Sccsid @(#)lock.cc	1.4 (gritter) 01/13/07
-+ * Sccsid @(#)lock.cc	1.5 (gritter) 10/1/07
-  */
- 
- #include <avo/intl.h>	/* for NOCATGETS */
-@@ -53,7 +53,7 @@
- extern	int		sys_nerr;
- #endif
- 
--static	void		file_lock_error(char *msg, char *file, char *str, int arg1, int arg2);
-+static	void		file_lock_error(char *msg, char *file, char *str, const char *arg1, const char *arg2);
- 
- #define BLOCK_INTERUPTS sigfillset(&newset) ; \
- 	sigprocmask(SIG_SETMASK, &newset, &oldset)
-@@ -123,7 +123,7 @@
- 
- 		if (errno != EEXIST) {
- 			file_lock_error(msg, name, NOCATGETS("symlink(%s, %s)"),
--			    (int) name, (int) lockname);
-+			    name, lockname);
- 			fprintf(stderr, "%s", msg);
- 			return errno;
- 		}
-@@ -171,7 +171,8 @@
-  * Format a message telling why the lock could not be created.
-  */
- static	void
--file_lock_error(char *msg, char *file, char *str, int arg1, int arg2)
-+file_lock_error(char *msg, char *file, char *str,
-+	const char *arg1, const char *arg2)
- {
- 	int		len;
- 
diff --git a/user/heirloom-devtools/heirloom-devtools-070527-solaris.patch b/user/heirloom-devtools/heirloom-devtools-070527-solaris.patch
deleted file mode 100644
index c6b394208..000000000
--- a/user/heirloom-devtools/heirloom-devtools-070527-solaris.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff --git a/make/include/mksh/defs.h b/make/include/mksh/defs.h
-index 1992205..8065a77 100644
---- a/make/include/mksh/defs.h
-+++ b/make/include/mksh/defs.h
-@@ -63,7 +63,6 @@
- #include <widec.h>
- #endif
- 
--#ifndef __sun
- /*
-  * Definition of wchar functions.
-  */
-@@ -90,7 +89,6 @@
- #	define wscmp(x,y) wcscmp(x,y)
- #	undef wsncmp
- #	define wsncmp(x,y,z) wcsncmp(x,y,z)
--#endif
- 
- #if defined (__FreeBSD__) || defined (__APPLE__) || defined (__hpux)
- extern "C" { wchar_t	*wcsdup(const wchar_t *s); }
-diff --git a/make/makestate/lock.c b/make/makestate/lock.c
-index cdf7562..aa6083e 100644
---- a/make/makestate/lock.c
-+++ b/make/makestate/lock.c
-@@ -42,18 +42,6 @@
- #include <sys/errno.h>
- #include <errno.h>		/* errno */
- 
--#if defined(_LP64)
--/*
-- * The symbols _sys_errlist and _sys_nerr are not visible in the
-- * LP64 libc.  Use strerror(3C) instead.
-- */
--#else  /* #_LP64 */
--#if defined (__sun) || defined (__hpux)
--extern	char *		sys_errlist[];
--extern	int		sys_nerr;
--#endif
--#endif /* #_LP64 */
--
- static	void		file_lock_error(char *, char *, const char *, char *, char *);
- 
- /*
-@@ -167,16 +155,7 @@ file_lock_error(char * msg, char * file, const char * str, char * arg1,
- 	len = strlen(msg);
- 	sprintf(&msg[len], str, arg1, arg2);
- 	strcat(msg, " failed - ");
--#if defined(_LP64)
- 	/* Needs to be changed to use strerror(3C) instead. */
- 	len = strlen(msg);
- 	sprintf(&msg[len], "errno %d", errno);
--#else  /* #_LP64 */
--	if (errno < sys_nerr) {
--		strcat(msg, sys_errlist[errno]);
--	} else {
--		len = strlen(msg);
--		sprintf(&msg[len], "errno %d", errno);
--	}
--#endif /* #_LP64 */
- }
-diff --git a/make/mksh/macro.cc b/make/mksh/macro.cc
-index 6ddb624..23b0315 100644
---- a/make/mksh/macro.cc
-+++ b/make/mksh/macro.cc
-@@ -43,6 +43,7 @@
- /*
-  * Included files
-  */
-+#include <alloca.h>
- #include <wordexp.h>
- #include <mksh/dosys.h>		/* sh_command2string() */
- #include <mksh/i18n.h>		/* get_char_semantics_value() */
-@@ -1403,13 +1404,6 @@ found_it:;
- 			new_value = ALLOC_WC(length);
- 			new_value_allocated = true;
- 			WCSTOMBS(mbs_buffer, old_vr);
--#ifdef __sun
--			wsprintf(new_value,
--				        NOCATGETS("/usr/arch/%s/%s:%s"),
--				        ha->string_mb + 1,
--				        ta->string_mb + 1,
--				        mbs_buffer);
--#else
- 			char * mbs_new_value = (char *)getmem(length);
- 			sprintf(mbs_new_value,
- 				        NOCATGETS("/usr/arch/%s/%s:%s"),
-@@ -1418,7 +1412,6 @@ found_it:;
- 				        mbs_buffer);
- 			MBSTOWCS(new_value, mbs_new_value);
- 			retmem_mb(mbs_new_value);
--#endif
- 		}
- 		if (new_value[0] != 0) {
- 			setvar_daemon(virtual_root,
-diff --git a/make/mksh/misc.cc b/make/mksh/misc.cc
-index 11122cf..d617591 100644
---- a/make/mksh/misc.cc
-+++ b/make/mksh/misc.cc
-@@ -382,30 +382,7 @@ setup_char_semantics(void)
- char *
- errmsg(int errnum)
- {
--#ifndef __sun
- 	return strerror(errnum);
--#else // __sun
--
--	extern int		sys_nerr;
--#ifdef SUN4_x
--	extern char		*sys_errlist[];
--#endif
--	char			*errbuf;
--
--	if ((errnum < 0) || (errnum > sys_nerr)) {
--		errbuf = getmem(6+1+11+1);
--		sprintf(errbuf, "Error %d", errnum);
--		return errbuf;
--	} else {
--#ifdef SUN4_x
--		return(sys_errlist[errnum]);
--#endif
--#ifdef SUN5_0
--		return strerror(errnum);
--#endif
--
--	}
--#endif // !__sun
- }
- 
- extern const char	*progname;
-diff --git a/make/src/implicit.cc b/make/src/implicit.cc
-index 2d388cc..a1cee7e 100644
---- a/make/src/implicit.cc
-+++ b/make/src/implicit.cc
-@@ -43,10 +43,13 @@
- /*
-  * Included files
-  */
-+#include <cstdio>
- #include <mk/defs.h>
- #include <mksh/macro.h>		/* expand_value() */
- #include <mksh/misc.h>		/* retmem() */
- 
-+using std::printf;
-+
- /*
-  * Defined macros
-  */
-@@ -97,8 +100,6 @@ extern	void		add_target_to_chain(Name target, Chain * query);
-  *		recursion_level	Used for tracing
-  */
- 
--extern int printf (const char *, ...);
--
- static Boolean actual_doname = false;
- 
- /* /tolik/
-diff --git a/make/src/nse_printdep.cc b/make/src/nse_printdep.cc
-index 6201a18..38826d2 100644
---- a/make/src/nse_printdep.cc
-+++ b/make/src/nse_printdep.cc
-@@ -37,9 +37,12 @@
- /*
-  * Included files
-  */
-+#include <cstdio>
- #include <mk/defs.h>
- #include <mksh/misc.h>		/* get_prop() */
- 
-+using std::printf;
-+
- /*
-  * File table of contents
-  */
-@@ -59,7 +62,6 @@ static void	print_rule(register Name target);
- static	void	print_rec_info(Name target);
- static Boolean	is_out_of_date(Property line);
- extern void depvar_print_results (void);
--extern int printf (const char *, ...);
- extern int _flsbuf (unsigned int, FILE *);
- 
- /*
-diff --git a/make/vroot/lock.cc b/make/vroot/lock.cc
-index 1d6239b..1a20bc0 100644
---- a/make/vroot/lock.cc
-+++ b/make/vroot/lock.cc
-@@ -48,11 +48,6 @@
- #include <signal.h>
- #include <errno.h>			/* errno */
- 
--#if defined(sun) || defined(HP_UX)
--extern	char		*sys_errlist[];
--extern	int		sys_nerr;
--#endif
--
- static	void		file_lock_error(char *msg, char *file, char *str, int arg1, int arg2);
- 
- #define BLOCK_INTERUPTS sigfillset(&newset) ; \
-@@ -179,20 +174,6 @@ file_lock_error(char *msg, char *file, char *str, int arg1, int arg2)
- 	len = strlen(msg);
- 	sprintf(&msg[len], str, arg1, arg2);
- 	strcat(msg, " failed - ");
--#ifdef __sun
--	if (errno < sys_nerr) {
--#ifdef SUN4_x
--		strcat(msg, sys_errlist[errno]);
--#endif
--#ifdef SUN5_0
--		strcat(msg, strerror(errno));
--#endif
--	} else {
--		len = strlen(msg);
--		sprintf(&msg[len], NOCATGETS("errno %d"), errno);
--	}
--#else
- 	strcat(msg, strerror(errno));
--#endif
- }
- 
-diff --git a/sccs/src/vc.c b/sccs/src/vc.c
-index d7f7187..1c0ffb1 100644
---- a/sccs/src/vc.c
-+++ b/sccs/src/vc.c
-@@ -37,6 +37,7 @@
-  */
- /*	from OpenSolaris "sccs:cmd/vc.c"	*/
- # include	<defines.h>
-+# include	<limits.h>
- # include	<locale.h>
- 
- 
diff --git a/user/heirloom-devtools/lex-compiler.patch b/user/heirloom-devtools/lex-compiler.patch
deleted file mode 100644
index e0d6e9967..000000000
--- a/user/heirloom-devtools/lex-compiler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heirloom-devtools-070527/lex/sub1.c.old	2005-11-26 12:50:23.000000000 -0600
-+++ heirloom-devtools-070527/lex/sub1.c	2017-12-12 04:13:27.493347227 -0600
-@@ -162,7 +162,8 @@
- }
- 
-+#undef index
- int
- index(int a, CHR *s)
- {
- 	int k;
- 	for (k = 0; s[k]; k++)
diff --git a/user/heirloom-devtools/make-no-rpc.patch b/user/heirloom-devtools/make-no-rpc.patch
deleted file mode 100644
index d80dd05dc..000000000
--- a/user/heirloom-devtools/make-no-rpc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- heirloom-devtools-070527/make/src/pmake.cc.old	2007-01-18 09:34:13.000000000 -0600
-+++ heirloom-devtools-070527/make/src/pmake.cc	2017-12-12 04:21:31.058974256 -0600
-@@ -46,7 +46,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/utsname.h>
-+#ifdef _sun
- #include <rpc/rpc.h>		/* host2netname(), netname2host() */
-+#endif
- #include <unistd.h>		/* getdomainname() */
- 
- /*
diff --git a/user/hyphen/APKBUILD b/user/hyphen/APKBUILD
new file mode 100644
index 000000000..eb37c9a1b
--- /dev/null
+++ b/user/hyphen/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=hyphen
+pkgver=2.8.8
+pkgrel=1
+pkgdesc="Library for high quality word hyphenation and justification"
+url="https://hunspell.sourceforge.net/"
+arch="all"
+license="LGPL-2.1+ OR LGPL-2.0+ OR MPL-1.0 or GPL-2.0+"
+subpackages="$pkgname-dev"
+depends=""
+depends_dev="perl"
+makedepends="$depends_dev"
+source="https://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz
+	mawk.patch"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		--disable-dependency-tracking \
+		--enable-fast-install
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make -j1 DESTDIR="$pkgdir" install
+	# The en_US dictionary that comes with has an unacceptable license
+	# and it isn't really needed anyway since libreoffice has its own
+	rm -r "$pkgdir"/usr/share
+}
+
+dev() {
+	default_dev
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de  hyphen-2.8.8.tar.gz
+c9ee32c265ded1e862baae69ec30f3a1769b447bdcf0b51d1d59d5fe4c986c8fdf04049085344311f411cd0204a5f7c003eb290669a668d9b137c74698d1c8b0  mawk.patch"
diff --git a/user/hyphen/mawk.patch b/user/hyphen/mawk.patch
new file mode 100644
index 000000000..c9292606a
--- /dev/null
+++ b/user/hyphen/mawk.patch
@@ -0,0 +1,23 @@
+--- hyphen-2.8.8/lig.awk	2010-03-04 07:13:47.000000000 -0500
++++ hyphen-2.8.8/lig.awk	2018-08-08 14:53:48.970188512 -0400
+@@ -24,14 +24,14 @@
+ c!=b { print c }
+ 
+ /f[1-9]?$/ {
+-	print gensub("f[1-9]?$", "ﬀ", "g", b);
+-	if (c!=b) print gensub("f[1-9]?$", "ﬀ", "g", c);
++	print gsub("f[1-9]?$", "ﬀ", b);
++	if (c!=b) print gsub("f[1-9]?$", "ﬀ", c);
+ 
+-	print gensub("f[1-9]?$", "ﬁ", "g", b);
+-	if (c!=b) print gensub("f[1-9]?$", "ﬁ", "g", c);
++	print gsub("f[1-9]?$", "ﬁ", b);
++	if (c!=b) print gsub("f[1-9]?$", "ﬁ", c);
+ 
+-	print gensub("f[1-9]?$", "ﬂ", "g", b);
+-	if (c!=b) print gensub("f[1-9]?$", "ﬂ", "g", c);
++	print gsub("f[1-9]?$", "ﬂ", b);
++	if (c!=b) print gsub("f[1-9]?$", "ﬂ", c);
+ }
+ 
+ 
diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD
index f18681cae..87f8ac126 100644
--- a/user/irssi/APKBUILD
+++ b/user/irssi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=irssi
 pkgver=1.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Text-based IRC client"
 url="https://irssi.org"
 arch="all"
@@ -22,7 +22,8 @@ build() {
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
 		--enable-true-color \
-		--with-perl=module
+		--with-perl=module \
+		--with-perl-lib=vendor
 	make
 }
 
diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD
index 64ceee132..599845de4 100644
--- a/user/iso-codes/APKBUILD
+++ b/user/iso-codes/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=iso-codes
-pkgver=3.79
+pkgver=4.1
 pkgrel=0
 pkgdesc="Lists of country, language, and currency names"
 url=" "
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install
 }
 
-sha512sums="286d4f328142cdc7ace409d2aaa811e3732df49d78b1875ce71f76f1bb683ce0c4d3f9d2bba752bf6cd25ee8f4c53bdc84568e2eaf85f49650452df19800b345  iso-codes-3.79.tar.xz"
+sha512sums="cf02be0cfc43a1fb28334ccae552cac9a7dee70ca3969b6263eca4bd7fee8ddcc437bd23d290643ba2cd7e99b207661d7330daaf452dc59cde36fdd5919b5616  iso-codes-4.1.tar.xz"
diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD
index a10bce279..a0430d44a 100644
--- a/user/juk/APKBUILD
+++ b/user/juk/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=juk
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="KDE Jukebox"
 url="https://juk.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f5492f3edfea4e74f984a1d09d15ec186a96ab536223821795d84f3b5868f45a9b76655121950f69580cd701d1fd6a621e6e4b43a05481c9c05672f02278a35d  juk-18.04.3.tar.xz"
+sha512sums="4b5cffc92545242543b5184d0b3ddf0858ff8ddfe49e7ca65ee95e02a7a3add3395f0f084cbea44a0493c0535a8ea70b98ab5326d621ccb849501ffa3ee01a18  juk-18.08.1.tar.xz"
diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD
index 5a2d1b072..a458d957d 100644
--- a/user/kactivities-stats/APKBUILD
+++ b/user/kactivities-stats/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kactivities-stats
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Gather statistics about KDE activities"
 url="https://api.kde.org/frameworks/kactivities/html/index.html"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a3e0d69135ffcc49c71dd9f18e69ff2dd03d49b42284cec1c2dd2bae0e88c17fa60bb46dca049eb438ec573436f4c4034599d444d66ef94454b45ecf38a09a18  kactivities-stats-5.48.0.tar.xz"
+sha512sums="0a8e76797333ac0ca29bd734c4c6acb4d2dc07deac0ebe7cfb5e32a2a61ea9537fc9b011dc6aad5c7ad70a6e3cf853d6ce847c612d56559a715b8c8a1378d714  kactivities-stats-5.50.0.tar.xz"
diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD
index 6a525999c..399d8dc61 100644
--- a/user/kactivities/APKBUILD
+++ b/user/kactivities/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kactivities
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Runtime and library to organize work into separate activities"
 url="https://api.kde.org/frameworks/kactivities/html/index.html"
@@ -48,4 +48,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a0009b382c71d606aff567374465b93fa0fba95b47310b2b538b547fb4af791a44af683c9d4e9662c3bec99a8fb9e7e435156c97fa17d940ae05ef5bbb36da8a  kactivities-5.48.0.tar.xz"
+sha512sums="dde9466f632768664114b791aaea1315dc7535545b66cd874109b83896d29fcb692f9598adefd601687540de5f960d5e238cce4110d484b71b1cc9021fa984c4  kactivities-5.50.0.tar.xz"
diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD
index 2d4e932ff..12fe2048a 100644
--- a/user/kalgebra/APKBUILD
+++ b/user/kalgebra/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kalgebra
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Graph calculator and plotter"
 url="https://www.kde.org/applications/education/kalgebra/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8314e8193a29a611b3566eac8b98e2599e2bfde7ff767a7cf513acf51599e9f42b32f24e8f08bca8e824822260c298f97a64c662882eba1d977ce20ddb92a3f6  kalgebra-18.04.3.tar.xz"
+sha512sums="ecad3a4b56cca0e017d4a168863a03b464955633b36ba76286ff825ddd6779816d9f5e9d4100fedf8b7d079cd7e75c5e37528eda2ca7715f0f1e2a4026d7614f  kalgebra-18.08.1.tar.xz"
diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD
index e6421636d..37fe3cc57 100644
--- a/user/kalzium/APKBUILD
+++ b/user/kalzium/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kalzium
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Periodic table of elements (PSE) with calculators"
 url="https://www.kde.org/applications/education/kalzium/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1a7a6d6dfc8d210fc29bb77de9b1f59cfe45eb774cec4f1783de367c9d67b4d73c83847ea2c99d2706a47e0d5b2c115decd7d3b9b4b1399bf7ca9d4d69a51cc6  kalzium-18.04.3.tar.xz"
+sha512sums="9d7caa714c3f8b345852539559d143009df7a334a4298fe2ef0d191277d55d8912c2487436cb815bb6e79eb3ac093f943002e09c0e25eb7644ef5d0904b57901  kalzium-18.08.1.tar.xz"
diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD
index 822e510cd..faaa5ef64 100644
--- a/user/kanagram/APKBUILD
+++ b/user/kanagram/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kanagram
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Letter order (anagram) game"
 url="https://www.kde.org/applications/education/kanagram/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a1b65cfecb6274d79fba8fe408d5941e4fbf52a7c5359903416801e246e08083b3a9865a21a570920bfd0e02dc403e36c9f7076a5e66ffda814e1ade4becc8c8  kanagram-18.04.3.tar.xz"
+sha512sums="6595fff9c3ebf8a795e9e57ce74f53b00cc3b15a0d0a1ceb823a969c211ade9348bdecaea7ccd65f504449057c859cdce57c43f580950afbbd84cccef4d614c1  kanagram-18.08.1.tar.xz"
diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD
index 72932be4c..884546ee4 100644
--- a/user/kapman/APKBUILD
+++ b/user/kapman/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kapman
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Pac-Man clone"
 url="https://www.kde.org/applications/games/kapman/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="80f6f2dce23244e4da3cbef019a97323ec4dfd146fb2844001339d096c1137a5b4b51b9d19c72c1ac5a404bde66cedd4bdd43b1df06a5deda0ef4adf8ebf0b5d  kapman-18.04.3.tar.xz"
+sha512sums="bfd3772f86d3a5d3b00aae9a6e5ba423d50ad86765a6bcd7bc7192740c7e341daf869156e65829cd9231c10139d93f5fb357174bdd792a2cce66ba3853e9439f  kapman-18.08.1.tar.xz"
diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD
index fee9c5893..b39098951 100644
--- a/user/karchive/APKBUILD
+++ b/user/karchive/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=karchive
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for manipulating archive files"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c48654c6946a2678d3bfdb8826df341124a81074940d2e7d9b939a83157b9e482241a21923fc9dd768d89933345350a6ec777ba30a785430b593ac14cb8fb5b5  karchive-5.48.0.tar.xz"
+sha512sums="8042ef931c8d2c6eeb84f6ea33858fb111f7e08bbc012b333eed33c278eff9269ae263b50110201fb448d5e213598a2afebf542e7d0f6c3fdcdc944ed2ddfaba  karchive-5.50.0.tar.xz"
diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD
index 275ccecd7..dd8e29ea2 100644
--- a/user/kate/APKBUILD
+++ b/user/kate/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kate
-pkgver=18.04.3
-pkgrel=1
+pkgver=18.08.1
+pkgrel=0
 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more"
 url="https://kate-editor.org/"
 arch="all"
@@ -92,4 +92,4 @@ kwrite_lang() {
 	done
 }
 
-sha512sums="7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e  kate-18.04.3.tar.xz"
+sha512sums="cd76272aa540aac13da8fd078ee0d5b020645c51fd16ed341e91383570d3e30d0005bdd7702c2b145538df7252443bee8c927281f93a8473b42166bf964a1b41  kate-18.08.1.tar.xz"
diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD
index 786e1da1e..37ead7ff1 100644
--- a/user/katomic/APKBUILD
+++ b/user/katomic/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=katomic
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Fun, educational game involving molecular geometry"
 url="https://games.kde.org/game.php?game=katomic"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0aacb62e4c56bdfcb3a861b2ccca8c856d482bc31b89923a20d6a4a0d928bfbe7028553001a897f27742036856b057157b6ae4a226a8adac6ae73baf2a98b1d9  katomic-18.04.3.tar.xz"
+sha512sums="669e9b77689853270983e290df6a8ae8690544e589b11d14125a4696c12f34d4197d364d0c03d45407d6a1e69af1a1fbea94e61f16e6b6c9933131df751de32d  katomic-18.08.1.tar.xz"
diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD
index 3881ebc7a..84fce7ccc 100644
--- a/user/kauth/APKBUILD
+++ b/user/kauth/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kauth
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for allowing software to gain temporary privileges"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="34023dc452ebc0297c2a866b848109d4e34dcd4afccc541e76d98f07b2817b9928bc4ab100eded4f326aa6fa18f6c76cef6723fcd09cd8b56649b7175c1812bb  kauth-5.48.0.tar.xz"
+sha512sums="c31614178529262188ae83815b88cbe4553480e81b9d98ddab0bd6dd1656504930b8df211ab12c3b1510dd616cc0b681697eaf214b426b347b4377311f6d0c00  kauth-5.50.0.tar.xz"
diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD
index cd1a8f1d4..162169663 100644
--- a/user/kblackbox/APKBUILD
+++ b/user/kblackbox/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kblackbox
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Hide-and-seek logic game"
 url="https://www.kde.org/applications/games/kblackbox/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1d29e375de5671f3c9752291d793a5576ccc6acc89996ad6257f1bf54f1982f84047d65e9da7f3c633284092d0c19a883eb389579925b49ec7a1464370eec8c1  kblackbox-18.04.3.tar.xz"
+sha512sums="ca9092b71a45dddde78da793d6ba4981ba86f909df4aae1a4db8a3517ea433ae2a48046de36d50d921209ded6680ff03a42270723ea8ddf3fdd19c51797824f2  kblackbox-18.08.1.tar.xz"
diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD
index 309be8f9f..8ffa597e5 100644
--- a/user/kblocks/APKBUILD
+++ b/user/kblocks/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kblocks
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Falling blocks game"
 url="https://www.kde.org/applications/games/kblocks/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6ed96980cfb78ad0ebf62b9742b768e211689acc667120a390be7a0dcc63a4732c9fb4302b594066de4f9e6ecbe3b7b2409a5c4b56dae13bc7a90249de65f48b  kblocks-18.04.3.tar.xz"
+sha512sums="1c30f91d854de088cbd1fd3b68604d1778e26284fa06f693af599934a9308f0903185369a712143d3f1b3d799a720f54e622caf8af07c08e790d1544157fd6d9  kblocks-18.08.1.tar.xz"
diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD
index e74ad4939..74714a704 100644
--- a/user/kbookmarks/APKBUILD
+++ b/user/kbookmarks/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kbookmarks
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for managing XBEL-format bookmarks"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="635f05a1cf0a49e27ad77382ffa4dd3778eb63e3dd9c37c7c96230456d26bd55c1f36d1d0e2b5d1219858872443ac7b61db2dd63e9985dc28942d410c4ce22e9  kbookmarks-5.48.0.tar.xz"
+sha512sums="03340e18b6c4774e4aa16af9bdadccf102fdda9caae930e92f9afed833ec3f70eae818b9dd5f51c071b52019d7b7566195d2d552cc725af575548a75d7e7575a  kbookmarks-5.50.0.tar.xz"
diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD
index 5d6b4bb0d..ee8ede952 100644
--- a/user/kbounce/APKBUILD
+++ b/user/kbounce/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kbounce
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Puzzle/arcade game to build walls"
 url="https://games.kde.org/game.php?game=kbounce"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="73dfa5736780cf06d88125af12141ca5e76342923fb1ad9808998742ea147d6fc6b0d3e7815bdc8bc897671da29d50a749a9278db4dd931c21804fb683d48fe7  kbounce-18.04.3.tar.xz"
+sha512sums="f7c97c133f69a8a8db2cff91eba30d9aad3c4e340145b7e57db9fbe8a85c429896936fd258622158f283cb36b3d670bbd52056b9a249f6db79a27abf83cd293a  kbounce-18.08.1.tar.xz"
diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD
index d08f19126..b72d8629c 100644
--- a/user/kbreakout/APKBUILD
+++ b/user/kbreakout/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kbreakout
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Break-Out like game with a ball and paddle"
 url="https://games.kde.org/game.php?game=kbreakout"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d0296c7a66c7e54c7021bad5624894cd08dc52e6284c102817a43bf6266f5b30165a3c7b1d2f52f23024e6626a83b5e3ac35c4a24b484534f63692a642a1d270  kbreakout-18.04.3.tar.xz"
+sha512sums="0a069711dcaf47cdeb91ac07b714bf2fa3400877656a94188e72e25131f4c44462f27cebb0860304b6ab29aaaeba909bde931547c7b431cb95ef4cfd33a559b6  kbreakout-18.08.1.tar.xz"
diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD
index ca6e1681b..83704799f 100644
--- a/user/kbruch/APKBUILD
+++ b/user/kbruch/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kbruch
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Practice calculating percentages and fractions"
 url="https://www.kde.org/applications/education/kbruch/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="566111d6b097d9b24e98c5911dccf6058b1f7b848a558d004f977fb82d27cbea102f9c84f53ea67a9f006a2537cf76dcd958474474d2cef1480d223552031cc0  kbruch-18.04.3.tar.xz"
+sha512sums="8b2ef8a7137a2fa92fe76c3c653f11f641b963e051c6a6d772b9b6285e9d7e6060f6004e80fb5d460471f67db859650cbc2c959ff6db90114b4d82360cee9d8d  kbruch-18.08.1.tar.xz"
diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD
index c8429f49c..7b5b9efd4 100644
--- a/user/kcalc/APKBUILD
+++ b/user/kcalc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcalc
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Calculator with many mathematical, scientific, and logic functions"
 url="https://utils.kde.org/projects/kcalc/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="372f0e2660836108c405e9aa48a07f042a86ec8c66f43a7ba4a64c5ac1da561b3ead94f7c9e496ec270826813c77e21144b12b720f6a3872a3c49859bb637c83  kcalc-18.04.3.tar.xz"
+sha512sums="5d738132b06c9a866a6001007afa7c90d7df7ffade11464ff7378beb656cdc826d7b79e174c1f942f7b9e61edc32348b313dbd4e824dd34de1858b3363540f6f  kcalc-18.08.1.tar.xz"
diff --git a/user/kcalcore/APKBUILD b/user/kcalcore/APKBUILD
index 865e206df..a248e8c50 100644
--- a/user/kcalcore/APKBUILD
+++ b/user/kcalcore/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcalcore
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Library for managing a calendar of events"
 url="https://www.kde.org/"
@@ -33,7 +33,7 @@ build() {
 
 check() {
 	cd "$builddir"
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(RecursOn-RFC2445_RRULETest39.ics|Compat-Mozilla|Compat-Evolution|Compat-libical3)'
+	TZ=UTC CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'Compat-libical3'
 }
 
 package() {
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2da0993ab1d0c6facbf7f02af186f3554ca38408468dd72f57380817ef1f7f0bf236409a8644d7e84b5019d1eb918f2fd6ff1c1190a89a4e825845659ea84a1b  kcalcore-18.04.3.tar.xz"
+sha512sums="3573b9b5314085855c7a06c87423474d5e83a3ef4b7200fab2532345774a8984c927940c3e5e26b3c1123cf1e8c944c480ea510b3577da8d7820acfa691915c8  kcalcore-18.08.1.tar.xz"
diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD
index abed93ed5..614037e92 100644
--- a/user/kcharselect/APKBUILD
+++ b/user/kcharselect/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcharselect
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Tool to select special characters from all installed fonts"
 url="https://utils.kde.org/projects/kcharselect/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a0ab55769acb4cfbb33f54d5fbdafc48464c306286321ebd2e8f8b932217d5ae42b0b23c3ca3b40156a4770cb6980b832b2f8ae2dd8e7b6ac81d24c141df5140  kcharselect-18.04.3.tar.xz"
+sha512sums="5b6c5b384747461434f37f870fab85d7cccc33e11505b1b2cf80391378ce9eff051f468875e2a1c3453c2cc5e8ee85b1c622523f1db95f59ce490fe57ec91ffb  kcharselect-18.08.1.tar.xz"
diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD
index 9ead39272..e7cf772aa 100644
--- a/user/kcmutils/APKBUILD
+++ b/user/kcmutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcmutils
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for writing System Settings modules"
 url="https://api.kde.org/frameworks/kcmutils/html/index.html"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4b9dca72c705b2395dc16f205c7e215e76fa7bcf205b8081ee94f40f4ae1fe6abfd14cf94989df1898b664160f67458f532f194a847c0ecdc9cf2b39223dc86c  kcmutils-5.48.0.tar.xz"
+sha512sums="306c7c76c08d1ddfdec6ec0dae8367c531f174f3c1ccece3ea0d32d8650a1106be3c10741bd97d2ddff4d81f05c720e8b98d43b290bdd787a0b1269dd6d71bbb  kcmutils-5.50.0.tar.xz"
diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD
index 0ac5bea78..36ad184d1 100644
--- a/user/kcodecs/APKBUILD
+++ b/user/kcodecs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcodecs
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for manipulating strings in differing encodings"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fc48ca509a397721aeef9af174b073a17895758fb595370ce6103640f53c20ddb9d375bbd81d7417a65342247c5a0cf4e52a9457d027dbe7e85431095cee739b  kcodecs-5.48.0.tar.xz"
+sha512sums="94b8027989f317ae0f4e4563c670c8c91534ae353ca5d8e00d742c6e285d99043fd1cf0197f08408f8f66e64ab7a3c8f21055364ac8e152130c04a21c7d1f221  kcodecs-5.50.0.tar.xz"
diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD
index 096e6e56a..66dbf928d 100644
--- a/user/kcolorchooser/APKBUILD
+++ b/user/kcolorchooser/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcolorchooser
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Simple application to choose a colour from the screen"
 url="https://www.kde.org/applications/graphics/kcolorchooser/"
@@ -38,4 +38,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3adbc920566089bc12e83507dfa25d7215a1811c8adac530a059bbcc5d35dabd8fc122143dd0a238a1e1d586fae18fdf32a24b4685ec044f1fee1c3060d0b667  kcolorchooser-18.04.3.tar.xz"
+sha512sums="a2a514297dc9930d96f23f153f11b0b0a87d0bae1ecf41940665b89c2bfd3ea6c30bfdb622c47cf108e92f21bf7ac7f428f4c9414b72863b76955f18acb0f7bf  kcolorchooser-18.08.1.tar.xz"
diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD
index 3c2d61d9d..820273f90 100644
--- a/user/kcompletion/APKBUILD
+++ b/user/kcompletion/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcompletion
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for implementing automatic completion of input"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="efd00a2ec90acc14bd717a1fca375da9741386e346aebb47eb41d65552675d2a7834763d5362190c0c8b8918b0e9a1eea25c37f72b2bc7c3734aa1e28ae44a99  kcompletion-5.48.0.tar.xz"
+sha512sums="27db7af56d4cafada863ae8f30a87c4d1974717ee2b3f537b235a6f1353c3976932c27308b4f9fe1a6386b0d395c22ffefb2f4c273a496a0785a34a494451c4c  kcompletion-5.50.0.tar.xz"
diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD
index e5dbc3623..e1cb1880e 100644
--- a/user/kconfig/APKBUILD
+++ b/user/kconfig/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kconfig
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for managing software configuration"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c1d11fae67114976937d9f30aa3fb8ad3d53e756b792c1b4dcf89f660b77d8150310a06b2e1365bb7f78f46ef6a37280d20657ca8f460d6fc088c9f75efd8ca4  kconfig-5.48.0.tar.xz"
+sha512sums="282a5cefb3cc1752fbfd450732bb3479751d3a20b65661da5ebe1797968f4e20f093b3e1083b232581ed375ab9314f059f13a7f8a1021c1dbb2c96d33fabe746  kconfig-5.50.0.tar.xz"
diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD
index 59bb9b1d3..0a3db8409 100644
--- a/user/kconfigwidgets/APKBUILD
+++ b/user/kconfigwidgets/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kconfigwidgets
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework providing widgets for software configuration"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1ac9575b1ca64d73150f7cd8a24b7aa6d511198c724cf61b90f055fd6eb19aab0172c4480eb4f80ac21b22aa6fbb91657aa0cdd74f4c5bce110c5effa04f4def  kconfigwidgets-5.48.0.tar.xz"
+sha512sums="7129f42ae1e6c80bde763ae0c44ee7913358243b49b2337d42d4aa580ff4135229c5146105a548bbff0e3234ae9990f09827218a7109d932396da2e5a82f5763  kconfigwidgets-5.50.0.tar.xz"
diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD
index 1d1fd599e..6ea3ca92b 100644
--- a/user/kcontacts/APKBUILD
+++ b/user/kcontacts/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcontacts
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Library for working with contact information"
 url="https://www.kde.org"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="bf177c4cf0ecbdb71e75ee32a4e71599f864062524f5663e3c1d4b49a06d58a3abf7b18d2840cf7e70248a426fa6b6367375a2aaea211ba15a697e0dbd27953e  kcontacts-18.04.3.tar.xz"
+sha512sums="a28f004bb7c87206a3d063f66fae54c0147a1489bae94e7b5e5b7756f88518ddf86bd425a590483bcde6f339fbba2f76ee44e2138f595b19b1944718537c5fb2  kcontacts-18.08.1.tar.xz"
diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD
index fe5d26b59..f8d1988d2 100644
--- a/user/kcoreaddons/APKBUILD
+++ b/user/kcoreaddons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcoreaddons
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Core KF5 framework"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f828d9e4f011c10479611a6556ff04a6843a0473286188bc0f696a41ded466407d451691ce278f6acc0610a884339dd9caf9432d92e104a0d140493c38256263  kcoreaddons-5.48.0.tar.xz"
+sha512sums="3b8f50b2775425363b83048ab78bb7999dcdfa522a4d8d002292cbaf6975747b5159687c2ce4737b17404b999ec2d6894a3acd23873480ae7376e9134f1ea887  kcoreaddons-5.50.0.tar.xz"
diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD
index 1602deed5..ac76418fd 100644
--- a/user/kcrash/APKBUILD
+++ b/user/kcrash/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcrash
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for gracefully handling software errors~"
 url="https://www.kde.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3c0abab1e52d51c6f92ff3f5a808a73a82f2ecb7a64d00ec652521c1fe29ad3f4273f34c73c958481e339d7000bd03927d4bb2536e99cbde5e050d26028ca2cb  kcrash-5.48.0.tar.xz"
+sha512sums="79cec88f7e37901e9758dcc8f69883369dba8db536a563cfa66245038ca46240a5c0c70c4fb4b48c0c1e4b7772ec90d341707add99124b02408fc567a7e64648  kcrash-5.50.0.tar.xz"
diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD
index c5d8d8218..3c92c23b6 100644
--- a/user/kdbusaddons/APKBUILD
+++ b/user/kdbusaddons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdbusaddons
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for coping with D-Bus"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="78b184a0e89dbb04a9f281a64f571476d41bd8104534f5a456df1007bad31fc9211497272c91b9c9875c6eaf6ec7024067c213ef9848441d6b6edd4a6ecaf7dd  kdbusaddons-5.48.0.tar.xz"
+sha512sums="26176685e8aebcdb1c249de9e95d88ba1faf9e0e2ffe67338237df2cfdf8b1a1fabc79c6febabc4a80a774a2e838085e273640d66fbacdbbaf49e00bcbd6d9dd  kdbusaddons-5.50.0.tar.xz"
diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD
index ac9457939..67b1cf614 100644
--- a/user/kde-education/APKBUILD
+++ b/user/kde-education/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kde-education
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Educational software from the KDE Software Collection"
 url="https://www.kde.org/applications/education/"
diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD
index 73f243ea4..ab5dd711d 100644
--- a/user/kde-games/APKBUILD
+++ b/user/kde-games/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kde-games
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="The KDE games collection"
 url="https://www.kde.org/applications/games/"
@@ -10,7 +10,7 @@ options="!check"  # Metapackage, no tests needed.
 license="NCSA"
 depends="bomber kapman katomic kblackbox kblocks kbounce kbreakout kdiamond
 	kfourinline kgoldrunner kigo killbots kiriki kjumpingcube klickety
-	klines kmahjongg kmines knetwalk kollision konquest kpat kreversi
+	klines kmahjongg kmines knetwalk kollision konquest kreversi
 	kshisen ksnakeduel ksquares ksudoku kteatime ktuberling kubrick
 	lskat xdg-utils bovo granatier"
 makedepends=""
diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD
index 45ac70080..ec45f7d58 100644
--- a/user/kde-graphics/APKBUILD
+++ b/user/kde-graphics/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kde-graphics
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Graphics software from the KDE Software Collection"
 url="https://www.kde.org/applications/graphics/"
diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD
index 337d74b34..08d30bbb3 100644
--- a/user/kde-multimedia/APKBUILD
+++ b/user/kde-multimedia/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kde-multimedia
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Multimedia software from the KDE Software Collection"
 url="https://www.kde.org/applications/multimedia/"
diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD
index be484dc42..f2267818b 100644
--- a/user/kde-system/APKBUILD
+++ b/user/kde-system/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kde-system
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="System utiltiies from the KDE Software Collection"
 url="https://www.kde.org/applications/system/"
diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD
index 6fecf1f7f..5f53975ec 100644
--- a/user/kde-utilities/APKBUILD
+++ b/user/kde-utilities/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kde-utilities
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Desktop utiltiies from the KDE Software Collection"
 url="https://www.kde.org/applications/utilities/"
diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD
index 2f2c05017..3d72ee926 100644
--- a/user/kdeclarative/APKBUILD
+++ b/user/kdeclarative/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdeclarative
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Frameworks for creating KDE components using QML"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ab1cad3c84e9b64521a9387ca448abad2606088da215c55944415363a9e1e66ee17b02499dbb516cfc7f0bba7755aaba8f0f1ffc8ccd9cb57d9ac4ce44d4dcf1  kdeclarative-5.48.0.tar.xz"
+sha512sums="ebe13f08a292cd3c1cf92cd242433160f1a2e9a5ea329379dab1d3b26d7c2a026261d77b8dc7b4abd1980a1a3d769b021bee6c2730ad2d4910b758c5b0e135dc  kdeclarative-5.50.0.tar.xz"
diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD
index 76b5b5892..91fb19b38 100644
--- a/user/kded/APKBUILD
+++ b/user/kded/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kded
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Central KDE workspace daemon"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3a5bcc7e5a1206f6bf36ee43af2f2a25c70a02643bf44e43d50f37a873bfd4e160c2fb6e6df763275955d1e8ee5061bcd4cbcb8397c1e81032c00d1a159e9a42  kded-5.48.0.tar.xz"
+sha512sums="f5751df6c7b142038e67ca0cd1d59d5afa0b48268e09cd4e691750603258484ae264821cbc400cd4db348083377325d2213ac515aaa6c1aca7bf8a5843a5fc50  kded-5.50.0.tar.xz"
diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD
index b0014c6dc..b0a51e451 100644
--- a/user/kdelibs4support/APKBUILD
+++ b/user/kdelibs4support/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdelibs4support
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Legacy support for KDE 4 software"
 url="https://www.kde.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="76903eb30429cab5130859ac8bfa6e4b79ea0c4b7ada8b990e63c3cb5e35051213752a69df98b17283f2e713eabee469294175aae596d777df3dd3e3d9d3e306  kdelibs4support-5.48.0.tar.xz"
+sha512sums="1fa3a9bcd2b0af1cd4ec66d6538bfd25bb33a2a5ba6c74bbc4b6709ee71b681d5fea9672245c8a060dcfa493fcaf590af49c6c34a4ec535499a3db9d7007166a  kdelibs4support-5.50.0.tar.xz"
diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD
index d846f1a4f..67adf9300 100644
--- a/user/kdenlive/APKBUILD
+++ b/user/kdenlive/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdenlive
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Libre video editor"
 url="https://kdenlive.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c4f903a2de7a44b743a87068bd54379f12af1ba56f19aa7a5820db58514bd2c973cdfddc05f89232304ba06da9a8e4437138485eff0d611138e21f4f8af4ed77  kdenlive-18.04.3.tar.xz"
+sha512sums="737ebbb877c93a064472c82bda2ab6915833bb49442b9f36f3e3833d395dfa8608c7dff7dcea2816b25f7569025fbe810e8dd3c29ba96ee0c872d25ce9314bc6  kdenlive-18.08.1.tar.xz"
diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD
index afcae95b1..7dc9aa5ce 100644
--- a/user/kdesignerplugin/APKBUILD
+++ b/user/kdesignerplugin/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdesignerplugin
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Qt Designer plugin for KDE widgets"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="12a4c174bb85acbb66574103571aef2af1d2c080ce18ac69c9d05612cc0cb5a2b2106a8e70f0f77addbf951e4bc41115226c6ae17f64f510bc30c56926d41e2e  kdesignerplugin-5.48.0.tar.xz"
+sha512sums="6e4b58096559a0568da9618a6644440f1cca7f569118ecadaf5b5fdb07d5a28c6845e075c4745e61812365ccf96ec7e1cea0edfa70afaacf2df4b0ef4ee92b08  kdesignerplugin-5.50.0.tar.xz"
diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD
index d64e8fc45..9f0712103 100644
--- a/user/kdesu/APKBUILD
+++ b/user/kdesu/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdesu
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for elevating privileges"
 url="https://api.kde.org/frameworks/kdesu/html/index.html"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="26ac4fca0408cf72eafb60eb147a3c7b25300cb97fe5889fb149637d91a77211e056550cba5cb1b68262aa2f547a09052c589aa2888662681fd54a1c7a24c2f1  kdesu-5.48.0.tar.xz"
+sha512sums="b8104fc48e36db124f735aad13edde0c6cedde33ad20ec0eaff68e5ea1eaa1a664444b30e6a20b5d20f2c75792c94d0f77a06ad1d7852388a7d987da8298d95b  kdesu-5.50.0.tar.xz"
diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD
index b64db0be1..d81c45377 100644
--- a/user/kdf/APKBUILD
+++ b/user/kdf/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdf
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="View disk usage information"
 url="https://utils.kde.org/projects/kdf/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="60d79b85ea9432561dc2cbd9a5f1ccd986fe8bf6fa8d8d0d722ab3e1316013d4044731ed98756441bdf5e56f91bce46d5496bc53863e74c0b5e456b0412cb3fe  kdf-18.04.3.tar.xz"
+sha512sums="49f91e8d502c624029639ea19ccbd470d6e48da1b5e41e76a95e16ec69a710f448a997916de5496aad01c9039e96374d473c65d410dc2cb31b60d5638a2f913b  kdf-18.08.1.tar.xz"
diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD
index 2c2c6b983..52a6b0df8 100644
--- a/user/kdiamond/APKBUILD
+++ b/user/kdiamond/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdiamond
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Three-in-a-row game"
 url="https://games.kde.org/game.php?game=kdiamond"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="05798ded8fd034fe4f8829fa1a57ac60b579d8215318ad4707527536cc56d5a0a5634eb7b5634abfab9c070774278efe26ead9a1708f4958690d58c061a4e3bd  kdiamond-18.04.3.tar.xz"
+sha512sums="ebb91009e6dee64e8e7cc8a3188a3386640398fb55d59b93cb37e029626afe71caf0b29d1e7b8fa1b6936140d07567db7843ca5bf7605105bc2240959b8c9e7e  kdiamond-18.08.1.tar.xz"
diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD
index db08e9681..23f522646 100644
--- a/user/kdnssd/APKBUILD
+++ b/user/kdnssd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdnssd
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for discovering network services using Zeroconf"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cb0e8bbf418d9e3b32580895850d1973beed24987593fd776a4fc73d6a20c672a29fd032e86514411dfb234c4fbcd3a4593e23503479bc7c207445d2ff16261b  kdnssd-5.48.0.tar.xz"
+sha512sums="cd49247c02c2cc568d4942e3c08d4bb9b40180a8e096ee978b2d5884e40ba69266ea78b319301cf5106e135f3b648f1adbefd5288fccbf5779dff1e2d1c0d1d4  kdnssd-5.50.0.tar.xz"
diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD
index bd349d9ca..a819c32e0 100644
--- a/user/kdoctools/APKBUILD
+++ b/user/kdoctools/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdoctools
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Tools to generate user-readable documentation from DocBook XML"
 url="https://www.kde.org/"
@@ -32,7 +32,8 @@ build() {
 
 check() {
 	cd "$builddir"
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+	# Requires catalogue files to be already installed
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'kdoctools_install'
 }
 
 package() {
@@ -40,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="40b50dfbd2f1590bdfa75dd276e9060d84988608398d0567dad3f798fcaa8782c23974256cf0ef7cb529c5b93bc54107d6219551458b608b576c922e83529729  kdoctools-5.48.0.tar.xz"
+sha512sums="cb09a6c0a990b074e66161171e947f18b0036621da075a4f66452fb2a8f5985bee45b371e1e3303cc4afa73d376b89a839ac42e8b479c71911f7f89845422e86  kdoctools-5.50.0.tar.xz"
diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD
index c482d5f6a..c4b38c990 100644
--- a/user/kemoticons/APKBUILD
+++ b/user/kemoticons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kemoticons
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Emoticons to express emotions in KDE"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="24889212ca03736caca6ad591237961a53409205b7e03a1599bff6fe7b88f78a1088f857d896e2f60a1432d8b35921487ca710b2091af855d553aa0ac68922c7  kemoticons-5.48.0.tar.xz"
+sha512sums="04c132340be0159514cf46b60f2a9f9ce35c6cd35ad64820463d9d8f929fccbb7d4082337c1920b778e35875b222e4caae4d98c4133b4c9ea365b4e69ab79223  kemoticons-5.50.0.tar.xz"
diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD
index b57a32e50..3697cbaec 100644
--- a/user/kfilemetadata/APKBUILD
+++ b/user/kfilemetadata/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kfilemetadata
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="File metadata extraction framework"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a3738e1184ddf34582aaa0ebcc75dd881bf4fc8e68253ccd597b70db71a093a9ccee6c726f034324521556471a3ae7f73dd4b1c8384922c95272d9c28c5cc8d0  kfilemetadata-5.48.0.tar.xz"
+sha512sums="9e6d86da7e50e4dc432fc29af366572cc3504301686a38f8f46d44be0041bcd72fc0c8515906995d8ba4a6fb7217767efb9eb151d2578e1104c5a1cb8db9cc4a  kfilemetadata-5.50.0.tar.xz"
diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD
index bdfac1592..8b00aab74 100644
--- a/user/kfind/APKBUILD
+++ b/user/kfind/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kfind
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Standalone search utility for KDE"
 url="https://www.kde.org/applications/utilities/kfind/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="04e055c67256ad3f25b60ce2aec12f11ab5201e92a5d091d9faed6ef395ac129108cf8108c3cb413ffe45104aa4a1f59fd3e89ad6b32f6f8b4107b52aafefb4b  kfind-18.04.3.tar.xz"
+sha512sums="53c1a34776a6b5b56363d2f40a29252cc5dd7828c97f40917032132883a4b1f50d1972a241a287f7ef086c1bac137d8628ad08e3c21a879fa444c6d7247731a1  kfind-18.08.1.tar.xz"
diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD
index 1b93f28ae..1b4562594 100644
--- a/user/kfloppy/APKBUILD
+++ b/user/kfloppy/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kfloppy
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Utility for formatting floppy diskettes"
 url="https://utils.kde.org/projects/kfloppy/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4bdc3541bdf3e817840e81b11ab1878d71e96bc7eff2e3fe53d2877b0956588e0ec6cafc41b2661064a676e4e08c0de4c744d97146fee7ae0d3379f6850eb674  kfloppy-18.04.3.tar.xz"
+sha512sums="e33857c5ff4988a6675461302b53125f54a678f7c4286a8416dc8f569fe1c9d7560567d2884788b912a08cedc66430149747a1d2e5fadd23c3c2c1b8590d586a  kfloppy-18.08.1.tar.xz"
diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD
index 399ab1fb5..2e19ec8ba 100644
--- a/user/kfourinline/APKBUILD
+++ b/user/kfourinline/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kfourinline
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Two player board game based on Connect Four"
 url="https://games.kde.org/game.php?game=kfourinline"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e7333413bb85ce817ea71dd5b12c3af5eb36147d48f2df9bd87fc83f8b975def60a4dfa17fee8836cd3388d5ac6de189f22cd2d35029764569df9773216f0129  kfourinline-18.04.3.tar.xz"
+sha512sums="b1540e2c3cb1eb3e41dc78836c1341b8afabbf0faa00da596233ecf5768dfffdb6cb20274fb383f8bfe7a35c92eb345873decdf3fe502df374632246f84f4959  kfourinline-18.08.1.tar.xz"
diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD
index 5175aa231..46aeab4e8 100644
--- a/user/kgeography/APKBUILD
+++ b/user/kgeography/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kgeography
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Geography learning tool and trainer"
 url="https://www.kde.org/applications/education/kgeography/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c462a2e3a20fb12bb5583539fbe75d884a4b8f25f018bb3baa15d44054af1c6814d534bb873b66b418927a2009bc3915733828abce8e650c5f3ee752ca3d78d6  kgeography-18.04.3.tar.xz"
+sha512sums="a2f3573cb281f165fc222304c981b4d88eadd0707b227e5e28580c8dc1ad1b8c9490505a17611b0bcb028e36ec68e473b9947eacd7a8a0834b4ea5b9c60b4abb  kgeography-18.08.1.tar.xz"
diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD
index c82dea0c5..2ed329914 100644
--- a/user/kget/APKBUILD
+++ b/user/kget/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kget
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Versatile download manager"
 url="https://www.kde.org/applications/internet/kget/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cefc16a3ecd919a6c288e3adf6b63fff55b8dcbb1517b70ebafebea1045044b28ca490bef91a50dcdcd96091523a0a0b79bb5f3c926f719138de29bb29f50489  kget-18.04.3.tar.xz"
+sha512sums="c6fb54e4b91952372aaa038c1e3a6ec6fdb82ff0f320dd1f6059fa41118a8399a9369bfd93e7b1db1123c893174469a1479fc7c000c555709d8d6aa80334502d  kget-18.08.1.tar.xz"
diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD
index 07f092dbc..bd10da079 100644
--- a/user/kglobalaccel/APKBUILD
+++ b/user/kglobalaccel/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kglobalaccel
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for implementing global shortcuts/accelerators"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c62e1766eae97d658477e0cea100f354be58f176eb8a843699af728ca0ee296ea3a8762107ca5e3290dbb7500d699cd11265f68d5848d765f586eb093db60817  kglobalaccel-5.48.0.tar.xz"
+sha512sums="3cb9530c392c5eeb126a56b6efd81a9f6daa072fd860b79362bfb6ae47c9af3f259a0d3258bbe04a7af34fb1c0ad6000c1e70b7f8075e6cbd10444acee9222eb  kglobalaccel-5.50.0.tar.xz"
diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD
index b7db18cb9..eb1879c9c 100644
--- a/user/kgoldrunner/APKBUILD
+++ b/user/kgoldrunner/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kgoldrunner
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around"
 url="https://games.kde.org/game.php?game=kgoldrunner"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f920c917322e20fadedfd2b00a93294238f2ea11f7bfcd14110b3feb586958551febc80a729ba5319c77cde08b4e9a68c82df0cf02ee2937472c64c9dc08f482  kgoldrunner-18.04.3.tar.xz"
+sha512sums="d55d67438f2906cd161f3957d50d35ce9ea7578c0381af39825d65de4701d96230400f41e998be3d2eff65f95bbcddbf8af45769fe5280aafa1d77eff9a9d529  kgoldrunner-18.08.1.tar.xz"
diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD
index 67117295b..b713d4a5b 100644
--- a/user/kgpg/APKBUILD
+++ b/user/kgpg/APKBUILD
@@ -1,11 +1,12 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kgpg
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Simple interface for GnuPG, a powerful encryption utility"
 url="https://utils.kde.org/projects/kgpg/"
 arch="all"
+options="!check"  # Tests require X11 now.
 license="GPL-2.0-only"
 depends=""
 makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kcodecs-dev
@@ -42,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e799244dd28b26cd5738cdc03a07c563eef94a92304d4e045441f9c3104cd37addb240ed2ab1a42b576746b9c02e694111e4a4de8f01da61f95ea940ac69e74c  kgpg-18.04.3.tar.xz"
+sha512sums="339f64bc9be2a644f0c3b4f901c14c19bbe7891996d7a3ba840d9368260e87d75a3860d6bdc78d0ceb2d966f04223a2350a0d86e46b06f7e4a3e665713bafb5e  kgpg-18.08.1.tar.xz"
diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD
index 3b4b74727..45dcca573 100644
--- a/user/kguiaddons/APKBUILD
+++ b/user/kguiaddons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kguiaddons
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for creating high-level user interfaces"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b0d48ab61da46b703b06d246b1deb5e41a0e80221ae563c0bfaff5b7639133963c35fce5d3503bf0d6748893eeb8442c9c78f85567072130304323dadb3bad25  kguiaddons-5.48.0.tar.xz"
+sha512sums="6a7ac22a60a0811aa7f2ce9f2ccb3f16f17e53dcb2352092b10b5d5384251d7e46c575b12549a4733416de88c5bd724670d52d5b96fa47005fb6b8ab847594cd  kguiaddons-5.50.0.tar.xz"
diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD
index 007d51cdb..038173711 100644
--- a/user/khangman/APKBUILD
+++ b/user/khangman/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=khangman
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Hangman word game"
 url="https://www.kde.org/applications/education/khangman/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6df84c260f72f925e272f1977bd8b6552ce23b27402e88ac7640cdd4e6a89ef79cae928b11c26c17775c70e424d1934dd7961f2a7f41bb894d9aebd5d950edca  khangman-18.04.3.tar.xz"
+sha512sums="72603208e513a1e7e47b639892f07c57434eaf15d31d3c793efdd7969f365c150f4f05d40652009c5e84e58d92408aa2373f8b70c854d6e3a762bc90aa44f35f  khangman-18.08.1.tar.xz"
diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD
index 3bc147d75..b2a4c831d 100644
--- a/user/khelpcenter/APKBUILD
+++ b/user/khelpcenter/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=khelpcenter
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Graphical documentation viewer"
 url="https://www.kde.org/applications/system/khelpcenter/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4727de8223af52a9c269d47e59b4de3f7f30a1d06b85cdc71300a6c83eb49ddcc2f32c33db8a9ea7d8d961da6d20550dcf49400df6431fa91c7ec5a2b676dd63  khelpcenter-18.04.3.tar.xz"
+sha512sums="243ebc119a2e6190a645b9bf0a14a47e14f0bd6ff4dd768ef994b344dbbdbd8242501fa01d28f71453bd34002fff1e119505cfa4f6f7c0ea76e363c84e3be25f  khelpcenter-18.08.1.tar.xz"
diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD
index 2cbab91b9..824b0d0e8 100644
--- a/user/kholidays/APKBUILD
+++ b/user/kholidays/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kholidays
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="List of national holidays for many countries"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="70bf5b48e08d5a250205b30e62108944aa01a9df497e653765d3225166239395c9b88ec8a2622309e19b644f256727331723ffa96dc7a1ea55e36568f933536f  kholidays-5.48.0.tar.xz"
+sha512sums="019c22a2806d73fd726157854a70206c7e91cdfc8ac23a84b5c64cdbdc474fd4a7daaaecf5f0a3636790e85e8ebb86e9e5a9dd1a64a9fbd728c39ae68fe94f9e  kholidays-5.50.0.tar.xz"
diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD
index bf0408cc7..304a1faee 100644
--- a/user/khtml/APKBUILD
+++ b/user/khtml/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=khtml
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="The KDE HTML library, ancestor of WebKit"
 url="https://konqueror.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="66d714d33550539893f4ddad26749251705579c806207e93a029cbe00a561acaab13cb2f3a6e0d9bcf99411300e8cc773f09216e078cbe4f094757fec9be0324  khtml-5.48.0.tar.xz"
+sha512sums="b2259a11635ea9a363eb17b73e5112d144f86c6ed258d1c7e7bb3571587a526a852a98c51b503d2dee4c8d3478cd4e3ae28beaab1e4f2e5633709ff5b69508d9  khtml-5.50.0.tar.xz"
diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD
index d8f35f12b..04b434549 100644
--- a/user/ki18n/APKBUILD
+++ b/user/ki18n/APKBUILD
@@ -1,11 +1,12 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ki18n
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for creating multi-lingual software"
 url="https://www.kde.org/"
 arch="all"
+options="!check"
 license="LGPL-2.1-only"
 depends=""
 depends_dev="qt5-qtbase-dev qt5-qtscript-dev qt5-qtdeclarative-dev"
@@ -13,8 +14,7 @@ makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz
 	qt5-qttools-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ki18n-$pkgver.tar.xz
-	libintl.patch"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ki18n-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -43,5 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b757ce1d0dd1becbe658f628f4840cf82d5abf97ccad7657305166a5c7928b315269e9641773cb17d7bf02cba043d24f962578038a07f2de10cdffc186452af2  ki18n-5.48.0.tar.xz
-b2b74bf07e49e0451b880fadea5d2a1566f69bb7f7751bef97f29a4cb35e08a144bcf5c2dc5f793cb71fdd4504237140af1ab98b4372bf1a89d534f5ec9aeedd  libintl.patch"
+sha512sums="4d05eda1f5ab6f08a7aa5617c456c646a7037f1b099f60dbaead1fdabb02ad4579306c3774cf86cc45713c14dcc1b3c12013380150de95ed2e4bb40511aa4e9f  ki18n-5.50.0.tar.xz"
diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD
index 2db479802..8ece5a3cb 100644
--- a/user/kiconthemes/APKBUILD
+++ b/user/kiconthemes/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kiconthemes
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for icon theming"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0f3f5a8e69e71f4eedd2c39300075ebd3932548271178432abcdf5bfd4df63df8c05649ef0f5fff889a6855faea5680a2bb4cc96e45dc3b44b8b8726bf54e5d0  kiconthemes-5.48.0.tar.xz"
+sha512sums="b5fae1e7f8f6881e963ab9afd4d25988f8df98443f3bd526a67e4ca7c390dc4be0be4564e26dfbf6b10c15dcbada70adec60b383463b142dd7f6d2df77b885d9  kiconthemes-5.50.0.tar.xz"
diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD
index 285de8da2..a307714f9 100644
--- a/user/kidletime/APKBUILD
+++ b/user/kidletime/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kidletime
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=1
 pkgdesc="Framework for determining a user's idle time"
 url="https://api.kde.org/frameworks/kidletime/html/index.html"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5ac2b16e5870e7123ef20b5a0f42104657a1d587bb0cac6476ca4f07e80faf367733fa54f0f16cb3348e5f41560deabd948c10552183dc68b9483b76f88f1281  kidletime-5.48.0.tar.xz"
+sha512sums="825d7b509c8bca1042b453d600165574c72d684a07159e9eea436e37c720ff2f40c165075d7c9d076689f1f25c75d5e20779e25a29b069ed25339fd83e9baef8  kidletime-5.50.0.tar.xz"
diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD
index 360ce1e28..e5d1f36c7 100644
--- a/user/kig/APKBUILD
+++ b/user/kig/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kig
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Interactive geometry learning and exploration tool"
 url=" https://www.kde.org/applications/education/kig/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cb015a7d675cf0854c8f911fe0f9868c3a55c844af9f4337a0ebb67ce14f75146fe86a03248cdb0c7f361dba61d58276d0893fa06b355f26a85faf48423ce377  kig-18.04.3.tar.xz"
+sha512sums="db82e76ea91bcb263f5bea85a0dc5fb50d6cfe88c37d1acde1f0ec237a666a05a51effac1fea1a5648377eafe265a430838fdcbda64589641699565572aade5e  kig-18.08.1.tar.xz"
diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD
index 0ad3ea818..181fd3d68 100644
--- a/user/kigo/APKBUILD
+++ b/user/kigo/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kigo
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Go or Igo game for KDE"
 url="https://www.kde.org/applications/games/kigo/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3e42114294c633985ba527390bf24404086fd5fa0a03f714201af1a93c2e16a6b325b10eaa5459aa11d4f11fb69a88f3fa40c8bf3a0535ae44ad6ce408591c7a  kigo-18.04.3.tar.xz"
+sha512sums="664b5827f505198cd173020b36ebe45f1721143c0a0ca5867e7ebf576d490f043c09a681cc44403368a88c1f5abf81bc0a4e1c9d1f437740ae7a81f8ec770972  kigo-18.08.1.tar.xz"
diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD
index f48b81048..a5d21099a 100644
--- a/user/killbots/APKBUILD
+++ b/user/killbots/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=killbots
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Simple game of evading killer robots"
 url="https://www.kde.org/applications/games/killbots/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b14103edecedc5b3b8602c56b0291d4a2cb73805098f2380c48dd010b1363901a36adaea3b655d474cb379679932060696cd7dcb3a0cf5d91531778980f9fad3  killbots-18.04.3.tar.xz"
+sha512sums="471d20aec8e9e9391c3125f52d34a8e687819838510937180ce51aa5f6ae3bb61b82bf076475a16514a4aec024cac2c52166c25a2c60a16b3327915c3700a45d  killbots-18.08.1.tar.xz"
diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD
index 4067167ef..29e5d5e0e 100644
--- a/user/kinit/APKBUILD
+++ b/user/kinit/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kinit
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="KDE initialisation routines"
 url="https://www.kde.org/"
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8ccad1a037889a1a32885087da02bc2fe1a5bfbe144517ec8553e0b9b4dae86b61bd54ea27bd9f3e07d745d8e63a44db263d364aa8ca885a7b18f0fde762cd87  kinit-5.48.0.tar.xz"
+sha512sums="8b0187f0e7d67b1d6b5d773cd651ae438291ea2a801fb05292811e7b109afee62c4166953b09f6c1c958690c2b9a3c769d005f3ae008513eaf2eac933e1a8a63  kinit-5.50.0.tar.xz"
diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD
index 486d4f331..49dbdadda 100644
--- a/user/kio-extras/APKBUILD
+++ b/user/kio-extras/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kio-extras
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="KIO plugins for various data tasks"
 url="https://www.kde.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="49ab5ad8d74831a9ef1636e46abc76d66d3ef7d9e8f1ce793eb8d5c37f9e7ee4205c9643339f5c46657d4f537572e3f8a180ebace8599a1dfcbf8d27470b2f0b  kio-extras-18.04.3.tar.xz"
+sha512sums="152b62c43c81df4b874d68d3504a18891f68b047e74edd2eae37fddcf72302696db9e0c006b037d3ea5a688cf838e69c949fb5a9253dde7c26c8e1ba1cf7f7bf  kio-extras-18.08.1.tar.xz"
diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD
index e1cd4f1f3..cd27cc371 100644
--- a/user/kio/APKBUILD
+++ b/user/kio/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kio
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for data and file management"
 url="https://www.kde.org/"
@@ -46,5 +46,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4a25f5664d3ac993a115dc13597ab758fc24122d02441c20d98d42dd67d5dd9a57e7e5013716de1b3e9d2c523bf45b843fd726a4ce20a3eccd3a25e1e4dba5ad  kio-5.48.0.tar.xz
+sha512sums="18a6e4b1d2fb71b16aa4b08862fe0abea691c4f60d4fccc316c654455786a705cc94232b5bcffdb6ea39917722f237d0de00e9ea22273c26e7c3a0282148244a  kio-5.50.0.tar.xz
 280b2a610613786e688c06f4d4b51d3b9d583472bf1941b7b5873fece31b5df0b2f8f08f8de677ebb39fc906c57a2fa50d7890105c0aeb930b82986e0b504623  strcpy-ppc.patch"
diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD
index fd4a8ea2a..6d0c326d5 100644
--- a/user/kirigami2/APKBUILD
+++ b/user/kirigami2/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kirigami2
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for rapidly designing usable interfaces"
 url="https://www.kde.org/"
@@ -49,4 +49,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="591b100e3e3646ed04b35ed759a8bc44c7dbc8428e3cdff3f79f963d9d6ef5ae1bed38344a2926dcd205f9a270dcc8673282b74f59ef93236e4bc32f6d274cfc  kirigami2-5.48.0.tar.xz"
+sha512sums="f43b9c0adf35ece8153334cc4f66c3d6e30f5603f9a29b8b54eb358c14f98124838a19a1073b17cd3e00975963782cfff664d811171a7f58238a49c84c7faec8  kirigami2-5.50.0.tar.xz"
diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD
index ae73558eb..2ebc8ae4d 100644
--- a/user/kiriki/APKBUILD
+++ b/user/kiriki/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kiriki
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Yahtzee-like dice game for one or more players"
 url="https://games.kde.org/game.php?game=kiriki"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2d00d7d04768dea1000f5d96d69e069087085f5450cbd60425f686ae7dc177cef67575b45a107ef203c2a7b04e7aa2f9168b683d7c624c04ca8e85465d8b750b  kiriki-18.04.3.tar.xz"
+sha512sums="5e14d301148e9c333bca36753291228337b7b3b00c2ba7946ba7fb0f7bcaf52f6a570825a9d68053e2df5b4b24db237f2fd94198b47a5305662c68a63a5dd64e  kiriki-18.08.1.tar.xz"
diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD
index e6af44978..674f9cf48 100644
--- a/user/kitemmodels/APKBUILD
+++ b/user/kitemmodels/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kitemmodels
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for sorting and searching objects"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d5a9033193c4ae734110ba01de39c5986999782ebb9f931f1b9f156edd20728e36706663895b1c06d9ee0e9d80496d7255f4ab8ff7488394df87e77b259fb93e  kitemmodels-5.48.0.tar.xz"
+sha512sums="1df3636da596a67255ac460658868d83f42955bff8085586a846f8e37d9a6d7ca29daaa96d03d686b9d2ff0647f40e7188c0619e11af6b93de0df627463de0a1  kitemmodels-5.50.0.tar.xz"
diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD
index b34360adb..2255c2c41 100644
--- a/user/kitemviews/APKBUILD
+++ b/user/kitemviews/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kitemviews
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for displaying collections of items"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4aca1a7e2a2fa2a89c12b9ecaac99d28219eaf88fb3fc3a3884cc2ff5a218f76ca1eecaab599450d63b17c3cacef4f8c123e4fbf55b8c6041573381d15ecaf96  kitemviews-5.48.0.tar.xz"
+sha512sums="e2e1fbccde1f7f9aa4cbb6feb175aff3055621cd39e5aed60d6cdbc807cea2763e35847825a70f310276335ee37eacc066ede5d297fe58fe19d33fec094ac121  kitemviews-5.50.0.tar.xz"
diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD
index 2293ddeaf..16d738f1e 100644
--- a/user/kiten/APKBUILD
+++ b/user/kiten/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kiten
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Japanese reference and study tool"
 url="https://www.kde.org/applications/education/kiten/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b377ce0b7f3644c23301d6c3cd3a947e311a8b62e786ab9c1e66a3c2b0675eaee5d90db2023fe15e6c612cdf82d616e9afc13b90a69f3199c442249dbea63541  kiten-18.04.3.tar.xz"
+sha512sums="32d542778e8ef63df9da29be94e76ffdf8839b88419906c78733449531a4fb4b62bcb9940e1c49eae09c9da75ad6c35e9d18d426848f6bcabfcd0b6c71da3525  kiten-18.08.1.tar.xz"
diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD
index 5d31412eb..0dfdfb4c1 100644
--- a/user/kjobwidgets/APKBUILD
+++ b/user/kjobwidgets/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kjobwidgets
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework providing widgets that show job progress"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9c4015ed11d71702a88e34f1c929ceb47c76e056e9f29a1854125fbd01573e4bcbe8338fd3e7ecf8609a53815e86c037e281601f7497cd5b872468af86ffd5e1  kjobwidgets-5.48.0.tar.xz"
+sha512sums="9f8af0073912311fe6572606682f56952736d7cb3218646a6086c5830003dff0aa4f13d3fd59a1617d393d17d14abc6bb4f9762822e423373252cf6b6d0fbc8f  kjobwidgets-5.50.0.tar.xz"
diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD
index 4a6a1e97e..08e13397b 100644
--- a/user/kjs/APKBUILD
+++ b/user/kjs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kjs
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Independent, free JavaScript engine"
 url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="527a77e4da885327edf0769e2560e39e474c6fe29b2eddfe278b12eb8d790f99f5810d96d044b7d2a44aeb19d545f0b2b95e328d05f0781d055e6ab43c0d779b  kjs-5.48.0.tar.xz"
+sha512sums="698ef596c03b88a35dba48363034223366e14ae94c805e68d34d913ca9944a1f8c67a3db15c0454e6ea726391b6a120a21d24fdec3ba25c7b2d4480f34da3f37  kjs-5.50.0.tar.xz"
diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD
index 8e5344698..85fdbebbf 100644
--- a/user/kjsembed/APKBUILD
+++ b/user/kjsembed/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kjsembed
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="JavaScript bindings for QObject"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e8e01e4d78a081f6946ce5d18e33f815a0336afc06c2ce08c4808bacadccd1378cad6eae03d846ed3ab721d00ec895a4f926ce084a6ead317388dacb491e5322  kjsembed-5.48.0.tar.xz"
+sha512sums="2b7a86569217304a0b6a5ebfaa03df000b08e6779be0cfeb4109de8861e6d262b5f415863b831d89eb9992e8bf73d8273572e2838ae1c95be61bbbcc65fbd43d  kjsembed-5.50.0.tar.xz"
diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD
index 0b3c44b44..0245aec1b 100644
--- a/user/kjumpingcube/APKBUILD
+++ b/user/kjumpingcube/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kjumpingcube
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Dice-driven tactical game"
 url="https://games.kde.org/game.php?game=kjumpingcube"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c10548aa970fec60f9306ee351f5129c4892dfd74746d782ef72696d41a6362fd92f6bbcc49abf816b455f1e6d8992b4f66cf9ddf19c6109596ea053dd04d8bf  kjumpingcube-18.04.3.tar.xz"
+sha512sums="b50c87a94f5c560e665a145ddd3e62db2ab637149b41f0a5f0fbc726d36eeea90e42615d3fb10b27f65325ae84ad460d0ecbd837e35a4f7a245617202553c338  kjumpingcube-18.08.1.tar.xz"
diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD
index 1fb5a726a..fee0cad00 100644
--- a/user/kleopatra/APKBUILD
+++ b/user/kleopatra/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kleopatra
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Certificate manager and cryptography GUI"
 url="https://www.kde.org/applications/utilities/kleopatra/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6f74ad1d5da2c1e2c22b42212010768af2dbcf108b337dbca9f21e2cb2a88e4899fec692667cc1515a46dbe8e942eef5cb86551a3f605b9d048345fc31277061  kleopatra-18.04.3.tar.xz"
+sha512sums="dd13d287f645a263e460f91528e7eec5d2e8523702770fe4f7c4f49da5303344d6a6fe2b2124ce39c480546ba126d518921f49ef746d34c66f40c2aa99f85c1c  kleopatra-18.08.1.tar.xz"
diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD
index 9458ed060..2a66e234b 100644
--- a/user/klettres/APKBUILD
+++ b/user/klettres/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=klettres
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Learn alphabets for multiple languages"
 url="https://www.kde.org/applications/education/klettres/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c579a1421694a1681d68716695210ad88bf0510647a4d0957ffdd4f86ce137ffb0693bb7a0fa7ef5d0a15845ce8ed85a909fb1711597b6dc8302ae43e0435b0a  klettres-18.04.3.tar.xz"
+sha512sums="6e0aadf89c9bae1f06e2318d40830b1793c5410548e706ab66545c26528e7f516c0b3986f36b2cfd083d53fef50a2199b30a110b7149d06a6264ad19f9be74ee  klettres-18.08.1.tar.xz"
diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD
index 62a88355c..f5a4338eb 100644
--- a/user/klickety/APKBUILD
+++ b/user/klickety/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=klickety
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Fun, simple colour matching game"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d7cfefc611ad711c2e2990995e1faf208dcc61f685ed792934ffa001c83958c319c3245a652135f2e460b8d7d160b8ccb357b4fc5283d68978d1449fca6fc8df  klickety-18.04.3.tar.xz"
+sha512sums="2df34e87cdeb9f0edd7516f0ab280eed02ad1beea7b4ad85b9d6ec496c744c0bc15a9661792a09196021aea12754ab7569e3395ab80d98f37193a27cd79f5268  klickety-18.08.1.tar.xz"
diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD
index 09a5ec671..18cc6ec80 100644
--- a/user/klines/APKBUILD
+++ b/user/klines/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=klines
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Simple yet addictive single-player game"
 url="https://games.kde.org/game.php?game=klines"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="15885ee5afaf863e2cc95aeb8d7877741b12cd2d7e16fa0ddd2fc88b50231e4fee0e29e246017e6507e0e59fbf70616a4251d60ba235539870b6c50f141699a0  klines-18.04.3.tar.xz"
+sha512sums="cee1b2d23de590f6449869485d213f8d87b0dd97f376af9f4dbcb7463053b915d6a9b5dbd17b46116e04802ddfb42cfe5413f8e5f92aaa8dc323e71bb786f814  klines-18.08.1.tar.xz"
diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD
index 87211d6fa..243eebce5 100644
--- a/user/kmag/APKBUILD
+++ b/user/kmag/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kmag
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Screen magnification utility"
 url="https://www.kde.org/applications/utilities/kmag/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f3a9890906143824f36e2bd5ea191ddf68aedd7afeabff50c884f00d160c9ad670e96b5563afb1d5b2c9c2ec7842a49c0ee62781ea9337086f40875607b4e09e  kmag-18.04.3.tar.xz"
+sha512sums="ca35b13fc309df8b8d2c7ca4af726b57823ad01bd6dc8d307e81294625d8f8f98e4fdb6827260b00b4427f5980de0ec1c3d9664ad89b54699125ca0dfe6a8b18  kmag-18.08.1.tar.xz"
diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD
index ee3a5716c..6bd04a4c6 100644
--- a/user/kmahjongg/APKBUILD
+++ b/user/kmahjongg/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kmahjongg
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Mah Jongg desktop game"
 url="https://games.kde.org/game.php?game=kmahjongg"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ce986e043a1620fc982ad0b6406214a53d4c3d912a36c5468fc9c4c986565fbca83e1f2d42179295fa7ba694ca1190fdd7c740d035c05fe378161c268ff8c0dd  kmahjongg-18.04.3.tar.xz"
+sha512sums="2969e334808f396825ab7370a0c76e3836c89deb6ba46841e0355a10257a9daf53beb6675655729c94af225167e78bccbc13deba4f8a331eba50e0213195c27d  kmahjongg-18.08.1.tar.xz"
diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD
index e115a9585..8c2c3369b 100644
--- a/user/kmediaplayer/APKBUILD
+++ b/user/kmediaplayer/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kmediaplayer
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Media player framework for KDE 5"
 url="https://www.kde.org/"
@@ -11,7 +11,7 @@ depends=""
 depends_dev="qt5-qtbase-dev kparts-dev kxmlgui-dev"
 makedepends="$depends_dev cmake extra-cmake-modules"
 subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/frameworks/5.48/portingAids/kmediaplayer-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/5.50/portingAids/kmediaplayer-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="bea8f58843a8164bbecda9da751d5a53e43ea630580590c96f1af30fcced027f18b6bb484b114269feb1f56cefbe66c7df85b5416d382202e47bdf15b49eb728  kmediaplayer-5.48.0.tar.xz"
+sha512sums="20307ad83e787cdae856362ffc5cead82ac2cb46ab469de3d27d9c635d2123404c44fe28067c8712fc99cb0be78c755361811816d697d12f4415adffdbbefe2e  kmediaplayer-5.50.0.tar.xz"
diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD
index cee58867d..94e748891 100644
--- a/user/kmime/APKBUILD
+++ b/user/kmime/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kmime
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="KDE support library for MIME"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="274a0835fe429b6d442f287bbfc5953639bb4cae3c24f29bdb11092aa85ccb60d5b555161d778077460014fa5e5362f617bbefd630700696c2160d6013c220cc  kmime-18.04.3.tar.xz"
+sha512sums="2a3ab2f7e69e14f8ad86ac9f6a9c33a3fd3da703da82ec7b53d126f6d8c7a51608b4f221a7903d37c2db429b444e643130a8687b1e02d5cc746d5c8d34c151d4  kmime-18.08.1.tar.xz"
diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD
index d8b0f5fe8..0779e4192 100644
--- a/user/kmines/APKBUILD
+++ b/user/kmines/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kmines
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Classic Minesweeper game"
 url="https://games.kde.org/game.php?game=kmines"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="580730e896b70cb7923c34f223026f74c9451096d7cae53ef775c100957e774687e6e9902dee90c49b05f96d25480cc858269e0af462f7873516d9d91ea29374  kmines-18.04.3.tar.xz"
+sha512sums="b578fba58b776921d8a051dbf5dae02e91f2a41a4fa832543b671b1454a0fc16e108535299be33499f13a01aab0a75675394d43f0d804c96c45ab3cedf3074b2  kmines-18.08.1.tar.xz"
diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD
index 19a1ca001..ef2a0f629 100644
--- a/user/kmix/APKBUILD
+++ b/user/kmix/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kmix
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="KDE sound mixer"
 url="https://www.kde.org/applications/multimedia/kmix/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="768b787a939e10e045f7af4d8d6a47d216da17dd73c0d8d3d73a93855998bc3f345bc38d6b9298d63e8149523a6d9280ff89467edc01b2c085be8b138b29dad6  kmix-18.04.3.tar.xz"
+sha512sums="2e532d9041604e9d7661add070eeedb7fccf85bf9d6c01160f67cd3a2b20d95322afa9813d45938774456eb9cee342e888f742839b423dab327c898bed9b846f  kmix-18.08.1.tar.xz"
diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD
index f4f92a619..dd870f305 100644
--- a/user/kmousetool/APKBUILD
+++ b/user/kmousetool/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kmousetool
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Tool to assist with clicking the mouse button"
 url="https://userbase.kde.org/KMouseTool"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="46821eaecc616288892226d5f7c9a2eea97b8e2e822d2c98871ad028dd0b9b71404f2b74a6032299266623239d7a57e8ed09dbfeb6b8b54f50e8c747e98564b2  kmousetool-18.04.3.tar.xz"
+sha512sums="d7ff0284453c39a8c3be8f7937ac0439d17af4313ab56a6903eb39473d8fad06c836fe836ec4e061dd5a96317bef916e9a3ac9771c5a829061d1ad20ef32be08  kmousetool-18.08.1.tar.xz"
diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD
index 58cbffd1a..4420fcada 100644
--- a/user/kmplot/APKBUILD
+++ b/user/kmplot/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kmplot
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Mathematical function plotter"
 url="https://www.kde.org/applications/education/kmplot/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="798ac10e281efc393f111e222641f92a9a5cca94513f740468aa17626cabdc80fd9628a96972748a7297665957d7c5164f43036e51bef35269899e04d779708a  kmplot-18.04.3.tar.xz"
+sha512sums="b5e5944875bc49f2bbe55aad41212f68973995e0de1926195a4f16e2b4dbc67f46bf745a577f6bd07d9ad30b7795ff65e853920f6fc3333e46b74f256a1b266a  kmplot-18.08.1.tar.xz"
diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD
index d1cf55db8..963150b46 100644
--- a/user/knetwalk/APKBUILD
+++ b/user/knetwalk/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=knetwalk
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Build up a computer network by placing the wires correctly"
 url="https://www.kde.org/applications/games/knetwalk/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1d2d778f170d0ffba2ac9052c53a256ef6682ca82573fbe09b75cf5b00ab6cb4ce0948a3f40ec8bb75b39563c7ef383bde23fb2fca794ce6927e996acfd25e9b  knetwalk-18.04.3.tar.xz"
+sha512sums="2e85f38874c8c8e6929ef84b39cf5498d3b44e924aeb623cf58b55e0c9a213f3e25150aace852ae6082d50414468b90a59a288440860102a06f7e6296d662611  knetwalk-18.08.1.tar.xz"
diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD
index d1c685660..ed21673ad 100644
--- a/user/knewstuff/APKBUILD
+++ b/user/knewstuff/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=knewstuff
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for discovering and downloading plugins, themes, and more"
 url="https://www.kde.org/"
@@ -45,4 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d74f024b9dd7756f912cfd46424e0921e64f7fff7bbfef593a228a4749da10e638cd67cacd962cd481aada183d58a56fc05588067f0261a5d48375e4c5b6b55b  knewstuff-5.48.0.tar.xz"
+sha512sums="492adcfe5542c39483f30be026a1d6d69ed438448d57c062aeaf4fb7fe1676c9e91c11a3a29bf2ad738c6581aadc0f45b5c252935a7530bb34e051b207e6af51  knewstuff-5.50.0.tar.xz"
diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD
index 13b32c38b..a16b5122c 100644
--- a/user/knotifications/APKBUILD
+++ b/user/knotifications/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=knotifications
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for sending notifications to users"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fff0d688a9e083adc2809490ffff84abe38039afda8628b605016a825a9f9a7fb22e65d5b557f13d3af726e1baab3e99665064d46a788e2a7024f64c49dba6eb  knotifications-5.48.0.tar.xz"
+sha512sums="3128717e747baf8a3fecc3147ebfbd256fe1f330e1199222f276eabd17321c8e63272f0b252bdbf3372f712436046e4f7a725abfcee5345a9c1f823da218ab28  knotifications-5.50.0.tar.xz"
diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD
index 4d3e249fe..527ffae25 100644
--- a/user/knotifyconfig/APKBUILD
+++ b/user/knotifyconfig/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=knotifyconfig
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for configuring notifications"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ac2fedd6ecea150e59a3f55b6b161771f08d7b9f172031e46a540f04e2f186a53500724e69fb57b55e7c23bdb14e65690a8170cb3701fdee5506609d3f068794  knotifyconfig-5.48.0.tar.xz"
+sha512sums="1a00c395e2cc52b3215a4e8d87e1b4d376f4b5f4b4ef0a4afd48ec776924314604549d9b6b0d3514e70a090643fdc8f30be405593f108f2cdf05ecd7c9a920c4  knotifyconfig-5.50.0.tar.xz"
diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD
index 2c2304672..459157fcb 100644
--- a/user/kollision/APKBUILD
+++ b/user/kollision/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kollision
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Simple ball dodging game"
 url="https://games.kde.org/game.php?game=kollision"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c4db5f6a96364e86eed8f344bb378752c9c05e147302d029aedc9a6926a761ae71acaa5b37ae39abe14e6ab7b0e9061ac26e495b5917d6b3cf862516898db58e  kollision-18.04.3.tar.xz"
+sha512sums="ec2c7d2ac4cbbfc9dbb7fae4046984f5acae8ca68c2a2f493dba3edc649a7cd834c9cca23a579f75c704aa76efdd4cd920ae5fc431ff3343ba9d304f5ea3daf9  kollision-18.08.1.tar.xz"
diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD
index 816fb91f4..f674cb6e0 100644
--- a/user/kolourpaint/APKBUILD
+++ b/user/kolourpaint/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kolourpaint
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Simple painting program for KDE"
 url="https://www.kolourpaint.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e9e90e16ac93f019327f9987f546ea55999a707e5ac93218a6850669bd729506d80c52e2e1cdc78d5c2d12a3abc696412c7eee07343a2bf726d7c5fadb5ff4e0  kolourpaint-18.04.3.tar.xz"
+sha512sums="ffd286a272bb0152238f73ab510d9eab006b9362f1d4d4f35b30d3ba9d3335be24f86b6aa71e29a5c5faf87c6d72e96f58ff2b0fbcbcaf1471c94a9fff8949c0  kolourpaint-18.08.1.tar.xz"
diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD
index 5b4845883..8c753ac6b 100644
--- a/user/konquest/APKBUILD
+++ b/user/konquest/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=konquest
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Galactic strategy game"
 url="https://games.kde.org/game.php?game=konquest"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="211830edd3a3bd24f48dafff7a0e60229f3f24296ba91314f93c00d5494400df7f34a54b792dbfffb5d57f5a169135563485839637055f6234590f95cf38e216  konquest-18.04.3.tar.xz"
+sha512sums="a3fd61d8b167d9b1cb00771c12a1cbdefc6230484f0e79069647b8c6b104b3993d326bf5c4e202be69ad8794d0c0058b13569bc2cae071aafb352235eccaec44  konquest-18.08.1.tar.xz"
diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD
index 1052527c1..705d23523 100644
--- a/user/konsole/APKBUILD
+++ b/user/konsole/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=konsole
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Terminal emulator for Qt/KDE"
 url="https://konsole.kde.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0809cf4db6e10e672a4a976609045fb88879fe615b48e452f140da0a6c44971f31a7b4606124ed3b7642ee3f3556ace45b31e0b5c466df611fea98a9cf702066  konsole-18.04.3.tar.xz"
+sha512sums="ec450f0393fece73394d7c77afba0b7adbf4e18d7b0d216de3e135f0e01371c3b5833ebbc79dc356fa102d2d8e3bea3667a5f42695793058b406d38b1f8e81a6  konsole-18.08.1.tar.xz"
diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD
index b0183d944..a9b058ba7 100644
--- a/user/kpackage/APKBUILD
+++ b/user/kpackage/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kpackage
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Frameworks for managing KDE data packages"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0a2e0e8cba221b48153019426a469b247fc61cc265ee2114568574faee1408a2ba51a3fb1ef0289e00a94238385723ba0ade64e922f46af700fc87ce8c893c5b  kpackage-5.48.0.tar.xz"
+sha512sums="f56de9577b6de69724967f1ea911097d03d8bf5de8dcfeb10dc040e0fa61504d5db5e3330ceff85c1590899289f1a4b904b1d7cefa9516fa14a635b1da14650a  kpackage-5.50.0.tar.xz"
diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD
index 8e06e2812..da0d7ab42 100644
--- a/user/kparts/APKBUILD
+++ b/user/kparts/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kparts
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for user interface components"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8adb238406a5c70d80e2f53a9005fa61f8cd3f4712bea1d152184db8e461d0ed92bb71a3ed28140d3741e2621e26da5815aaae482364ca366a589bebe1fbb213  kparts-5.48.0.tar.xz"
+sha512sums="c787e7b85cd4053e014eed5610812715b6bfd9a450e86fddc5259f8bbfd5fddb215720cb3ef7a190a345343042712ccda7e55082807e3a2dd168decf30f13fd2  kparts-5.50.0.tar.xz"
diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD
index 5f2f8f786..5ab7534a2 100644
--- a/user/kpeople/APKBUILD
+++ b/user/kpeople/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kpeople
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Provides access to all contacts and groups them by physical person"
 url="https://api.kde.org/frameworks/kpeople/html/index.html"
@@ -45,5 +45,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="68e3c87f2387b73406dcee20cda1980d7ec2129deb04f0740ff1ee9a8b3f10fd3dbbd00ae8b81c3047a6aa691090767f99d487236319f6138ed47bc271457120  kpeople-5.48.0.tar.xz
+sha512sums="1e52717038027a0bb7e8e6a4007b095f44ac6932aa8766c947d96046184927946464d56e0253fe231a80a3b95ba4f2980e474b58d1a5261ce0cbedf59e5b737e  kpeople-5.50.0.tar.xz
 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9  dont-crash-test.patch"
diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD
index 13457fd7f..80f407c1f 100644
--- a/user/kpimtextedit/APKBUILD
+++ b/user/kpimtextedit/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kpimtextedit
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Text editor for Personal Information Managers (PIMs)"
 url="https://pim.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e8cf0563a2c60bef0b82b0d60a025191c8660c783f262648bc0c9c9c17eb24b5c3c2a0d21159df60009256e920e8a649f06b22815ab051099ba4d6ef145d848e  kpimtextedit-18.04.3.tar.xz"
+sha512sums="e7830227a74331e399d030dfd8058382329512b85ccd36061d7ddeba2c1eca287d41890847203afb6df254e2d9927fda7974feb4c48ab433f5b037fe48c588f5  kpimtextedit-18.08.1.tar.xz"
diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD
index 04b1c5139..be0cd160b 100644
--- a/user/kplotting/APKBUILD
+++ b/user/kplotting/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kplotting
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for data plotting functions"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="626917c0f08e94d5c56ccb6a6cd770e1312d8dc1191a25e4d19b3f2fe76fa481ee76bac5fceafc41d85aab9b59814f01b55cb759d377f051d93191d3d0364e49  kplotting-5.48.0.tar.xz"
+sha512sums="352c424d842ddbe277c7a71acb7fe50fb7cdc78bc750c85ac5a364a6e330bd69344cd5dbdd7922725e1b143bd0d7b1ac1b6d003f5baa67edb33981d27f830838  kplotting-5.50.0.tar.xz"
diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD
index 7be0928dc..5f4f9400a 100644
--- a/user/kpty/APKBUILD
+++ b/user/kpty/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kpty
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for implementing terminal emulation"
 url="https://www.kde.org/"
@@ -27,6 +27,7 @@ build() {
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DBUILD_QCH:BOOL=ON \
+		-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter \
 		${CMAKE_CROSSOPTS}
 	make
 }
@@ -41,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="71bf28660812e8ab0b94fd658995c377075459712d16af7002031d926e2b1fbd64615a3be57063cbd5d86e64a0a5249bdf957598ee86a470383daed97e5093e9  kpty-5.48.0.tar.xz"
+sha512sums="22b394b8d53ab5aae05a51470a3a9ed209c8533425da6f1d6fdb26c82cc5fc1fec2c6869caa5192f067bb60a819a4ce6c19784c5fb8b7bb1691b507e77aae54d  kpty-5.50.0.tar.xz"
diff --git a/user/krb5-conf/APKBUILD b/user/krb5-conf/APKBUILD
index 4d60ad666..7d9b6b91c 100644
--- a/user/krb5-conf/APKBUILD
+++ b/user/krb5-conf/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 #
 # We need this package to avoid conflict with krb5 and heimdal. We can not
 # let it be a subpackage of either because that could create a cyclic
@@ -8,7 +8,7 @@ pkgname=krb5-conf
 pkgver=1.0
 pkgrel=1
 pkgdesc="Shared krb5.conf for both MIT krb5 and heimdal"
-url="http://web.mit.edu/kerberos/www/ http://h5l.org"
+url="http://web.mit.edu/kerberos/www/"
 arch="noarch"
 options="!check"  # Single config file.
 license="MIT"
diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD
index 7b4779dd4..89d6a6391 100644
--- a/user/krdc/APKBUILD
+++ b/user/krdc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=krdc
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="View and control remote desktops (RDP and VNC)"
 url="https://www.kde.org/applications/internet/krdc/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ee987c449b76abeaca909a3053ad41eace8a1890eff8cf05f6a2a83faa7707ad60e2c1c18cbd06268d4d9f0452a033574b26c2b38c29f463179c6a9fcde82e30  krdc-18.04.3.tar.xz"
+sha512sums="9765378af2d792958511f7359a12c7da1c032c1b23abf5859d679c4aab47260b1d4ae208ddaf6a08b69b4de8340b3fc3eafd9bd171b906f088dd80db52f6c032  krdc-18.08.1.tar.xz"
diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD
index 93908add8..2c20058b7 100644
--- a/user/kreversi/APKBUILD
+++ b/user/kreversi/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kreversi
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Reversi game"
 url="https://games.kde.org/game.php?game=kreversi"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b5c104e23b1dc26d3e074b3b1f5863f8a937e5a4c6be3344defbbf5f43226b61a666a1cc7b967dfea36b44386a56e58f8953185477972698c37667d2c583bd21  kreversi-18.04.3.tar.xz"
+sha512sums="5811bb3cc0aa2e7b9b5a56c0f5cb4c3de2120179878ec06eb387190618951d3315bf06184272b70ccb995c5c06b84b56949ca49d8c3ae6896b5d264aa8d13cca  kreversi-18.08.1.tar.xz"
diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD
index 43ae8da9d..139ffeeec 100644
--- a/user/krfb/APKBUILD
+++ b/user/krfb/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=krfb
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Share your screen with others for remote watching or assistance"
 url="https://www.kde.org/applications/system/krfb/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="25ddd2a9a71266961a1f55f0e2442e67e6c4ebb45205903981857b3d24f82b1ba5edd34e7386b56b301a7c925a4498cb85213c543d74d5fca522619dcc107e8f  krfb-18.04.3.tar.xz"
+sha512sums="1024222c35f4c73774635ccf6e65109f6ecdf29ddb2d63a9d6ae4821647115b2945320ea3cd4f1d3bb13009e853f5d045dfc7bea7f94d41ebccb42dbaa86433c  krfb-18.08.1.tar.xz"
diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD
index 0a8beec2a..ad145f237 100644
--- a/user/kross/APKBUILD
+++ b/user/kross/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kross
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for scripting KDE applications"
 url="https://www.kde.org/"
@@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev qt5-qtscript-dev kparts-dev"
 makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev
 	kcompletion-dev kcoreaddons-dev ki18n-dev kiconthemes-dev kio-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/frameworks/5.48/portingAids/kross-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/5.50/portingAids/kross-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d4790f6317d82bcb2d6ca1136e41ede2912310a393a9eb4809da2d0fcbfd3cd5505a343da7490ab16120d880580da3f2d878e58f5da143994a94bf0e4464b877  kross-5.48.0.tar.xz"
+sha512sums="6c1f4062d87bfa691b6323ec6210cb1f321525e012ff8e37a90271f05eb7dde489f64fa36c027d7890b220ac7af89f3571547d267033a451fedb85522d01577b  kross-5.50.0.tar.xz"
diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD
index 9eab0cdd1..ccaa5a9f1 100644
--- a/user/kruler/APKBUILD
+++ b/user/kruler/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kruler
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Screen ruler"
 url="https://www.kde.org/applications/graphics/kruler/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0d1ff9656530e4496e18b4382bd73c5750b4b2ecfd677140a57c3e159687e56254790198f406898c140654f01288580fbe48d84531d24c53b629a7d2a87557c0  kruler-18.04.3.tar.xz"
+sha512sums="8facbb509eada0762264bef0435d2d4888a5e6a9a102f6c4d5746f4e299a67be888543ff12c4f53970c4371ac85cf4877d307193e9f33d4bf776a6ffd61922dc  kruler-18.08.1.tar.xz"
diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD
index 3656160de..93aa18030 100644
--- a/user/krunner/APKBUILD
+++ b/user/krunner/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=krunner
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Parallel query system"
 url="https://api.kde.org/frameworks/krunner/html/index.html"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b91f2de6e13375f05643b3e9e20f3a69ffa4206281eab08114d8565fa0aceb4dffe5a36ec4b2f68ee399a2a6682f4f2dee48c0a718f1f205c8ed7a87d0265ca0  krunner-5.48.0.tar.xz"
+sha512sums="c1f14161c39c718f6dd9e3dca818a53d86d05b33d8115e26ce7e76d66dd3d54d22a15ea7b6c1865a5d374bd4175b9bc351db949b373e2b9de1fac8e3efb6542c  krunner-5.50.0.tar.xz"
diff --git a/user/krusader/APKBUILD b/user/krusader/APKBUILD
index 9830c6b0a..5e586643b 100644
--- a/user/krusader/APKBUILD
+++ b/user/krusader/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=krusader
-pkgver=2.7.0
+pkgver=2.7.1
 pkgrel=0
 pkgdesc="Advanced, twin-panel (commander style) file manager"
 url="https://krusader.org/"
@@ -43,5 +43,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="254b1a0a68fca010dfe79d8364ca745dacc2b5899c9b99d6c576b95e9ac8a564a59a291568158ec1f114b0e2c0137e2a9e7a9b4c01497539e6a9a9d5b7411b1d  krusader-2.7.0.tar.xz
+sha512sums="860908fd960ae45d298ade30bd4962eea44d126b5a3bb28d04540a0e4fbc0645de2394490fdb624b5fcc7005841c0ce392cda896dc4b1d3d2de3a1e44171222d  krusader-2.7.1.tar.xz
 6df1a858c896d91d2f09a0cf49a90177655cf21bd7fe18c5b82e0805f81d3c121978b932a2f139d2e0e4ca8d9741d181274b968628e905f87557b6ad43f05a59  posix-headers.patch"
diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD
index f6b634a29..b1acd8701 100644
--- a/user/kservice/APKBUILD
+++ b/user/kservice/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kservice
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for implementing plugins and services"
 url="https://www.kde.org/"
@@ -16,8 +16,13 @@ makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev python3
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kservice-$pkgver.tar.xz"
 
-build() {
+prepare() {
 	cd "$builddir"
+	mkdir -p build
+}
+
+build() {
+	cd "$builddir"/build
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -30,13 +35,14 @@ build() {
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DBUILD_TESTING=OFF \
 		-DBUILD_QCH:BOOL=ON \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} \
+		..
 	make
 }
 
 package() {
-	cd "$builddir"
+	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3c781f0634e646ad287a02d3fc65ef1850984e637a9a01c2f5f86805c6962429a2cfeedb7e3d81ac12c60b6786b5c51545a15a049d5dcf2d339a235c060e34e9  kservice-5.48.0.tar.xz"
+sha512sums="d239647335f0c72e1c76f36f4f23dfdd4614467b1f95d75bffc3ffd11c2bcf307dbbbc7f67c0197030a1c27875bf256a751721204f06769d9fdc3f1e49172e87  kservice-5.50.0.tar.xz"
diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD
index 2f4d4433a..2bef40a11 100644
--- a/user/kshisen/APKBUILD
+++ b/user/kshisen/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kshisen
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Mixture of Solitaire and Mah Jongg"
 url="https://games.kde.org/game.php?game=kshisen"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="87d7e86ac41fe179735afd20ca5186c659a8eeefa8b4973553f295ee712649a7bf05fa25b051583c4904d2b875816cb0175206b48febc48520f4ec548149081f  kshisen-18.04.3.tar.xz"
+sha512sums="aa215ad4b30f91ac262d99657ff093ff9b24529af33c3f1c9ee5a79d3eb7bca5ff6515112430f4b4e70ce06fe75289082ec26ef9092418de2f5d8df291860f28  kshisen-18.08.1.tar.xz"
diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD
index e5cf126a0..fb062a554 100644
--- a/user/ksnakeduel/APKBUILD
+++ b/user/ksnakeduel/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ksnakeduel
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Tron-like game"
 url="https://www.kde.org/applications/games/ksnakeduel/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="04ccbba57d99aecbba962d45456f59b35195991653491550115e1f4d9909ca67ad55e2c5d603475334e795d8ee449fd5deb3f3aa60b319602d159af475b5a465  ksnakeduel-18.04.3.tar.xz"
+sha512sums="ae8ffbc8fa2489ec3aaf2d2ea866b6df5d1a9ea6e24708c584b21db69e93bff659d418bed33063a8a4c36735f6cf0664a3a117f4a55a4fe19e441b71d5c3a4b7  ksnakeduel-18.08.1.tar.xz"
diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD
index 64fe805ca..70623fe6e 100644
--- a/user/ksquares/APKBUILD
+++ b/user/ksquares/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ksquares
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Fun and exciting game of Dots and Boxes"
 url="https://games.kde.org/game.php?game=ksquares"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="58b28c87321ad2380b95d58ca5969f5def22642bf3d073a4774acd036cc9d50489594feb0492d9e53c33744c0c7ffd3fc1243e475e00ac9ec6f96b9bf2c9f646  ksquares-18.04.3.tar.xz"
+sha512sums="8c5fbb1e5989adf061571a63a16d86f38b3f68d977162ce8fab4ea2b1b41eb58dee9371cca1f97052497a4a72d101fa4478941ea39022d87e885c23a39aef028  ksquares-18.08.1.tar.xz"
diff --git a/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch b/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch
new file mode 100644
index 000000000..052b849d9
--- /dev/null
+++ b/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch
@@ -0,0 +1,25 @@
+From b2b36b864813e512829ab8a3613f8a91f2bff20e Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Wed, 29 Aug 2018 11:27:38 -0500
+Subject: [PATCH] htmesh: Fix compile error on modern Linux systems
+
+---
+ kstars/htmesh/SkipListElement.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kstars/htmesh/SkipListElement.h b/kstars/htmesh/SkipListElement.h
+index f8187e42a..52dfff38a 100644
+--- a/kstars/htmesh/SkipListElement.h
++++ b/kstars/htmesh/SkipListElement.h
+@@ -20,7 +20,7 @@
+ #define KEY_MAX _I64_MAX
+ #else
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || \
+-    (defined(__SUNPRO_CC) && defined(__sun)) || defined(__APPLE__)
++    (defined(__SUNPRO_CC) && defined(__sun)) || defined(__APPLE__) || defined(__linux__)
+ #define KEY_MAX LLONG_MAX
+ #else
+ #define KEY_MAX LONG_LONG_MAX
+-- 
+2.17.1
+
diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD
new file mode 100644
index 000000000..11b503db3
--- /dev/null
+++ b/user/kstars/APKBUILD
@@ -0,0 +1,52 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kstars
+pkgver=2.9.8
+pkgrel=0
+pkgdesc="Desktop planetarium"
+url="https://www.kde.org/applications/education/kstars/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
+	qt5-qtsvg-dev knotifyconfig-dev kauth-dev kconfig-dev kcrash-dev
+	kdoctools-dev kwidgetsaddons-dev knewstuff-dev ki18n-dev kio-dev
+	kxmlgui-dev kplotting-dev knotifications-dev eigen-dev mesa-dev
+	qt5-qtwebsockets-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/kstars/kstars-$pkgver.tar.xz
+	0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch
+	"
+
+build() {
+	cd "$builddir"
+	mkdir build
+	cd build
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
+		${CMAKE_CROSSOPTS} \
+		..
+	make
+}
+
+check() {
+	cd "$builddir"/build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	cd "$builddir"/build
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="52bc57cd5c46d470f6b49441512708c4446da6cb894cc4f450e8a98616fac8a7d8bcce7ceebcc9a78763f7df612b9cf33498944feed24f2a4104f6b838dc7925  kstars-2.9.8.tar.xz
+8c81a6db810a99b7d8bf7adca15767fdbfb79269ab2de1e4136de3c75266dde2fd572b961f63dc9b4f619abf7292e02eed5d29ca9ba53586f30871aba6015fdb  0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch"
diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD
index 8e46a1946..a00cd06f5 100644
--- a/user/ksudoku/APKBUILD
+++ b/user/ksudoku/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ksudoku
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Desktop Sudoku (symbol placement / logic) game"
 url="https://games.kde.org/game.php?game=ksudoku"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b205523e365c87badaa9c0b47f3228df2c678e89346329215c2a11cc652f92399d0a31edb09db992164e20addf44ba18c31b989b1d5b66b090138c656d4b32c4  ksudoku-18.04.3.tar.xz"
+sha512sums="c310e1ea217e0c7cf56562c6ac5e2d028567031b7f4c710d132ea4149e658577d659689a607c3ae27337f0c09a9674a5d38d229651401fb98cc8b01adc2544de  ksudoku-18.08.1.tar.xz"
diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD
index 7efec0bda..0f836fa04 100644
--- a/user/ksystemlog/APKBUILD
+++ b/user/ksystemlog/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ksystemlog
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Friendly, powerful system log viewer tool"
 url="https://www.kde.org/applications/system/ksystemlog/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f42d7fdabd93f98180077388ff4fc93921db562795edaa1892dd4526a8f8637a2f5ed5c063c0b97f96603a0f0f2f0425336c61b956c9ba933cec565fb2cad827  ksystemlog-18.04.3.tar.xz"
+sha512sums="096c335bc4b461548d7d16dbee738ee06fb5fae91ab3f02869b73af18f1dd8ef4ea27568a265e6a40f3777e7749e9f5a11e9b3402ac5f698836e00475a759308  ksystemlog-18.08.1.tar.xz"
diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD
index a06deb011..799131cc0 100644
--- a/user/kteatime/APKBUILD
+++ b/user/kteatime/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kteatime
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Steep responsibly"
 url="https://www.kde.org/applications/games/kteatime/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5d6e19eac3687b1ecd0abeec1f6e0e28f69b78fe599e9d2cadca33a5f38b4565fe6a7abefc3877ff5a3b174a12d85c057c020d92318f311b7917466195e72961  kteatime-18.04.3.tar.xz"
+sha512sums="61d0233dc81a492f2fa3caec2a0a028c66a0f9b0ceb18ff1d395dedee3ea184b221dd59bb35886d65ba7c4bd32f84a6ac8aaab0b0ccc61d3989824a5410539c3  kteatime-18.08.1.tar.xz"
diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD
index 51a2e4a69..21c0fe277 100644
--- a/user/ktexteditor/APKBUILD
+++ b/user/ktexteditor/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ktexteditor
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Reusable, programmable text editor widget"
 url="https://www.kde.org/"
@@ -18,7 +18,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ktexteditor-$pkgver.tar.xz"
 
 # secfixes:
-#   5.48.0-r0:
+#   5.50.0-r0:
 #     - CVE-2018-10361
 
 build() {
@@ -48,4 +48,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1db1f2967d9fa806f29538dd3289780ecfb3ed1ff12e8ecb1ad012d7d7e18acb69952b018e22246c2a75297a351fd9258fd199fe090c3e00fda4b2fd2bbe18cd  ktexteditor-5.48.0.tar.xz"
+sha512sums="ab58d937d7b3e6374f7800fa81d52522a8fe73e67a222402b557b41770f1067348bb6b0e8a4e76cf4c983cc3e2e9df0760bd10791531b6d59cbd438c39e93537  ktexteditor-5.50.0.tar.xz"
diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD
index 15fb7ea72..0476c3c52 100644
--- a/user/ktextwidgets/APKBUILD
+++ b/user/ktextwidgets/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ktextwidgets
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework providing widgets for text manipulation"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9c36cb5ee98f9c2968e7ffd68ff4bf40a8e593baaeb3ab7d768b5f0ed3f4f7b11bcb0030200dc06e9b1a420257a083a3c010c96c3172552f9af57330853e89be  ktextwidgets-5.48.0.tar.xz"
+sha512sums="bbb886b5f3520d7aba4b2f0fb3b63fcba7df16cf551077bc6827ca402fda4849a6148b21706c3c733cb788042a2ed1870a28104f7cb7227cbf5f3f4e14128db0  ktextwidgets-5.50.0.tar.xz"
diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD
index a1346f183..ecc6bf036 100644
--- a/user/ktimer/APKBUILD
+++ b/user/ktimer/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ktimer
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Tool to execute programs after some time"
 url="https://www.kde.org/applications/utilities/ktimer/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d964f1751782ee112d91d59c66e8f5836751e41cb607d04d61eff4450c75dee44989a73cd484b651ec31b233e7242ab8ab8a39c29d175d20259a35dc54d02e56  ktimer-18.04.3.tar.xz"
+sha512sums="54916845190dcf9e80deefbdf1cfa583cfc37c4ab7fca9ba56a0542a934719f98b56bc879768a0f6822d255ead23446edad9bf21886fd341a11f2ad3296f2947  ktimer-18.08.1.tar.xz"
diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD
index f239a08a3..0f816ab37 100644
--- a/user/ktorrent/APKBUILD
+++ b/user/ktorrent/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ktorrent
-pkgver=5.1.0
-pkgrel=1
+pkgver=5.1.1
+pkgrel=0
 pkgdesc="BitTorrent client by KDE"
 url="https://www.kde.org/applications/internet/ktorrent/"
 arch="all"
@@ -16,9 +16,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev
 	kwindowsystem-dev kxmlgui-dev libktorrent-dev taglib-dev kplotting-dev
 	kdnssd-dev plasma-workspace-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/ktorrent/5.1/ktorrent-$pkgver.tar.xz
-	qtimer.patch
-	"
+source="https://download.kde.org/stable/ktorrent/$pkgver/ktorrent-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -46,5 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7bfe3a04a2b0f62d68b41c946af34e9f6ead6aa4ff7818a9c0ce2e83629d311e9e9be5fb1689065ce2601c43bd576b27d8c6946b845d4cdf5fa6362d53e8dd25  ktorrent-5.1.0.tar.xz
-94972e958b44850686d6853090bb0ba7b709b68f5b3c8715c42c1cab602ce2b22710fc120bad4a1cc824fc6de9e9aedc94f5bb8b9f9d31170d24adaefabdce28  qtimer.patch"
+sha512sums="bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06  ktorrent-5.1.1.tar.xz"
diff --git a/user/ktorrent/qtimer.patch b/user/ktorrent/qtimer.patch
deleted file mode 100644
index efbf740c0..000000000
--- a/user/ktorrent/qtimer.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6d7433d44c7f18cd84d2de105beb5c646ed0e355 Mon Sep 17 00:00:00 2001
-From: Adriaan de Groot <groot@kde.org>
-Date: Tue, 24 Apr 2018 19:15:32 +0200
-Subject: QTimer may not be an incomplete type as it is used as a member
- variable. Add the #include to fully define the type. This problem shows up
- when this header is included in a context that doesn't already have QTimer
- included -- CMake 3.11 exposes that accidentally.
-
-Upstreamed from FreeBSD ports.
----
- ktorrent/dialogs/torrentcreatordlg.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ktorrent/dialogs/torrentcreatordlg.h b/ktorrent/dialogs/torrentcreatordlg.h
-index 68dde8a..12a1a43 100644
---- a/ktorrent/dialogs/torrentcreatordlg.h
-+++ b/ktorrent/dialogs/torrentcreatordlg.h
-@@ -23,6 +23,8 @@
- #define KT_TORRENTCREATORDLG_HH
- 
- #include <QDialog>
-+#include <QTimer>
-+
- #include "ui_torrentcreatordlg.h"
- #include <torrent/torrentcreator.h>
- 
--- 
-cgit v0.11.2
-
diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD
index e36a11157..e9d79daa6 100644
--- a/user/ktouch/APKBUILD
+++ b/user/ktouch/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ktouch
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Touch typing tutor"
 url="https://www.kde.org/applications/education/ktouch/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="eb27ecb18b9b06b839d56e150248e0ca89e12b89d80c1ba7237f46462e28056cdc423c1e3f3e9282b746f94c265d944dbc2cd4143dff1b145d6bdaf83d2e563d  ktouch-18.04.3.tar.xz"
+sha512sums="83fb8fefff5a3fbb8124fb7a0d545f5d2edbcf1b2c1e134cf8c9984809bbe1f4b50e566782a9eed78233e9716f8638b86e177f5ed9f1f1304fbe70942abdf3ed  ktouch-18.08.1.tar.xz"
diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD
index d637cbfc3..af37697bc 100644
--- a/user/ktuberling/APKBUILD
+++ b/user/ktuberling/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ktuberling
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Simple constructor game"
 url="https://games.kde.org/game.php?game=ktuberling"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7f8e26b681389d50194d85c08a88abce6d96acecf8b668e966eb4a61bb9129f9d9ebd667e3021eb83f681bdf5476a0c60fdd4716f083456be5b5d0e24c9a57d6  ktuberling-18.04.3.tar.xz"
+sha512sums="71381b04656f15e1c9409bfae15252f4a8ebe8c6de139d432e88ab23f942d8662a07dfb1d93901097c4d83227229e5becdebf1da10935cbb830848dfe8d4b18a  ktuberling-18.08.1.tar.xz"
diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD
index eb1a19fde..10b73a429 100644
--- a/user/kturtle/APKBUILD
+++ b/user/kturtle/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kturtle
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Educational programming environment"
 url="https://www.kde.org/applications/education/kturtle/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c4d3a20b7a399f4ffd2e8ed6975df6732fe33fe945694a8eb94410c2d80923f3156d7cae1658edbfb48692ebf86fd19c17040d8fbda877c86d12e939eba98ec6  kturtle-18.04.3.tar.xz"
+sha512sums="d33694c95676579a72c4065009f86f9a4aef9576057a4215267b16d5a37ba2b1d57e103bc9b3824dd5691b63d078e964291775a067f85c74d542b3654cd276a7  kturtle-18.08.1.tar.xz"
diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD
index 36f2fd2da..0ab818f4c 100644
--- a/user/kubrick/APKBUILD
+++ b/user/kubrick/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kubrick
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="3D cube puzzle solving game"
 url="https://www.kde.org/applications/games/kubrick/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a2bc2bb76150a60b7e85173899eb112eeddc91748c412bd2f2281d72ca83a6b418edfb693d4468de125ddffff280a9bebd3412bda0a331b17ce494c0b5610d57  kubrick-18.04.3.tar.xz"
+sha512sums="37cd3bb1488f3cf0704010a3b9d10ba8861f3e258fbab63703b255e999f326899ddd5c50bf8409598ebced62e532105bfe541f5fe768e9a942fff3dd09cfb443  kubrick-18.08.1.tar.xz"
diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD
index a12c118f4..39d7a3515 100644
--- a/user/kunitconversion/APKBUILD
+++ b/user/kunitconversion/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kunitconversion
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Convert between metric and imperial"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9415de7ddbc354bc3121692677ec79de0a0628eea5fdbe1e6743c3c7d44ae09a6476e4e4a3d70dff643644bf7c1864bf501605e938600be89d59d01bf684660c  kunitconversion-5.48.0.tar.xz"
+sha512sums="82dc61f9893e6d1f7215226a1bc87404a09d8c29f384dab21fb78a2620ffb3ba45621beb057ef803f95635f2e8b1b0f3e57a9dbcbf815871d45c87f70d53750f  kunitconversion-5.50.0.tar.xz"
diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD
index c92e50463..1ed6014d1 100644
--- a/user/kwallet/APKBUILD
+++ b/user/kwallet/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwallet
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Secure storage system for passwords built atop Qt"
 url="https://www.kde.org/"
@@ -44,5 +44,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="465c6839f5a47126f785381f0a8b01c03aa6952c606ff1beb639f48f0f57baecff89a48590cebde1b731e8a931f96ccc0ec9e4df786aa947962cc1999c188db4  kwallet-5.48.0.tar.xz
+sha512sums="45d798775898a8781be3341411c55f07df668d2f13806b3085e3c9f77926f564d6dc5ea3425aa3e0fdc42276125f320136725cd988807fb1a29b22ccc1bdccf8  kwallet-5.50.0.tar.xz
 edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179  kwallet-5.22.0-blowfish-endianness.patch"
diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD
index 0731ed694..e05deca6d 100644
--- a/user/kwalletmanager/APKBUILD
+++ b/user/kwalletmanager/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwalletmanager
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Manage KDE wallets"
 url="https://www.kde.org/applications/system/kwalletmanager/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="54cc68ad34419703092cc53fdfe19e48ab758377b47feae405d2a094950501195cb8a39ce863d37204b0d2a0019100411ad73164c00bbf1e96bc2662a9a79b44  kwalletmanager-18.04.3.tar.xz"
+sha512sums="9e5d37f3600dc8f6499e791c92858a0e16afe8cce6b60232af8736e161ad67936f4e4e2ec49cfd413aae410d4b1ef24e27dca42e3c04ab1fc05c61ed39698740  kwalletmanager-18.08.1.tar.xz"
diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD
index cca19309a..d99fa5a64 100644
--- a/user/kwave/APKBUILD
+++ b/user/kwave/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwave
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Sound editor built for KDE"
 url="https://kwave.sourceforge.net/"
@@ -31,6 +31,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DWITH_OSS=OFF \
 		${CMAKE_CROSSOPTS}
 	make
 }
@@ -45,5 +46,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="30fdfdf681bdf2f339a0b8ca91899e4b3e447075a7454f352f897745af2b671a5412c37ff372563a5f80cb3545295a5c4849b3243386ab86831e325867f7ef23  kwave-18.04.3.tar.xz
+sha512sums="5e9abc54dbd3e757ffb287ce68f43eb91c4b7ee8c231fca194139d0c2183f1b1e8acd23f713d15ea40dca6cea03d4567591ac78d58650e554422772cd7a53660  kwave-18.08.1.tar.xz
 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4  remove-msgcat.patch"
diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD
index 372e08e5b..ab6e4bb2d 100644
--- a/user/kwayland/APKBUILD
+++ b/user/kwayland/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwayland
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Qt wrapper libraries for Wayland"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cc446d6e9262a1ee3d6c3800fd833c28218ecf035ec156490bbd922567e47dd10ee103631b4be5db0d1520a2856c080f06698250afa8d1e5b7d7813013a41e68  kwayland-5.48.0.tar.xz"
+sha512sums="6698eace0b13d276b24ccb47cf15cb04c6ee473d5e21adcbd8729a02bb481387faf280b4fff5a7e94965671424e8a1be6364f17e738b929d2a5b1d6638c15428  kwayland-5.50.0.tar.xz"
diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD
index 72e80d263..8e9a19a09 100644
--- a/user/kwidgetsaddons/APKBUILD
+++ b/user/kwidgetsaddons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwidgetsaddons
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework containing ready-made widgets for common tasks"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="561db5f830aecb92569c3c3e3a55bd1c062b42e0d84675b73d60d03d7f53d24501b61aeea876b1f39128d4256db1473cf1ce7a5ad523a6a863db84afad6168b3  kwidgetsaddons-5.48.0.tar.xz"
+sha512sums="91c4824d1c5b889c11f84fe95f0e48453275451d3e2e7c5b4a5603fa5db4ffbe0ab20dfd48bb3fcec8576c4f1d494a5fcb5d53e84ff11af01ded26b93377cfe7  kwidgetsaddons-5.50.0.tar.xz"
diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD
index f02eb5f75..12be7c657 100644
--- a/user/kwindowsystem/APKBUILD
+++ b/user/kwindowsystem/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwindowsystem
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for introspecting the running X11 window manager"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="be6b4b0aa86762908dd9dc8bbff593342d8913cca91f899773c8f8cb81b2e3e92b1a8ecabd86098ee0c3820c5fd05e0b878fd3b6f48160d1e4555eb00673770a  kwindowsystem-5.48.0.tar.xz"
+sha512sums="7e83e07ab587ef4a0edd58ca22ecba8277f97ca6438f537b6475bf03225559d207e80c2fde4c1ce5ebdb78b5a4c1e04407af9cba0a5dacbbaeacf3d7b14a9ed6  kwindowsystem-5.50.0.tar.xz"
diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD
index fa899ab10..5fdb2bb57 100644
--- a/user/kwordquiz/APKBUILD
+++ b/user/kwordquiz/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwordquiz
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Flash card trainer for KDE"
 url="https://www.kde.org/applications/education/kwordquiz/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9b8fe36ebaecd49bea700fe74338aef430a2d0f9449eef4c3b1ca3ef84915e49e1fa22a8aa4fd72786cbf0631cbb39477170b0b5ba4e5f713722dd591b55fb55  kwordquiz-18.04.3.tar.xz"
+sha512sums="40a00ca117b4a4a14921b84c312bd4afc98b83e45d0f7a1cc9cc24d365b57bb5a3a383dae65e8517e835991e02e1841fb5470a215003467c29f93e7e04427a28  kwordquiz-18.08.1.tar.xz"
diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD
index d66ef34d6..d7b3e60b4 100644
--- a/user/kxmlgui/APKBUILD
+++ b/user/kxmlgui/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kxmlgui
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for creating user interfaces using XML"
 url="https://www.kde.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4f0bfac2f795fccc021cc139397e0691dfe9fa0a273ab8ad95783f4a415cd15c2f84dc5b0d80d0e37d92c7b884c3cb9f338fcf67964f89ac9d0d40cc6f6acef2  kxmlgui-5.48.0.tar.xz"
+sha512sums="01915037c1709df0a04d9651d0c56f21856448636937188c50ff5785de374f68d87e9bb8a4f553b8247a601e186c4291b1e5ff4ec9bf89dbfd7d975c527e064a  kxmlgui-5.50.0.tar.xz"
diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD
index 62a78ac38..c865e581e 100644
--- a/user/kxmlrpcclient/APKBUILD
+++ b/user/kxmlrpcclient/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kxmlrpcclient
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Qt library for writing XML-RPC clients"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2ee236b34950fd8ce9475acadaf1e404a79ebbc3a95b53ba0749706e201569cfbd1dfb19837ca829e7fb0597781c436f94a0cbf5401042316c757d321ffee98a  kxmlrpcclient-5.48.0.tar.xz"
+sha512sums="08c207cc2c0db165ed76ea2c92bfbb1ed9eb49ace49ffb3bfbfb8780a0b335e0938504fe370465dc074ee6bb02f64a4d5f5bce459729215a334bfdbebba4ca98  kxmlrpcclient-5.50.0.tar.xz"
diff --git a/user/libabw/APKBUILD b/user/libabw/APKBUILD
new file mode 100644
index 000000000..0bb3a9494
--- /dev/null
+++ b/user/libabw/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libabw
+pkgver=0.1.2
+pkgrel=0
+pkgdesc="Import filter and tools for AbiWord documents"
+url="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
+arch="all"
+options="!check"  # No test suite.
+license="MPL-2.0"
+depends=""
+depends_dev="librevenge-dev libxml2-dev zlib-dev boost-dev"
+makedepends="$depends_dev doxygen gperf perl"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-werror
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd  libabw-0.1.2.tar.xz"
diff --git a/user/libatomic_ops/APKBUILD b/user/libatomic_ops/APKBUILD
index eb8d23914..6c8423843 100644
--- a/user/libatomic_ops/APKBUILD
+++ b/user/libatomic_ops/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libatomic_ops
-pkgver=7.6.4
+pkgver=7.6.6
 pkgrel=0
 pkgdesc="Provides semi-portable access to hardware provided atomic memory operations"
 arch="all"
@@ -40,4 +40,4 @@ package() {
 	install -Dm644 doc/LICENSING.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b  libatomic_ops-7.6.4.tar.gz"
+sha512sums="ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8  libatomic_ops-7.6.6.tar.gz"
diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD
index 5eb8347f0..05785a223 100644
--- a/user/libblockdev/APKBUILD
+++ b/user/libblockdev/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libblockdev
-pkgver=2.18
+pkgver=2.19
 pkgrel=0
 pkgdesc="Library for manipulating block devices"
 url="http://storaged.org/libblockdev/"
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="65e2f795ced3e902af889f3bd9e303234e1611fb25555123b4edaf0b1e3aca24d399422f96eb0694ada025e57ddeb207f60c8666d0640110e228cfb8da92d5ab  libblockdev-2.18.tar.gz"
+sha512sums="bc0e9524b95ca7b32478cb2e9195df336b44921825832393189d04611e6cb634aa033485507239add55d126021f103c7528d912be950c58d46e130c09b4d5167  libblockdev-2.19.tar.gz"
diff --git a/user/libbytesize/APKBUILD b/user/libbytesize/APKBUILD
index d7b9c4727..4c80ef88a 100644
--- a/user/libbytesize/APKBUILD
+++ b/user/libbytesize/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libbytesize
-pkgver=1.3
+pkgver=1.4
 pkgrel=0
 pkgdesc="Library for working with sizes in bytes"
 url="https://github.com/storaged-project/libbytesize/"
@@ -46,5 +46,5 @@ py() {
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="a8e5b5d59d0a97ae52a2c0f437c4d7fd8afc8249762be99027e3beeadc6c54ad52a09c1d30e66466b99496fcf3419fa799d0fcccf61c0661b3e9cff48d0054af  libbytesize-1.3.tar.gz
+sha512sums="54aba1f605ad662ff525c47206e8342e727c807692225361f1fa8d6a66c00f2740fc3d3672978eec2806227d85f146034042a9808e458d8d6271a08934032959  libbytesize-1.4.tar.gz
 5f8b46c257553672b7c2501bae99ff44594b91bfcf3f1ee209a390a8cdda693616e8207a99cea2e1263093324807a307dac9e643d1482e14f9ba604f51a05d6d  no-msgcat.patch"
diff --git a/user/libcdr/APKBUILD b/user/libcdr/APKBUILD
new file mode 100644
index 000000000..8ed5fd70b
--- /dev/null
+++ b/user/libcdr/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libcdr
+pkgver=0.1.4
+pkgrel=2
+pkgdesc="Import filter and tools for Corel DRAW files"
+url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
+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"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="769b0319b5a904ce9f727b7076f82cd915ecd8c9e5e2456416e3e6739c6403bbd4108787ab124d36efb1b47d5c9e37c48b0e12d096eb440ae8f9979ec06048a6  libcdr-0.1.4.tar.xz"
diff --git a/user/libcmis/APKBUILD b/user/libcmis/APKBUILD
new file mode 100644
index 000000000..a60e7f2b0
--- /dev/null
+++ b/user/libcmis/APKBUILD
@@ -0,0 +1,52 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libcmis
+pkgver=0.5.1
+pkgrel=2
+pkgdesc="CMIS protocol client library for C/C++"
+url="https://github.com/tdf/libcmis"
+arch="all"
+license="MPL-1.1 OR GPL-2.0+ OR LGPL-2.0+"
+depends=""
+depends_dev="boost-dev"
+makedepends="$depends_dev curl-dev libxml2-dev"
+checkdepends="cppunit-dev"
+subpackages="$pkgname-dev cmis-client:client"
+source="https://github.com/tdf/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$builddir"
+
+	# Note: manpages require docbook2x to build
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--without-man \
+		--disable-werror
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+
+	# Leftover docbook file
+	rm -r "$pkgdir"/usr/share/man
+}
+
+client() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="da1e66a7604f90644ad6ee691a5c06df36debec20db361e166ee64c9f8ce85be48623e38367ea2799107c10041ed5f8c3a8011a80d6eaca800c29084fb4fe0f6  libcmis-0.5.1.tar.gz"
diff --git a/user/libdbusmenu-qt/APKBUILD b/user/libdbusmenu-qt/APKBUILD
index 4a1df2f48..8b95777ca 100644
--- a/user/libdbusmenu-qt/APKBUILD
+++ b/user/libdbusmenu-qt/APKBUILD
@@ -2,10 +2,11 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libdbusmenu-qt
-pkgver=0.9.3_pre20160218
-pkgrel=2
+pkgver=0.9.3.16.04.20160218
+_realver=${pkgver/.16.04/+16.04}
+pkgrel=0
 pkgdesc="library to export QMenu over DBusMenu protocol"
-url="http://people.canonical.com/~agateau/dbusmenu/index.html"
+url="https://launchpad.net/libdbusmenu-qt/"
 arch="all"
 options="!check"  # requires as-of-yet unpkg'd qjson, may require dbus?
 license="LGPL-2.1+"
@@ -13,8 +14,8 @@ depends=""
 depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev cmake doxygen"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${pkgver/_pre/+16.04.}.orig.tar.gz"
-builddir="$srcdir"/"$pkgname-0.9.3+16.04.20160218"
+source="https://launchpad.net/ubuntu/+archive/primary/+files/"$pkgname"_"$_realver".orig.tar.gz"
+builddir="$srcdir"/$pkgname-$_realver
 
 prepare() {
 	cd "$builddir"
diff --git a/user/libdmtx/APKBUILD b/user/libdmtx/APKBUILD
index 3c296d019..ce8e9f442 100644
--- a/user/libdmtx/APKBUILD
+++ b/user/libdmtx/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libdmtx
-pkgver=0.7.4
-pkgrel=1
+pkgver=0.7.5
+pkgrel=0
 pkgdesc="Library for creating and reading Data Matrix barcodes"
 url="http://libdmtx.sourceforge.net/"
 arch="all"
@@ -10,12 +10,12 @@ license="BSD-2-Clause"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/libdmtx/libdmtx-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/dmtx/$pkgname/archive/v$pkgver.tar.gz"
 
 prepare() {
 	cd "$builddir"
-	update_config_sub
 	default_prepare
+	./autogen.sh
 }
 
 build() {
@@ -33,7 +33,7 @@ build() {
 
 check() {
 	cd "$builddir"
-	make check
+	make CFLAGS="-std=c99" check
 	test/simple_test/simple_test
 }
 
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="307aeb30506e60fc44550d1bb86081634f0718d53e7b878b45b0e704e75c5996e27285a16881b7c3a93cafa9a9b125175dadc0f0c2c2f976878666eb652108ae  libdmtx-0.7.4.tar.gz"
+sha512sums="c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a  libdmtx-0.7.5.tar.gz"
diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD
index c1e30c1ff..d9b707067 100644
--- a/user/libdrm/APKBUILD
+++ b/user/libdrm/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libdrm
-pkgver=2.4.92
+pkgver=2.4.94
 pkgrel=0
 pkgdesc="Userspace interface to kernel DRM services"
 url="https://dri.freedesktop.org/"
@@ -43,5 +43,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9b75584d8957d298125884d490b74c0a641725d17088ba47f3dc2ec9d06519d8387eb464c024ee11712b31b17fb84e1a9a52bd4ebc7c316beb7d2f8711dc9eb2  libdrm-2.4.92.tar.bz2
+sha512sums="1a1699d6ea70b8759b37f3863e0802a99430b58f02e62632ad451356e2463eaf6faf4b810323f7dcc85ffdcca28f674b32caa5631ebd65b83e5b86bd59a35937  libdrm-2.4.94.tar.bz2
 af52fef51aaa05a4dd17919371cb9d92a77480402730bf53ba223e54df52f3825be05a7f28e6aef8c904db5ee59fe38a6c15bc6aafa7f8d31a719e80399dd51f  ioctl.patch"
diff --git a/user/libe-book/APKBUILD b/user/libe-book/APKBUILD
new file mode 100644
index 000000000..fefff969c
--- /dev/null
+++ b/user/libe-book/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libe-book
+pkgver=0.1.3
+pkgrel=1
+pkgdesc="Import filter and tools for various ebook formats"
+url="https://sourceforge.net/projects/libebook/"
+arch="all"
+license="MPL-2.0"
+depends_dev="boost-dev librevenge-dev liblangtag-dev"
+makedepends="$depends_dev icu-dev libxml2-dev zlib-dev doxygen gperf"
+checkdepends="cppunit-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-werror
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21  libe-book-0.1.3.tar.bz2"
diff --git a/user/libepubgen/APKBUILD b/user/libepubgen/APKBUILD
new file mode 100644
index 000000000..c8ac0d749
--- /dev/null
+++ b/user/libepubgen/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libepubgen
+pkgver=0.1.1
+pkgrel=1
+pkgdesc="librevenge export filter to EPUB"
+url="https://sourceforge.net/projects/libepubgen/"
+arch="all"
+license="MPL-2.0"
+depends=""
+makedepends="librevenge-dev libxml2-dev doxygen"
+checkdepends="cppunit-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://download.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="8e0d3670d16825ec8262c8cbd990f089b7c85defd9f52bb063085bb9a13fd0bb26ab92b59fb794d5af4ec81f62f560efad133585de71c9e5c27c4706f5738f50  libepubgen-0.1.1.tar.bz2"
diff --git a/user/libetonyek/APKBUILD b/user/libetonyek/APKBUILD
new file mode 100644
index 000000000..877041047
--- /dev/null
+++ b/user/libetonyek/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libetonyek
+pkgver=0.1.8
+pkgrel=0
+pkgdesc="Import filter and tools for Apple iWork documents"
+url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+arch="all"
+license="MPL-2.0"
+depends_dev="glm boost-dev librevenge-dev liblangtag-dev"
+makedepends="$depends_dev zlib-dev libxml2-dev gperf doxygen mdds"
+checkdepends="cppunit-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-werror \
+		--disable-static
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865  libetonyek-0.1.8.tar.xz"
diff --git a/user/libexttextcat/APKBUILD b/user/libexttextcat/APKBUILD
new file mode 100644
index 000000000..48fb2df18
--- /dev/null
+++ b/user/libexttextcat/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libexttextcat
+pkgver=3.4.5
+pkgrel=1
+pkgdesc="An N-Gram-based text categorization library"
+url="https://wiki.documentfoundation.org/Libexttextcat"
+arch="all"
+license="BSD-3-Clause"
+depends=""
+makedepends=""
+checkdepends="bash"
+subpackages="$pkgname-dev"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-werror
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6  libexttextcat-3.4.5.tar.xz"
diff --git a/user/libfreehand/APKBUILD b/user/libfreehand/APKBUILD
new file mode 100644
index 000000000..85ff7cf1f
--- /dev/null
+++ b/user/libfreehand/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libfreehand
+pkgver=0.1.2
+pkgrel=1
+pkgdesc="Import filter and tools for Adobe FreeHand documents"
+url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
+arch="all"
+license="MPL-2.0 AND Public-Domain"
+depends=""
+depends_dev="libxml2-dev lcms2-dev icu-dev"
+makedepends="$depends_dev gperf perl doxygen librevenge-dev zlib-dev"
+checkdepends="cppunit-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-werror
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963  libfreehand-0.1.2.tar.xz"
diff --git a/user/libgit2/APKBUILD b/user/libgit2/APKBUILD
index 11f1995af..3b9652088 100644
--- a/user/libgit2/APKBUILD
+++ b/user/libgit2/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libgit2
-pkgver=0.27.3
+pkgver=0.27.4
 pkgrel=0
 pkgdesc="Pure C re-entrant library for custom Git applications"
 url="https://libgit2.github.com/"
@@ -50,4 +50,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e470050b89289908ec64dafaa954ad9bfc8f557ba7dafcab440d9efde474f736c025d8202bfd81a508070d9cf678f3fb1f3687d72a849ce86edd1ee90ad13c3b  libgit2-0.27.3.tar.gz"
+sha512sums="d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61  libgit2-0.27.4.tar.gz"
diff --git a/user/libixion/APKBUILD b/user/libixion/APKBUILD
new file mode 100644
index 000000000..659969780
--- /dev/null
+++ b/user/libixion/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libixion
+pkgver=0.13.0
+pkgrel=0
+pkgdesc="A general purpose formula parser & interpreter"
+url="https://gitlab.com/ixion/ixion"
+arch="all"
+license="MPL-2.0"
+depends=""
+depends_dev="mdds"
+makedepends="$depends_dev boost-dev"
+subpackages="$pkgname-dev"
+source="http://kohei.us/files/ixion/src/$pkgname-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--disable-python
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+dev() {
+	default_dev
+	cd "$builddir"
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0  libixion-0.13.0.tar.xz"
diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD
index e051f57ef..ad5143e17 100644
--- a/user/libkdegames/APKBUILD
+++ b/user/libkdegames/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkdegames
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Library for common routines shared between KDE games"
 url="https://www.kde.org/applications/games/"
@@ -52,4 +52,4 @@ carddecks() {
 	mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/
 }
 
-sha512sums="ac31eb0c7308bfbf9d55f2cbfaea6a50d3f6b1c70420c17e2dcb9269b67831738bb1ddbb254f30bf4c6e34b90272b6c254d2bb5387452d0e6615a87a7be40c46  libkdegames-18.04.3.tar.xz"
+sha512sums="09769549944b42f8c0381ba691b787b9ab00575343047ee1763d8c1a5347e62716d0cada05b0688aee7f160846a6d16aa7d68978d99bdf65c5dc3a21ce5619e1  libkdegames-18.08.1.tar.xz"
diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD
index af469d4b1..7e50fe8b9 100644
--- a/user/libkeduvocdocument/APKBUILD
+++ b/user/libkeduvocdocument/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkeduvocdocument
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Library for manipulating KVTML files"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a703357c2444ee20ad38620575e07d6dcd8f49c45bc2e5b5fe464738d829df4d3847fc1f79698d309d88d6a652fe38ebf9776ce4d39dd11ddf774e77ef1dcfdb  libkeduvocdocument-18.04.3.tar.xz"
+sha512sums="fb71a7c76426a959f25c5bb2d01c8d843bcd31c0b28f4acf37fe860a2dff7a9ee5dfc67e9a51715f137ee5b7c284f885cae0f7941888ef0c75607b03ad90d11c  libkeduvocdocument-18.08.1.tar.xz"
diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD
index 8767b787f..d96026984 100644
--- a/user/libkipi/APKBUILD
+++ b/user/libkipi/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkipi
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="KDE Image Plugin Interface library"
 url="https://www.digikam.org/"
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3fa2fe8bbc5158bb1b06812ba708ce11feacacee9c9e39030bf4ef570177a8ff13962c02fddf33a6253f8db5d60805c2e1a65fc6264c7ca5d62e81abe3b44523  libkipi-18.04.3.tar.xz"
+sha512sums="d209b81bfe29d41816347d8292fabd572579ad4ba916127ea1fa1a9d247f08347dc6f2f1c91dbe5ba4e8f7e3305b411246a14c8c776e16af9b36fa57d8cd6641  libkipi-18.08.1.tar.xz"
diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD
index e044a93dd..f73aa01c5 100644
--- a/user/libkleo/APKBUILD
+++ b/user/libkleo/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkleo
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="KDE encryption library"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="678c68fdc249dfea337f6f262da1d4e3b20482ab5c4db859a5fef04b8d544c0709e9dcb59fa33bab89a6de550c81ba14883c3d31122849c83674b3dbca00b545  libkleo-18.04.3.tar.xz"
+sha512sums="3df1d5236d31636de4811dea600b660d1920613a56c0ec7821fdf3451737d896ba129746f5a838cfb96d106dcd68b3170efdf2616f8e56b562e59cd7ec7ce1ed  libkleo-18.08.1.tar.xz"
diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD
index 811576f90..2fcb476ae 100644
--- a/user/libkmahjongg/APKBUILD
+++ b/user/libkmahjongg/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkmahjongg
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Library with Mah Jongg logic"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f8ef97f0bf5fbd8c1dd923b26c42138f317a8b87df50261318ee438f29d53a99aceaaf077e24b36ab46e9f564761dcf389160cc657c6bec5ddf1c1ff3eddc87e  libkmahjongg-18.04.3.tar.xz"
+sha512sums="bfcae260ec5baef8ff8f881331442448d6e40619321c0034f9d638df91283ea50bd57a1ac90e118b99ab662d4d08c29b9493946119b9f378b1fa6fb823dcdc70  libkmahjongg-18.08.1.tar.xz"
diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD
index 5e7875a35..1fe14d367 100644
--- a/user/libksane/APKBUILD
+++ b/user/libksane/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libksane
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="KDE scanning library"
 url="https://www.kde.org"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1e9dcc5ab7ac5a8df0bd20db589da05f067e6611d19b796208fe8d08e92568661707a7e36a84e9bd361a57231652baba5ce23211aff41a7db69ff0aa3abe200c  libksane-18.04.3.tar.xz"
+sha512sums="fdd65c8857a31f2d805f12308b6ccb0027c5960b9af5f80553740f6ebe86e84278f2d078d651003c1f95835893794feabb76ce13c516f03783e65eacc82be48d  libksane-18.08.1.tar.xz"
diff --git a/user/liblangtag/APKBUILD b/user/liblangtag/APKBUILD
new file mode 100644
index 000000000..f46f49f9b
--- /dev/null
+++ b/user/liblangtag/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=liblangtag
+pkgver=0.6.2
+pkgrel=0
+pkgdesc="Interface library to access tags for identifying languages"
+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"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://bitbucket.org/tagoh/$pkgname/downloads/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f  liblangtag-0.6.2.tar.bz2"
diff --git a/user/libmspub/APKBUILD b/user/libmspub/APKBUILD
new file mode 100644
index 000000000..9b2de9baf
--- /dev/null
+++ b/user/libmspub/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libmspub
+pkgver=0.1.4
+pkgrel=0
+pkgdesc="Import filter and tools for Microsoft Publisher files"
+url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+arch="all"
+options="!check"  # No test suite.
+license="MPL-2.0 AND (MPL-1.1 OR GPL-2.0+ OR LGPL-2.0+)"
+depends_dev="boost-dev librevenge-dev"
+makedepends="$depends_dev icu-dev doxygen"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31  libmspub-0.1.4.tar.xz"
diff --git a/user/libmwaw/APKBUILD b/user/libmwaw/APKBUILD
new file mode 100644
index 000000000..0ab2b30bc
--- /dev/null
+++ b/user/libmwaw/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libmwaw
+pkgver=0.3.14
+pkgrel=0
+pkgdesc="Import filter and tools for old Mac documents"
+url="https://sourceforge.net/projects/libmwaw/"
+arch="all"
+options="!check"  # No test suite.
+license="MPL-2.0 OR LGPL-2.0+"
+depends=""
+depends_dev="boost-dev attr-dev zlib-dev"
+makedepends="$depends_dev librevenge-dev doxygen"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-werror
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="72d4a1132d96c99518c63b441abd13c239e3f71987ca487c24f3f2c8e72aff24b7c8d6edd6ea1b07d998ecd9003a8f85ef95553a325f7cd8721ddf4e17020ad5  libmwaw-0.3.14.tar.bz2"
diff --git a/user/libodfgen/APKBUILD b/user/libodfgen/APKBUILD
new file mode 100644
index 000000000..64eb49c62
--- /dev/null
+++ b/user/libodfgen/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libodfgen
+pkgver=0.1.7
+pkgrel=0
+pkgdesc="Export filter and tools for Open Document Format"
+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"
+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 \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--enable-test
+	make
+}
+
+check() {
+	cd "$builddir/test"
+	make launch_all
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e  libodfgen-0.1.7.tar.xz"
diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD
new file mode 100644
index 000000000..cd6494fef
--- /dev/null
+++ b/user/liborcus/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=liborcus
+pkgver=0.13.4
+pkgrel=0
+pkgdesc="Library for processing spreadsheet documents"
+url="https://gitlab.com/orcus/orcus"
+arch="all"
+license="MPL-2.0 AND MIT"
+depends_dev="boost-dev mdds libixion-dev"
+makedepends="$depends_dev zlib-dev"
+subpackages="$pkgname-dev"
+source="http://kohei.us/files/orcus/src/liborcus-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--disable-python
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b  liborcus-0.13.4.tar.xz"
diff --git a/user/libpagemaker/APKBUILD b/user/libpagemaker/APKBUILD
new file mode 100644
index 000000000..d6194da5d
--- /dev/null
+++ b/user/libpagemaker/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libpagemaker
+pkgver=0.0.4
+pkgrel=0
+pkgdesc="Import filter and tools for PageMaker"
+url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
+arch="all"
+options="!check"  # No test suite.
+license="MPL-2.0"
+depends=""
+depends_dev="librevenge-dev"
+makedepends="$depends_dev boost-dev doxygen"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-werror
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64  libpagemaker-0.0.4.tar.xz"
diff --git a/user/libpthread-stubs/APKBUILD b/user/libpthread-stubs/APKBUILD
index 5c5301b08..02af44664 100644
--- a/user/libpthread-stubs/APKBUILD
+++ b/user/libpthread-stubs/APKBUILD
@@ -1,21 +1,14 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libpthread-stubs
-pkgver=0.3
-pkgrel=6
-pkgdesc="Pthread functions stubs for platforms missing them"
+pkgver=0.4
+pkgrel=0
+pkgdesc="POSIX threading functions stubs for platforms missing them"
 url="https://cgit.freedesktop.org/xcb/pthread-stubs"
 arch="all"
 options="!dbg"
 license="X11"
 source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	update_config_sub
-}
-
 build() {
 	cd "$builddir"
 	./configure \
@@ -35,4 +28,4 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="c7cf63fa82ce9e8c37c6dc3b8cc30f8883655f95683c4466c54b617b086dd26a43bfa36363e47dc5730af6d59ac70443d211eb01b07d276edd144030a3580b15  libpthread-stubs-0.3.tar.bz2"
+sha512sums="0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954  libpthread-stubs-0.4.tar.bz2"
diff --git a/user/libqxp/APKBUILD b/user/libqxp/APKBUILD
new file mode 100644
index 000000000..de0a29d66
--- /dev/null
+++ b/user/libqxp/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libqxp
+pkgver=0.0.1
+pkgrel=0
+pkgdesc="Import filter and tools for QuarkXPress documents"
+url="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
+arch="all"
+license="MPL-2.0"
+depends=""
+depends_dev="librevenge-dev"
+makedepends="$depends_dev icu-dev doxygen"
+checkdepends="cppunit-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+	make
+	cd "$builddir/docs"
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607  libqxp-0.0.1.tar.xz"
diff --git a/user/libreoffice/APKBUILD b/user/libreoffice/APKBUILD
new file mode 100644
index 000000000..fd36400dd
--- /dev/null
+++ b/user/libreoffice/APKBUILD
@@ -0,0 +1,482 @@
+# Contributor: Jens Staal <staal1978@gmail.com>
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+
+# You probably don't want "srcdir", "pkgdir", or "deps" in CLEANUP,
+# and you definitely don't want "deps" in ERROR_CLEANUP.
+# Just "abuild clean undeps" once you're completely done.
+#
+# Build requirements:
+# * RAM:
+#   8 GB with Hulu in Chromium in the background is enough.
+#
+# * Disk space:
+#   * Dependencies:  1216 MiB
+#   * Downloads:      372 MiB
+#   * Subtotal:      1588 MiB =  1.6 GiB
+#   * Complete src: 28682 MiB
+#   * Complete pkg:  7935 MiB
+#   * All APKs:      1934 MiB =  1.9 GiB
+#   * Subtotal:     38551 MiB = 37.6 GiB
+#   * Grand total:  40139 MiB = 39.2 GiB
+#
+# Build stats:
+# * Run "abuild deps fetch" first.
+# * time abuild -r
+#
+# * x86_64 Intel i7-4810MQ (4 core 2.8 GHz, turbo to 3.8 GHz, no HT)
+#   JOBS=4, 8 GB RAM
+#   abuild -r  29590.16s user 1077.69s system 340% cpu 2:30:13.12 total
+
+pkgname=libreoffice
+pkgver=6.0.6.2
+pkgrel=0
+case "$pkgver" in
+*.*.*.*) _ver="${pkgver%.*}";;
+*.*.*) _ver="$pkgver";;
+esac
+pkgdesc="LibreOffice - Meta package for the full office suite"
+url="http://www.libreoffice.org/"
+# While the metapackage technically is empty and should be "noarch", there's
+# no easy way to change this to noarch and then change all of the subpackages
+# to have the correct arch. Setting $arch in a split function is forbidden,
+# and $subpackages doesn't really support setting $arch to anything other than
+# noarch.
+arch="all"
+options="!checkroot"
+license="MPL-2.0 AND Apache-2.0 AND MIT AND X11 AND (MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+) AND GPL-2.0+ AND GPL-3.0 AND GPL-3.0+ AND LGPL-2.1 AND LGPL-3.0+ AND BSD-3-Clause AND SISSL AND IJG AND CC-BY-SA-3.0"
+
+depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw
+	$pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer"
+# 1. Base dependencies
+# 2. GUIs
+# 3. File formats
+makedepends="apr-dev bash bison boost-dev cairo-dev clucene-dev cmd:which
+	coreutils cppunit-dev cups-dev dbus-glib-dev findutils flex
+	fontconfig-dev freetype-dev gettext-tiny-dev glm gperf gpgme-dev
+	gst-plugins-base-dev gstreamer-dev harfbuzz-dev hunspell-dev
+	hyphen-dev icu icu-dev lcms2-dev libcmis-dev libexttextcat-dev
+	libjpeg-turbo-dev libpng-dev libxml2-utils libxslt-dev mdds mythes-dev
+	neon-dev nss-dev openldap-dev openssl-dev paxmark perl poppler-dev
+	postgresql-dev python3-dev redland-dev sane-dev sed ucpp
+	unixodbc-dev util-linux xmlsec-dev zip
+
+	gtk+3.0-dev libepoxy-dev libice-dev libsm-dev libxext-dev
+	libxinerama-dev libxrandr-dev libxrender-dev
+
+	libabw-dev libcdr-dev libe-book-dev libepubgen-dev libetonyek-dev
+	libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev
+	libpagemaker-dev libqxp-dev libstaroffice-dev libvisio-dev libwpd-dev
+	libwpg-dev libwps-dev libzmf-dev
+"
+# -common also depends on these fonts
+_fonts="ttf-liberation ttf-dejavu ttf-carlito"
+checkdepends="$_fonts"
+
+# The order here is important.
+# -doc    comes first since it redirects manpages from the other subpackages
+# -lang-* comes before -common since it redirects miscellaneous
+#         language-specific files from -common
+subpackages="$pkgname-doc $pkgname-gtk3 $pkgname-base
+	$pkgname-calc $pkgname-draw $pkgname-impress $pkgname-math
+	$pkgname-connector-postgres $pkgname-writer"
+source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkgver.tar.xz
+	https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-dictionaries-$pkgver.tar.xz
+	https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-translations-$pkgver.tar.xz
+	https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-help-$pkgver.tar.xz
+	linux-musl.patch
+	fix-execinfo.patch
+	fix-includes.patch
+	gettext-tiny.patch
+	disable-crc-test.patch
+"
+ldpath="/usr/lib/$pkgname/program"
+
+_languages="af:Afrikaans:MPL-2.0 AND Public-Domain AND LGPL-3.0 AND LGPL-2.1+ AND Apache-2.0
+	am:Amharic:MPL-2.0 AND Apache-2.0
+	an:Aragonese:MPL-1.1 OR GPL-3.0+ OR LGPL-3.0+
+	ar:Arabic:MPL-2.0 AND (GPL-2.0+ OR LGPL-2.1+ OR MPL-1.1+) AND Apache-2.0
+	as:Assamese:MPL-2.0 AND Apache-2.0
+	ast:Asturian:MPL-2.0 AND Apache-2.0
+	be:Belarusian:MPL-2.0 AND CC-BY-SA-3.0 AND Apache-2.0
+	bg:Bulgarian:MPL-2.0 AND GPL-2.0+ AND Apache-2.0
+	bn:Bengali:MPL-2.0 AND GPL-2.0 AND Apache-2.0
+	bn_in:Bengali (India):MPL-2.0 AND Apache-2.0
+	bo:Tibetan:MPL-2.0 AND Apache-2.0
+	br:Breton:MPL-2.0 AND LGPL-3.0 AND Apache-2.0
+	brx:Bodo:MPL-2.0 AND Apache-2.0
+	bs:Bosnian:MPL-2.0 AND Apache-2.0
+	ca:Catalan:MPL-2.0 AND GPL-2.0+ AND GPL-3.0+ AND (GPL-3.0+ OR LGPL-3.0+) AND Apache-2.0
+	ca_valencia:Catalan (Valencian):MPL-2.0 AND Apache-2.0
+	cs:Czech:MPL-2.0 AND Custom AND Apache-2.0
+	cy:Welsh (Cymraeg):MPL-2.0 AND Apache-2.0
+	da:Danish:MPL-2.0 AND (GPL-2.0 OR LGPL-2.1 OR MPL-1.1) AND Apache-2.0
+	de:German:MPL-2.0 AND (GPL-2.0 OR GPL-3.0 OR OASIS-0.1) AND Apache-2.0
+	dgo:Dogri proper:MPL-2.0 AND Apache-2.0
+	dz:Dzongkha:MPL-2.0 AND Apache-2.0
+	el:Greek:MPL-2.0 AND (GPL-2.0 OR LGPL-2.1 OR MPL-1.1) AND Apache-2.0
+	en_gb:English (UK):MPL-2.0
+	en_us:English (US):MPL-2.0 AND Custom AND MIT AND (MPL-1.1 OR GPL-3.0+ OR LGPL-3.0+) AND GPL-2.0+ AND LGPL-2.1+ AND Apache-2.0
+	en_za:English (South Africa):MPL-2.0
+	eo:Esperanto:MPL-2.0 AND Apache-2.0
+	es:Spanish:MPL-2.0 AND (GPL-3.0 OR LGPL-3.0 OR MPL-1.1) AND LGPL-2.1 AND Apache-2.0
+	et:Estonian:MPL-2.0 AND LGPL-2.1 AND LPPL-1.3c AND Apache-2.0
+	eu:Basque:MPL-2.0 AND Apache-2.0
+	fa:Persian (Farsi):MPL-2.0 AND Apache-2.0
+	fi:Finnish:MPL-2.0 AND Apache-2.0
+	fr:French:MPL-2.0 AND (MPL-1.1+ OR GPL-2.0+ OR LGPL-2.1+) AND LPPL-1.3c AND LGPL-2.1+ AND Apache-2.0
+	ga:Irish:MPL-2.0 AND Apache-2.0
+	gd:Scottish Gaelic:MPL-2.0 AND GPL-3.0 AND Apache-2.0
+	gl:Galician:MPL-2.0 AND GPL-3.0 AND Apache-2.0
+	gu:Gujarati:MPL-2.0 AND GPL-3.0 AND Apache-2.0
+	gug:Guaraní (Paraguay):MPL-2.0 AND Apache-2.0
+	he:Hebrew:MPL-2.0 AND GPL-3.0 AND Apache-2.0
+	hi:Hindi:MPL-2.0 AND GPL-2.0+ AND Apache-2.0
+	hr:Croatian:MPL-2.0 AND LGPL-2.1 AND Apache-2.0
+	hu:Hungarian:MPL-2.0 AND (GPL-2.0+ OR LGPL-2.1+ OR MPL-1.1+) AND Apache-2.0
+	id:Indonesian:MPL-2.0 AND Apache-2.0
+	is:Icelandic:MPL-2.0 AND CC-BY-SA-3.0 AND Apache-2.0
+	it:Italian:MPL-2.0 AND GPL-3.0 AND LGPL-3.0 AND Apache-2.0
+	ja:Japanese:MPL-2.0 AND Apache-2.0
+	ka:Georgian:MPL-2.0 AND Apache-2.0
+	kk:Kazakh:MPL-2.0 AND Apache-2.0
+	km:Khmer:MPL-2.0 AND Apache-2.0
+	kmr_latn:Kurmanji Kurdish (Latin):MPL-2.0 AND Apache-2.0
+	kn:Kannada:MPL-2.0 AND Apache-2.0
+	ko:Korean:MPL-2.0 AND Apache-2.0
+	kok:Konkani:MPL-2.0 AND Apache-2.0
+	ks:Kashmiri:MPL-2.0 AND Apache-2.0
+	lb:Luxembourgish:MPL-2.0 AND Apache-2.0
+	lo:Lao:MPL-2.0 AND LGPL-2.1 AND Apache-2.0
+	lt:Lithuanian:MPL-2.0 AND BSD-3-Clause AND LPPL-1.3c AND Apache-2.0
+	lv:Latvian:MPL-2.0 AND LGPL-2.1 AND Apache-2.0
+	mai:Maithili:MPL-2.0 AND Apache-2.0
+	mk:Macedonian:MPL-2.0 AND Apache-2.0
+	ml:Malayalam:MPL-2.0 AND Apache-2.0
+	mn:Mongolian:MPL-2.0 AND Apache-2.0
+	mni:Meithei (Manipuri):MPL-2.0 AND Apache-2.0
+	mr:Marathi:MPL-2.0 AND Apache-2.0
+	my:Burmese:MPL-2.0 AND Apache-2.0
+	nb:Norwegian (Bokmal):MPL-2.0 AND Apache-2.0
+	ne:Nepali:MPL-2.0 AND LGPL-2.1 AND Apache-2.0
+	nl:Dutch:MPL-2.0 AND (BSD-2-Clause OR CC-BY-3.0) AND Apache-2.0
+	no:Norwegian:GPL-2.0
+	nn:Nynorsk:MPL-2.0 AND Apache-2.0
+	nr:Ndebele (South):MPL-2.0 AND Apache-2.0
+	nso:Northern Sotho:MPL-2.0 AND Apache-2.0
+	oc:Occitan:MPL-2.0 AND GPL-2.0+ AND Apache-2.0
+	om:Oromo:MPL-2.0 AND Apache-2.0
+	or:Oriya:MPL-2.0 AND Apache-2.0
+	pa_in:Punjabi (India):MPL-2.0 AND Apache-2.0
+	pl:Polish:MPL-2.0 AND (GPL OR LGPL OR MPL OR CC-SA-1.0) AND LGPL-3.0 AND LGPL-2.1 AND Apache-2.0
+	pt:Portuguese:MPL-2.0 AND (GPL-2.0 OR LGPL-2.1 OR MPL-1.1) AND GPL-2.0 AND Apache-2.0
+	pt_br:Portuguese (Brazil):MPL-2.0 AND (LGPL-3.0 OR MPL-1.1) AND (GPL-3.0+ OR LGPL-3.0+ OR MPL-1.1) AND Apache-2.0
+	ro:Romanian:MPL-2.0 AND (GPL-2.0 OR LGPL-2.1 OR MPL-1.1) AND GPL-2.0 AND GPL-2.0+ AND Apache-2.0
+	ru:Russian:MPL-2.0 AND (MPL-1.1 OR GPL OR LGPL) AND Custom AND LGPL AND Apache-2.0
+	rw:Kinyarwanda:MPL-2.0 AND Apache-2.0
+	sa_in:Sanskrit (India):MPL-2.0 AND Apache-2.0
+	sat:Santali:MPL-2.0 AND Apache-2.0
+	sd:Sindhi:MPL-2.0 AND Apache-2.0
+	si:Sinhala:MPL-2.0 AND GPL-3.0 AND Apache-2.0
+	sid:Sidamo:MPL-2.0 AND Apache-2.0
+	sk:Slovak:MPL-2.0 AND (GPL-2.0 OR LGPL-2.1 OR MPL-1.1) AND LPPL-1.3c AND MIT AND Apache-2.0
+	sl:Slovenian:MPL-2.0 AND (GPL-2.0 OR LGPL-2.1) AND LGPL-2.1 AND Apache-2.0
+	sq:Albanian:MPL-2.0 AND Apache-2.0
+	sr:Serbian:MPL-2.0 AND (LGPL-2.1+ OR MPL-1.1+ OR GPL-2.0+ OR CC-BY-SA-3.0) AND LGPL-2.1+ AND Apache-2.0
+	sr_latn:Serbian (Latin):MPL-2.0 AND Apache-2.0
+	ss:Swati:MPL-2.0 AND Apache-2.0
+	st:Southern Sotho:MPL-2.0 AND Apache-2.0
+	sv:Swedish:MPL-2.0 AND LGPL-3.0 AND Custom AND Apache-2.0
+	sw_tz:Swahili (Tanzania):MPL-2.0 AND LGPL-2.1 AND Apache-2.0
+	ta:Tamil:MPL-2.0 AND Apache-2.0
+	te:Telugu:MPL-2.0 AND GPL-2.0+ AND (GPL-3.0+ OR LGPL-3.0+) AND Apache-2.0
+	tg:Tajik:MPL-2.0 AND Apache-2.0
+	th:Thai:MPL-2.0 AND LGPL-2.1 AND Apache-2.0
+	tn:Tswana:MPL-2.0 AND Apache-2.0
+	tr:Turkish:MPL-2.0 AND Apache-2.0
+	ts:Tsonga:MPL-2.0 AND Apache-2.0
+	tt:Tatar:MPL-2.0 AND Apache-2.0
+	ug:Uyghur:MPL-2.0 AND Apache-2.0
+	uk:Ukrainian:MPL-2.0 AND (GPL-2.0+ OR LGPL-2.1+ OR MPL-1.1) AND GPL-2.0+ AND Apache-2.0
+	uz:Uzbek:MPL-2.0 AND Apache-2.0
+	ve:Venda:MPL-2.0 AND Apache-2.0
+	vi:Vietnamese:MPL-2.0 AND GPL-2.0 AND Apache-2.0
+	xh:Xhosa:MPL-2.0 AND Apache-2.0
+	zh_cn:Simplified Chinese (People's Republic of China):MPL-2.0 AND Apache-2.0
+	zh_tw:Traditional Chinese (Taiwan):MPL-2.0 AND Apache-2.0
+	zu:Zulu:MPL-2.0 AND LGPL-2.1 AND Apache-2.0
+"
+_lo_lang() {
+	local lang="$1"
+	case "$lang" in
+	# e.g. zh_cn -> zh_CN
+	*_[a-z][a-z]) lang="${lang%_*}_$(printf '%s' "${lang#*_}" | tr '[a-z]' '[A-Z]')";;
+	# e.g. sr_latn -> sr_Latn
+	*_latn) lang="${lang%_latn}_Latn";;
+	esac
+	printf '%s' "$lang"
+}
+_lo_languages=""
+for _lang in $(printf '%s' "$_languages" | cut -d : -f 1); do
+	subpackages="$subpackages $pkgname-lang-$_lang:_split_lang:noarch"
+	# Seriously now. We even have secret languages that are not recognized
+	# by the configure script. These two languages only have dictionaries.
+	# c.f. _split_lang()
+	[ "$_lang" = "an" ] || [ "$_lang" = "no" ] && continue
+
+	# --with-languages seems to prefer dashes instead of underscores
+	# when --with-myspell-dicts is given
+	_lang="$(_lo_lang "$_lang" | tr _ -)"
+	_lo_languages="$_lo_languages $_lang"
+done
+subpackages="$subpackages $pkgname-common"
+
+prepare() {
+	cd "$builddir"
+
+	default_prepare
+	NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+	cd "$builddir"
+
+	export PYTHON="python3"
+	# Note: --with-parallelism must be specified since getconf does not
+	#       recognize _NPROCESSORS_ONLN
+
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--with-vendor="Adélie Linux" \
+		--enable-symbols \
+		--with-parallelism="$JOBS" \
+		--disable-online-update \
+		--disable-fetch-external \
+		--disable-dependency-tracking \
+		--enable-release-build \
+		--enable-split-app-modules \
+		--enable-python=system \
+		--with-alloc=system \
+		--with-tls=nss \
+		--with-system-libs \
+		--with-system-ucpp \
+		--with-help \
+		--without-system-dicts \
+		--with-external-tar="$srcdir" \
+		--with-lang="$_lo_languages" \
+		--with-myspell-dicts \
+		--without-fonts \
+		--disable-firebird-sdbc \
+		--disable-coinmp \
+		--disable-lpsolve \
+		--enable-gtk3 \
+		--disable-gtk \
+		--disable-qt5 \
+		--disable-odk \
+		--disable-avahi \
+		--disable-scripting-beanshell \
+		--disable-scripting-javascript \
+		--disable-sdremote \
+		--disable-sdremote-bluetooth \
+		--disable-pdfium \
+		--disable-ooenv \
+		--without-java \
+		--disable-epm
+
+	# adding '-isystem /usr/include' make things break with gcc6
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823145
+	sed -i -e 's:-isystem /usr/include[^/]::g' config_host.mk
+
+	make build-nocheck
+}
+
+check() {
+	cd "$builddir"
+	make -k unitcheck
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" distro-pack-install
+}
+
+doc() {
+	default_doc
+	pkgdesc="LibreOffice - man pages"
+	sed -i -e '\#^/usr/share/man#d' "$builddir"/file-lists/*.txt
+}
+
+_split() {
+	local i
+	for i in $(grep -v ^%dir "$builddir/file-lists/${1}_list.txt" | sort -u); do
+		dirname="$(dirname $i)"
+		[ -d "$subpkgdir/$dirname" ] || install -dm755 "$subpkgdir/$dirname"
+		mv "$pkgdir/$i" "$subpkgdir/$i"
+	done
+}
+
+_move_from() {
+	orig_pkg="$1" # original owner of $path
+	path="$2"     # file/directory to move
+	dest="$3"     # destination directory, automatically under $subpkgdir
+
+	sed -i -e "\\#^\\(%dir \\)*/${path#$pkgdir/}#d" \
+		"$builddir/file-lists/${orig_pkg}_list.txt"
+	[ -d "$subpkgdir/$dest" ] || install -dm755 "$subpkgdir/$dest"
+	mv "$path" "$subpkgdir/$dest"
+}
+
+_split_lang() {
+	local i lang entry dict dictdir auto autodir wiz wizdir logo logodir
+	lang="${subpkgname#$pkgname-lang-}"
+	entry="$(printf '%s' "$_languages" | grep "^\\s*$lang")"
+	lang="$(_lo_lang "$lang")"
+
+	pkgdesc="LibreOffice - $(printf '%s' "$entry" | cut -d : -f 2) language pack"
+	license="$(printf '%s' "$entry" | cut -d : -f 3)"
+	depends=""
+
+	# Includes translations/messages and help packs initially
+	_split "lang_$lang"
+	# Everything else we must move by hand
+
+	dictdir="usr/lib/libreoffice/share/extensions"
+	case "$lang" in
+	# en_US is installed by default, so it will own most of the English files
+	en_US) dict="en";;
+	pt) dict="pt-PT";;
+	*) dict="$(printf '%s' "$lang" | tr _ -)";;
+	esac
+	if [ -d "$pkgdir/$dictdir/dict-$dict" ]; then
+		_move_from common "$pkgdir/$dictdir/dict-$dict" "$dictdir"
+	fi
+	# Again, these languages only have dictionaries
+	[ "$_lang" = "an" ] || [ "$_lang" = "no" ] && return 0
+
+	autodir="usr/lib/libreoffice/share/autocorr"
+	case "$lang" in
+	de) auto="de";;
+	en_US) auto="en-[A-Z][A-Z]";;
+	en_*) auto="skip";;
+	es) auto="es";;
+	fr) auto="fr";;
+	it) auto="it";;
+	pt) auto="pt-PT";;
+	pt_BR) auto="pt-BR";;
+	*_[A-Z][A-Z]) auto="$(printf '%s' "$lang" | tr _ -)";;
+	*_Latn) auto="${lang%_Latn}-Latn-[A-Z][A-Z]";;
+	*) auto="$lang-[A-Z][A-Z]";;
+	esac
+	for i in $(find "$pkgdir/$autodir" -name "acor_$auto.dat"); do
+		_move_from common "$i" "$autodir"
+	done
+
+	wizdir="usr/lib/libreoffice/share/wizards"
+	case "$lang" in
+	en_US) wiz="en_[A-Z][A-Z]";;
+	en_*) wiz="skip";;
+	*) wiz="$lang";;
+	esac
+	for i in $(find "$pkgdir/$wizdir" -name "resources_$wiz.properties"); do
+		_move_from common "$i" "$wizdir"
+	done
+
+	logodir="usr/lib/libreoffice/share/Scripts/python/LibreLogo"
+	case "$lang" in
+	en_US) logo="en_[A-Z][A-Z]";;
+	en_*) logo="skip";;
+	*) logo="$lang";;
+	esac
+	for i in $(find "$pkgdir/$logodir" -name "LibreLogo_$logo.properties"); do
+		_move_from common "$i" "$logodir"
+	done
+}
+
+common() {
+	pkgdesc="LibreOffice - common files"
+	depends="$pkgname-lang-en_us $pkgname-gtk3 $_fonts"
+
+	_split common
+
+	paxmark -m \
+		"$subpkgdir"/usr/lib/libreoffice/program/soffice.bin \
+		"$subpkgdir"/usr/lib/libreoffice/program/unopkg.bin
+
+	mkdir -p "$subpkgdir/usr/share/appdata"
+	mv "$pkgdir"/usr/share/appdata/*.xml "$subpkgdir/usr/share/appdata"
+	mkdir -p "$subpkgdir/usr/lib/libreoffice/share/libreofficekit"
+	mv "$pkgdir"/usr/lib/libreoffice/share/libreofficekit/*.png \
+		"$subpkgdir/usr/lib/libreoffice/share/libreofficekit"
+
+	# At this point there should only be empty directories left in
+	# the "libreoffice" metapackage
+	if [ -n "$(find "$pkgdir" -type f)" ]; then
+		error "Files still in 'libreoffice' package:"
+		find "$pkgdir" -type f | sed "s#^$pkgdir/#\\t#"
+		return 1
+	fi
+}
+
+gtk3() {
+	pkgdesc="LibreOffice - GTK+3.0 GUI"
+	depends="libreoffice-common"
+	_split gnome
+}
+
+base() {
+	pkgdesc="LibreOffice - database frontend"
+	depends="libreoffice-common"
+	_split base
+}
+
+calc() {
+	pkgdesc="LibreOffice - spreadsheet editor"
+	depends="libreoffice-common"
+	_split calc
+}
+
+draw() {
+	pkgdesc="LibreOffice - drawing application"
+	depends="libreoffice-common"
+	_split draw
+}
+
+impress() {
+	pkgdesc="LibreOffice - presentation application"
+	depends="libreoffice-common"
+	_split impress
+}
+
+math() {
+	pkgdesc="LibreOffice - equation editor"
+	depends="libreoffice-common"
+	_split math
+}
+
+postgres() {
+	pkgdesc="LibreOffice - connector for PostgreSQL database"
+	depends="libreoffice-base"
+	_split postgresql
+}
+
+writer() {
+	pkgdesc="LibreOffice - word processor"
+	depends="libreoffice-common"
+	_split writer
+}
+
+sha512sums="8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517  libreoffice-6.0.6.2.tar.xz
+7b84e2ec964b02e5d2fe17f7879080571fce02d090cde0e09de07af5419c8b7879e88a53fd1231d1195e3d29a2919c33a7d85f11c469cd87670ad67921cf8b9b  libreoffice-dictionaries-6.0.6.2.tar.xz
+fcc2ffeefde50abb80e539f7395efec6e022462b8b8938c2077df6fb3be217808cc2b96eb51539d5bf04fe0680807cb9af5f46f838bac6e6a5c88f90f88c5f2c  libreoffice-translations-6.0.6.2.tar.xz
+89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13  libreoffice-help-6.0.6.2.tar.xz
+10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a  linux-musl.patch
+4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336  fix-execinfo.patch
+ae36500897db9d758e95da1791ef2577d59b0e0865baba316b4a1f1f48ce9fd5e52fc3f14fa45aeeab73c5b93f57e89f9a42c996bdb3c85eb3beb2634543d85e  fix-includes.patch
+c50272ec2cf0471e629bf817d23e5c51ff59e94961fab1ee107f43352409353a37f2988c1ff75f423c4c5aedb1e38b432849619700e25124a33c99a589d7a80b  gettext-tiny.patch
+4ce3bacada3ab99dc09c6d29529bfc5e70eb287bcb61bc6e9a4ba4334cf77624121191d240f2a8f31b63e7510886904ce7842425752252e174478e0034988055  disable-crc-test.patch"
diff --git a/user/libreoffice/disable-crc-test.patch b/user/libreoffice/disable-crc-test.patch
new file mode 100644
index 000000000..35e6ce678
--- /dev/null
+++ b/user/libreoffice/disable-crc-test.patch
@@ -0,0 +1,39 @@
+--- libreoffice-6.0.6.2/vcl/qa/cppunit/svm/svmtest.cxx
++++ libreoffice-6.0.6.2/vcl/qa/cppunit/svm/svmtest.cxx
+@@ -759,14 +759,13 @@ void SvmTest::checkBitmaps(const GDIMeta
+     xmlDocPtr pDoc = dumpMeta(rMetaFile);
+ 
+ #ifdef LINUX
+-    assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "7932585a"}});
++    assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"},});
+     assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", {
+-        {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "08bfca1f"}
++        {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"},
+     });
+     assertXPathAttrs(pDoc, "/metafile/bmpscalepart[1]", {
+         {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"},
+         {"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"},
+-        {"crc", "abd45514"}
+     });
+ #else
+     assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}});
+@@ -815,16 +814,16 @@ void SvmTest::checkBitmapExs(const GDIMe
+ 
+ #ifdef LINUX
+     assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
+-        {"x", "1"}, {"y", "2"}, {"crc", "7932585a"}, {"transparenttype", "bitmap"}
++        {"x", "1"}, {"y", "2"}, {"transparenttype", "bitmap"}
+     });
+     assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", {
+         {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"},
+-        {"crc", "08bfca1f"}, {"transparenttype", "bitmap"}
++        {"transparenttype", "bitmap"}
+     });
+     assertXPathAttrs(pDoc, "/metafile/bmpexscalepart[1]", {
+         {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"},
+         {"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"},
+-        {"crc", "abd45514"}, {"transparenttype", "bitmap"}
++        {"transparenttype", "bitmap"}
+     });
+ #else
+     assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
diff --git a/user/libreoffice/fix-execinfo.patch b/user/libreoffice/fix-execinfo.patch
new file mode 100644
index 000000000..4c3b35917
--- /dev/null
+++ b/user/libreoffice/fix-execinfo.patch
@@ -0,0 +1,39 @@
+diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
+index 5fafc1c..408c12c 100644
+--- a/sal/osl/unx/backtrace.h
++++ b/sal/osl/unx/backtrace.h
+@@ -20,7 +20,7 @@
+ #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H
+ #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H
+ 
+-#if defined (LINUX)
++#if defined (LINUX) && defined (__GLIBC__)
+ 
+ #include <execinfo.h>
+ 
+diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
+index f4c9a9c..da6d9cf 100644
+--- a/sal/osl/unx/signal.cxx
++++ b/sal/osl/unx/signal.cxx
+@@ -35,7 +35,7 @@
+ 
+ #endif /* MACOSX */
+ 
+-#ifdef LINUX
++#if defined(LINUX) && defined(__GLIBC__)
+ #include <execinfo.h>
+ #include <link.h>
+ #define INCLUDE_BACKTRACE
+diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
+index 1d9a58b..fd648e4 100644
+--- a/sal/osl/unx/backtrace.c
++++ b/sal/osl/unx/backtrace.c
+@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
+     }
+ }
+ 
+-#elif !defined LINUX
++#elif !defined(__GLIBC__)
+ 
+ int backtrace( void **buffer, int max_frames )
+ {
diff --git a/user/libreoffice/fix-includes.patch b/user/libreoffice/fix-includes.patch
new file mode 100644
index 000000000..4a837a94b
--- /dev/null
+++ b/user/libreoffice/fix-includes.patch
@@ -0,0 +1,36 @@
+diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
+index f177d86..99bb408 100644
+--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
++++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
+@@ -21,7 +21,7 @@
+   #include <dbus/dbus.h>
+   #include <errno.h>
+   #include <fcntl.h>
+-  #include <sys/unistd.h>
++  #include <unistd.h>
+   #include <sys/socket.h>
+   #include <bluetooth/bluetooth.h>
+   #include <bluetooth/rfcomm.h>
+diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
+index 932e928..b65ced7 100644
+--- a/vcl/inc/headless/svpinst.hxx
++++ b/vcl/inc/headless/svpinst.hxx
+@@ -30,7 +30,7 @@
+ 
+ #include <list>
+ 
+-#include <time.h>
++#include <sys/time.h>
+ 
+ #define VIRTUAL_DESKTOP_WIDTH 1024
+ #define VIRTUAL_DESKTOP_HEIGHT 768
+--- a/avmedia/source/vlc/wrapper/Types.hxx	2017-01-12 01:54:33.000000000 +0100
++++ b/avmedia/source/vlc/wrapper/Types.hxx	2017-01-27 20:03:39.243895504 +0100
+@@ -15,6 +15,7 @@
+ #if defined(_WIN32)
+         typedef __int64 libvlc_time_t;
+ #else
++#	include <stdint.h>
+         typedef int64_t libvlc_time_t;
+ #endif
+ 
diff --git a/user/libreoffice/gettext-tiny.patch b/user/libreoffice/gettext-tiny.patch
new file mode 100644
index 000000000..990241c3b
--- /dev/null
+++ b/user/libreoffice/gettext-tiny.patch
@@ -0,0 +1,38 @@
+gettext-tiny does not currently ship msguniq, so let's cheat around it
+
+--- libreoffice-6.0.6.2/solenv/gbuild/AllLangMoTarget.mk
++++ libreoffice-6.0.6.2/solenv/gbuild/AllLangMoTarget.mk
+@@ -40,10 +40,10 @@
+ 	$(call gb_Helper_abbreviate_dirs,\
+ 		mkdir -p $(dir $@) && \
+ 		if test -e $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po; then \
+-			$(MSGUNIQ) --force-po $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@; \
++			cat $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@; \
+ 		else \
+ 			echo missing $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po && \
+-			$(MSGUNIQ) --force-po $(SRCDIR)/solenv/bin/dummy.po | $(MSGFMT) - -o $@; \
++			cat $(SRCDIR)/solenv/bin/dummy.po | $(MSGFMT) - -o $@; \
+ 	        fi)
+ 
+ #$(info $(call gb_MoTarget_get_target,$(1)))
+--- libreoffice-6.0.6.2/configure.ac
++++ libreoffice-6.0.6.2/configure.ac
+@@ -11749,18 +11749,6 @@
+             fi
+         fi
+     fi
+-    if test -z "$MSGUNIQ"; then
+-        if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msguniq" ; then
+-            MSGUNIQ="$LODE_HOME/opt/bin/msguniq"
+-        elif test -x "/opt/lo/bin/msguniq"; then
+-            MSGUNIQ="/opt/lo/bin/msguniq"
+-        else
+-            AC_CHECK_PROGS(MSGUNIQ, [msguniq])
+-            if test -z "$MSGUNIQ"; then
+-                AC_MSG_ERROR([msguniq not found. Install GNU gettext, or re-run without languages.])
+-            fi
+-        fi
+-    fi
+ fi
+ AC_SUBST(MSGFMT)
+ AC_SUBST(MSGUNIQ)
diff --git a/user/libreoffice/linux-musl.patch b/user/libreoffice/linux-musl.patch
new file mode 100644
index 000000000..5fbf6b31c
--- /dev/null
+++ b/user/libreoffice/linux-musl.patch
@@ -0,0 +1,60 @@
+--- libreoffice-5.3.0.3/configure.ac.orig	2017-01-26 22:22:46.000000000 +0000
++++ libreoffice-5.3.0.3/configure.ac	2017-02-08 13:14:16.777547599 +0000
+@@ -652,7 +652,7 @@
+     fi
+     ;;
+ 
+-linux-gnu*|k*bsd*-gnu*)
++linux-gnu*|linux-musl*|k*bsd*-gnu*)
+     test_gtk=yes
+     build_gstreamer_1_0=yes
+     build_gstreamer_0_10=yes
+@@ -4170,7 +4170,7 @@
+     esac
+     ;;
+ 
+-linux-gnu*)
++linux-gnu*|linux-musl*)
+     COM=GCC
+     USING_X11=TRUE
+     OS=LINUX
+@@ -7197,7 +7197,7 @@
+         test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+         ;;
+ 
+-    linux-gnu*)
++    linux-gnu*|linux-musl*)
+         JAVAINC="-I$JAVA_HOME/include"
+         JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
+         test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+@@ -9748,21 +9748,6 @@
+ fi
+ AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
+ 
+-dnl ***************************************
+-dnl testing libc version for Linux...
+-dnl ***************************************
+-if test "$_os" = "Linux"; then
+-    AC_MSG_CHECKING([whether libc is >= 2.1.1])
+-    exec 6>/dev/null # no output
+-    AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
+-    exec 6>&1 # output on again
+-    if test "$HAVE_LIBC"; then
+-        AC_MSG_RESULT([yes])
+-    else
+-        AC_MSG_ERROR([no, upgrade libc])
+-    fi
+-fi
+-
+ dnl =========================================
+ dnl Check for the Windows  SDK.
+ dnl =========================================
+@@ -12775,7 +12760,7 @@
+ 
+     case "$host_os" in
+ 
+-    aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
++    aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
+         if test "$ENABLE_JAVA" != ""; then
+             pathmunge "$JAVA_HOME/bin" "after"
+         fi
diff --git a/user/librevenge/APKBUILD b/user/librevenge/APKBUILD
new file mode 100644
index 000000000..2697082af
--- /dev/null
+++ b/user/librevenge/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=librevenge
+pkgver=0.0.4
+pkgrel=1
+pkgdesc="Base library for writing document import filters"
+url="https://sourceforge.net/p/libwpd/wiki/librevenge/"
+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"
+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 \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-dependency-tracking \
+		--enable-fast-install
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712  librevenge-0.0.4.tar.xz"
diff --git a/user/libstaroffice/APKBUILD b/user/libstaroffice/APKBUILD
new file mode 100644
index 000000000..bad200ada
--- /dev/null
+++ b/user/libstaroffice/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libstaroffice
+pkgver=0.0.6
+pkgrel=0
+pkgdesc="Import filter for StarOffice documents"
+url="https://github.com/fosnola/libstaroffice"
+arch="all"
+options="!check"  # No test suite.
+license="MPL-2.0 OR LGPL-2.0+"
+depends=""
+depends_dev="librevenge-dev"
+makedepends="$depends_dev zlib-dev boost-dev doxygen"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="https://github.com/fosnola/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324  libstaroffice-0.0.6.tar.xz"
diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD
index 966a9ed57..170e00fae 100644
--- a/user/libtirpc/APKBUILD
+++ b/user/libtirpc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libtirpc
-pkgver=1.0.3
+pkgver=1.1.4
 pkgrel=0
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
 url="http://libtirpc.sourceforge.net/"
@@ -29,4 +29,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc  libtirpc-1.0.3.tar.bz2"
+sha512sums="392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23  libtirpc-1.1.4.tar.bz2"
diff --git a/user/libutempter/APKBUILD b/user/libutempter/APKBUILD
index 5d4a3841c..058530412 100644
--- a/user/libutempter/APKBUILD
+++ b/user/libutempter/APKBUILD
@@ -1,30 +1,32 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libutempter
 pkgver=1.1.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Library to record virtual terminal sessions in login files"
 url="No URL"
 arch="all"
-options="!check"  # No test suite.
+options="!check suid"  # No test suite.
 license="LGPL-2.1+"
 depends=""
 makedepends="utmps-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="ftp://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.bz2
+	fix-linking.patch
 	port-to-utmpx.patch
 	"
 
 build() {
 	cd "$builddir"
-	make
+	make LDLIBS="-lutmps -lskarnet"
 }
 
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	# utmps allows us to log without root!
-	chmod 0755 "$pkgdir"/usr/lib/utempter/utempter
+	# we need to be setuid, not setgid
+	chmod 4711 "$pkgdir"/usr/lib/utempter/utempter
 }
 
 sha512sums="6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede  libutempter-1.1.6.tar.bz2
+c5abc344544ac962dfc7ba6a5a7c807120e03db5b2cc7111613934322ee7041e5e97db10643cab6bbf734b3f5687f8db3a7e375b04f9b952b7c7e33b4f0431e7  fix-linking.patch
 b2d0bc9075bda0dc3404458547ee2d190855d6d8b2c209ae70b763ea11baa0569bd3b167589ad09f77c82075430ca60ffe758a925b9fd4124b5945b93c19a10d  port-to-utmpx.patch"
diff --git a/user/libutempter/fix-linking.patch b/user/libutempter/fix-linking.patch
new file mode 100644
index 000000000..91719507a
--- /dev/null
+++ b/user/libutempter/fix-linking.patch
@@ -0,0 +1,11 @@
+--- libutempter-1.1.6/Makefile.old	2010-11-04 17:14:53.000000000 +0000
++++ libutempter-1.1.6/Makefile	2018-08-29 14:47:24.740000000 +0000
+@@ -52,7 +52,7 @@
+ 	$(COMPILE.c) -fPIC $< $(OUTPUT_OPTION)
+ 
+ $(PROJECT): utempter.c
+-	$(LINK.c) -Wl,-z,now,-stats $(LDLIBS) $< $(OUTPUT_OPTION)
++	$(LINK.c) -Wl,-z,now,-stats $< $(OUTPUT_OPTION) $(LDLIBS)
+ 
+ $(SHAREDLIB): iface.os $(MAP)
+ 	$(LINK.o) -shared \
diff --git a/user/libvisio/APKBUILD b/user/libvisio/APKBUILD
new file mode 100644
index 000000000..84a23c799
--- /dev/null
+++ b/user/libvisio/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libvisio
+pkgver=0.1.6
+pkgrel=2
+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"
+checkdepends="cppunit-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="58cee8cfe4205b2cad2f11dbe17882e57ebf0d10500116ca9d8d120e138f8eb0c65a5fea3bd7d2746bf8140377ee9deb34258597e028f9fdc8d21f270606cce1  libvisio-0.1.6.tar.xz"
diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD
index a98f8bcc0..d2ab224f4 100644
--- a/user/libwacom/APKBUILD
+++ b/user/libwacom/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Ivan Tham <pickfire@riseup.net>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libwacom
-pkgver=0.30
+pkgver=0.31
 pkgrel=0
 pkgdesc="Tablet description library"
 url="http://linuxwacom.sourceforge.net/"
@@ -10,8 +10,7 @@ license="MIT"
 depends=""
 makedepends="libgudev-dev"
 checkdepends="bash findutils"
-install=""
-subpackages="$pkgname-dev"
+subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
 
 build() {
@@ -38,4 +37,4 @@ package() {
 		> "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules
 }
 
-sha512sums="863df2bca6778181b8cbe2546d4766143f78b3f9e555d6ac62ffe7f6ce53729dd78badfd1d795f217b0d4a335b600921932850c1ca2bfe832614bf22f93e09ae  libwacom-0.30.tar.bz2"
+sha512sums="fb1fd470000bf3a620c4dd2293fff483bf6e1ffddaffc176e7b88f13d44347f4b322e1827b53ce61ae25e2d99f36c50767c201f38161498969c7c8215dad1c36  libwacom-0.31.tar.bz2"
diff --git a/user/libwpd/APKBUILD b/user/libwpd/APKBUILD
new file mode 100644
index 000000000..20307c037
--- /dev/null
+++ b/user/libwpd/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libwpd
+pkgver=0.10.2
+pkgrel=1
+pkgdesc="Import filter and tools for WordPerfect documents"
+url="https://sourceforge.net/p/libwpd/"
+arch="all"
+options="!check"  # No test suite.
+license="MPL-2.0 OR LGPL-2.1+"
+depends=""
+depends_dev="librevenge-dev"
+makedepends="$depends_dev doxygen"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://downloads.sourceforge.net/project/libwpd/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+
+prepare() {
+	update_config_sub
+	default_prepare
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="879f96b6290d9db7ed4a431e84d18a1f7e81826394a8c63e03c3b6b49c578bfb417056956209d1934e34080471df28a40d93f45ac4f8a976631610d3103d6b7c  libwpd-0.10.2.tar.bz2"
diff --git a/user/libwpg/APKBUILD b/user/libwpg/APKBUILD
new file mode 100644
index 000000000..1985152e8
--- /dev/null
+++ b/user/libwpg/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libwpg
+pkgver=0.3.2
+pkgrel=1
+pkgdesc="Import filter and tools for WordPerfect graphics"
+url="https://sourceforge.net/projects/libwpg/"
+arch="all"
+options="!check"  # No test suite.
+license="MPL-2.0 OR LGPL-2.1+"
+depends=""
+depends_dev="librevenge-dev"
+makedepends="$depends_dev doxygen libwpd-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://downloads.sourceforge.net/project/libwpg/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+
+prepare() {
+	update_config_sub
+	default_prepare
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-werror
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="af9bf007c1cd380cc6da543024e6f068c0eb49514ff0027b1e82170927c8496e69d6c7a2a502380f25c54fea1fc33865c70c7d24d4b38e4fbf1d064bf1f1e192  libwpg-0.3.2.tar.bz2"
diff --git a/user/libwps/APKBUILD b/user/libwps/APKBUILD
new file mode 100644
index 000000000..f58ca254b
--- /dev/null
+++ b/user/libwps/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libwps
+pkgver=0.4.10
+pkgrel=0
+pkgdesc="Import filter and tools for Microsoft Works files"
+url="https://sourceforge.net/projects/libwps/"
+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"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="349fe4eb21abefc6091a38172a0f4227dd9df0050428ca2a28cada49c1fd1066c507facfd34ffa7a504d806bb515774cb25f0633adbf3cdddd74c9a601620392  libwps-0.4.10.tar.bz2"
diff --git a/user/libx11/APKBUILD b/user/libx11/APKBUILD
index c6ecfdeb6..5917acfa6 100644
--- a/user/libx11/APKBUILD
+++ b/user/libx11/APKBUILD
@@ -1,13 +1,13 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libx11
-pkgver=1.6.5
-pkgrel=2
+pkgver=1.6.6
+pkgrel=0
 pkgdesc="X11 client-side library"
 url="https://www.X.Org/"
 arch="all"
 license="MIT AND X11"
-depends=
+depends=""
 depends_dev="xtrans"
 makedepends="$depends_dev libxcb-dev util-macros xorgproto-dev"
 subpackages="$pkgname-dev $pkgname-doc"
@@ -38,4 +38,4 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0  libX11-1.6.5.tar.bz2"
+sha512sums="9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7  libX11-1.6.6.tar.bz2"
diff --git a/user/libxxf86misc/APKBUILD b/user/libxxf86misc/APKBUILD
index b092aa30d..2ead4d544 100644
--- a/user/libxxf86misc/APKBUILD
+++ b/user/libxxf86misc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libxxf86misc
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=0
 pkgdesc="X11 XFree86 miscellaneous extension library"
 url="https://www.X.Org/"
 arch="all"
@@ -12,11 +12,6 @@ makedepends="libx11-dev libxext-dev util-macros xorgproto-dev"
 source="https://www.X.Org/releases/individual/lib/libXxf86misc-$pkgver.tar.bz2"
 builddir="$srcdir/libXxf86misc-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	update_config_sub
-}
-
 build() {
 	cd "$builddir"
 	./configure \
@@ -37,4 +32,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4df80bdf6cae9f43a1ddf09b078f354d0cfcab1861d073f3d274bc3a5dd0efe1057abae792f6c512e8f45286a62db95f85bf8c02de23fe96a76d8972cc1fdb7f  libXxf86misc-1.0.3.tar.bz2"
+sha512sums="1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb  libXxf86misc-1.0.4.tar.bz2"
diff --git a/user/libzmf/APKBUILD b/user/libzmf/APKBUILD
new file mode 100644
index 000000000..3307e6598
--- /dev/null
+++ b/user/libzmf/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libzmf
+pkgver=0.0.2
+pkgrel=0
+pkgdesc="Import filter and tools for Zoner Callisto/Draw documents"
+url="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
+arch="all"
+license="MPL-2.0"
+depends=""
+depends_dev="boost-dev icu-dev libpng-dev zlib-dev"
+makedepends="$depends_dev librevenge-dev doxygen"
+checkdepends="cppunit-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--disable-werror
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2  libzmf-0.0.2.tar.xz"
diff --git a/user/links/APKBUILD b/user/links/APKBUILD
index 1450559f5..572f9d977 100644
--- a/user/links/APKBUILD
+++ b/user/links/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=links
-pkgver=2.16
+pkgver=2.17
 pkgrel=0
 pkgdesc="Text Web browser, similar to Lynx"
 url="http://links.twibright.com/"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3ce169e214eae0f997c1f8647d354dc0803c9118a97dcd2594d62af23336890272f4b027d3ab0a0e151672d1506e50da0f0e561999c5841f0f183f32a279b14a  links-2.16.tar.bz2"
+sha512sums="871a3a2cbc210467f4ffd830ba2966f2ebc0ec9ed4a1de018d032cec4b550e58f6858875478647c627ec746bb76810a4b97603575f2d21b5ea650c612684c8d5  links-2.17.tar.bz2"
diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD
index f18e64e47..0276048d8 100644
--- a/user/lskat/APKBUILD
+++ b/user/lskat/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=lskat
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Lieutenant Skat is an interactive two-player card game"
 url="https://games.kde.org/game.php?game=lskat"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8951df28673e51f48ef2002049e34315b8102db2099cfde1d3c671fb2a332f4c44691a771ce9dcb23b46942304bb60a6e80371011fb7340e6038d887357048c9  lskat-18.04.3.tar.xz"
+sha512sums="958ca673414a700f253c2b61d3e15502161fa3b3724e16b9ef1a1e3827c0093721a866a4ff00a9056ad027a541ce6873e192421d2b473f5e1dd7d307498c4715  lskat-18.08.1.tar.xz"
diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD
index f8d85c20a..a80a9a2e0 100644
--- a/user/marble/APKBUILD
+++ b/user/marble/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=marble
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Free, open-source map and virtual globe"
 url="https://marble.kde.org/"
@@ -38,4 +38,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="26a29e6648516e99c6ae33a6253fa4922271a412eba14212af24cf33dcab8845533eb4c1a8fea11b61f20c0a5c34007ed9e0db8edb3590b01a01404ac4493704  marble-18.04.3.tar.xz"
+sha512sums="e6bf16f7b26f8f1ba88448378c1d97506140f87c0d75481f9cc2435f5f7e09a55ae510475397c6ccfecd4252a618287638cb350425895ad216c1d74115f81956  marble-18.08.1.tar.xz"
diff --git a/user/mdds/APKBUILD b/user/mdds/APKBUILD
new file mode 100644
index 000000000..c4a28fe12
--- /dev/null
+++ b/user/mdds/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=mdds
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="Multi-dimensional data index algorithms"
+url="https://gitlab.com/mdds/mdds"
+arch="noarch"
+license="MIT"
+depends=""
+makedepends=""
+checkdepends="boost-dev"
+subpackages="$pkgname-doc"
+source="http://kohei.us/files/$pkgname/src/$pkgname-$pkgver.tar.bz2"
+replaces="$pkgname-dev"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	install -d 755 "$pkgdir"/usr/lib
+	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
+}
+
+sha512sums="c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8  mdds-1.3.1.tar.bz2"
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index 3943557c0..c0ba61046 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=mesa
-pkgver=18.1.3
-pkgrel=2
+pkgver=18.1.7
+pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
 arch="all"
@@ -245,7 +245,7 @@ _wayland() {
 		|| return 1
 }
 
-sha512sums="f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887  mesa-18.1.3.tar.xz
+sha512sums="697c4f441ae52bc867d9d73b103094a29102168c248a502c4ea0fc48f51bcb86b2e741da39e882f24131326d460cdb1416415604c6994d1b8c09fb8a153a5c77  mesa-18.1.7.tar.xz
 c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a  glx_ro_text_segm.patch
 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553  musl-fixes.patch
 c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e  musl-fix-includes.patch
diff --git a/user/minivmac/APKBUILD b/user/minivmac/APKBUILD
index 56e7814f4..71a16a1b2 100644
--- a/user/minivmac/APKBUILD
+++ b/user/minivmac/APKBUILD
@@ -4,7 +4,7 @@ pkgname=minivmac
 pkgver=3.5.8
 pkgrel=1
 pkgdesc="a simple and accurate emulator of early Macintosh computers"
-url="http://www.gryphel.com/c/minivmac/"
+url="https://www.gryphel.com/c/minivmac/"
 arch="all !s390x"
 options="!check"  # minivmac does not ship a test suite
 license="GPL-2.0-only"
diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD
index 7ea386435..bcbb4ceeb 100644
--- a/user/minuet/APKBUILD
+++ b/user/minuet/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=minuet
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Music education software"
 url="https://minuet.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c602b377323b1bc3c115a9297ef042738f25274e5b028756aa307e9b0951dc853771b9e4031d6ee39c868f2db2459ae316f0691a8f5efd291e89bf9c88c5ee19  minuet-18.04.3.tar.xz"
+sha512sums="653db86bc761f59df02a8d8ff82e59afeb71ef078a62ba5712d5092b0d9651dde9ddee027d303e622bd143c6aee49b01da1476d8cdc484b89192c08669cc6bef  minuet-18.08.1.tar.xz"
diff --git a/user/mpg123/APKBUILD b/user/mpg123/APKBUILD
index ee9890005..c9aca7988 100644
--- a/user/mpg123/APKBUILD
+++ b/user/mpg123/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=mpg123
 pkgver=1.25.10
-pkgrel=0
+pkgrel=1
 pkgdesc="Real time MPEG Audio player for Layers 1, 2 and 3"
 url="https://www.mpg123.org/"
 arch="all"
@@ -9,7 +9,7 @@ options="libtool textrels"
 license="LGPL-2.1-only"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=""
-makedepends="alsa-lib-dev libtool linux-headers"
+makedepends="alsa-lib-dev libtool linux-headers pulseaudio-dev"
 source="https://www.mpg123.org/download/$pkgname-$pkgver.tar.bz2"
 
 build() {
@@ -21,7 +21,7 @@ build() {
 		--disable-dependency-tracking \
 		--with-ipv6 \
 		--with-pic \
-		--with-audio="alsa"
+		--with-audio="alsa,oss,pulse"
 	make
 }
 
diff --git a/user/mythes/APKBUILD b/user/mythes/APKBUILD
new file mode 100644
index 000000000..6346e7cb9
--- /dev/null
+++ b/user/mythes/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=mythes
+pkgver=1.2.4
+pkgrel=1
+pkgdesc="A simple thesaurus"
+url="http://hunspell.github.io/"
+arch="all"
+options="!check"  # No test suite.
+license="Custom"
+subpackages="$pkgname-dev"
+depends_dev="perl hunspell-dev"
+makedepends="$depends_dev"
+source="http://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-dependency-tracking \
+		--enable-fast-install
+	make
+}
+
+package() {
+	cd "$builddir"
+	make -j1 DESTDIR="$pkgdir" install
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+dev() {
+	default_dev
+
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21  mythes-1.2.4.tar.gz"
diff --git a/user/netqmail/0001-DESTDIR.patch b/user/netqmail/0001-DESTDIR.patch
new file mode 100644
index 000000000..30dba79a6
--- /dev/null
+++ b/user/netqmail/0001-DESTDIR.patch
@@ -0,0 +1,576 @@
+--- netqmail-1.06.old/Makefile
++++ netqmail-1.06/Makefile
+@@ -21,9 +21,10 @@
+ 	./compile alloc_re.c
+ 
+ auto-ccld.sh: \
+-conf-cc conf-ld warn-auto.sh
++conf-cc conf-ld conf-ldi warn-auto.sh
+ 	( cat warn-auto.sh; \
+ 	echo CC=\'`head -1 conf-cc`\'; \
++	echo LDI=\'`head -1 conf-ldi`\'; \
+ 	echo LD=\'`head -1 conf-ld`\' \
+ 	) > auto-ccld.sh
+ 
+@@ -702,7 +703,7 @@
+ 	./compile hfield.c
+ 
+ hier.o: \
+-compile hier.c auto_qmail.h auto_split.h auto_uids.h fmt.h fifo.h
++compile hier.c auto_qmail.h auto_split.h auto_uids.h fmt.h fifo.h stralloc.h
+ 	./compile hier.c
+ 
+ home: \
+@@ -740,15 +741,15 @@
+ 	./compile idedit.c
+ 
+ install: \
+-load install.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \
+-strerr.a substdio.a open.a error.a str.a fs.a
+-	./load install fifo.o hier.o auto_qmail.o auto_split.o \
+-	auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a 
++loadi install.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \
++strerr.a substdio.a open.a error.a str.a fs.a stralloc.a alloc.a
++	./loadi install fifo.o hier.o auto_qmail.o auto_split.o \
++	auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a stralloc.a alloc.a
+ 
+ install-big: \
+-load install-big.o fifo.o install.o auto_qmail.o auto_split.o \
++loadi install-big.o fifo.o install.o auto_qmail.o auto_split.o \
+ auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a
+-	./load install-big fifo.o install.o auto_qmail.o \
++	./loadi install-big fifo.o install.o auto_qmail.o \
+ 	auto_split.o auto_uids.o strerr.a substdio.a open.a error.a \
+ 	str.a fs.a 
+ 
+@@ -763,10 +764,10 @@
+ 	./compile install.c
+ 
+ instcheck: \
+-load instcheck.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \
+-strerr.a substdio.a error.a str.a fs.a
+-	./load instcheck fifo.o hier.o auto_qmail.o auto_split.o \
+-	auto_uids.o strerr.a substdio.a error.a str.a fs.a 
++loadi instcheck.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \
++strerr.a substdio.a error.a str.a fs.a stralloc.a alloc.a
++	./loadi instcheck fifo.o hier.o auto_qmail.o auto_split.o \
++	auto_uids.o strerr.a substdio.a error.a str.a fs.a stralloc.a alloc.a
+ 
+ instcheck.o: \
+ compile instcheck.c strerr.h error.h readwrite.h exit.h
+@@ -815,6 +816,11 @@
+ 	( cat warn-auto.sh; ./make-load "`cat systype`" ) > load
+ 	chmod 755 load
+ 
++loadi: \
++make-loadi warn-auto.sh systype
++	( cat warn-auto.sh; ./make-loadi "`cat systype`" ) > loadi
++	chmod 755 loadi
++
+ lock.a: \
+ makelib lock_ex.o lock_exnb.o lock_un.o
+ 	./makelib lock.a lock_ex.o lock_exnb.o lock_un.o
+@@ -912,6 +918,11 @@
+ make-load.sh auto-ccld.sh
+ 	cat auto-ccld.sh make-load.sh > make-load
+ 	chmod 755 make-load
++
++make-loadi: \
++make-loadi.sh auto-ccld.sh
++	cat auto-ccld.sh make-loadi.sh > make-loadi
++	chmod 755 make-loadi
+ 
+ make-makelib: \
+ make-makelib.sh auto-ccld.sh
+--- netqmail-1.06.old/TARGETS
++++ netqmail-1.06/TARGETS
+@@ -1,8 +1,10 @@
+ auto-ccld.sh
+ make-load
++make-loadi
+ find-systype
+ systype
+ load
++loadi
+ make-compile
+ compile
+ fork.h
+--- netqmail-1.06.old/hier.c
++++ netqmail-1.06/hier.c
+@@ -1,3 +1,5 @@
++#include <stdlib.h>
++#include "stralloc.h"
+ #include "auto_qmail.h"
+ #include "auto_split.h"
+ #include "auto_uids.h"
+@@ -6,6 +8,19 @@
+ 
+ char buf[100 + FMT_ULONG];
+ 
++static char *base_qmail ;
++
++static void base_init (void)
++{
++  static stralloc sa = { 0 } ;
++  char *x = getenv("DESTDIR") ;
++  sa.len = 0 ;
++  if (x) stralloc_cats(&sa, x) ;
++  stralloc_cats(&sa, auto_qmail) ;
++  stralloc_0(&sa) ;
++  base_qmail = sa.s ;
++}
++
+ void dsplit(base,uid,mode)
+ char *base; /* must be under 100 bytes */
+ int uid;
+@@ -14,7 +29,7 @@
+   char *x;
+   unsigned long i;
+ 
+-  d(auto_qmail,base,uid,auto_gidq,mode);
++  d(base_qmail,base,uid,auto_gidq,mode);
+ 
+   for (i = 0;i < auto_split;++i) {
+     x = buf;
+@@ -23,230 +38,231 @@
+     x += fmt_ulong(x,i);
+     *x = 0;
+ 
+-    d(auto_qmail,buf,uid,auto_gidq,mode);
++    d(base_qmail,buf,uid,auto_gidq,mode);
+   }
+ }
+ 
+ void hier()
+ {
+-  h(auto_qmail,auto_uido,auto_gidq,0755);
++  base_init() ;
++  h(base_qmail,auto_uido,auto_gidq,0755);
+ 
+-  d(auto_qmail,"control",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"users",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"bin",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"boot",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"doc",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/cat1",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/cat5",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/cat7",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/cat8",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/man1",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/man5",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/man7",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/man8",auto_uido,auto_gidq,0755);
++  d(base_qmail,"control",auto_uido,auto_gidq,0755);
++  d(base_qmail,"users",auto_uido,auto_gidq,0755);
++  d(base_qmail,"bin",auto_uido,auto_gidq,0755);
++  d(base_qmail,"boot",auto_uido,auto_gidq,0755);
++  d(base_qmail,"doc",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man/cat1",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man/cat5",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man/cat7",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man/cat8",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man/man1",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man/man5",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man/man7",auto_uido,auto_gidq,0755);
++  d(base_qmail,"man/man8",auto_uido,auto_gidq,0755);
+ 
+-  d(auto_qmail,"alias",auto_uida,auto_gidq,02755);
++  d(base_qmail,"alias",auto_uida,auto_gidq,02755);
+ 
+-  d(auto_qmail,"queue",auto_uidq,auto_gidq,0750);
+-  d(auto_qmail,"queue/pid",auto_uidq,auto_gidq,0700);
+-  d(auto_qmail,"queue/intd",auto_uidq,auto_gidq,0700);
+-  d(auto_qmail,"queue/todo",auto_uidq,auto_gidq,0750);
+-  d(auto_qmail,"queue/bounce",auto_uids,auto_gidq,0700);
++  d(base_qmail,"queue",auto_uidq,auto_gidq,0750);
++  d(base_qmail,"queue/pid",auto_uidq,auto_gidq,0700);
++  d(base_qmail,"queue/intd",auto_uidq,auto_gidq,0700);
++  d(base_qmail,"queue/todo",auto_uidq,auto_gidq,0750);
++  d(base_qmail,"queue/bounce",auto_uids,auto_gidq,0700);
+ 
+   dsplit("queue/mess",auto_uidq,0750);
+   dsplit("queue/info",auto_uids,0700);
+   dsplit("queue/local",auto_uids,0700);
+   dsplit("queue/remote",auto_uids,0700);
+ 
+-  d(auto_qmail,"queue/lock",auto_uidq,auto_gidq,0750);
+-  z(auto_qmail,"queue/lock/tcpto",1024,auto_uidr,auto_gidq,0644);
+-  z(auto_qmail,"queue/lock/sendmutex",0,auto_uids,auto_gidq,0600);
+-  p(auto_qmail,"queue/lock/trigger",auto_uids,auto_gidq,0622);
++  d(base_qmail,"queue/lock",auto_uidq,auto_gidq,0750);
++  z(base_qmail,"queue/lock/tcpto",1024,auto_uidr,auto_gidq,0644);
++  z(base_qmail,"queue/lock/sendmutex",0,auto_uids,auto_gidq,0600);
++  p(base_qmail,"queue/lock/trigger",auto_uids,auto_gidq,0622);
+ 
+-  c(auto_qmail,"boot","home",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","home+df",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","proc",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","proc+df",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","binm1",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","binm1+df",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","binm2",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","binm2+df",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","binm3",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"boot","binm3+df",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","home",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","home+df",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","proc",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","proc+df",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","binm1",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","binm1+df",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","binm2",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","binm2+df",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","binm3",auto_uido,auto_gidq,0755);
++  c(base_qmail,"boot","binm3+df",auto_uido,auto_gidq,0755);
+ 
+-  c(auto_qmail,"doc","FAQ",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","UPGRADE",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","SENDMAIL",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","INSTALL",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","INSTALL.alias",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","INSTALL.ctl",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","INSTALL.ids",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","INSTALL.maildir",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","INSTALL.mbox",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","INSTALL.vsm",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","TEST.deliver",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","TEST.receive",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","REMOVE.sendmail",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","REMOVE.binmail",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.local2alias",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.local2ext",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.local2local",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.local2rem",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.local2virt",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.nullclient",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.relaybad",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.relaygood",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"doc","PIC.rem2local",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","FAQ",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","UPGRADE",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","SENDMAIL",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","INSTALL",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","INSTALL.alias",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","INSTALL.ctl",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","INSTALL.ids",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","INSTALL.maildir",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","INSTALL.mbox",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","INSTALL.vsm",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","TEST.deliver",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","TEST.receive",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","REMOVE.sendmail",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","REMOVE.binmail",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.local2alias",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.local2ext",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.local2local",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.local2rem",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.local2virt",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.nullclient",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.relaybad",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.relaygood",auto_uido,auto_gidq,0644);
++  c(base_qmail,"doc","PIC.rem2local",auto_uido,auto_gidq,0644);
+ 
+-  c(auto_qmail,"bin","qmail-queue",auto_uidq,auto_gidq,04711);
+-  c(auto_qmail,"bin","qmail-lspawn",auto_uido,auto_gidq,0700);
+-  c(auto_qmail,"bin","qmail-start",auto_uido,auto_gidq,0700);
+-  c(auto_qmail,"bin","qmail-getpw",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","qmail-local",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","qmail-remote",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","qmail-rspawn",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","qmail-clean",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","qmail-send",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","splogger",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","qmail-newu",auto_uido,auto_gidq,0700);
+-  c(auto_qmail,"bin","qmail-newmrh",auto_uido,auto_gidq,0700);
+-  c(auto_qmail,"bin","qmail-pw2u",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","qmail-inject",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","predate",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","datemail",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","mailsubj",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-showctl",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-qread",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-qstat",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-tcpto",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-tcpok",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-pop3d",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-popup",auto_uido,auto_gidq,0711);
+-  c(auto_qmail,"bin","qmail-qmqpc",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-qmqpd",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-qmtpd",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qmail-smtpd",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","sendmail",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","tcp-env",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qreceipt",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qsmhook",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qbiff",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","forward",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","preline",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","condredirect",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","bouncesaying",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","except",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","maildirmake",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","maildir2mbox",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","maildirwatch",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","qail",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","elq",auto_uido,auto_gidq,0755);
+-  c(auto_qmail,"bin","pinq",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-queue",auto_uidq,auto_gidq,04711);
++  c(base_qmail,"bin","qmail-lspawn",auto_uido,auto_gidq,0700);
++  c(base_qmail,"bin","qmail-start",auto_uido,auto_gidq,0700);
++  c(base_qmail,"bin","qmail-getpw",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","qmail-local",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","qmail-remote",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","qmail-rspawn",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","qmail-clean",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","qmail-send",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","splogger",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","qmail-newu",auto_uido,auto_gidq,0700);
++  c(base_qmail,"bin","qmail-newmrh",auto_uido,auto_gidq,0700);
++  c(base_qmail,"bin","qmail-pw2u",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","qmail-inject",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","predate",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","datemail",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","mailsubj",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-showctl",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-qread",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-qstat",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-tcpto",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-tcpok",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-pop3d",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-popup",auto_uido,auto_gidq,0711);
++  c(base_qmail,"bin","qmail-qmqpc",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-qmqpd",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-qmtpd",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qmail-smtpd",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","sendmail",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","tcp-env",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qreceipt",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qsmhook",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qbiff",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","forward",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","preline",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","condredirect",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","bouncesaying",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","except",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","maildirmake",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","maildir2mbox",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","maildirwatch",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","qail",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","elq",auto_uido,auto_gidq,0755);
++  c(base_qmail,"bin","pinq",auto_uido,auto_gidq,0755);
+ 
+-  c(auto_qmail,"man/man5","addresses.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","addresses.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","envelopes.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","envelopes.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","maildir.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","maildir.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","mbox.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","mbox.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","dot-qmail.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","dot-qmail.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","qmail-control.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","qmail-control.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","qmail-header.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","qmail-header.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","qmail-log.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","qmail-log.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","qmail-users.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","qmail-users.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man5","tcp-environ.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","tcp-environ.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","addresses.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","addresses.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","envelopes.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","envelopes.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","maildir.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","maildir.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","mbox.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","mbox.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","dot-qmail.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","dot-qmail.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","qmail-control.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","qmail-control.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","qmail-header.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","qmail-header.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","qmail-log.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","qmail-log.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","qmail-users.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","qmail-users.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man5","tcp-environ.5",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat5","tcp-environ.0",auto_uido,auto_gidq,0644);
+ 
+-  c(auto_qmail,"man/man7","forgeries.7",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat7","forgeries.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man7","qmail-limits.7",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat7","qmail-limits.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man7","qmail.7",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat7","qmail.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man7","forgeries.7",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat7","forgeries.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man7","qmail-limits.7",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat7","qmail-limits.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man7","qmail.7",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat7","qmail.0",auto_uido,auto_gidq,0644);
+ 
+-  c(auto_qmail,"man/man1","forward.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","forward.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","condredirect.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","condredirect.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","bouncesaying.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","bouncesaying.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","except.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","except.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","maildirmake.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","maildirmake.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","maildir2mbox.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","maildir2mbox.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","maildirwatch.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","maildirwatch.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","mailsubj.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","mailsubj.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","qreceipt.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","qreceipt.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","qbiff.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","qbiff.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","preline.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","preline.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man1","tcp-env.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","tcp-env.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","forward.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","forward.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","condredirect.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","condredirect.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","bouncesaying.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","bouncesaying.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","except.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","except.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","maildirmake.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","maildirmake.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","maildir2mbox.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","maildir2mbox.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","maildirwatch.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","maildirwatch.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","mailsubj.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","mailsubj.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","qreceipt.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","qreceipt.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","qbiff.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","qbiff.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","preline.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","preline.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man1","tcp-env.1",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat1","tcp-env.0",auto_uido,auto_gidq,0644);
+ 
+-  c(auto_qmail,"man/man8","qmail-local.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-local.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-lspawn.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-lspawn.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-getpw.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-getpw.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-remote.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-remote.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-rspawn.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-rspawn.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-clean.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-clean.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-send.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-send.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-start.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-start.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","splogger.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","splogger.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-queue.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-queue.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-inject.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-inject.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-showctl.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-showctl.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-newmrh.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-newmrh.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-newu.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-newu.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-pw2u.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-pw2u.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-qread.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qread.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-qstat.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qstat.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-tcpok.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-tcpok.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-tcpto.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-tcpto.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-pop3d.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-pop3d.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-popup.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-popup.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-qmqpc.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qmqpc.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-qmqpd.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qmqpd.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-qmtpd.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qmtpd.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-smtpd.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-smtpd.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/man8","qmail-command.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-command.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-local.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-local.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-lspawn.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-lspawn.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-getpw.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-getpw.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-remote.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-remote.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-rspawn.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-rspawn.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-clean.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-clean.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-send.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-send.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-start.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-start.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","splogger.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","splogger.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-queue.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-queue.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-inject.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-inject.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-showctl.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-showctl.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-newmrh.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-newmrh.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-newu.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-newu.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-pw2u.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-pw2u.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-qread.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-qread.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-qstat.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-qstat.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-tcpok.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-tcpok.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-tcpto.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-tcpto.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-pop3d.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-pop3d.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-popup.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-popup.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-qmqpc.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-qmqpc.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-qmqpd.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-qmqpd.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-qmtpd.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-qmtpd.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-smtpd.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-smtpd.0",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/man8","qmail-command.8",auto_uido,auto_gidq,0644);
++  c(base_qmail,"man/cat8","qmail-command.0",auto_uido,auto_gidq,0644);
+ }
+--- /dev/null
++++ netqmail-1.06/make-loadi.sh
+@@ -0,0 +1,2 @@
++echo 'main="$1"; shift'
++echo exec "$LDI" '-o "$main" "$main".o ${1+"$@"}'
diff --git a/user/netqmail/0002-qbiffutmpx-20170820.patch b/user/netqmail/0002-qbiffutmpx-20170820.patch
new file mode 100644
index 000000000..a55044f6e
--- /dev/null
+++ b/user/netqmail/0002-qbiffutmpx-20170820.patch
@@ -0,0 +1,130 @@
+<https://schmonz.com/qmail/qbiffutmpx>
+
+diff --git a/Makefile b/Makefile
+index 0f0e31a..ae8d229 100644
+--- a/Makefile
++++ b/Makefile
+@@ -685,6 +685,13 @@ chkshsgr warn-shsgr tryshsgr.c compile load
+ 	hasshsgr.h
+ 	rm -f tryshsgr.o tryshsgr
+ 
++hasutmpx.h: \
++tryutmpx.c compile load
++	( ( ./compile tryutmpx.c && ./load tryutmpx ) >/dev/null \
++	2>&1 \
++	&& echo \#define HASUTMPX 1 || exit 0 ) > hasutmpx.h
++	rm -f tryutmpx.o tryutmpx
++
+ haswaitp.h: \
+ trywaitp.c compile load
+ 	( ( ./compile trywaitp.c && ./load trywaitp ) >/dev/null \
+@@ -1071,7 +1078,8 @@ qbiff.1
+ 
+ qbiff.o: \
+ compile qbiff.c readwrite.h stralloc.h gen_alloc.h substdio.h subfd.h \
+-substdio.h open.h byte.h str.h headerbody.h hfield.h env.h exit.h
++substdio.h open.h byte.h str.h headerbody.h hfield.h env.h exit.h \
++hasutmpx.h
+ 	./compile qbiff.c
+ 
+ qmail-clean: \
+diff --git a/TARGETS b/TARGETS
+index facdad7..c37a453 100644
+--- a/TARGETS
++++ b/TARGETS
+@@ -388,3 +388,4 @@
+ man
+ setup
+ check
++hasutmpx.h
+diff --git a/qbiff.c b/qbiff.c
+index 4e9f1d8..f21b6bf 100644
+--- a/qbiff.c
++++ b/qbiff.c
+@@ -1,5 +1,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include "hasutmpx.h"
++#ifdef HASUTMPX
++#include <utmpx.h>
++#else
+ #include <utmp.h>
+ #ifndef UTMP_FILE
+ #ifdef _PATH_UTMP
+@@ -8,6 +12,7 @@
+ #define UTMP_FILE "/etc/utmp"
+ #endif
+ #endif
++#endif
+ #include "readwrite.h"
+ #include "stralloc.h"
+ #include "substdio.h"
+@@ -20,15 +25,22 @@
+ #include "env.h"
+ #include "exit.h"
+ 
++#ifndef HASUTMPX
+ substdio ssutmp;
+ char bufutmp[sizeof(struct utmp) * 16];
+ int fdutmp;
++#endif
+ substdio sstty;
+ char buftty[1024];
+ int fdtty;
+ 
++#ifdef HASUTMPX
++struct utmpx *ut;
++char line[sizeof(ut->ut_line) + 1];
++#else
+ struct utmp ut;
+ char line[sizeof(ut.ut_line) + 1];
++#endif
+ stralloc woof = {0};
+ stralloc tofrom = {0};
+ stralloc text = {0};
+@@ -63,7 +75,11 @@ void main()
+  if (!(user = env_get("USER"))) _exit(0);
+  if (!(sender = env_get("SENDER"))) _exit(0);
+  if (!(userext = env_get("LOCAL"))) _exit(0);
++#ifdef HASUTMPX
++ if (str_len(user) > sizeof(ut->ut_user)) _exit(0);
++#else
+  if (str_len(user) > sizeof(ut.ut_name)) _exit(0);
++#endif
+ 
+  if (!stralloc_copys(&tofrom,"*** TO <")) _exit(0);
+  if (!stralloc_cats(&tofrom,userext)) _exit(0);
+@@ -88,6 +104,7 @@ void main()
+  if (!stralloc_cat(&woof,&text)) _exit(0);
+  if (!stralloc_cats(&woof,"\015\n")) _exit(0);
+ 
++#ifndef HASUTMPX
+  fdutmp = open_read(UTMP_FILE);
+  if (fdutmp == -1) _exit(0);
+  substdio_fdbuf(&ssutmp,read,fdutmp,bufutmp,sizeof(bufutmp));
+@@ -97,6 +114,13 @@ void main()
+     {
+      byte_copy(line,sizeof(ut.ut_line),ut.ut_line);
+      line[sizeof(ut.ut_line)] = 0;
++#else
++ while ((ut = getutxent()))
++   if (ut->ut_type == USER_PROCESS && !str_diffn(ut->ut_user,user,sizeof(ut->ut_user)))
++    {
++     byte_copy(line,sizeof(ut->ut_line),ut->ut_line);
++     line[sizeof(ut->ut_line)] = 0;
++#endif
+      if (line[0] == '/') continue;
+      if (!line[0]) continue;
+      if (line[str_chr(line,'.')]) continue;
+diff --git a/tryutmpx.c b/tryutmpx.c
+new file mode 100644
+index 0000000..551b597
+--- /dev/null
++++ b/tryutmpx.c
+@@ -0,0 +1,6 @@
++#include <utmpx.h>
++
++void main()
++{
++  ;
++}
diff --git a/user/netqmail/0003-qmailremote-20170716.patch b/user/netqmail/0003-qmailremote-20170716.patch
new file mode 100644
index 000000000..706441d21
--- /dev/null
+++ b/user/netqmail/0003-qmailremote-20170716.patch
@@ -0,0 +1,62 @@
+<https://schmonz.com/qmail/remote>
+
+diff --git a/Makefile b/Makefile
+index 0f0e31a..8042611 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1462,11 +1462,11 @@ tcpto.h readwrite.h timeoutconn.h timeoutread.h timeoutwrite.h
+ 
+ qmail-rspawn: \
+ load qmail-rspawn.o spawn.o tcpto_clean.o now.o coe.o sig.a open.a \
+-seek.a lock.a wait.a fd.a stralloc.a alloc.a substdio.a error.a str.a \
++seek.a lock.a wait.a fd.a stralloc.a alloc.a substdio.a error.a env.a str.a \
+ auto_qmail.o auto_uids.o auto_spawn.o
+ 	./load qmail-rspawn spawn.o tcpto_clean.o now.o coe.o \
+ 	sig.a open.a seek.a lock.a wait.a fd.a stralloc.a alloc.a \
+-	substdio.a error.a str.a auto_qmail.o auto_uids.o \
++	substdio.a error.a env.a str.a auto_qmail.o auto_uids.o \
+ 	auto_spawn.o 
+ 
+ qmail-rspawn.0: \
+@@ -1474,7 +1474,7 @@ qmail-rspawn.8
+ 	nroff -man qmail-rspawn.8 > qmail-rspawn.0
+ 
+ qmail-rspawn.o: \
+-compile qmail-rspawn.c fd.h wait.h substdio.h exit.h fork.h error.h \
++compile qmail-rspawn.c fd.h wait.h substdio.h exit.h fork.h error.h env.h \
+ tcpto.h
+ 	./compile qmail-rspawn.c
+ 
+diff --git a/qmail-rspawn.c b/qmail-rspawn.c
+index 9d838e6..e064db1 100644
+--- a/qmail-rspawn.c
++++ b/qmail-rspawn.c
+@@ -5,6 +5,17 @@
+ #include "fork.h"
+ #include "error.h"
+ #include "tcpto.h"
++#include "env.h"
++
++static char *qrargs[1] = { 0 };
++
++static void setup_qrargs()
++{
++ if (!qrargs[0])
++  qrargs[0] = env_get("QMAILREMOTE");
++ if (!qrargs[0])
++  qrargs[0] = "qmail-remote";
++}
+ 
+ void initialize(argc,argv)
+ int argc;
+@@ -84,7 +95,9 @@ char *s; char *r; int at;
+  int f;
+  char *(args[5]);
+ 
+- args[0] = "qmail-remote";
++ setup_qrargs();
++
++ args[0] = qrargs[0];
+  args[1] = r + at + 1;
+  args[2] = s;
+  args[3] = r;
diff --git a/user/netqmail/0004-notifyfd.patch b/user/netqmail/0004-notifyfd.patch
new file mode 100644
index 000000000..d734b1417
--- /dev/null
+++ b/user/netqmail/0004-notifyfd.patch
@@ -0,0 +1,41 @@
+--- netqmail-1.06.old/qmail-send.c
++++ netqmail-1.06/qmail-send.c
+@@ -1,5 +1,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <fcntl.h>
++#include <stdlib.h>
+ #include "readwrite.h"
+ #include "sig.h"
+ #include "direntry.h"
+@@ -1521,7 +1523,17 @@
+  int nfds;
+  struct timeval tv;
+  int c;
++ int notifyfd = -1;
+ 
++  {
++   char *x = getenv("QMAIL_NOTIFY_FD") ;
++   if (x)
++    {
++     unsigned long u;
++     if (scan_ulong(x, &u) && fcntl(u, F_GETFD) >= 0) notifyfd = (int)u;
++    }
++  }
++
+  if (chdir(auto_qmail) == -1)
+   { log1("alert: cannot start: unable to switch to home directory\n"); _exit(111); }
+  if (!getcontrols())
+@@ -1567,6 +1579,12 @@
+  pass_init();
+  todo_init();
+  cleanup_init();
++
++ if (notifyfd >=0)
++  {
++   write(notifyfd, "\n", 1);
++   close(notifyfd);
++  }
+ 
+  while (!flagexitasap || !del_canexit())
+   {
diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD
new file mode 100644
index 000000000..e6aa892ac
--- /dev/null
+++ b/user/netqmail/APKBUILD
@@ -0,0 +1,116 @@
+# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
+pkgname=netqmail
+pkgver=1.06
+pkgrel=2
+pkgdesc="The qmail mail transfer agent (community version)"
+url="http://www.qmail.org/$pkgname/"
+arch="all"
+license="ISC"
+provides=sendmail
+options="suid !check" # suid programs (qmail-queue); no test suite
+depends="execline s6 s6-networking"
+makedepends="utmps-dev"
+subpackages="$pkgname-doc $pkgname-openrc"
+install="$pkgname.post-install $pkgname.pre-deinstall"
+source="http://www.qmail.org/$pkgname-$pkgver.tar.gz \
+	0001-DESTDIR.patch \
+	0002-qbiffutmpx-20170820.patch \
+	0003-qmailremote-20170716.patch
+	0004-notifyfd.patch
+	qmail.run
+	smtpd.run
+	smtpsd.run
+	$pkgname.confd
+	$pkgname.initd"
+
+makeservicedir()
+{
+	mkdir -p -m 0755 "$1"/log "$1"/env
+	{
+	  echo '#!/bin/execlineb -P'
+	  echo
+	  echo 's6-setuidgid qmaill'
+	  echo 's6-envdir ../env'
+	  echo 'importas -u IP IP'
+	  echo 'exec -c'
+	  echo "s6-log t $4"
+	} > "$1"/log/run
+	echo "$2" > "$1"/notification-fd
+	cp -f "$3" "$1"/run
+	
+	mkdir -p -m 3730 "$1"/event
+	mkdir -p -m 0700 "$1"/supervise
+	touch "$1"/supervise/lock "$1"/supervise/death_tally
+	mkfifo -m 0600 "$1"/supervise/control
+	dd if=/dev/zero of="$1"/supervise/status bs=35 count=1
+	if test $5 -eq 0 ; then
+	  echo /var/qmail/bin:/usr/bin:/usr/sbin:/bin:/sbin > "$1"/env/PATH
+	  echo "$2" > "$1"/env/QMAIL_NOTIFY_FD
+	else
+	  echo 110 > "$1"/env/UID
+	  echo 200 > "$1"/env/GID
+	  echo > "$1"/env/GIDLIST
+	  if test $5 -eq 6 ; then
+	    mkdir -p -m 0755 "$1"/data/rules/ip6/::_0
+	    touch "$1"/data/rules/ip6/::_0/allow
+	    sed -i -e 's/s6-tcpserver /s6-tcpserver6 /' "$1"/run
+	  elif test $5 -eq 4 ; then
+	    mkdir -p -m 0755 "$1"/data/rules/ip4/0.0.0.0_0
+	    touch "$1"/data/rules/ip4/0.0.0.0_0/allow
+	    sed -i -e 's/s6-tcpserver /s6-tcpserver4 /' "$1"/run
+	  fi
+	fi
+	chmod 0755 "$1"/run "$1"/log/run
+}
+
+build() {
+        cd "$builddir"
+        echo "gcc -O2 -pipe -W -Wall -Wextra" > conf-cc
+        echo "gcc -s -static" > conf-ld
+        echo "gcc -s" > conf-ldi  # because fakeroot doesn't work with static programs
+        echo 022 > conf-patrn
+        echo /var/qmail > conf-qmail
+        echo 255 > conf-spawn
+        { echo alias; echo qmaild; echo qmaill; echo root; echo qmailp; echo qmailq; echo qmailr; echo qmails; } > conf-users
+        { echo qmail; echo nofiles; } > conf-groups
+        make
+
+
+	# The following should be done in package(), but abuild only
+	# does it under fakeroot when it's done in build() and
+	# there's no package() function.
+
+	mkdir -p -m 0755 "$pkgdir"/var/qmail/services "$pkgdir"/var/log/qmail "$pkgdir"/usr/bin "$pkgdir"/usr/sbin "$pkgdir"/usr/share/doc "$pkgdir"/etc/qmail/services "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d
+	chown qmaill:qmaill "$pkgdir"/var/log/qmail
+	chmod 2700 "$pkgdir"/var/log/qmail
+	cp -f "$srcdir/$pkgname".confd "$pkgdir/etc/conf.d/$pkgname"
+	cp -f "$srcdir/$pkgname".initd "$pkgdir/etc/init.d/$pkgname"
+	chmod 0755 "$pkgdir/etc/init.d/$pkgname"
+
+	env DESTDIR="$pkgdir" make setup install
+	ln -s ../../var/qmail/bin/sendmail "$pkgdir"/usr/sbin/
+	ln -s ../../var/qmail/control "$pkgdir"/etc/qmail/control
+	rm -rf "$pkgdir"/var/qmail/boot "$pkgdir"/var/qmail/man/cat?
+	rm -f "$pkgdir"/var/qmail/bin/qbiff "$pkgdir"/var/qmail/man/man1/qbiff.*
+	mv -f "$pkgdir"/var/qmail/man "$pkgdir"/usr/share/man
+	mv -f "$pkgdir"/var/qmail/doc "$pkgdir/usr/share/doc/$pkgname-$pkgver"
+	echo 255 > "$pkgdir"/var/qmail/control/concurrencylocal
+	echo 255 > "$pkgdir"/var/qmail/control/concurrencyremote
+	makeservicedir "$pkgdir"/var/qmail/services/qmail 7 "$srcdir"/qmail.run 'n20 s1000000 /var/log/qmail' 0
+	makeservicedir "$pkgdir"/etc/qmail/services/smtpd4-skeleton 3 "$srcdir"/smtpd.run '/var/log/smtpd-$IP' 4
+	makeservicedir "$pkgdir"/etc/qmail/services/smtpd6-skeleton 3 "$srcdir"/smtpd.run '/var/log/smtpd-$IP' 6
+	makeservicedir "$pkgdir"/etc/qmail/services/smtpsd4-skeleton 3 "$srcdir"/smtpsd.run '/var/log/smtpsd-$IP' 4
+	makeservicedir "$pkgdir"/etc/qmail/services/smtpsd6-skeleton 3 "$srcdir"/smtpsd.run '/var/log/smtpsd-$IP' 6
+}
+
+sha512sums="de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b  netqmail-1.06.tar.gz
+ad126cad5c0d35351919ad87022fd94b910519d91cf82f38c158f423bbfc1b82455844a791ba0c69d347af1a20a86b095bed571f75365a86ea786cbc9c626487  0001-DESTDIR.patch
+b3af9c29e6d46daa2a1b9f677c6f32892d5f8c9b8d5c2bdd6f34b106dd5ad41394c05a5ebe145c6e29b4ced4482f08b2d09e7818fd309123c0d087600500e336  0002-qbiffutmpx-20170820.patch
+cbebdc72c7cc5c437531c9277534ae552c6d044a83b36e3f3ce60ab5563c55eb814d6c543cc0997abab73075d1b517cc0929dd65674d468d517b0ca38196e2b4  0003-qmailremote-20170716.patch
+b32a8a36c8ab8872abd4f1a117482f064a6d631a6bb2ba75cafe61743bef09f923d26935d9514eec33a7dec5aeb3d0b517d677e55924859d2db5233bc11f9f11  0004-notifyfd.patch
+954a905bac5e3bc49f180dc0de7f6ee4c4ae8f94dd400ee4b06d3c944f1ff1cfc44bddccb07ae439f2523ad06fcb89023e57d091737da88f836013757794e931  qmail.run
+c0cd244af4d8186305c51b0e93960bdb1ea6ce40f1adf20c4f72419aa7498e35649590919ebd16547a0313676bf9171c9efea2ff8ac3a5c773b18473a972a977  smtpd.run
+719c4ce5ad93cddeafbb734cffeec3fd959d3f374e44e1f34e9a25d638303dd97df41642d3df5c7a069a8db47d1e31c32a16ecd2d04b72860c4e00bbba0c9fcf  smtpsd.run
+80ee7e8b3c1ca7cdb00044e6fdd5b9c6a39fd9c882b470f4968c79b974c95e48946a1a3a8b79d9d0ed134ecf09b1185823bf6d022f8b17168e34c18f44ddd16f  netqmail.confd
+7600285e70511447b11161a2fc1ca11debc5adcde1d76583d4c715e9710cab876f8be158fd8e034d480588d3d4978c42a9254c29f2db70913105ab009cab6479  netqmail.initd"
diff --git a/user/netqmail/netqmail.confd b/user/netqmail/netqmail.confd
new file mode 100644
index 000000000..b3f331fdb
--- /dev/null
+++ b/user/netqmail/netqmail.confd
@@ -0,0 +1,49 @@
+# netqmail configuration for SMTP servers.
+
+# Most of the configuration for qmail is done in /var/qmail/control.
+# Please read the documentation of qmail-control(5) and
+# and adjust the files in /var/qmail/control according to your needs.
+# In particular, that's where options for *routing* and *sending*
+# mail are set.
+
+# The file you're viewing is about *receiving* mail.
+
+
+# List the IP addresses (v4 or v6) where a SMTP daemon should
+# be listening. v4 and v6 are handled separately (if you have
+# one interface, you need to list both its IPv4 and its IPv6
+# address).
+# 0.0.0.0 means all v4 addresses. Remove it if you want to
+# list v4 addresses explicitly.
+# :: means all v6 addresses. Remove it if you want to
+# list v6 addresses explicitly.
+
+SMTPD_IPS="0.0.0.0 ::"
+
+
+# TLS configuration.
+# If you want to have SMTP-over-TLS daemons, the
+# SMTPSD_KEYFILE should point to your private key, and the
+# SMTPSD_CERTFILE should point to your certificate.
+# Leave them empty for no SMTP-over-TLS.
+
+SMTPSD_KEYFILE=
+SMTPSD_CERTFILE=
+
+
+# List the IP addresses (v4 or v6) where a SMTP-over-TLS daemon
+# should be listening. This will only be used if SMTPSD_KEYFILE
+# and SMTPSD_CERTFILE are defined.
+
+SMTPSD_IPS="0.0.0.0 ::"
+
+
+# Relaying configuration.
+# If you want qmail to act as a relay for some subnets, declare
+# the subnets here: for instance 1.2.3.0/24, 1.2.3.4/30,
+# 0001:0002:0003:0004::/64. A single IP is a subnet with a netmask
+# of 32 (for IPv4) or 128 (for IPv6).
+# DO NOT ADD PUBLIC IP ADDRESSES THAT YOU DO NOT OWN. Doing this
+# would make you an open relay and get you blacklisted by spam cops.
+
+RELAY_SUBNETS=""
diff --git a/user/netqmail/netqmail.initd b/user/netqmail/netqmail.initd
new file mode 100644
index 000000000..dae9c4d55
--- /dev/null
+++ b/user/netqmail/netqmail.initd
@@ -0,0 +1,153 @@
+#!/sbin/openrc-run
+
+description="Start/stop the s6 services for netqmail"
+
+depend()
+{
+  after net
+  after localmount
+}
+
+makesmtpd()
+{
+  set -e
+  ip="$1"
+  usetls="$2"
+  if "$usetls" ; then
+    s="s"
+    port=25
+  else
+    s=
+    port=465
+  fi
+  if s6-tcpserver6-socketbinder -dBb0 -- "$ip" "$port" true 2>/dev/null ; then
+    ipv=6
+    relayfor="$smtprelay6"
+  elif s6-tcpserver4-socketbinder -dBb0 -- "$ip" "$port" true 2>/dev/null ; then
+    ipv=4
+    relayfor="$smtprelay4"
+  else
+    return 1
+  fi
+
+  service="smtp${s}d-$ip"
+  sdir=/run/services/"$service"
+  logdir=/var/log/"smtp${s}d-$ip"
+
+  mkdir -p -m 0755 "$logdir"
+  chown qmaill:qmaill "$logdir"
+  chmod 2700 "$logdir"
+
+  rm -rf "$sdir"
+  cp -a /etc/qmail/services/smtp"${s}"d"${ipv}"-skeleton "$sdir"
+  echo "$ip" > "$sdir"/env/IP
+  if "$usetls" ; then
+    echo "$SMTPSD_KEYFILE" > "$sdir"/env/KEYFILE
+    echo "$SMTPSD_CERTFILE" > "$sdir"/env/CERTFILE
+  fi
+
+  for j in $relayfor ; do
+    mkdir -p -m 0755 "$sdir/data/rules/ip${ipv}/$j/env"
+    touch "$sdir/data/rules/ip${ipv}/$j/allow"
+    echo > "$sdir/data/rules/ip${ipv}/$j/env/RELAYCLIENT"
+  done
+
+  return 0
+}
+
+stop()
+{
+  set -e
+  . /etc/conf.d/netqmail
+  ebegin "Stopping SMTP and SMTPS listeners"
+  dirs=""
+  logs=""
+  for i in ${SMTPD_IPS} ; do
+    rm -f "/run/service/smtpd-$i"
+    s6-svc -d "/run/services/smtpd-$i"
+    dirs="$dirs /run/services/smtpd-$i"
+    logs="$logs /run/services/smtpd-$i/log"
+  done
+  if test -r "$SMTPSD_KEYFILE" && test -r "$SMTPSD_CERTFILE" ; then
+    for i in ${SMTPSD_IPS} ; do
+      rm -f "/run/service/smtpsd-$i"
+      s6-svc -d "/run/services/smtpsd-$i"
+      dirs="$dirs /run/services/smtpsd-$i"
+      logs="$logs /run/services/smtpsd-$i/log"
+    done
+  fi
+  s6-svwait -D $dirs
+  eend $?
+
+  ebegin "Stopping the qmail-send service (this may take some time)"
+  rm -f /run/service/qmail
+  logs="$logs /var/qmail/services/qmail/log"
+  s6-svc -dwD /var/qmail/services/qmail
+  eend $?
+
+  ebegin "Stopping loggers and cleaning up qmail services"
+  for i in $logs ; do
+    s6-svc -d "$i"
+  done
+  s6-svwait -D $logs
+  s6-svscanctl -aN /run/service
+  rm -rf $dirs
+  eend $?
+}
+
+start()
+{
+  set -e
+  . /etc/conf.d/netqmail
+
+  ebegin "Parsing the relay subnets"
+  smtprelay4=
+  smtprelay6=
+  for i in ${RELAY_SUBNETS} ; do
+    j=`echo "$i" | tr / _`
+    if echo "$i" | grep -qF : ; then
+      smtprelay6="$smtprelay6 $j"
+    elif echo "$i" | grep -qF . ; then
+      smtprelay4="$smtprelay4 $j"
+    else
+      false
+      break
+    fi
+  done
+  eend $?
+
+  ebegin "Starting the qmail-send service"
+  ln -nsf ../../var/qmail/services/qmail /run/service/qmail
+  s6-svscanctl -a /run/service
+  s6-svwait -U /var/qmail/services/qmail
+  eend $?
+
+  for i in ${SMTPD_IPS} ; do
+    ebegin "Creating a service directory for a SMTP listener on $i"
+    makesmtpd "$i" false
+    eend $?
+  done
+  if test -r "$SMTPSD_KEYFILE" && test -r "$SMTPSD_CERTFILE" ; then
+    for i in ${SMTPSD_IPS} ; do
+      ebegin "Creating a service directory for a SMTPS listener on $i"
+      makesmtpd "$i" true
+      eend $?
+    done
+  fi
+
+  dirs=""
+  ebegin "Starting SMTP/S listeners"
+  for i in ${SMTPD_IPS} ; do
+    ln -nsf "../services/smtpd-$i" "/run/service/smtpd-$i"
+    dirs="$dirs /run/service/smtpd-$i"
+  done
+  if test -r "$SMTPSD_KEYFILE" && test -r "$SMTPSD_CERTFILE" ; then
+    for i in ${SMTPSD_IPS} ; do
+      ln -nsf "../services/smtpsd-$i" "/run/service/smtpsd-$i"
+      dirs="$dirs /run/service/smtpsd-$i"
+    done
+  fi
+  s6-svscanctl -aN /run/service
+  s6-svwait -U $dirs
+  eend $?
+}
diff --git a/user/netqmail/netqmail.post-install b/user/netqmail/netqmail.post-install
new file mode 100644
index 000000000..b9c03e947
--- /dev/null
+++ b/user/netqmail/netqmail.post-install
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+# Basic /var/qmail/control configuration so qmail has a chance to
+# work out-of-the-box for very simple installations.
+
+name=`uname -n`
+ddom=`echo "$name" | sed 's/^\([^\.]*\)\.\([^\.]*\)\./\2\./'`
+pdom=`echo "$name" | sed 's/^.*\.\([^\.]*\)\.\([^\.]*\)$/\1.\2/'`
+
+cd /var/qmail/control
+echo "$name" > me
+echo "$name" > locals
+echo "$name" > rcpthosts
+echo "$name powered by qmail" > smtpgreeting
+echo "$ddom" > defaultdomain
+echo "$pdom" > plusdomain
+
+{
+  echo "Minimal qmail configuration done in /var/qmail/control."
+  echo "Please check and adjust those settings before starting the service."
+  echo "Please review /etc/init.d/netqmail for more settings."
+} 1>&2
diff --git a/user/netqmail/netqmail.pre-deinstall b/user/netqmail/netqmail.pre-deinstall
new file mode 100644
index 000000000..496133f3d
--- /dev/null
+++ b/user/netqmail/netqmail.pre-deinstall
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+# Remove s6-supervise files so apk can clean up directories.
+
+rm -rf /var/qmail/services/qmail/event /var/qmail/services/qmail/supervise /var/qmail/services/qmail/log/event /var/qmail/services/qmail/log/supervise
diff --git a/user/netqmail/qmail.run b/user/netqmail/qmail.run
new file mode 100644
index 000000000..5d92e7540
--- /dev/null
+++ b/user/netqmail/qmail.run
@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+
+fdmove -c 2 1
+s6-envdir env
+/var/qmail/bin/qmail-start ./Maildir/
diff --git a/user/netqmail/smtpd.run b/user/netqmail/smtpd.run
new file mode 100644
index 000000000..7f10dbdbb
--- /dev/null
+++ b/user/netqmail/smtpd.run
@@ -0,0 +1,9 @@
+#!/bin/execlineb -P
+
+fdmove -c 2 1
+s6-envdir env
+importas -u IP IP
+fdmove 1 3
+s6-tcpserver -v2 -1U -c 255 -- $IP 25
+s6-tcpserver-access -v2 -DRpl0 -t 5000 -i data/rules --
+qmail-smtpd
diff --git a/user/netqmail/smtpsd.run b/user/netqmail/smtpsd.run
new file mode 100644
index 000000000..32d9f54ab
--- /dev/null
+++ b/user/netqmail/smtpsd.run
@@ -0,0 +1,8 @@
+#!/bin/execlineb -P
+
+fdmove -c 2 1
+s6-envdir env
+importas -u IP IP
+fdmove 1 3
+s6-tlsserver -v2 -1U -c 255 -DRpl0 -t 5000 -i data/rules -- $IP 465
+qmail-smtpd
diff --git a/user/npth/APKBUILD b/user/npth/APKBUILD
index b286a58fd..7f73efd37 100644
--- a/user/npth/APKBUILD
+++ b/user/npth/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=npth
-pkgver=1.5
-pkgrel=2
+pkgver=1.6
+pkgrel=0
 pkgdesc="Portable threading library from GNU"
 url="https://www.gnupg.org/software/npth/index.html"
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="20f0ec59d304c68081e42535870af8e76c18e30aa7b04ccdafe60fe5261ad7275c2c0e3ea3a767d6145258a3a39fa641032cd97205318266dd727a5fe7ee331a  npth-1.5.tar.bz2"
+sha512sums="2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2  npth-1.6.tar.bz2"
diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD
index 1462ba86f..9fbbd1741 100644
--- a/user/obconf-qt/APKBUILD
+++ b/user/obconf-qt/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=obconf-qt
-pkgver=0.12.0
+pkgver=0.13.0
 pkgrel=0
 pkgdesc="Qt5-based Openbox configuration tool"
 url="https://lxqt.org/"
@@ -17,6 +17,7 @@ build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
+	mkdir -p build && cd build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
@@ -25,18 +26,18 @@ build() {
 		-DPULL_TRANSLATIONS=False \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} ..
 	make
 }
 
 check() {
-	cd "$builddir"
+	cd "$builddir"/build
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
+	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="087d453d111c4aa5e9be7e03b1253192bf8c274bbee822f0c9bc9375fef79763c48cba0096ce153b1da3a6fe59429d228ffe3611746cfa20d0193232768f372e  obconf-qt-0.12.0.tar.xz"
+sha512sums="537c10e286311d39f3e69c2940f4267d7dd2e55888e1e50d6aeb3cad8f694fec7792ca30e258a69cfe0c5361acecd4232605e47e71e27fa53b25f4bb65a0d703  obconf-qt-0.13.0.tar.xz"
diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD
index 784f51f2d..6f5c1111b 100644
--- a/user/okteta/APKBUILD
+++ b/user/okteta/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=okteta
-pkgver=0.25.1
+pkgver=0.25.3
 pkgrel=0
 pkgdesc="Graphical hex/binary editor"
 url="https://www.kde.org/applications/utilities/okteta/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174  okteta-0.25.1.tar.xz"
+sha512sums="f27b0c2ca3c5f1ad838af847e08c53c8f8f3c386921bd2e0d5e833902659477196e6c6b72a428443e2be9013928c2151c1889ef33d59404815a34d81560ef2a7  okteta-0.25.3.tar.xz"
diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD
index edc203a9a..ba2fd75c2 100644
--- a/user/okular/APKBUILD
+++ b/user/okular/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=okular
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Universal document reader developed by KDE"
 url="https://okular.kde.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9ee463627089caec1b4fb63263daeb8ab1001d415a053720adb498bfebe44a3572b322841625b9419a34156866302bfc35eac6a68ae123a99fe61b19287c9c0b  okular-18.04.3.tar.xz"
+sha512sums="4114c614c3d773de158469a201c976ad36d706a0eb00b238af49d5e5a97fb272ce6033f744101c7e26110a7ac6b9c6cda26e3fc8c9c1bde22277f3ba2c55a375  okular-18.08.1.tar.xz"
diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD
index e73ac3911..3b4c6dc49 100644
--- a/user/openjpeg/APKBUILD
+++ b/user/openjpeg/APKBUILD
@@ -2,15 +2,18 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=openjpeg
 pkgver=2.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Open-source implementation of JPEG 2000 image codec"
 url="http://www.openjpeg.org/"
 arch="all"
 options="!check"  # No test suite.
 license="BSD-2-Clause-NetBSD"
+depends_dev="$pkgname-tools"
 makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake"
 subpackages="$pkgname-dev $pkgname-tools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz
+	fix-include-path.patch
+	"
 
 build() {
 	cd "$builddir"
@@ -48,4 +51,5 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568  openjpeg-2.3.0.tar.gz"
+sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568  openjpeg-2.3.0.tar.gz
+354fb181a25eeabe231d28216bcb8e401648cf8e71ba476cabd25e297f46bbc1ea5b091b4d2d4450501422b8b20649bf109ff5b3f3b49f1492650dbb46ed6e22  fix-include-path.patch"
diff --git a/user/openjpeg/fix-include-path.patch b/user/openjpeg/fix-include-path.patch
new file mode 100644
index 000000000..f5ff1e60d
--- /dev/null
+++ b/user/openjpeg/fix-include-path.patch
@@ -0,0 +1,11 @@
+--- openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in.old	2017-10-04 22:23:14.000000000 +0000
++++ openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in	2018-09-06 00:53:22.860000000 +0000
+@@ -26,7 +26,7 @@
+ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+   # This is an install tree
+   include(${SELF_DIR}/OpenJPEGTargets.cmake)
+-  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
++  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
+   set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
+ 
+ else()
diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD
new file mode 100644
index 000000000..06317735b
--- /dev/null
+++ b/user/openvpn/APKBUILD
@@ -0,0 +1,69 @@
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Lee Starnes <lee@canned-death.us>
+pkgname=openvpn
+pkgver=2.4.6
+pkgrel=1
+pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
+url="https://openvpn.net/"
+arch="all"
+license="GPL-2.0-only WITH openvpn-openssl-exception"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-auth-pam:pam $pkgname-openrc"
+depends="iproute2"
+makedepends="openssl-dev lzo-dev linux-pam-dev linux-headers"
+install="$pkgname.pre-install"
+source="https://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz
+	openvpn.initd
+	openvpn.confd
+	openvpn.up
+	openvpn.down
+	"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/openvpn \
+		--enable-crypto \
+		--enable-iproute2
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+
+	# install samples
+	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/samples
+	cp -a sample/sample-* "$pkgdir"/usr/share/doc/$pkgname/samples
+	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+
+	# install init.d and conf.d
+	install -Dm755 "$srcdir"/openvpn.initd "$pkgdir"/etc/init.d/openvpn
+	install -Dm644 "$srcdir"/openvpn.confd "$pkgdir"/etc/conf.d/openvpn
+
+	# install up and down scripts
+	install -Dm755 "$srcdir"/openvpn.up "$pkgdir"/etc/openvpn/up.sh
+	install -Dm755 "$srcdir"/openvpn.down "$pkgdir"/etc/openvpn/down.sh
+}
+
+pam() {
+	pkgdesc="OpenVPN plugin for PAM authentication"
+	mkdir -p "$subpkgdir"/usr/lib/openvpn/plugins
+	mv "$pkgdir"/usr/lib/openvpn/plugins/*-auth-pam* \
+		"$subpkgdir"/usr/lib/openvpn/plugins/
+}
+
+sha512sums="cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8  openvpn-2.4.6.tar.gz
+3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9  openvpn.initd
+6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e  openvpn.confd
+cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760  openvpn.up
+4456880d5c2db061219ba94e4052786700efa5e685f03b0d12d75a6023e3c0fc7b5242cc3d2bd3988e42fcd99701ab13a6257b1a0943b812318d30c64843ad27  openvpn.down"
diff --git a/user/openvpn/openvpn.confd b/user/openvpn/openvpn.confd
new file mode 100644
index 000000000..7274a079d
--- /dev/null
+++ b/user/openvpn/openvpn.confd
@@ -0,0 +1,24 @@
+# Configuration for /etc/init.d/openvpn{,.*}
+
+# OpenVPN can run in many modes. Most people want the init script to
+# automatically detect the mode and try and apply a good default configuration
+# and setup scripts. However, there are cases where the OpenVPN configuration
+# looks like a client, but it's really a peer or something else.
+# detect_client controls this behaviour.
+#detect_client="yes"
+
+# Path of the OpenVPN configuration file to load.
+# Default is /etc/openvpn/openvpn.conf, or /etc/openvpn/<vpn>.conf if
+# the runscript is symlinked to openvpn.<vpn> or <vpn>.
+#cfgfile=
+
+# The script to run in client mode after successful TUN/TAP device open.
+#up_script="/etc/openvpn/up.sh"
+
+# The script to run in client mode after TUN/TAP device close.
+#down_script="/etc/openvpn/down.sh"
+
+# OpenVPN automatically creates an /etc/resolv.conf (or sends it to
+# resolvconf) if given DNS information by the OpenVPN server.
+# Set to "no" to stop this.
+#peer_dns="yes"
diff --git a/user/openvpn/openvpn.down b/user/openvpn/openvpn.down
new file mode 100644
index 000000000..50d463f16
--- /dev/null
+++ b/user/openvpn/openvpn.down
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Copyright (c) 2006-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# If we have a service specific script, run this now
+if [ -x /etc/openvpn/"${RC_SVCNAME}"-down.sh ] ; then
+	/etc/openvpn/"${RC_SVCNAME}"-down.sh "$@"
+fi
+
+# Restore resolv.conf to how it was
+if [ "${PEER_DNS}" != "no" ]; then
+	if [ -x /sbin/resolvconf ] ; then
+		/sbin/resolvconf -d "${dev}"
+	elif [ -e /etc/resolv.conf-"${dev}".sv ] ; then
+		# Important that we cat instead of move incase resolv.conf is
+		# a symlink and not an actual file
+		cat /etc/resolv.conf-"${dev}".sv > /etc/resolv.conf
+		rm -f /etc/resolv.conf-"${dev}".sv
+	fi
+fi
+
+if [ -n "${RC_SVCNAME}" ]; then
+	# Re-enter the init script to start any dependant services
+	if /etc/init.d/"${RC_SVCNAME}" --quiet status ; then
+		export IN_BACKGROUND=true
+		/etc/init.d/"${RC_SVCNAME}" --quiet stop
+	fi
+fi
+
+exit 0
+
+# vim: ts=4 :
diff --git a/user/openvpn/openvpn.initd b/user/openvpn/openvpn.initd
new file mode 100644
index 000000000..dae0e3833
--- /dev/null
+++ b/user/openvpn/openvpn.initd
@@ -0,0 +1,130 @@
+#!/sbin/openrc-run
+
+extra_commands="checkconfig"
+
+instance_name=${RC_SVCNAME#*.}
+[ "$instance_name" != "openvpn" ] \
+	&& name="OpenVPN ($instance_name)" \
+	|| name="OpenVPN"
+
+# Upper case variables are for backward compatibility with Alpine < v3.8.
+: ${cfgdir:=${VPNDIR:-"/etc/openvpn"}}
+: ${cfgfile:="$cfgdir/$instance_name.conf"}
+: ${detect_client:="${DETECT_CLIENT:-yes}"}
+: ${up_script:="$cfgdir/up.sh"}
+: ${down_script:="$cfgdir/down.sh"}
+: ${peer_dns:=${PEER_DNS:-"yes"}}
+
+pidfile="/run/$RC_SVCNAME.pid"
+command="/usr/sbin/openvpn"
+command_args="
+	--daemon
+	--config $cfgfile
+	--writepid $pidfile
+	--setenv RC_SVCNAME $RC_SVCNAME
+	--setenv PEER_DNS $peer_dns"
+
+required_dirs="$cfgdir"
+required_files="$cfgfile"
+
+
+depend() {
+	need localmount net
+	use dns
+	after bootmisc
+}
+
+checkconfig() {
+	# Note: This is not just a check; we need to detect the mode both for
+	# "start" and "checkconfig" commands, that's why it's here.
+	if [ -z "$client_mode" ] && yesno "$detect_client"; then
+		cfgfile_has_option 'remote' \
+			&& client_mode=yes \
+			|| client_mode=no
+	fi
+
+	if [ ! -e /dev/net/tun ]; then
+		if ! modprobe tun; then
+			eerror "TUN/TAP support is not available in this kernel"
+			return 1
+		fi
+	fi
+	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
+		ebegin "Detected broken /dev/net/tun symlink, fixing..."
+		rm -f /dev/net/tun
+		ln -s /dev/misc/net/tun /dev/net/tun
+		eend $?
+	fi
+
+	if yesno "$client_mode"; then
+		local f; for f in "$up_script" "$down_script"; do
+			[ -r "$f" ] || { eerror "'$f' is not readable"; return 1; }
+		done
+
+		# Warn about setting scripts as we override them
+		if cfgfile_has_option "(up|down)"; then
+			ewarn "WARNING: You have defined your own up/down scripts"
+			ewarn "As you're running as a client, we now force Alpine specific"
+			ewarn "scripts to be run for up and down events."
+			ewarn "These scripts will call /etc/openvpn/$RC_SVCNAME-{up,down}.sh"
+			ewarn "where you can put your own code."
+		fi
+		# Warn about the inability to change ip/route/dns information when
+		# dropping privs
+		if cfgfile_has_option "user"; then
+			ewarn "WARNING: You are dropping root privileges!"
+			ewarn "As such openvpn may not be able to change ip, routing"
+			ewarn "or DNS configuration."
+		fi
+	fi
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	if yesno "$client_mode"; then
+		command_args="$command_args
+			--up-delay
+			--up-restart
+			--down-pre
+			--script-security 2
+			--up $up_script
+			--down $down_script"
+		start_inactive="yes"
+	else
+		# Run as openvpn unless otherwise specified.
+		cfgfile_has_option "user" || command_args="$command_args --user openvpn"
+		cfgfile_has_option "group" || command_args="$command_args --group openvpn"
+	fi
+
+	# If the config file does not specify the cd option, we do.
+	# But if we specify it, we override the config option which we do not want.
+	if cfgfile_has_option "cd"; then
+		command_args="$command_args --cd $cfgdir"
+	fi
+}
+
+start() {
+	# If we are re-called by the up.sh script, then we don't actually want
+	# to start OpenVPN. We do this so we can "start" ourselves from
+	# inactive (from the up.sh script) which then triggers other
+	# services to start which depend on us.
+	yesno "$IN_BACKGROUND" && return 0
+
+	default_start
+}
+
+stop() {
+	# If we are re-called by the down.sh script, then we don't actually
+	# want to stop OpenVPN.
+	if yesno "$IN_BACKGROUND"; then
+		mark_service_inactive "$RC_SVCNAME"
+		return 0
+	fi
+
+	default_stop
+}
+
+cfgfile_has_option() {
+	grep -Eq "^\s*$1\s" "$cfgfile"
+}
diff --git a/user/openvpn/openvpn.pre-install b/user/openvpn/openvpn.pre-install
new file mode 100644
index 000000000..c07253531
--- /dev/null
+++ b/user/openvpn/openvpn.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S openvpn 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G openvpn -g openvpn openvpn 2>/dev/null
+
+exit 0
diff --git a/user/openvpn/openvpn.up b/user/openvpn/openvpn.up
new file mode 100644
index 000000000..2923bef7a
--- /dev/null
+++ b/user/openvpn/openvpn.up
@@ -0,0 +1,82 @@
+#!/bin/sh
+# Copyright (c) 2006-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Setup our resolv.conf
+# Vitally important that we use the domain entry in resolv.conf so we
+# can setup the nameservers are for the domain ONLY in resolvconf if
+# we're using a decent dns cache/forwarder like dnsmasq and NOT nscd/libc.
+# nscd/libc users will get the VPN nameservers before their other ones
+# and will use the first one that responds - maybe the LAN ones?
+# non resolvconf users just the the VPN resolv.conf
+
+# FIXME:- if we have >1 domain, then we have to use search :/
+# We need to add a flag to resolvconf to say
+# "these nameservers should only be used for the listed search domains
+#  if other global nameservers are present on other interfaces"
+# This however, will break compatibility with Debians resolvconf
+# A possible workaround would be to just list multiple domain lines
+# and try and let resolvconf handle it
+
+if [ "${PEER_DNS}" != "no" ]; then
+	NS=
+	DOMAIN=
+	SEARCH=
+	i=1
+	while true ; do
+		eval opt=\$foreign_option_${i}
+		[ -z "${opt}" ] && break
+		if [ "${opt}" != "${opt#dhcp-option DOMAIN *}" ] ; then
+			if [ -z "${DOMAIN}" ] ; then
+				DOMAIN="${opt#dhcp-option DOMAIN *}"
+			else
+				SEARCH="${SEARCH}${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
+			fi
+		elif [ "${opt}" != "${opt#dhcp-option DNS *}" ] ; then
+			NS="${NS}nameserver ${opt#dhcp-option DNS *}\n"
+		fi
+		i=$((${i} + 1))
+	done
+
+	if [ -n "${NS}" ] ; then
+		DNS="# Generated by openvpn for interface ${dev}\n"
+		if [ -n "${SEARCH}" ] ; then
+			DNS="${DNS}search ${DOMAIN} ${SEARCH}\n"
+		elif [ -n "${DOMAIN}" ]; then
+			DNS="${DNS}domain ${DOMAIN}\n"
+		fi
+		DNS="${DNS}${NS}"
+		if [ -x /sbin/resolvconf ] ; then
+			printf "${DNS}" | /sbin/resolvconf -a "${dev}"
+		else
+			# Preserve the existing resolv.conf
+			if [ -e /etc/resolv.conf ] ; then
+				cp /etc/resolv.conf /etc/resolv.conf-"${dev}".sv
+			fi
+			printf "${DNS}" > /etc/resolv.conf
+			chmod 644 /etc/resolv.conf
+		fi
+	fi
+fi
+
+# Below section is Gentoo specific
+# Quick summary - our init scripts are re-entrant and set the RC_SVCNAME env var
+# as we could have >1 openvpn service
+
+if [ -n "${RC_SVCNAME}" ]; then
+	# If we have a service specific script, run this now
+	if [ -x /etc/openvpn/"${RC_SVCNAME}"-up.sh ] ; then
+		/etc/openvpn/"${RC_SVCNAME}"-up.sh "$@"
+	fi
+
+	# Re-enter the init script to start any dependant services
+	if ! /etc/init.d/"${RC_SVCNAME}" --quiet status ; then
+		export IN_BACKGROUND=true
+		/etc/init.d/${RC_SVCNAME} --quiet start
+	fi
+fi
+
+exit 0
+
+# vim: ts=4 :
diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD
index 1a0af56bd..1afc13380 100644
--- a/user/pcsc-lite/APKBUILD
+++ b/user/pcsc-lite/APKBUILD
@@ -5,7 +5,7 @@ pkgname=pcsc-lite
 pkgver=1.8.23
 pkgrel=2
 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)"
-url="http://pcsclite.alioth.debian.org/pcsclite.html"
+url="https://pcsclite.apdu.fr/"
 arch="all"
 license="Custom"
 depends=""
diff --git a/user/perl-gd/APKBUILD b/user/perl-gd/APKBUILD
index 1562ac465..bde0ece21 100644
--- a/user/perl-gd/APKBUILD
+++ b/user/perl-gd/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-gd
 _pkgreal=GD
-pkgver=2.68
+pkgver=2.69
 pkgrel=0
 pkgdesc="Perl module for GD graphics library"
 url="https://metacpan.org/release/GD"
@@ -44,4 +44,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="089d5482f55bd7a2990422fac41f6351f73492bb08fdb47c9acfed593e0f05a1a077ef3bf3179676f59e1b0de8ffc0f92b40597283ab2df3d24bb8a5d8d60698  GD-2.68.tar.gz"
+sha512sums="9df5bc704c7723c032874f2c715c8abac9102826278c7502ec8396568176abb11f95a4fcc91f1d5fac7c92685481f3d759b760c3dfadf86564d110128e41c677  GD-2.69.tar.gz"
diff --git a/user/perl-xml-parser/APKBUILD b/user/perl-xml-parser/APKBUILD
index 35d4d1f10..92367af8b 100644
--- a/user/perl-xml-parser/APKBUILD
+++ b/user/perl-xml-parser/APKBUILD
@@ -5,7 +5,7 @@ _pkgreal=XML-Parser
 pkgver=2.44
 pkgrel=5
 pkgdesc="Perl module for parsing XML documents"
-url="http://search.cpan.org/dist/XML-Parser/"
+url="https://metacpan.org/release/XML-Parser"
 arch="all"
 license="Artistic-2.0-Perl OR GPL-2.0-only"
 cpandepends="perl-libwww"
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD
index 194120417..8d3d77ffe 100644
--- a/user/php7/APKBUILD
+++ b/user/php7/APKBUILD
@@ -25,7 +25,7 @@
 
 pkgname=php7
 _pkgname=php
-pkgver=7.2.8
+pkgver=7.2.9
 pkgrel=0
 _apiver=20170718
 pkgdesc="The PHP7 language runtime engine"
@@ -522,7 +522,7 @@ _mv() {
 	mv $@
 }
 
-sha512sums="4eaab35ff99c6829e4e67b99d0dbc1d25b83210c9d894fbb9e6810dd3de8b7d5bd62b2d8a9f2ecb3c1f2f5a9c28116a22b36f019a21b8770f02fe1e3149728d9  php-7.2.8.tar.bz2
+sha512sums="45ff1b090646d3d8516250c88951d797831dc449aad15c809995462c7df72c347a4012578d0c923a036aaebd761844bfc6804639f21e386e53fe68b0445b091a  php-7.2.9.tar.bz2
 23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f  php-fpm.initd
 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb  php-fpm.logrotate
 a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48  php-module.conf
diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD
index c2fecd3b2..6234f9b56 100644
--- a/user/plasma-framework/APKBUILD
+++ b/user/plasma-framework/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=plasma-framework
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment"
 url="https://www.kde.org/"
@@ -47,4 +47,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a8a3757ca735e5846d2e6ae437803057102f928a89d8faa320f8aaaddee0ab005a01d98cf65842458aa0c52db9f7cec0813d4467c3ffa1afffa4416ed8db7373  plasma-framework-5.48.0.tar.xz"
+sha512sums="b0cee3cbca89f5497ea3525b52dafe1c0219fa29086454ba235bc02e9a2870ac1dcbddd3c05f5eb9b0fd2e9a5ac04b9aafcd4d03939f5023b907a5749fb22d87  plasma-framework-5.50.0.tar.xz"
diff --git a/user/polkit/APKBUILD b/user/polkit/APKBUILD
index 52a742130..ea5cb0c02 100644
--- a/user/polkit/APKBUILD
+++ b/user/polkit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=polkit
 pkgver=0.115
-pkgrel=0
+pkgrel=1
 pkgdesc="Toolkit for controlling system-wide privileges"
 url="https://www.freedesktop.org/wiki/Software/polkit/"
 arch="all"
@@ -12,7 +12,9 @@ depends=""
 makedepends="glib-dev gobject-introspection-dev gtk-doc intltool linux-pam-dev
 	mozjs-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-pkgusers="polkit"
+pkgusers="polkitd"
+pkggroups="polkitd"
+install="$pkgname.pre-install"
 source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz
 	0001-make-netgroup-support-optional.patch
 	fix-consolekit-db-stat.patch
diff --git a/user/polkit/polkit.pre-install b/user/polkit/polkit.pre-install
new file mode 100644
index 000000000..816f89236
--- /dev/null
+++ b/user/polkit/polkit.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+useradd -r -s /sbin/nologin -d /usr/lib/polkit-1 -M -U polkitd 2>/dev/null
+
+exit 0
diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD
index 701481f1c..854e018a7 100644
--- a/user/poppler-qt5/APKBUILD
+++ b/user/poppler-qt5/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=poppler-qt5
 _realname=poppler
-pkgver=0.66.0
+pkgver=0.68.0
 pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)"
 url="https://poppler.freedesktop.org/"
@@ -38,4 +38,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cf0ce3855d7cc28021685731308bfdeca0a7a764345432242887852d67fb4119b149ab7ba692e7031e2f0e79b9982e71446efbd75bb7886450d13ea6c5035b51  poppler-0.66.0.tar.xz"
+sha512sums="98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a  poppler-0.68.0.tar.xz"
diff --git a/user/poppler/APKBUILD b/user/poppler/APKBUILD
index 01394737e..41371d01e 100644
--- a/user/poppler/APKBUILD
+++ b/user/poppler/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: 
 pkgname=poppler
-pkgver=0.66.0
-pkgrel=1
+pkgver=0.68.0
+pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="https://poppler.freedesktop.org/"
 arch="all"
 options="!check"  # Test data is available in Git only.
 license="GPL-2.0+"
-depends=
+depends=""
 depends_dev="cairo-dev glib-dev"
 makedepends="$depends_dev libjpeg-turbo-dev cairo-dev libxml2-dev openjpeg-dev
 	fontconfig-dev gobject-introspection-dev lcms2-dev libpng-dev tiff-dev
@@ -17,6 +17,7 @@ source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz"
 builddir="$srcdir"/$pkgname-$pkgver/build
 
 prepare() {
+	default_prepare
 	mkdir "$builddir"
 }
 
@@ -58,4 +59,4 @@ _cpp() {
 		"$subpkgdir"/usr/lib/
 }
 
-sha512sums="cf0ce3855d7cc28021685731308bfdeca0a7a764345432242887852d67fb4119b149ab7ba692e7031e2f0e79b9982e71446efbd75bb7886450d13ea6c5035b51  poppler-0.66.0.tar.xz"
+sha512sums="98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a  poppler-0.68.0.tar.xz"
diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD
index 24a527f98..5ccc01d17 100644
--- a/user/prison/APKBUILD
+++ b/user/prison/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=prison
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Qt Barcode library for programatically creating QR codes"
 url="https://www.kde.org/"
@@ -47,4 +47,4 @@ quick() {
 	mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/
 }
 
-sha512sums="d47110b7d95b9392eda6d49d54972bd981cd55bef00ad44073b780b5ad9e267c2aec68836b6ee3d3ed34397dfe7e5bafb01478449ea3b44b6d0ecf138ea6e51c  prison-5.48.0.tar.xz"
+sha512sums="69baa1f0fb3859d7c32e53463e4c81d4f394ddf61ed6b11bd907a9edc98098b1895b01990bfe787359b9f5eae5b214a1c514b4bdacdbd0f7de2a10dfe90163d9  prison-5.50.0.tar.xz"
diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD
index 8dbcdd0b6..86910481a 100644
--- a/user/pulseaudio/APKBUILD
+++ b/user/pulseaudio/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=pulseaudio
-pkgver=12.0
+pkgver=12.2
 pkgrel=0
 pkgdesc="A featureful, general-purpose sound server"
 url="https://www.freedesktop.org/wiki/Software/PulseAudio"
@@ -20,7 +20,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bluez
 	$pkgname-alsa $pkgname-utils $pkgname-system:system:noarch
 	$pkgname-bash-completion:bashcomp:noarch $pkgname-lang
 	$pkgname-zsh-completion:zshcomp:noarch"
-source="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz
+source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz
 	$pkgname.initd
 	$pkgname.confd"
 
@@ -127,6 +127,6 @@ zshcomp() {
 	mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share
 }
 
-sha512sums="e9b02522f1e9cc2cf2e9db3364153fff5bc70561df34bc8e254e373a24c45585c1c722de8b6ebd7cd1814f523cf29b67c6940390a6fcc1ccbdde5aeff48f8d8c  pulseaudio-12.0.tar.xz
+sha512sums="877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e  pulseaudio-12.2.tar.xz
 34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1  pulseaudio.initd
 75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e  pulseaudio.confd"
diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD
index f9b290230..3f10c708b 100644
--- a/user/py3-lxml/APKBUILD
+++ b/user/py3-lxml/APKBUILD
@@ -3,10 +3,10 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=py3-lxml
 _pkgname=lxml
-pkgver=4.2.1
+pkgver=4.2.4
 pkgrel=0
 pkgdesc="Python LXML Library"
-url="http://lxml.de/"
+url="https://lxml.de/"
 arch="all"
 license="BSD-3-Clause"
 options="!check"  # No test suite.
@@ -24,4 +24,4 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="17dfa309f1066ba2478cdc87b8ec018f99dd9d43dd088c458dcae83683dbde2f9c341f64dfeab4e1d1f341b8294e6168b24294bec21e393c4f4bf9513b271124  lxml-4.2.1.tar.gz"
+sha512sums="fdbc0f15c20047d2e6ee616f73f84b57e1effcecb009cbd90e16f405e3a4e12cc320a0eb31782922d934441580870991331f9a2f1ce6a319be8bf7b92312319f  lxml-4.2.4.tar.gz"
diff --git a/user/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/user/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
deleted file mode 100644
index 7ea1dba6d..000000000
--- a/user/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3e231fa7a2dc66e2ef06ac44f4f719b08fc0c67e Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 29 Apr 2014 15:51:31 +0200
-Subject: [PATCH 6/6] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU
- platforms
-
-The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available
-on all platforms, so we define those if they are missing.
-
-This is needed for musl libc.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- linux-user/signal.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 7d6246f..6019dbb 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -32,6 +32,13 @@
- 
- //#define DEBUG_SIGNAL
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN 32
-+#endif
-+#ifndef __SIGRTMAX
-+#define __SIGRTMAX (NSIG-1)
-+#endif
-+
- static struct target_sigaltstack target_sigaltstack_used = {
-     .ss_sp = 0,
-     .ss_size = 0,
--- 
-1.9.2
-
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
index d1717c62f..41a6647bf 100644
--- a/user/qemu/APKBUILD
+++ b/user/qemu/APKBUILD
@@ -4,12 +4,12 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qemu
-pkgver=2.12.0
+pkgver=3.0.0
 pkgrel=0
-pkgdesc="QEMU is a generic machine emulator and virtualizer"
-url="http://qemu.org/"
+pkgdesc="Machine emulator and virtualisation software"
+url="https://www.qemu.org/"
 arch="all"
-license="GPL-2.0-only LGPL-2.1-only"
+license="GPL-2.0-only AND LGPL-2.1-only"
 makedepends="
 	alsa-lib-dev
 	bison
@@ -50,8 +50,7 @@ install="$pkgname.pre-install $pkgname.post-install"
 # suid needed for qemu-bridge-helper
 # strip fails on .img files
 # some tests does not run on our builders
-# ROMs confuse dbg
-options="suid !strip !check !dbg"
+options="suid !strip !check"
 subpackages="$pkgname-doc $pkgname-lang $pkgname-guest-agent:guest
 	$pkgname-user $pkgname-system"
 
@@ -127,6 +126,8 @@ done
 case "$CARCH" in
 	x86) _arch=i386 ;;
 	x86_64) _arch=x86_64 ;;
+	ppc64) _arch=ppc64 ;;
+	ppc) _arch=ppc ;;
 	*) _arch="" ;;
 esac
 if [ -n "$_arch" ]; then
@@ -136,9 +137,8 @@ fi
 
 subpackages="$subpackages $pkgname-img"  # -img must be declared the last
 
-source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2
+source="https://download.qemu.org/$pkgname-$pkgver.tar.xz
 	0001-elfload-load-PIE-executables-to-right-address.patch
-	0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 	0001-linux-user-fix-build-with-musl-on-aarch64.patch
 	musl-F_SHLCK-and-F_EXLCK.patch
 	fix-sigevent-and-sigval_t.patch
@@ -148,8 +148,8 @@ source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2
 	0001-linux-user-fix-build-with-musl-on-ppc64le.patch
 	fix-sockios-header.patch
 	test-crypto-ivgen-skip-essiv.patch
-	ppc-Fix-size-of-ppc64-xer-register-fwd.patch
 	ppc32-musl-support.patch
+	signal-fixes.patch
 	sysinfo-header.patch
 	fix-lm32-underlinking.patch
 
@@ -203,7 +203,8 @@ _compile_common() {
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/qemu \
 		--disable-glusterfs \
-		--disable-debug-info \
+		--enable-debug-info \
+		--disable-strip \
 		--disable-bsd-user \
 		--disable-werror \
 		--disable-sdl \
@@ -217,6 +218,7 @@ _compile_common() {
 _compile_system() {
 	_compile_common \
 		--audio-drv-list=oss,alsa \
+		--enable-debug-tcg \
 		--enable-kvm \
 		--enable-vde \
 		--enable-virtfs \
@@ -343,6 +345,16 @@ img() {
 	return $retval
 }
 
+dbg() {
+	# God, save me.
+	local _save="$srcdir"/tmpshare
+	# default_dbg uses srcdir for its own purposes;
+	# its value cannot be used after it is executed
+	mv "$pkgdir"/usr/share/qemu $_save
+	default_dbg
+	mv $_save "$pkgdir"/usr/share/qemu
+}
+
 user() {
 	pkgdesc="All QEMU user targets (metapackage)"
 	depends=""
@@ -377,9 +389,8 @@ guest() {
 		"$subpkgdir"/etc/conf.d/$pkgname-guest-agent
 }
 
-sha512sums="91d829f44c431e4c1cd335f3efea5afff9da62d832b0296a92417463ea0826d09ce226c2ea8ac167fe7b99b6bb976c7cb1357aaf17735ee57af6602161e46346  qemu-2.12.0.tar.bz2
+sha512sums="a764302f50b9aca4134bbbc1f361b98e71240cdc7b25600dfe733bf4cf17bd86000bd28357697b08f3b656899dceb9e459350b8d55557817444ed5d7fa380a5a  qemu-3.0.0.tar.xz
 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd  0001-elfload-load-PIE-executables-to-right-address.patch
-ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 1ac043312864309e19f839a699ab2485bca51bbf3d5fdb39f1a87b87e3cbdd8cbda1a56e6b5c9ffccd65a8ac2f600da9ceb8713f4dbba26f245bc52bcd8a1c56  0001-linux-user-fix-build-with-musl-on-aarch64.patch
 224f5b44da749921e8a821359478c5238d8b6e24a9c0b4c5738c34e82f3062ec4639d495b8b5883d304af4a0d567e38aa6623aac1aa3a7164a5757c036528ac0  musl-F_SHLCK-and-F_EXLCK.patch
 5da8114b9bd2e62f0f1f0f73f393fdbd738c5dea827ea60cedffd6f6edd0f5a97489c7148d37a8ec5a148d4e65d75cbefe9353714ee6b6f51a600200133fc914  fix-sigevent-and-sigval_t.patch
@@ -389,8 +400,8 @@ fd178f2913639a0c33199b3880cb17536961f2b3ff171c12b27f4be6bca032d6b88fd16302d09c69
 d8933df9484158c2b4888254e62117d78f8ed7c18527b249419f39c2b2ab1afa148010884b40661f8965f1ef3105580fceffdfddbb2c9221dc1c62066722ba65  0001-linux-user-fix-build-with-musl-on-ppc64le.patch
 39590476a4ebd7c1e79a4f0451b24c75b1817a2a83abaa1f71bb60b225d772152f0af8f3e51ff65645e378c536ffa6ff551dade52884d03a14b7c6a19c5c97d4  fix-sockios-header.patch
 8b8db136f78bd26b5da171effa9e11016ec2bc3e2fc8107228b5543b47aa370978ed883794aa4f917f334e284a5b49e82070e1da2d31d49301195b6713a48eff  test-crypto-ivgen-skip-essiv.patch
-a4cbb020d6a839b5a129964027169babff2c1455170c5fec855232d999481eea2cae186fa66ceaa5c8a05f3eb87f9565aaf9bdcc0e56edf3060e39e80c10c782  ppc-Fix-size-of-ppc64-xer-register-fwd.patch
 fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55885bc784a96a99b28aeacbc6a5549b2e6750c9d3099a897c  ppc32-musl-support.patch
+c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b  signal-fixes.patch
 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da  sysinfo-header.patch
 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702  fix-lm32-underlinking.patch
 d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd
diff --git a/user/qemu/debug.patch b/user/qemu/debug.patch
new file mode 100644
index 000000000..930ae11c1
--- /dev/null
+++ b/user/qemu/debug.patch
@@ -0,0 +1,136 @@
+diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
+index 3e0be56..27ed920 100644
+--- a/user/qemu/APKBUILD
++++ b/user/qemu/APKBUILD
+@@ -5,7 +5,7 @@
+ # Maintainer: A. Wilcox <awilfox@adelielinux.org>
+ pkgname=qemu
+ pkgver=2.12.1
+-pkgrel=0
++pkgrel=95
+ pkgdesc="Machine emulator and virtualisation software"
+ url="https://www.qemu.org/"
+ arch="all"
+@@ -56,68 +56,10 @@ subpackages="$pkgname-doc $pkgname-lang $pkgname-guest-agent:guest
+ 	$pkgname-user $pkgname-system"
+ 
+ _user_subsystems="
+-	aarch64
+-	alpha
+-	arm
+-	armeb
+-	cris
+-	hppa
+ 	i386
+-	m68k
+-	microblaze
+-	microblazeel
+-	mips
+-	mips64
+-	mips64el
+-	mipsel
+-	mipsn32
+-	mipsn32el
+-	or1k
+-	ppc
+-	ppc64
+-	ppc64abi32
+-	ppc64le
+-	s390x
+-	sh4
+-	sh4eb
+-	sparc
+-	sparc32plus
+-	sparc64
+-	tilegx
+ 	x86_64"
+ _system_subsystems="
+-	system-aarch64
+-	system-alpha
+-	system-arm
+-	system-cris
+-	system-hppa
+ 	system-i386
+-	system-lm32
+-	system-m68k
+-	system-microblaze
+-	system-microblazeel
+-	system-mips
+-	system-mips64
+-	system-mips64el
+-	system-mipsel
+-	system-moxie
+-	system-nios2
+-	system-or1k
+-	system-ppc
+-	system-ppc64
+-	system-ppcemb
+-	system-riscv32
+-	system-riscv64
+-	system-s390x
+-	system-sh4
+-	system-sh4eb
+-	system-sparc
+-	system-sparc64
+-	system-tricore
+-	system-unicore32
+-	system-x86_64
+-	system-xtensa
+-	system-xtensaeb
+ 	"
+ _subsystems="$_user_subsystems $_system_subsystems"
+ for _sub in $_subsystems; do
+@@ -152,6 +94,7 @@ source="https://download.qemu.org/$pkgname-$pkgver.tar.xz
+ 	ppc32-musl-support.patch
+ 	sysinfo-header.patch
+ 	fix-lm32-underlinking.patch
++	debug.patch
+ 
+ 	$pkgname-guest-agent.confd
+ 	$pkgname-guest-agent.initd
+@@ -203,7 +146,8 @@ _compile_common() {
+ 		--sysconfdir=/etc \
+ 		--libexecdir=/usr/lib/qemu \
+ 		--disable-glusterfs \
+-		--disable-debug-info \
++		--enable-debug-info \
++		--disable-strip \
+ 		--disable-bsd-user \
+ 		--disable-werror \
+ 		--disable-sdl \
+@@ -217,6 +161,7 @@ _compile_common() {
+ _compile_system() {
+ 	_compile_common \
+ 		--audio-drv-list=oss,alsa \
++		--enable-debug-tcg \
+ 		--enable-kvm \
+ 		--enable-vde \
+ 		--enable-virtfs \
+@@ -247,7 +192,8 @@ build() {
+ 	_compile_common \
+ 		--enable-linux-user \
+ 		--disable-system \
+-		--static
++		--static \
++		--target-list="i386-linux-user,x86_64-linux-user"
+ 
+ 	cd "$builddir"/build
+ 	_compile_system \
+@@ -256,7 +202,8 @@ build() {
+ 		--enable-vnc-jpeg \
+ 		--enable-spice \
+ 		--enable-guest-agent \
+-		--disable-gtk
++		--disable-gtk \
++		--target-list="i386-softmmu"
+ 
+ 	if [ -n "$_arch" ]; then
+ 		cd "$builddir"/build-gtk
+@@ -403,6 +350,7 @@ a4cbb020d6a839b5a129964027169babff2c1455170c5fec855232d999481eea2cae186fa66ceaa5
+ fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55885bc784a96a99b28aeacbc6a5549b2e6750c9d3099a897c  ppc32-musl-support.patch
+ 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da  sysinfo-header.patch
+ 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702  fix-lm32-underlinking.patch
++cfa0bc3c10d64060bf2ad46fc056060527a9ab68ab36ed012eab85db8a6053a2aa81199c6850c097f56ff3d4ea8fb23ee66aec62c33117ccf7518d64105b7e30  debug.patch
+ d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd
+ 1cd24c2444c5935a763c501af2b0da31635aad9cf62e55416d6477fcec153cddbe7de205d99616def11b085e0dd366ba22463d2270f831d884edbc307c7864a6  qemu-guest-agent.initd
+ 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2  80-kvm.rules
diff --git a/user/qemu/ppc-Fix-size-of-ppc64-xer-register-fwd.patch b/user/qemu/ppc-Fix-size-of-ppc64-xer-register-fwd.patch
deleted file mode 100644
index 87fd4a1ee..000000000
--- a/user/qemu/ppc-Fix-size-of-ppc64-xer-register-fwd.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c
-index 7a33813..b6f6693 100644
---- a/target/ppc/gdbstub.c
-+++ b/target/ppc/gdbstub.c
-@@ -37,10 +37,10 @@ static int ppc_gdb_register_len_apple(int n)
-     case 65+32: /* msr */
-     case 67+32: /* lr */
-     case 68+32: /* ctr */
--    case 69+32: /* xer */
-     case 70+32: /* fpscr */
-         return 8;
-     case 66+32: /* cr */
-+    case 69+32: /* xer */
-         return 4;
-     default:
-         return 0;
-@@ -61,6 +61,8 @@ static int ppc_gdb_register_len(int n)
-         return 8;
-     case 66:
-         /* cr */
-+    case 69:
-+        /* xer */
-         return 4;
-     case 64:
-         /* nip */
-@@ -70,8 +72,6 @@ static int ppc_gdb_register_len(int n)
-         /* lr */
-     case 68:
-         /* ctr */
--    case 69:
--        /* xer */
-         return sizeof(target_ulong);
-     case 70:
-         /* fpscr */
-@@ -152,7 +152,7 @@ int ppc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
-             gdb_get_regl(mem_buf, env->ctr);
-             break;
-         case 69:
--            gdb_get_regl(mem_buf, env->xer);
-+            gdb_get_reg32(mem_buf, env->xer);
-             break;
-         case 70:
-             gdb_get_reg32(mem_buf, env->fpscr);
-@@ -208,7 +208,7 @@ int ppc_cpu_gdb_read_register_apple(CPUState *cs, uint8_t *mem_buf, int n)
-             gdb_get_reg64(mem_buf, env->ctr);
-             break;
-         case 69 + 32:
--            gdb_get_reg64(mem_buf, env->xer);
-+            gdb_get_reg32(mem_buf, env->xer);
-             break;
-         case 70 + 32:
-             gdb_get_reg64(mem_buf, env->fpscr);
-@@ -259,7 +259,7 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
-             env->ctr = ldtul_p(mem_buf);
-             break;
-         case 69:
--            env->xer = ldtul_p(mem_buf);
-+            env->xer = ldl_p(mem_buf);
-             break;
-         case 70:
-             /* fpscr */
-@@ -309,7 +309,7 @@ int ppc_cpu_gdb_write_register_apple(CPUState *cs, uint8_t *mem_buf, int n)
-             env->ctr = ldq_p(mem_buf);
-             break;
-         case 69 + 32:
--            env->xer = ldq_p(mem_buf);
-+            env->xer = ldl_p(mem_buf);
-             break;
-         case 70 + 32:
-             /* fpscr */
diff --git a/user/qemu/signal-fixes.patch b/user/qemu/signal-fixes.patch
new file mode 100644
index 000000000..7cde67d01
--- /dev/null
+++ b/user/qemu/signal-fixes.patch
@@ -0,0 +1,12 @@
+--- qemu-3.0.0/linux-user/signal.c.old	2018-09-06 23:06:29.040000000 +0000
++++ qemu-3.0.0/linux-user/signal.c	2018-09-06 23:09:23.370000000 +0000
+@@ -37,6 +37,9 @@
+ static void host_signal_handler(int host_signum, siginfo_t *info,
+                                 void *puc);
+ 
++#define __SIGRTMIN 35
++#define __SIGRTMAX _NSIG-1
++
+ static uint8_t host_to_target_signal_table[_NSIG] = {
+     [SIGHUP] = TARGET_SIGHUP,
+     [SIGINT] = TARGET_SIGINT,
diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD
index 14a8907ec..22b4db58c 100644
--- a/user/qt5-qtbase/APKBUILD
+++ b/user/qt5-qtbase/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qtbase-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5.9 base components"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
 _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql
diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD
index 5e4a874f4..f1b687ec6 100644
--- a/user/qt5-qtdeclarative/APKBUILD
+++ b/user/qt5-qtdeclarative/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=${pkgname/qt5-/}-opensource-src
 pkgver=5.9.6
 pkgrel=1
 pkgdesc="Qt 5 - Qt Declarative and Qt Quick 2"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev libexecinfo-dev python3"  # python-compat
diff --git a/user/qt5-qtgraphicaleffects/APKBUILD b/user/qt5-qtgraphicaleffects/APKBUILD
index 00f5021dc..0e7de1aaa 100644
--- a/user/qt5-qtgraphicaleffects/APKBUILD
+++ b/user/qt5-qtgraphicaleffects/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qtgraphicaleffects-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Pre-made visual effects for QML"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
diff --git a/user/qt5-qtmultimedia/APKBUILD b/user/qt5-qtmultimedia/APKBUILD
index 19e99f609..cf71e6071 100644
--- a/user/qt5-qtmultimedia/APKBUILD
+++ b/user/qt5-qtmultimedia/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qtmultimedia-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Audio, video, radio, and camera libraries"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
 makedepends="alsa-lib-dev gstreamer-dev gst-plugins-base-dev libxv-dev
diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD
index e2fc9f64b..cb8d4c129 100644
--- a/user/qt5-qtpositioning/APKBUILD
+++ b/user/qt5-qtpositioning/APKBUILD
@@ -5,7 +5,7 @@ _pkgname=qtlocation-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Geolocation services"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 options="!check"
 license="LGPLv2 with exceptions OR GPLv3 with exceptions"
diff --git a/user/qt5-qtquickcontrols/APKBUILD b/user/qt5-qtquickcontrols/APKBUILD
index 63c9e8690..466046164 100644
--- a/user/qt5-qtquickcontrols/APKBUILD
+++ b/user/qt5-qtquickcontrols/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qtquickcontrols-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - controls for use with Qt Quick"
-url="https://qt.io"
+url="https://www.qt.io/"
 arch="all"
 license="(LGPL-2.0 with exceptions OR GPL-3.0 with exceptions) AND GFDL-1.3"
 makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
diff --git a/user/qt5-qtquickcontrols2/APKBUILD b/user/qt5-qtquickcontrols2/APKBUILD
index 7aa9e065f..3d1ca5113 100644
--- a/user/qt5-qtquickcontrols2/APKBUILD
+++ b/user/qt5-qtquickcontrols2/APKBUILD
@@ -5,7 +5,7 @@ _pkgname=qtquickcontrols2-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Quick Controls 2.0"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 options="!check"  # Impossible to test with accelerated X desktop
 license="LGPLv2 with exceptions OR GPLv3 with exceptions"
diff --git a/user/qt5-qtscript/APKBUILD b/user/qt5-qtscript/APKBUILD
index 3aee24d1d..940d23e5a 100644
--- a/user/qt5-qtscript/APKBUILD
+++ b/user/qt5-qtscript/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qtscript-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Deprecated scripting framework for Qt applications"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev"
diff --git a/user/qt5-qtsensors/APKBUILD b/user/qt5-qtsensors/APKBUILD
index 3a67e873d..152d9eabe 100644
--- a/user/qt5-qtsensors/APKBUILD
+++ b/user/qt5-qtsensors/APKBUILD
@@ -5,7 +5,7 @@ _pkgname=qtsensors-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Library for interfacing with sensors"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 options="!check"
 license="LGPLv2 with exceptions OR GPLv3 with exceptions"
diff --git a/user/qt5-qtserialport/APKBUILD b/user/qt5-qtserialport/APKBUILD
new file mode 100644
index 000000000..78ce5b969
--- /dev/null
+++ b/user/qt5-qtserialport/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=qt5-qtserialport
+_pkgname=qtserialport-opensource-src
+pkgver=5.9.6
+pkgrel=0
+pkgdesc="Qt 5 - Connect Qt applications to serial ports"
+url="https://www.qt.io/"
+arch="all"
+options="!check"
+license="LGPLv2 with exceptions OR GPLv3 with exceptions"
+depends=""
+makedepends="eudev-dev qt5-qtbase-dev"
+subpackages="$pkgname-dev"
+source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
+builddir="$srcdir"/$_pkgname-$pkgver
+
+build() {
+	cd "$builddir"
+	qmake
+	make
+}
+
+package() {
+	cd "$builddir"
+	make install INSTALL_ROOT="$pkgdir"
+}
+
+sha512sums="a4f5230c78772aa8899471dea90bab38a1cc021c22737f959e1a6852d18e7faeaadba4d329e49b3c9a3b7ef5fea69febb550e7fb4a9d99902d0e80a144822847  qtserialport-opensource-src-5.9.6.tar.xz"
diff --git a/user/qt5-qtsvg/APKBUILD b/user/qt5-qtsvg/APKBUILD
index e5384eb23..f3d5b3b94 100644
--- a/user/qt5-qtsvg/APKBUILD
+++ b/user/qt5-qtsvg/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qtsvg-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - SVG rendering library"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev zlib-dev"
diff --git a/user/qt5-qttools/APKBUILD b/user/qt5-qttools/APKBUILD
index 7143e3406..05a6b8652 100644
--- a/user/qt5-qttools/APKBUILD
+++ b/user/qt5-qttools/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qttools-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Tools for Qt development"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 options="!check"  # Tests require KDE 4 with special window manager config
 license="LGPLv2 with exceptions OR GPLv3 with exceptions"
diff --git a/user/qt5-qtwebchannel/APKBUILD b/user/qt5-qtwebchannel/APKBUILD
index d2a4e7c10..2306ceeaf 100644
--- a/user/qt5-qtwebchannel/APKBUILD
+++ b/user/qt5-qtwebchannel/APKBUILD
@@ -5,7 +5,7 @@ _pkgname=qtwebchannel-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Connect Qt applications to WebSockets"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 options="!check"
 license="LGPLv2 with exceptions OR GPLv3 with exceptions"
diff --git a/user/qt5-qtwebkit/APKBUILD b/user/qt5-qtwebkit/APKBUILD
index 37eb11b1c..59bbea61d 100644
--- a/user/qt5-qtwebkit/APKBUILD
+++ b/user/qt5-qtwebkit/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qtwebkit-opensource-src
 pkgver=5.9.1
 pkgrel=3
 pkgdesc="Qt 5 - WebKit components"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 options="!check"
 license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
diff --git a/user/qt5-qtwebsockets/APKBUILD b/user/qt5-qtwebsockets/APKBUILD
new file mode 100644
index 000000000..2d7914eb3
--- /dev/null
+++ b/user/qt5-qtwebsockets/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=qt5-qtwebsockets
+_pkgname=qtwebsockets-opensource-src
+pkgver=5.9.6
+pkgrel=0
+pkgdesc="Qt 5 - Pure Qt implementation of WebSockets"
+url="https://www.qt.io/"
+arch="all"
+options="!check"
+license="LGPLv2 with exceptions OR GPLv3 with exceptions"
+depends=""
+makedepends="qt5-qtbase-dev"
+subpackages="$pkgname-dev"
+source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
+builddir="$srcdir"/$_pkgname-$pkgver
+
+build() {
+	cd "$builddir"
+	qmake
+	make
+}
+
+package() {
+	cd "$builddir"
+	make install INSTALL_ROOT="$pkgdir"
+}
+
+sha512sums="3ecb44b6046d1a57ee85d261107b332f219aaed312712f817127cf0715f22ef3688192bccd86bc2057f79b9b1d69bfbceb3b8cac97ddaa33afc4bb3284b857dd  qtwebsockets-opensource-src-5.9.6.tar.xz"
diff --git a/user/qt5-qtx11extras/APKBUILD b/user/qt5-qtx11extras/APKBUILD
index e7e4d52dc..d3d895012 100644
--- a/user/qt5-qtx11extras/APKBUILD
+++ b/user/qt5-qtx11extras/APKBUILD
@@ -5,7 +5,7 @@ _pkgname=qtx11extras-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Extra libraries for X11 support"
-url="https://qt.io/"
+url="https://www.qt.io/"
 arch="all"
 options="!check"
 license="LGPLv2 with exceptions OR GPLv3 with exceptions"
diff --git a/user/qt5-qtxmlpatterns/APKBUILD b/user/qt5-qtxmlpatterns/APKBUILD
index 7db73f263..3ec06d9db 100644
--- a/user/qt5-qtxmlpatterns/APKBUILD
+++ b/user/qt5-qtxmlpatterns/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=qtxmlpatterns-opensource-src
 pkgver=5.9.6
 pkgrel=0
 pkgdesc="Qt 5 - Support for XPath, XQuery, XSLT, and XML schema validation"
-url="https://doc.qt.io/qt-5/qtxmlpatterns-index.html"
+url="https://www.qt.io/"
 arch="all"
 license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev"
diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD
index 68f3308b2..f8cb02cd8 100644
--- a/user/qt5ct/APKBUILD
+++ b/user/qt5ct/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=qt5ct
-pkgver=0.35
+pkgver=0.36
 pkgrel=0
 pkgdesc="GUI utility for configuring Qt5"
 url="https://sourceforge.net/projects/qt5ct/"
@@ -23,4 +23,4 @@ package() {
 	make INSTALL_ROOT="$pkgdir" install
 }
 
-sha512sums="2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a  qt5ct-0.35.tar.bz2"
+sha512sums="dfd6f85328fe8f14c8f2349bc0cac698e549350e2c000a73ac26474ca38ec5f44fd4ebed9b6976fc3423dda8322fd80355eafa6ecbec17495d1e2278c3189a88  qt5ct-0.36.tar.bz2"
diff --git a/user/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD
index 681e5eb53..e3e861748 100644
--- a/user/qtkeychain/APKBUILD
+++ b/user/qtkeychain/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=qtkeychain
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=0
 pkgdesc="Platform-independent Qt-based API for storing passwords securely"
 url="https://github.com/frankosterfeld/qtkeychain"
@@ -13,7 +13,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev"
 install=""
 subpackages="$pkgname-dev"
 source="qtkeychain-$pkgver.tar.gz::https://github.com/frankosterfeld/qtkeychain/archive/v$pkgver.tar.gz"
-sha512sums="d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df  qtkeychain-0.9.0.tar.gz"
 
 build() {
 	cd "$builddir"
@@ -46,3 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
+sha512sums="c80bd25a5b72c175d0d4a985b952924c807bf67be33eeb89e2b83757727e642c10d8d737cea9744d2faad74c50c1b55d82b306135559c35c91a088c3b198b33a  qtkeychain-0.9.1.tar.gz"
diff --git a/user/raptor2/APKBUILD b/user/raptor2/APKBUILD
new file mode 100644
index 000000000..e092e2e64
--- /dev/null
+++ b/user/raptor2/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=raptor2
+pkgver=2.0.15
+pkgrel=1
+pkgdesc="RDF parser/serializer toolkit for Redland"
+url="http://www.librdf.org/raptor"
+arch="all"
+license="Public-Domain AND (LGPL-2.1+ OR GPL-2.0+ OR Apache-2.0+)"
+depends=""
+depends_dev="curl-dev libxml2-dev libxslt-dev yajl-dev"
+makedepends="$depends_dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://download.librdf.org/source/$pkgname-$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+	autoreconf -vif
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	# Note: some tests are shown as FAIL but they are actually XFAIL :)
+	# As long as the return status is zero we are fine
+	make check -j1
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee  raptor2-2.0.15.tar.gz"
diff --git a/user/rasqal/APKBUILD b/user/rasqal/APKBUILD
new file mode 100644
index 000000000..ddeb6bd5e
--- /dev/null
+++ b/user/rasqal/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=rasqal
+pkgver=0.9.33
+pkgrel=1
+pkgdesc="RDF query library"
+url="http://www.librdf.org/"
+arch="all"
+license="(LGPL-2.1+ OR GPL-2.0+ OR Apache-2.0+) AND Unlicense AND Public-Domain"
+depends=""
+depends_dev="raptor2-dev"
+makedepends="$depends_dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://download.librdf.org/source/$pkgname-$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522  rasqal-0.9.33.tar.gz"
diff --git a/user/redis/APKBUILD b/user/redis/APKBUILD
index 6e83b18d8..ec71b8eb9 100644
--- a/user/redis/APKBUILD
+++ b/user/redis/APKBUILD
@@ -4,7 +4,7 @@ pkgname=redis
 pkgver=4.0.10
 pkgrel=0
 pkgdesc="Advanced key-value store"
-url="http://redis.io/"
+url="https://redis.io/"
 arch="all"
 license="BSD-3-Clause"
 depends=""
@@ -14,7 +14,7 @@ subpackages="$pkgname-openrc"
 install="redis.pre-install"
 pkgusers="redis"
 pkggroups="redis"
-source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz
+source="https://download.redis.io/releases/$pkgname-$pkgver.tar.gz
 	fix-ppc-atomics.patch
 	posix-runtest.patch
 	redis.initd
diff --git a/user/redland/APKBUILD b/user/redland/APKBUILD
new file mode 100644
index 000000000..1059aa845
--- /dev/null
+++ b/user/redland/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=redland
+pkgver=1.0.17
+pkgrel=0
+pkgdesc="High-level RDF library"
+url="http://www.librdf.org/"
+arch="all"
+license="(LGPL-2.1+ OR GPL-2.0+ OR Apache-2.0+) AND Public-Domain"
+depends=""
+depends_dev="raptor2-dev rasqal-dev sqlite-dev"
+makedepends="$depends_dev perl"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://download.librdf.org/source/$pkgname-$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	update_config_guess
+	update_config_sub
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850  redland-1.0.17.tar.gz"
diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD
index b7628e572..3cf0d9ef7 100644
--- a/user/rocs/APKBUILD
+++ b/user/rocs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=rocs
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Graph theory IDE"
 url="https://www.kde.org/applications/education/rocs/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="90d7af9934d2eb451882013676dee3d6b9aef421043dc39d17e3bfcc05d03b6c21d1f1836f247cada5e9b78d065d1544828bfc5288df8a1250388e48d26bede5  rocs-18.04.3.tar.xz"
+sha512sums="3b850415274bbc9155d56b7ff25dc17467d5947609133fe8d903263311b9a5551080110ee9af6f9a28c8e50c96e7f1a7d28fb5e6f91c94debf6b3ddf6631d45d  rocs-18.08.1.tar.xz"
diff --git a/user/rxvt-unicode/APKBUILD b/user/rxvt-unicode/APKBUILD
new file mode 100644
index 000000000..f9c836dde
--- /dev/null
+++ b/user/rxvt-unicode/APKBUILD
@@ -0,0 +1,71 @@
+# Contributor: Moritz Wilhelmy
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=rxvt-unicode
+pkgver=9.22
+pkgrel=4
+pkgdesc="Fork of the rxvt terminal emulator with improved unicode support"
+url="http://software.schmorp.de/pkg/rxvt-unicode.html"
+arch="all"
+options="!check"  # No test suite.
+license="(GPL-2.0+ OR BSD-2-Clause) AND GPL-2.0+ AND GPL-3.0+"
+depends="$pkgname-terminfo"
+makedepends="libx11-dev libxft-dev ncurses fontconfig-dev
+	gdk-pixbuf-dev libxrender-dev perl-dev startup-notification-dev"
+subpackages="$pkgname-doc $pkgname-terminfo::noarch"
+source="http://dist.schmorp.de/$pkgname/$pkgname-$pkgver.tar.bz2
+	gentables.patch
+	kerning.patch"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-terminfo=/usr/share/terminfo \
+		--enable-256-color \
+		--enable-font-styles \
+		--enable-xim \
+		--enable-keepscrolling \
+		--enable-selectionscrolling \
+		--enable-smart-resize \
+		--enable-pixbuf \
+		--enable-transparency \
+		--enable-frills \
+		--enable-perl \
+		--enable-mousewheel \
+		--enable-text-blink \
+		--enable-fading \
+		--enable-startup-notification \
+		--enable-unicode3 \
+		--disable-utmp \
+		--disable-wtmp \
+		--disable-lastlog
+	make
+}
+
+package() {
+	# despite having a separate terminfo subpackage
+	# TERMINFO env var is used by rxvt-unicode makefile
+	# leaving it as is ~skrzyp
+	export TERMINFO="$pkgdir/usr/share/terminfo"
+	mkdir -p "$TERMINFO"
+
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+terminfo() {
+	pkgdesc="$pkgdesc (terminfo data)"
+	depends=""
+
+	mkdir -p "$subpkgdir"/usr/share
+	mv "$pkgdir"/usr/share/terminfo "$subpkgdir"/usr/share/terminfo
+}
+
+sha512sums="b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9  rxvt-unicode-9.22.tar.bz2
+a45074b8fe39ffb712bd53b03521a8611fe5887a97ea09c1e85a7086de1042dd0360269803ffe5fcc56425af3c0cc3a55c214b2ef0fcfa2c3a298b4b37d261cb  gentables.patch
+42314393f7f061f1aa2cf2fedd3d84e96d3104868b0629cefd9e9b313529afde52127a412992e76935fa2de8d4e685d6b5ce42162cb8d1b0365de63d10c11925  kerning.patch"
diff --git a/user/rxvt-unicode/gentables.patch b/user/rxvt-unicode/gentables.patch
new file mode 100644
index 000000000..577d0d78f
--- /dev/null
+++ b/user/rxvt-unicode/gentables.patch
@@ -0,0 +1,8 @@
+--- ./src/gentables.orig	Wed Aug  4 04:59:09 2004
++++ ./src/gentables	Tue Aug 10 00:03:21 2004
+@@ -1,4 +1,4 @@
+-#!/opt/bin/perl
++#!/usr/bin/perl
+ 
+ # the generated tables mostly have NOT been checked so far!
+ 
diff --git a/user/rxvt-unicode/kerning.patch b/user/rxvt-unicode/kerning.patch
new file mode 100644
index 000000000..a29a6f608
--- /dev/null
+++ b/user/rxvt-unicode/kerning.patch
@@ -0,0 +1,21 @@
+--- a/src/rxvtfont.C	2008-07-09 12:21:45.000000000 +0400
++++ b/src/rxvtfont.C	2009-10-30 14:32:53.000000000 +0300
+@@ -1195,12 +1195,14 @@
+           XGlyphInfo g;
+           XftTextExtents16 (disp, f, &ch, 1, &g);
+ 
+-          g.width -= g.x;
+-
++/*  
++ * bukind: don't use g.width as a width of a character!
++ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
++ */
+           int wcw = WCWIDTH (ch);
+-          if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
++          if (wcw > 1) g.xOff = g.xOff / wcw;
++          if (width < g.xOff) width = g.xOff;
+ 
+-          if (width    < g.width       ) width    = g.width;
+           if (height   < g.height      ) height   = g.height;
+           if (glheight < g.height - g.y) glheight = g.height - g.y;
+         }
diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD
new file mode 100644
index 000000000..8c4ae8f36
--- /dev/null
+++ b/user/scummvm/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Tambra Wilcox <Tambra@J30AD.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=scummvm
+pkgver=2.0.0
+pkgrel=0
+pkgdesc="Allows running classic point-and-click adventure games"
+url="https://www.scummvm.org/"
+arch="all"
+options="!check"  # No tests provided.
+license="GPL-2.0+"
+depends=""
+makedepends="alsa-lib-dev curl-dev flac-dev fluidsynth-dev freetype-dev
+	libjpeg-turbo-dev libmpeg2-dev libogg-dev libpng-dev libvorbis-dev
+	sdl-dev zlib-dev"
+subpackages="$pkgname-doc"
+source="https://www.scummvm.org/frs/scummvm/$pkgver/scummvm-$pkgver.tar.bz2"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--prefix=/usr \
+		--disable-readline
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="66c689d776b8098d752ef696232f80f175f3bff9f523e6dceb246849e785889d135452f48eafa5f2664047297de8592c862677270de4bf83731f10e178ad6847  scummvm-2.0.0.tar.bz2"
diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD
index 1e43d6db6..d29ac7ad0 100644
--- a/user/solid/APKBUILD
+++ b/user/solid/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=solid
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Platform-independent hardware discovery and access"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="213019ef96f1531d9a893cfd3664d880b488c5b02a88f1b5aec057a942d2f8d3aa9d5fef3aca5d3110223b5d83f500800247fa501983cd11f8d5349da6f3b016  solid-5.48.0.tar.xz"
+sha512sums="f51c7bcaed7b2390f1b290791d7e9dc4a86ce8a925a2955c072be66274257c81c7872f76105fa8a03b35c184a8598551aa2bfa74017de487fc5a3521ea49d6a1  solid-5.50.0.tar.xz"
diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD
index a9ad64e57..740351e1d 100644
--- a/user/sonnet/APKBUILD
+++ b/user/sonnet/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=sonnet
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for implementing portable spell check functionality"
 url="https://www.kde.org/"
@@ -50,4 +50,4 @@ aspell() {
 		"$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so
 }
 
-sha512sums="70fdcdad762b1418b2a22100451d2609e698fcd436f975faeea53b2615e946a886eaa44d88e1ad6e0f4df73f3d1ef022fc5f32715ced8e03ab11791a80c92f8a  sonnet-5.48.0.tar.xz"
+sha512sums="ac0f5a0f729150d305410a4b91e3db7f1ede4148116821364611984eabfe4533fcd0a0ae4fd25f515a1b44b8983156224ef0da9fc4513be04b5b411a4dc62174  sonnet-5.50.0.tar.xz"
diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD
index 3edd667e9..aae2e4984 100644
--- a/user/spectacle/APKBUILD
+++ b/user/spectacle/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=spectacle
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Application for capturing desktop screenshots"
 url="https://www.kde.org/applications/graphics/spectacle/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c7ac9ec521162fc30a32e16597dd9309481bba1644e75df55e66fe385f27d320015f9ac0193ca333ec4dae201d634a8c99060d1145d28a7a0b5bc69f51e57e42  spectacle-18.04.3.tar.xz"
+sha512sums="659cf0f49793437903caea703ab54cc9f6077645dea7a6823830cf803d7fe35a5dfbc66265fecbeacaf1e4b80762b6e54b7f07a6f52a2a0fddfa88aa752d53c6  spectacle-18.08.1.tar.xz"
diff --git a/user/spice/APKBUILD b/user/spice/APKBUILD
index 2492cede3..4ca90937f 100644
--- a/user/spice/APKBUILD
+++ b/user/spice/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=spice
-pkgver=0.14.0
+pkgver=0.14.1
 pkgrel=0
 pkgdesc="Solution for seamless access to virtual machines"
 url="https://www.spice-space.org/"
@@ -12,7 +12,11 @@ makedepends="$depends_dev openssl-dev zlib-dev libjpeg-turbo-dev cyrus-sasl-dev
 	opus-dev lz4-dev gstreamer-dev gst-plugins-base-dev glib-dev orc-dev
 	python3 spice-protocol pixman-dev gstreamer-tools"
 subpackages="$pkgname-dev"
-source="https://www.spice-space.org/download/releases/spice-$pkgver.tar.bz2"
+source="https://www.spice-space.org/download/releases/spice-server/spice-$pkgver.tar.bz2"
+
+# secfixes:
+#   0.14.1-r0:
+#     - CVE-2018-10873
 
 build() {
 	cd "$builddir"
@@ -37,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f  spice-0.14.0.tar.bz2"
+sha512sums="2c0b4fbcb68c76bc0404a807f28c9645a30c6b88e81d2bc574d63b036778a299cebc0ae12aa72f2e1496f66cbf414325125948d440541a40e1b9e53b8956542d  spice-0.14.1.tar.bz2"
diff --git a/user/step/APKBUILD b/user/step/APKBUILD
index 7ad46b04b..4b7b0e5f8 100644
--- a/user/step/APKBUILD
+++ b/user/step/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=step
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Interactive physics simulation"
 url="https://www.kde.org/applications/education/step/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0634a5e00a8a5e631adbc1090fff41892c6846698706f685c3f4b06457b1ef991fce5539937b2eef039c8e8b13d4ddaf39a40806672d57c16f2c83a736838e79  step-18.04.3.tar.xz"
+sha512sums="7d35e51ccdb388fd56e3c03e2db7404146f0d8fe4294c8c6e21e376d5d09c36c79814a471164e606c664f47c42fa8bb08d4bb759be8a23d3298e976c2fa6c2ed  step-18.08.1.tar.xz"
diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD
index 08a7a9ad5..3c96bddb1 100644
--- a/user/syntax-highlighting/APKBUILD
+++ b/user/syntax-highlighting/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=syntax-highlighting
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="Framework for rendering programming code with formatting"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="79eaba8a3211d8eb12f6eabc07875cd88ec20486a892fdf8a9bbd5ee0b4d1e1c0ef1929ec9a48e1070ab5f33ac36d69757321f3012ebc14fa50543f2fce08f7e  syntax-highlighting-5.48.0.tar.xz"
+sha512sums="9f452946747a6f524b299547b608b0903ef359ea736182684f3ea2d7709659604bb4a9c8a474ab88123e9d066a35d81a6a67748e05e4bb9e66d20838113ff874  syntax-highlighting-5.50.0.tar.xz"
diff --git a/user/taglib/APKBUILD b/user/taglib/APKBUILD
index b8559a8f7..60586f78e 100644
--- a/user/taglib/APKBUILD
+++ b/user/taglib/APKBUILD
@@ -3,7 +3,7 @@ pkgname=taglib
 pkgver=1.11.1
 pkgrel=2
 pkgdesc="Library for manipulating audio file metadata"
-url="http://taglib.org/"
+url="https://taglib.org/"
 arch="all"
 options="!check"  # No test suite.
 license="LGPL-2.1-only AND MPL-1.1"
diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD
index da12e9f4b..2fa1e5e8d 100644
--- a/user/threadweaver/APKBUILD
+++ b/user/threadweaver/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=threadweaver
-pkgver=5.48.0
+pkgver=5.50.0
 pkgrel=0
 pkgdesc="High-level threading framework"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="76b042f6206c9b7035d188f5e67e9dd3ed3f46d85f2688e24e3da37dbf9afd725cd569228aeee71d5d30ad48199c683c2dff1c2bcbbd1505131385e9fc630d9b  threadweaver-5.48.0.tar.xz"
+sha512sums="a452aea4ca141c4964129412b42f8fe6457ca156edbd99770453564960714abeec395d78ab2686f01fa602822938fd50cb706920c25ec909d4446bfd14602175  threadweaver-5.50.0.tar.xz"
diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD
index 59cb19c17..9202bd063 100644
--- a/user/thunderbird/APKBUILD
+++ b/user/thunderbird/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=thunderbird
-pkgver=52.9.0
-pkgrel=1
+pkgver=52.9.1
+pkgrel=0
 pkgdesc="Email client from Mozilla"
 url="https://www.mozilla.org/thunderbird/"
 arch="all"
@@ -111,8 +111,8 @@ dev() {
 	mv "$pkgdir"/usr/share/idl "$subpkgdir"/usr/share
 }
 
-sha512sums="2142ba7cc04f48a9ffa17ad8f3a0d761f90416c9e6a7066be662a09b19846f13f0fb9669356ccbbf576744a83143cd659c28ce034679c4d6377004f428932dc1  thunderbird-52.9.0.source.tar.xz
-fa45db90165fd4eff9318de4c1f6af1d48f48ceb3506cad8ecbf4bed7a22241f930db2a4083444aeb0ebad127344a0f8fbe773f16b2ea5cddedca8937370176c  mozconfig
+sha512sums="0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23  thunderbird-52.9.1.source.tar.xz
+70fe8deb669eb0fb060f90f7af4ef98d6b6a80bde258a898397dd7e8c075b11ff3e418aa5eaf72262f40e561ea82da4b645cfc0b92d02af53f45536dc9963cbb  mozconfig
 9b11ba43f1f3fe9cda69b6b92e2073ea5165a47e30084537f396ceb8fb63573c4eb057251644837504aa4546183dc8f77fbb24f1450b6a15a1386f29180deefc  bad-google-code.patch
 2f52fcd7c42f8e12c955e05aa12449aa486c5347d2a7406ff0dada66f64079152b18c3f65c43410df372e871488f17889bc337ced37d0b76305afdbcb55cb580  fix-seccomp-bpf.patch
 475bdf81c41775634b131635197fa449b5068f2624a6b120d1878e2191a8e7badf01ac79a15ccf39242c64a29357f2ed7bae96352ceb70a234b17468a999e0c4  mach-linux-musl.patch
diff --git a/user/thunderbird/mozconfig b/user/thunderbird/mozconfig
index 623894870..a241960d5 100644
--- a/user/thunderbird/mozconfig
+++ b/user/thunderbird/mozconfig
@@ -20,7 +20,6 @@ ac_add_options --enable-pulseaudio
 ac_add_options --enable-startup-notification
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
 ac_add_options --with-system-icu
diff --git a/user/tint2/APKBUILD b/user/tint2/APKBUILD
new file mode 100644
index 000000000..b8ec7a53b
--- /dev/null
+++ b/user/tint2/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Mari Hahn <mari.hahn@wwu.de>
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=tint2
+pkgver=16.6
+pkgrel=0
+pkgdesc="Simple, unintrusive panel/taskbar"
+url="https://gitlab.com/o9000/tint2"
+arch="all"
+license="GPL-2.0-only AND GPL-2.0+ AND MIT AND Custom:zlib-optional-acknowledgement"
+options="!check"  # No test suite.
+depends=""
+makedepends="cmake imlib2-dev glib-dev pango-dev cairo-dev
+	libxcomposite-dev libxdamage-dev libxinerama-dev libxrandr-dev
+	gtk+2.0-dev librsvg-dev startup-notification-dev linux-headers"
+subpackages="$pkgname-doc $pkgname-lang"
+source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/o9000/$pkgname/repository/v$pkgver/archive.tar.bz2"
+
+prepare() {
+	mv "$srcdir/$pkgname-v$pkgver"-* "$builddir"
+	mkdir "$builddir"/build
+}
+
+build() {
+	cd "$builddir"/build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		..
+	make
+}
+
+package() {
+	cd "$builddir"/build
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="70ba1b338c19d2b61804b6cedda659f1dfe90cbeb2c02e2e37a8b35770f2ef826b373c050449bddc1995628e6b413ea18a0f939766c4f22b8147bf39af3e81cd  tint2-16.6.tar.bz2"
diff --git a/user/ttf-carlito/45-carlito.conf b/user/ttf-carlito/45-carlito.conf
new file mode 100644
index 000000000..dde534f5e
--- /dev/null
+++ b/user/ttf-carlito/45-carlito.conf
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+  <alias>
+    <family>Carlito</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/user/ttf-carlito/90-tt-carlito.conf b/user/ttf-carlito/90-tt-carlito.conf
new file mode 100644
index 000000000..87847acab
--- /dev/null
+++ b/user/ttf-carlito/90-tt-carlito.conf
@@ -0,0 +1,56 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Carlito</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Carlito</string>
+    </test>
+    <test name="weight" compare="less">
+      <const>medium</const>
+    </test>
+    <test name="pixelsize" compare="more">
+      <double>21.5</double>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>22.5</double>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+</fontconfig>
diff --git a/user/ttf-carlito/APKBUILD b/user/ttf-carlito/APKBUILD
new file mode 100644
index 000000000..f78242041
--- /dev/null
+++ b/user/ttf-carlito/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Max Rees <maxcrees@me.com>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=ttf-carlito
+pkgver=20130920
+pkgrel=0
+pkgdesc="Google's metric-compatible replacement for Microsoft Calibri"
+url="https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/master/media-fonts/crosextrafonts-carlito"
+arch="noarch"
+options="!check"  # You can't test fonts. -.-
+license="OFL-1.1 AND MIT"
+depends="fontconfig encodings mkfontdir mkfontscale"
+makedepends="font-util-dev"
+subpackages=""
+# added fontconfig configuration (MIT) from:
+# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
+source="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${pkgname#ttf-}-$pkgver.tar.gz
+	45-carlito.conf
+	90-tt-carlito.conf"
+builddir="$srcdir/crosextrafonts-${pkgname#ttf-}-$pkgver"
+
+package() {
+	mkdir -p "$pkgdir"/usr/share/fonts/$pkgname \
+		"$pkgdir"/etc/fonts/conf.avail \
+		"$pkgdir"/etc/fonts/conf.d
+
+	install -m644 "$builddir"/*.ttf "$pkgdir"/usr/share/fonts/$pkgname
+
+	cd "$pkgdir"/etc/fonts/conf.d
+	for j in "$srcdir"/*.conf; do
+		install -m644 "$j" "$pkgdir"/etc/fonts/conf.avail/
+		ln -sf /etc/fonts/conf.avail/${j##*/}
+	done
+}
+
+sha512sums="eb516060487d30353e06de711921c0d54c5844f2be69b1c1d37edac4b27303e9213a6bb306f309dc5827b2a6a2a37c9cb85b62368164eba6dd397dbaab3e3ba0  crosextrafonts-carlito-20130920.tar.gz
+1eb50a4f3bf1aa6c229059ef25a1344824ac3be179fa819f6613d1457758b4d79ae63e1872a4b54a32bc413d84f7a362c1f9fd9c8cd1265bfcf7abfc3f1b9c27  45-carlito.conf
+b859c5996a4942674979d4353e63ca59a383829e97713512a59910869841dbc923708880af74d9fdebb50ce482e21a2a8c8b1716973a676ee76f6248b3d1521d  90-tt-carlito.conf"
diff --git a/user/ttf-liberation/APKBUILD b/user/ttf-liberation/APKBUILD
index 02374ad24..7f0029af5 100644
--- a/user/ttf-liberation/APKBUILD
+++ b/user/ttf-liberation/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ttf-liberation
-pkgver=2.00.1
+pkgver=2.00.3
 # Note: 2.00.0 onward releases does not includes Liberation Sans Narrow font due to licensing problems.
 # we use narrowver to grab older release which does include narrow fonts
 _narrowver=1.07.4
@@ -14,7 +14,7 @@ depends="fontconfig"
 makedepends=""
 # added fontconfig configuration from:
 # https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
-source="https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-$pkgver.tar.gz
+source="https://github.com/liberationfonts/liberation-fonts/files/2012634/liberation-fonts-ttf-$pkgver.tar.gz
 	https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-$_narrowver.tar.gz
 	30-liberation-mono.conf
 	30-liberation-sans-narrow.conf
@@ -40,7 +40,7 @@ package() {
         done
 }
 
-sha512sums="52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739  liberation-fonts-ttf-2.00.1.tar.gz
+sha512sums="a83ab0c05bfa97ec30a946ff4b2d23dd1e29974999241b2a058f3c052879eb48e818e09a42a7fe27f04728fea56ddbbf67c60820b10e93e3b99f50892372565d  liberation-fonts-ttf-2.00.3.tar.gz
 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f  liberation-fonts-ttf-1.07.4.tar.gz
 585b74555132098d1d89b118b92fb843471ae2882622dec16178f8e7690fe6b5d8bf46e27e59fc3324aebfbd52a4b511d2ad77a8ddf8ef319cbe89b1a2dac91a  30-liberation-mono.conf
 cf017383d4390d52bef7c79abb2f48fc4440880ca03ee4dc11647ced524e45a944c4c3e3b318837bef9632b5aa1445e8f29e87f2ea195a8a47899cdeef67aae7  30-liberation-sans-narrow.conf
diff --git a/user/ucpp/APKBUILD b/user/ucpp/APKBUILD
new file mode 100644
index 000000000..60db06531
--- /dev/null
+++ b/user/ucpp/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=ucpp
+pkgver=1.3.2
+pkgrel=0
+pkgdesc="Embeddable, quick, light and C99 compliant C preprocessor"
+url="https://code.google.com/p/ucpp/"
+arch="all"
+options="!check"  # No test suite.
+license="BSD-3-Clause and Public-Domain"
+depends=""
+makedepends=""
+subpackages="$pkgname-doc"
+source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-$pkgver.tar.bz2"
+builddir="$srcdir/$pkgname"
+
+build() {
+	cd "$builddir"
+	make
+}
+
+package() {
+	cd "$builddir"
+	install -Dm755 ucpp "$pkgdir"/usr/bin/ucpp
+	gzip ucpp.1
+	install -Dm644 ucpp.1.gz "$pkgdir"/usr/share/man/man1/ucpp.1.gz
+}
+
+sha512sums="a8a22162c0e26bc8281928f921f4e531108ba02658fd9c7a1760ae2fe938c910215aa4db02e5c7f0c5ea1aa66d89157bc780f2f13c57fa603de6c2d0c48cfd32  ucpp-1.3.2.tar.bz2"
diff --git a/user/udisks2/APKBUILD b/user/udisks2/APKBUILD
index 7132606b3..8c5337b9c 100644
--- a/user/udisks2/APKBUILD
+++ b/user/udisks2/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=udisks2
-pkgver=2.7.7
-pkgrel=1
+pkgver=2.8.0
+pkgrel=0
 pkgdesc="A Disk Manager"
 url="https://www.freedesktop.org/wiki/Software/udisks"
 arch="all"
@@ -50,5 +50,5 @@ libs() {
 		"$subpkgdir"/usr/lib/
 }
 
-sha512sums="f679feb10a4a569445538a835fc573035639ace7821b4319d2ff5be801145d74966f3bbd8c90afbd4ab02bee552af23fa23db55a5d3e7699d41a15df3477008e  udisks-2.7.7.tar.bz2
+sha512sums="3814c4c02fbadc58d9e3a6615f015d385648211f12075ce46eb0016605f102fa0c8eeca152f2e03491522b484c43039901bf8f1be2f469ac35b1b6259e7e0ceb  udisks-2.8.0.tar.bz2
 269ba55cc755e2a484670258bc530790691b66c9fce9479a2a17d78cff5d52dd1be89290979efd44a0ba82be665f52a356a57f2cbb67951d91fe09d4e24c2a6a  O_CLOEXEC.patch"
diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD
index 3ba06d5e0..4207012ae 100644
--- a/user/umbrello/APKBUILD
+++ b/user/umbrello/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=umbrello
-pkgver=18.04.3
+pkgver=18.08.1
 pkgrel=0
 pkgdesc="Software modelling tool and code generator"
 url="https://umbrello.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fefecbdb4bc82e84f8174b45be63e195bd2fd769fd91acd6300e6eec8e4fe1c573c3043fb052682caa4772db0c3d73149d40b14cf181fe8c9889e652be03be41  umbrello-18.04.3.tar.xz"
+sha512sums="614ad45d95bc7f07eec668b5f2a54e6748be31b4bb0fe60fd86fe35df3df73a7ce6e12b867118674dd6961ed167249824344e2fb2155e8a58b1e07074dec8679  umbrello-18.08.1.tar.xz"
diff --git a/user/upower/APKBUILD b/user/upower/APKBUILD
index 84583b2f7..2458cd906 100644
--- a/user/upower/APKBUILD
+++ b/user/upower/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=upower
-pkgver=0.99.7
+pkgver=0.99.8
 pkgrel=0
 pkgdesc="Power Management Services"
 url="https://upower.freedesktop.org"
@@ -11,7 +11,7 @@ depends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+-dev
 	intltool libgudev-dev libusb-dev libxslt linux-headers polkit-dev"
-source="https://upower.freedesktop.org/releases/upower-$pkgver.tar.xz"
+source="https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/upower-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -22,7 +22,8 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--libexecdir=/usr/lib/upower \
-		--disable-static
+		--disable-static \
+		--with-udevrulesdir=/lib/udev/rules.d
 	make
 }
 
@@ -36,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4  upower-0.99.7.tar.xz"
+sha512sums="dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1  upower-0.99.8.tar.xz"
diff --git a/user/urw-base35-fonts/APKBUILD b/user/urw-base35-fonts/APKBUILD
new file mode 100644
index 000000000..40b0da945
--- /dev/null
+++ b/user/urw-base35-fonts/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Tambra Wilcox <Tambra@J30AD.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=urw-base35-fonts
+pkgver=20170801.1
+pkgrel=0
+pkgdesc="(URW)++ core font set"
+url="https://github.com/ArtifexSoftware/urw-base35-fonts"
+arch="noarch"
+options="!check"  # No tests provided.
+license="AGPL-3.0-only WITH font-exception"
+depends=""
+makedepends=""
+source="urw-base35-fonts-$pkgver.tar.gz::https://github.com/ArtifexSoftware/urw-base35-fonts/archive/$pkgver.tar.gz"
+
+package() {
+	local _fconf
+
+	mkdir -p "$pkgdir"/usr/share/fonts/ttf-urw-base35
+	cp -a "$builddir"/fonts/*.otf "$pkgdir"/usr/share/fonts/ttf-urw-base35/
+
+	mkdir -p "$pkgdir"/usr/share/fonts/urw-base35
+	cp -a "$builddir"/fonts/*.afm "$pkgdir"/usr/share/fonts/urw-base35/
+	cp -a "$builddir"/fonts/*.t1  "$pkgdir"/usr/share/fonts/urw-base35/
+
+	mkdir -p "$pkgdir"/etc/fonts/conf.d/
+	pushd "$builddir"/fontconfig
+	for _fconf in *.conf; do
+		install -m 644 "$_fconf" "$pkgdir"/etc/fonts/conf.d/61-${_fconf}.conf
+	done
+	popd
+}
+
+sha512sums="897fef5968d659ff49dc144f6c94513b32f8d9167c4fabcd7c3b13d2ce4c82d4182b25528291a36158d7a6e1cd864c67d22ce64a2c55dad4e984305f2fd65a91  urw-base35-fonts-20170801.1.tar.gz"
diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD
index c0e8cce47..dea31e948 100644
--- a/user/vlc/APKBUILD
+++ b/user/vlc/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=vlc
-pkgver=3.0.3
-pkgrel=3
+pkgver=3.0.4
+pkgrel=0
 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
 triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
 pkgusers="vlc"
@@ -64,7 +64,6 @@ source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz
 	disable-sub-autodetect-fuzzy-1-test.patch
 	endian-fix.patch
 	fix-testing.patch
-	fribidi-update.patch
 	lua.patch
 	omxil-rpi-codecs.patch
 	tar-compat.patch
@@ -294,12 +293,11 @@ plugins_video_filter()		{ _mv_plugins video_filter; }
 plugins_video_output()		{ _mv_plugins video_output; }
 plugins_visualization()		{ _mv_plugins visualization; }
 
-sha512sums="1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab  vlc-3.0.3.tar.xz
+sha512sums="55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271  vlc-3.0.4.tar.xz
 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa  check-headless.patch
 e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0  disable-sub-autodetect-fuzzy-1-test.patch
 e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012  endian-fix.patch
 63adb16b3a1927ee3de27ac339cbfbbaa346a69928c527f883259d1e03b5cb59f26a55feeda767837b448c455de584abcb53dc733b2845c0cc13621d72e7f6fd  fix-testing.patch
-3338531d385f76d9eedf10498d1b0b78565c531eedb3018d4500e377815f9ccbfcc16ec398cb8559bcc624f65b61d376125c4a5e6880cbad90ec9880dd4b9ce5  fribidi-update.patch
 35f83e38a6a0dd1e3c37e3dc6d63b1406d2f9454ed246854c1408d6f35ad74b743c5b0dbc19442bab65aad4268707ffa85bfda9e72b2d711c1d3412d955bf150  lua.patch
 e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89  omxil-rpi-codecs.patch
 a117ca4d7fd66a5f959fdeaddfdce2f8442fe9f2c13995bb7f4792a7745c00813813aa962f76e957e3b0735344a5dc000e0644ce09f23458802a2932231655c3  tar-compat.patch
diff --git a/user/vlc/fribidi-update.patch b/user/vlc/fribidi-update.patch
deleted file mode 100644
index fd293eea4..000000000
--- a/user/vlc/fribidi-update.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 26e2d3906658c30f2f88f4b1bc9630ec43bf5525 Mon Sep 17 00:00:00 2001
-From: Shaleen Jain <shaleen@jain.sh>
-Date: Sun, 25 Feb 2018 18:42:27 +0530
-Subject: [PATCH 1/1] fribidi: update for version 1.0
-
-Update functions deprecated in version 1.0 when building with release 1.0 and
-above.
-
-Signed-off-by: Thomas Guillem <thomas@gllm.fr>
----
- modules/text_renderer/freetype/text_layout.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c
-index 13efd567b4..1a28786d09 100644
---- a/modules/text_renderer/freetype/text_layout.c
-+++ b/modules/text_renderer/freetype/text_layout.c
-@@ -153,6 +153,9 @@ typedef struct paragraph_t
- 
- #ifdef HAVE_FRIBIDI
-     FriBidiCharType     *p_types;
-+#if FRIBIDI_MAJOR_VERSION >= 1
-+    FriBidiBracketType  *p_btypes;
-+#endif
-     FriBidiLevel        *p_levels;
-     FriBidiStrIndex     *pi_reordered_indices;
-     FriBidiParType       paragraph_type;
-@@ -361,6 +364,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter,
- #ifdef HAVE_FRIBIDI
-     p_paragraph->p_levels = vlc_alloc( i_size, sizeof( *p_paragraph->p_levels ) );
-     p_paragraph->p_types = vlc_alloc( i_size, sizeof( *p_paragraph->p_types ) );
-+#if FRIBIDI_MAJOR_VERSION >= 1
-+    p_paragraph->p_btypes = vlc_alloc( i_size, sizeof( *p_paragraph->p_btypes ) );
-+#endif
-     p_paragraph->pi_reordered_indices =
-             vlc_alloc( i_size, sizeof( *p_paragraph->pi_reordered_indices ) );
- 
-@@ -398,6 +404,9 @@ error:
- #ifdef HAVE_FRIBIDI
-     if( p_paragraph->p_levels ) free( p_paragraph->p_levels );
-     if( p_paragraph->p_types ) free( p_paragraph->p_types );
-+#if FRIBIDI_MAJOR_VERSION >= 1
-+    if( p_paragraph->p_btypes ) free( p_paragraph->p_btypes );
-+#endif
-     if( p_paragraph->pi_reordered_indices )
-         free( p_paragraph->pi_reordered_indices );
- #endif
-@@ -424,6 +433,9 @@ static void FreeParagraph( paragraph_t *p_paragraph )
- #ifdef HAVE_FRIBIDI
-     free( p_paragraph->pi_reordered_indices );
-     free( p_paragraph->p_types );
-+#if FRIBIDI_MAJOR_VERSION >= 1
-+    free( p_paragraph->p_btypes );
-+#endif
-     free( p_paragraph->p_levels );
- #endif
- 
-@@ -436,10 +448,22 @@ static int AnalyzeParagraph( paragraph_t *p_paragraph )
-     fribidi_get_bidi_types(  p_paragraph->p_code_points,
-                              p_paragraph->i_size,
-                              p_paragraph->p_types );
-+#if FRIBIDI_MAJOR_VERSION >= 1
-+    fribidi_get_bracket_types( p_paragraph->p_code_points,
-+                               p_paragraph->i_size,
-+                               p_paragraph->p_types,
-+                               p_paragraph->p_btypes );
-+    fribidi_get_par_embedding_levels_ex( p_paragraph->p_types,
-+                                      p_paragraph->p_btypes,
-+                                      p_paragraph->i_size,
-+                                      &p_paragraph->paragraph_type,
-+                                      p_paragraph->p_levels );
-+#else
-     fribidi_get_par_embedding_levels( p_paragraph->p_types,
-                                       p_paragraph->i_size,
-                                       &p_paragraph->paragraph_type,
-                                       p_paragraph->p_levels );
-+#endif
- 
- #ifdef HAVE_HARFBUZZ
-     hb_unicode_funcs_t *p_funcs = hb_unicode_funcs_get_default();
--- 
-2.11.0
-
diff --git a/user/volume_key/APKBUILD b/user/volume_key/APKBUILD
index 6b9a7c0c7..85ed4d482 100644
--- a/user/volume_key/APKBUILD
+++ b/user/volume_key/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=volume_key
-pkgver=0.3.10
+pkgver=0.3.11
 pkgrel=0
 pkgdesc="Storage volume encryption key management library"
 url="https://pagure.io/volume_key"
@@ -13,9 +13,7 @@ makedepends="cryptsetup-dev glib-dev gpgme-dev nss-dev python3-dev
 	util-linux-dev"
 checkdepends="nss-tools"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-$pkgname:py"
-source="https://releases.pagure.org/volume_key/volume_key-$pkgver.tar.xz
-	worst-python-hack-ever.patch
-	"
+source="https://releases.pagure.org/volume_key/volume_key-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -45,5 +43,4 @@ py() {
 	mv "$pkgdir"/usr/lib/python3.6 "$subpkgdir"/usr/lib/
 }
 
-sha512sums="b050d333e021bc3721f5e72c1d2498adea3265afe7f702e1b1e859546755745ac70dcffc194739a4833d4b0b77168506f7fe90fde382d8aab4df2af7b635932b  volume_key-0.3.10.tar.xz
-63f197e7d72e08110ad2fc13e2aa0cf50b5cbac91b10244778552adec8a2ee34255a795f90fbb50bb4ebb3404ce9bc5caf877c536f11396291ba6f71a0c07526  worst-python-hack-ever.patch"
+sha512sums="b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97  volume_key-0.3.11.tar.xz"
diff --git a/user/volume_key/worst-python-hack-ever.patch b/user/volume_key/worst-python-hack-ever.patch
deleted file mode 100644
index 1ecb334f4..000000000
--- a/user/volume_key/worst-python-hack-ever.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- volume_key-0.3.10/Makefile.in.old	2018-05-21 08:29:56.000000000 +0000
-+++ volume_key-0.3.10/Makefile.in	2018-07-14 09:27:05.430000000 +0000
-@@ -683,7 +683,7 @@
- 	$(libcryptsetup_CFLAGS) $(nss_CFLAGS)
- 
- LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"'
--PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION)
-+PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION)m
- SUBDIRS = po
- dist_man_MANS = doc/volume_key.8
- lib_LTLIBRARIES = lib/libvolume_key.la
-@@ -713,7 +713,7 @@
- python__volume_key_la_SOURCES = python/volume_key_wrap.c
- python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS)
- python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS)
--python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \
-+python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION)m \
- 	$(glib_LIBS) $(nss_LIBS)
- 
- src_volume_key_SOURCES = src/volume_key.c
diff --git a/user/wine/APKBUILD b/user/wine/APKBUILD
index 6341351d5..99cf1f2dd 100644
--- a/user/wine/APKBUILD
+++ b/user/wine/APKBUILD
@@ -83,9 +83,6 @@ package() {
 		*) _wine="wine";;
 	esac
 
-	paxmark -psmre "$pkgdir"/usr/bin/$_wine-preloader \
-		"$pkgdir"/usr/bin/$_wine
-
 	install -Dm755 tools/wineapploader \
 		"$pkgdir"/usr/bin/wineapploader
 
diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD
index 1454b1a31..e754a868e 100644
--- a/user/xdg-user-dirs/APKBUILD
+++ b/user/xdg-user-dirs/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xdg-user-dirs
-pkgver=0.16
-pkgrel=1
+pkgver=0.17
+pkgrel=0
 pkgdesc="Utilities for locale-aware management of user directories."
 url="https://www.freedesktop.org/wiki/Software/xdg-user-dirs/"
 arch="all"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae  xdg-user-dirs-0.16.tar.gz"
+sha512sums="a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f  xdg-user-dirs-0.17.tar.gz"
diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD
new file mode 100644
index 000000000..6c9f0d745
--- /dev/null
+++ b/user/xf86-video-intel/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=xf86-video-intel
+verbase=2.99.917
+pkgver=${verbase}_git20180803
+pkgrel=0
+pkgdesc="Legacy X.Org driver for Intel graphics cards"
+url="https://xorg.freedesktop.org"
+arch="x86 x86_64"
+options="!check"  # No test suite.
+license="MIT"
+subpackages="$pkgname-doc"
+depends="mesa-dri-intel"
+makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev
+	xcb-util-dev eudev-dev util-macros autoconf automake libtool xorgproto
+	"
+source="https://dev.sick.bike/$pkgname-$pkgver.tar.gz"
+giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git"
+reporev="3d395062ce73f85e8340218df01c2ebf4bc25023"
+
+prepare() {
+	cd "$builddir"
+	default_prepare
+	autoreconf -vif
+}
+
+build() {
+	cd "$builddir"
+	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-xvmc \
+		--disable-selective-werror \
+		--with-default-dri=3
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+	rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper
+}
+
+sha512sums="a96e627ed1b3fb6b66f02caaafb0f94967df9a2409158aacc9d8958538ef47bd84176ce71a4785f21944beb764450b1560c6dc59eef435f75959e27704be41f1  xf86-video-intel-2.99.917_git20180803.tar.gz"
diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD
index bcfc77eca..78a942af4 100644
--- a/user/xorg-server/APKBUILD
+++ b/user/xorg-server/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=xorg-server
-pkgver=1.20.0
+pkgver=1.20.1
 pkgrel=0
 pkgdesc="X.Org X11 server"
 url="https://www.X.Org/"
@@ -143,6 +143,6 @@ xwayland() {
 	mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
 }
 
-sha512sums="1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde  xorg-server-1.20.0.tar.bz2
+sha512sums="ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b  xorg-server-1.20.1.tar.bz2
 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200  autoconfig-sis.patch
 b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09  fix-musl-arm.patch"
diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD
index 9c2a3a434..57656637c 100644
--- a/user/xterm/APKBUILD
+++ b/user/xterm/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xterm
-pkgver=333
+pkgver=335
 pkgrel=0
 pkgdesc="An X-based terminal emulator"
 url="https://invisible-island.net/xterm/"
@@ -12,8 +12,6 @@ makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev
 	libxext-dev freetype-dev ncurses-dev pcre-dev"
 subpackages="$pkgname-doc"
 source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz"
-sha512sums="90c5d8d3d039417915d40d22fcc6244d1c86e8bcc39d865ba6cb67fc9d1ff6e0f3ee79da06a094d23f6801195f0baa26564a553d04c974d62a331016118215a0  xterm-333.tgz"
-builddir="$srcdir/xterm-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -33,3 +31,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
+sha512sums="386c3f4c9b3ee7750c4f03316fc94dfc6601d82b0fbac5714031e9e3c6f1acf5c949689fcc58deb8569516977eb88173356d3c890a263b7a1d0f383190a43362  xterm-335.tgz"
diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD
index b18b2b888..91dd88bf9 100644
--- a/user/yakuake/APKBUILD
+++ b/user/yakuake/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=yakuake
-pkgver=3.0.4
+pkgver=3.0.5
 pkgrel=0
 pkgdesc="Drop-down KDE terminal emulator"
 url="https://www.kde.org/applications/system/yakuake/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e50fe742349e02116bb9d7edd61178fcbc215ace39d50b48fb8ec3095c948a7ff91add7be5d8778c817f9d5b4663d4cefe3e0ef197c7ec6e0b88b3158ff39659  yakuake-3.0.4.tar.xz"
+sha512sums="17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22  yakuake-3.0.5.tar.xz"