530 files changed, 984 insertions, 1561 deletions

diff --git a/README.rst b/README.rst
index 836e1ca05..43b4622f7 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,10 @@
  README for Adélie Linux Package Set
 =====================================
 :Authors:
-  * **A. Wilcox**, primary maintainer
+  * **A. Wilcox**, Distro Lead
+  * **Elizabeth Myers**, Platform Group
+  * **Horst Burkhardt**, Platform Group
+  * **William Pitcock**, Platform Group
   * **Adélie Linux Developers and Users**, contributions
 :Status:
   Production
@@ -24,8 +27,7 @@ Licenses
 `````````
 As the Adélie Linux project is an open-source Linux distribution, packages
 contained in this repository must also be provided under a license recognised
-by the OSI_.  A separate repository may be provided in the future for certain
-non-free components, such as device driver firmware.
+by the OSI_.  No exceptions will be made.
 
 .. _OSI: http://opensource.org/licenses/category
 
@@ -50,9 +52,8 @@ find what you need.
 
 ``system``: System-level packages
 `````````````````````````````````
-The ``system`` directory contains special packages used by Adélie for core
-system functionality.  This directory is kept separate from ``user`` to
-facilitate sharing of user packages with other APK-based distributions.
+The ``system`` directory contains packages used by Adélie for core system
+functionality.  Special care should be taken before bumping these packages.
 
 
 ``user``: User packages
@@ -62,12 +63,15 @@ interested in installing.  Desktop applications, server software (also known as
 *daemons*), and other useful packages can be found here.
 
 
-``harmony``: Packages affected by Project Harmony
-`````````````````````````````````````````````````
-The ``harmony`` directory contains packages that are being discussed with
-Alpine Linux for later merging.  These packages may either end up in ``system``
-or Alpine's ``main`` depending on the outcome of discussions.  (These packages
-are always available in the ``system`` repo when built by Adélie.)
+``legacy``: Orphaned, unmaintained, or deprecated packages
+``````````````````````````````````````````````````````````
+The ``legacy`` directory contains packages that were at one time supported by
+Adélie, but are no longer.  This could be because upstream no longer maintains
+the software, its Adélie maintainer has dropped it and nobody has taken it, or
+it has been deprecated or replaced with something else.
+
+Use of packages in ``legacy`` are highly discouraged, and packages may be
+removed at any time.
 
 
 
@@ -83,12 +87,10 @@ As an overlay
 
 The ``user`` repository can be added as an overlay to any system running APK,
 which at the time of this writing includes Alpine Linux, postmarketOS, and a
-few others.  However, please do not add ``system`` to a computer running a
-different distribution unless you are fully aware of the concerns surrounding
-mixing packages in such a manner.  None of the packages in the ``system``
-repository are useful for an Alpine computer, and some packages (such as
-``baselayout`` or ``adelie-base``) may in fact damage your Alpine installation
-if installed.  Please be careful.
+few others.  However, please ensure you are fully aware of the concerns
+surrounding mixing packages in such a manner.  There may be different ABIs or
+library versions between each distribution, and packages may crash, experience
+instability, or fail to launch at all.  Please be careful.
 
 The domain ``distfiles.adelielinux.org`` is a round-robin for all available
 Adélie mirrors.  You may add a repository named above to
@@ -99,7 +101,7 @@ Adélie mirrors.  You may add a repository named above to
   https://distfiles.adelielinux.org/adelie/$version/$repo
 
 Where ``$version`` is the version of Adélie Linux you are running, or
-``current`` for automatic upgrades, or ``dev`` for a rolling-release
+``current`` for automatic stable upgrades, or ``dev`` for a rolling-release
 style distribution (which may be unstable - you have been warned!).
 
 ``$repo`` should be replaced with the name of the repository you are wanting
@@ -108,10 +110,14 @@ to use, such as ``user``.
 Run ``apk update`` to update the package index on your local system.  The
 packages will then be available to you.
 
+If you are using the repository on a non-Adélie system, you should use
+repository pinning for the Adélie repositories you add.  Please consult the
+APK manual for more information about repository pinning.
+
 
 As a repository
 ```````````````
 
 The Adélie Linux system is preconfigured to use packages in ``system`` and
-``user`` for APK.  No further configuration is required.
+``user`` for APK.  No further configuration should be required.
 
diff --git a/system/syslinux/APKBUILD b/legacy/syslinux/APKBUILD
index 43ac057b1..43ac057b1 100644
--- a/system/syslinux/APKBUILD
+++ b/legacy/syslinux/APKBUILD
diff --git a/system/syslinux/syslinux.post-upgrade b/legacy/syslinux/syslinux.post-upgrade
index 90388668d..90388668d 100644
--- a/system/syslinux/syslinux.post-upgrade
+++ b/legacy/syslinux/syslinux.post-upgrade
diff --git a/system/syslinux/syslinux.trigger b/legacy/syslinux/syslinux.trigger
index fe91f4379..fe91f4379 100644
--- a/system/syslinux/syslinux.trigger
+++ b/legacy/syslinux/syslinux.trigger
diff --git a/system/syslinux/update-extlinux b/legacy/syslinux/update-extlinux
index 5e1183ba9..5e1183ba9 100755
--- a/system/syslinux/update-extlinux
+++ b/legacy/syslinux/update-extlinux
diff --git a/system/syslinux/update-extlinux.conf b/legacy/syslinux/update-extlinux.conf
index 39598cb99..39598cb99 100644
--- a/system/syslinux/update-extlinux.conf
+++ b/legacy/syslinux/update-extlinux.conf
diff --git a/profiles/adelie/1.0/alpha/parent b/profiles/adelie/1.0/alpha/parent
deleted file mode 100644
index 6daae139e..000000000
--- a/profiles/adelie/1.0/alpha/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/alpha
-..
diff --git a/profiles/adelie/1.0/alpha/s6/parent b/profiles/adelie/1.0/alpha/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/alpha/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/alpha/systemd/parent b/profiles/adelie/1.0/alpha/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/alpha/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/arm/parent b/profiles/adelie/1.0/arm/parent
deleted file mode 100644
index 4e4b3f92c..000000000
--- a/profiles/adelie/1.0/arm/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/arm
-..
diff --git a/profiles/adelie/1.0/arm/s6/parent b/profiles/adelie/1.0/arm/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/arm/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/arm/systemd/parent b/profiles/adelie/1.0/arm/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/arm/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/arm/v7a/make.defaults b/profiles/adelie/1.0/arm/v7a/make.defaults
deleted file mode 100644
index acc01de5e..000000000
--- a/profiles/adelie/1.0/arm/v7a/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CHOST="armv7a-foxkit-linux-musleabihf"
diff --git a/profiles/adelie/1.0/arm/v7a/parent b/profiles/adelie/1.0/arm/v7a/parent
deleted file mode 100644
index f3229c5b9..000000000
--- a/profiles/adelie/1.0/arm/v7a/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/adelie/1.0/arm64/parent b/profiles/adelie/1.0/arm64/parent
deleted file mode 100644
index c416a90f0..000000000
--- a/profiles/adelie/1.0/arm64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/arm64
-..
diff --git a/profiles/adelie/1.0/arm64/s6/parent b/profiles/adelie/1.0/arm64/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/arm64/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/arm64/systemd/parent b/profiles/adelie/1.0/arm64/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/arm64/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/hppa/parent b/profiles/adelie/1.0/hppa/parent
deleted file mode 100644
index 93f0c7c3e..000000000
--- a/profiles/adelie/1.0/hppa/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/hppa
-..
diff --git a/profiles/adelie/1.0/hppa/s6/parent b/profiles/adelie/1.0/hppa/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/hppa/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/hppa/systemd/parent b/profiles/adelie/1.0/hppa/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/hppa/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/mips/parent b/profiles/adelie/1.0/mips/parent
deleted file mode 100644
index d7f50319a..000000000
--- a/profiles/adelie/1.0/mips/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/mips
-..
diff --git a/profiles/adelie/1.0/mips/s6/parent b/profiles/adelie/1.0/mips/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/mips/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/mips/systemd/parent b/profiles/adelie/1.0/mips/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/mips/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/ppc/cell/parent b/profiles/adelie/1.0/ppc/cell/parent
deleted file mode 100644
index f3229c5b9..000000000
--- a/profiles/adelie/1.0/ppc/cell/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/adelie/1.0/ppc/parent b/profiles/adelie/1.0/ppc/parent
deleted file mode 100644
index 15dfb07d8..000000000
--- a/profiles/adelie/1.0/ppc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/ppc
-..
diff --git a/profiles/adelie/1.0/ppc/s6/parent b/profiles/adelie/1.0/ppc/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/ppc/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/ppc/systemd/parent b/profiles/adelie/1.0/ppc/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/ppc/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/ppc64/parent b/profiles/adelie/1.0/ppc64/parent
deleted file mode 100644
index d2779419d..000000000
--- a/profiles/adelie/1.0/ppc64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/ppc64
-..
diff --git a/profiles/adelie/1.0/ppc64/s6/parent b/profiles/adelie/1.0/ppc64/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/ppc64/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/ppc64/systemd/parent b/profiles/adelie/1.0/ppc64/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/ppc64/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/sparc64/parent b/profiles/adelie/1.0/sparc64/parent
deleted file mode 100644
index 55950ad9e..000000000
--- a/profiles/adelie/1.0/sparc64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/sparc64
-..
diff --git a/profiles/adelie/1.0/sparc64/s6/parent b/profiles/adelie/1.0/sparc64/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/sparc64/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/sparc64/systemd/parent b/profiles/adelie/1.0/sparc64/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/sparc64/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/x86/i486/parent b/profiles/adelie/1.0/x86/i486/parent
deleted file mode 100644
index 9c6b28865..000000000
--- a/profiles/adelie/1.0/x86/i486/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../arch/x86/i486
-..
diff --git a/profiles/adelie/1.0/x86/i525/parent b/profiles/adelie/1.0/x86/i525/parent
deleted file mode 100644
index 71235bc8c..000000000
--- a/profiles/adelie/1.0/x86/i525/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../arch/x86/i525
-..
diff --git a/profiles/adelie/1.0/x86/parent b/profiles/adelie/1.0/x86/parent
deleted file mode 100644
index 06f9e8221..000000000
--- a/profiles/adelie/1.0/x86/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/x86
-..
diff --git a/profiles/adelie/1.0/x86/s6/parent b/profiles/adelie/1.0/x86/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/x86/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/x86/systemd/parent b/profiles/adelie/1.0/x86/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/x86/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/adelie/1.0/x86_64/parent b/profiles/adelie/1.0/x86_64/parent
deleted file mode 100644
index dee1098c8..000000000
--- a/profiles/adelie/1.0/x86_64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-../../../arch/x86_64
-..
diff --git a/profiles/adelie/1.0/x86_64/s6/parent b/profiles/adelie/1.0/x86_64/s6/parent
deleted file mode 100644
index 320ce53c3..000000000
--- a/profiles/adelie/1.0/x86_64/s6/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/s6
diff --git a/profiles/adelie/1.0/x86_64/systemd/parent b/profiles/adelie/1.0/x86_64/systemd/parent
deleted file mode 100644
index 115c740d2..000000000
--- a/profiles/adelie/1.0/x86_64/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../inits/systemd
diff --git a/profiles/arch.list b/profiles/arch.list
deleted file mode 100644
index 45e629cbf..000000000
--- a/profiles/arch.list
+++ /dev/null
@@ -1,13 +0,0 @@
-# Tier 1 architectures
-arm
-ppc
-ppc64
-x86
-x86_64
-
-# Tier 2 architectures
-alpha
-arm64
-hppa
-mips
-sparc64
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
deleted file mode 100644
index 4ea41dbc6..000000000
--- a/profiles/arch/alpha/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-ARCH=alpha
diff --git a/profiles/arch/alpha/parent b/profiles/arch/alpha/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/alpha/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
deleted file mode 100644
index c2bd556d3..000000000
--- a/profiles/arch/arm/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-ARCH=arm
diff --git a/profiles/arch/arm/parent b/profiles/arch/arm/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
deleted file mode 100644
index a22b214ef..000000000
--- a/profiles/arch/arm64/make.defaults
+++ /dev/null
@@ -1,2 +0,0 @@
-ARCH=arm64
-ACCEPT_KEYWORDS="arm64"
diff --git a/profiles/arch/arm64/package.accept_keywords b/profiles/arch/arm64/package.accept_keywords
deleted file mode 100644
index 6ae6e7b1a..000000000
--- a/profiles/arch/arm64/package.accept_keywords
+++ /dev/null
@@ -1,32 +0,0 @@
-=app-arch/libarchive-3.2.2-r1 ~arm64
-=app-editors/vim-8.0.0106 ~arm64
-=app-editors/vim-core-8.0.0106 ~arm64
-=app-misc/ca-certificates-20161130.3.29 ~arm64
-=dev-lang/perl-5.24.1 ~arm64
-=dev-libs/icu-58.1-r1 **
-=dev-libs/libbsd-0.8.3 ~arm64
-=dev-libs/libfetch-2.33-r1 ~arm64
-=gnome-base/dconf-0.26.0-r1 ~arm64
-=sys-apps/apk-tools-2.6.6-r2 ~arm64
-=sys-apps/dbus-1.10.16 ~arm64
-=sys-apps/ed-1.14.1a ~arm64
-=virtual/logger-0 ~arm64
-=virtual/perl-Test-Harness-3.360.100_rc ~arm64
-=x11-libs/xtrans-1.3.5 ~arm64
-
-# APK Kit dependencies
-=dev-db/sqlite-3.16.2 ~arm64
-=dev-python/apkkit-0.5.1 **
-=dev-python/cryptography-1.7.2 ~arm64
-=dev-python/idna-2.2 ~arm64
-=dev-python/jinja-2.9.5 ~arm64
-=dev-python/six-1.10.0 ~arm64
-=virtual/python-ipaddress-1.0-r1 ~arm64
-
-# TODO: Poke upstream about adding arm64 keywords to these.
-=mail-client/nail-12.4-r3 **
-=mail-mta/postfix-3.1.4-r1 **
-=sys-libs/musl-1.1.15-r5 **
-=sys-process/at-3.1.20 **
-=sys-process/fcron-3.2.1-r1 **
-=sys-libs/fts-standalone-1.2.7 **
diff --git a/profiles/arch/arm64/package.mask b/profiles/arch/arm64/package.mask
deleted file mode 100644
index 5d9a86c38..000000000
--- a/profiles/arch/arm64/package.mask
+++ /dev/null
@@ -1 +0,0 @@
-=sys-libs/ncurses-5.9-r101
diff --git a/profiles/arch/arm64/parent b/profiles/arch/arm64/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/arm64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
deleted file mode 100644
index c2b2c7e9f..000000000
--- a/profiles/arch/hppa/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-ARCH=hppa
diff --git a/profiles/arch/hppa/parent b/profiles/arch/hppa/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/hppa/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/mips/make.defaults b/profiles/arch/mips/make.defaults
deleted file mode 100644
index 1e6651339..000000000
--- a/profiles/arch/mips/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-# MIPS is an unstable arch, so we accept ~mips
-ACCEPT_KEYWORDS="mips ~mips"
-ARCH=mips
diff --git a/profiles/arch/mips/parent b/profiles/arch/mips/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/ppc/make.defaults b/profiles/arch/ppc/make.defaults
deleted file mode 100644
index 8964d8318..000000000
--- a/profiles/arch/ppc/make.defaults
+++ /dev/null
@@ -1,27 +0,0 @@
-CHOST="powerpc-foxkit-linux-musl"
-
-# We definitely use 32-bit ABI.
-ABI_PPC="32"
-IUSE_IMPLICIT="abi_ppc_32"
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="${ARCH}"
-
-# -O2           -> Perform second-level optimisations.
-#                  Not -Os because most/all PPC aren't starved for space.
-# -ggdb         -> Generate GDB debugging information.
-#                  This is used with splitdebug to make -dbg split packages.
-# -mcpu=7450    -> Require a 7450 or higher, or "G4".
-#                  700/G3 uses the g3 profile, overriding this.
-#                  600 series is not supported by Adélie.
-# -maltivec.     -> Use AltiVec floating point extensions.
-#.                  These are always available on 7450+.
-# -fno-omit-... -> Never omit the frame pointer.
-#                  This is crucial for proper debugging.
-# -mfpu=dp_full -> Use hardware for floating point math.
-CFLAGS="-O2 -mlong-double-64 -ggdb -mcpu=G3 -fno-omit-frame-pointer"
-CXXFLAGS="${CFLAGS}"
-
-ELIBC="musl"
-
-USE="altivec pam threads"
diff --git a/profiles/arch/ppc/package.accept_keywords b/profiles/arch/ppc/package.accept_keywords
deleted file mode 100644
index a305a6726..000000000
--- a/profiles/arch/ppc/package.accept_keywords
+++ /dev/null
@@ -1,164 +0,0 @@
-# the goal is for all of these to be upstreamed to glpgs/gentoo
-# if a binary distro with support guarantees can keyword it, you can too! <3
-=app-crypt/gnupg-2.1.15 ~ppc
-=app-misc/fdupes-1.6.1 ~ppc
-=app-laptop/radeontool-1.6.3 ~ppc
-=dev-cpp/muParser-2.2.5 ~ppc
-=dev-libs/libassuan-2.4.3 ~ppc
-=dev-libs/libgpg-error-1.25 ~ppc
-=dev-libs/npth-1.3 ~ppc
-=sys-boot/grub-2.02_beta3-r1 **
-=x11-misc/lightdm-1.18.3 ~ppc
-=x11-misc/lightdm-gtk-greeter-2.0.1-r1 ~ppc
-=x11-misc/sddm-0.14.0-r2 **
-=x11-misc/xdg-utils-1.1.1-r1 ~ppc
-
-# KDE Frameworks 5.29
-=kde-frameworks/extra-cmake-modules-5.29.0 **
-=kde-frameworks/kf-env-4 **
-=kde-frameworks/kguiaddons-5.29.0 **
-=kde-frameworks/kidletime-5.29.0 **
-=kde-frameworks/kwayland-5.29.0 **
-=kde-frameworks/kwindowsystem-5.29.0 **
-=kde-frameworks/solid-5.29.0 **
-=kde-plasma/libkscreen-5.8.5 **
-
-# Qt 5.7.1
-=dev-qt/linguist-tools-5.7.1 ~ppc
-=dev-qt/qtconcurrent-5.7.1 ~ppc
-=dev-qt/qtcore-5.7.1 ~ppc
-=dev-qt/qtdbus-5.7.1 ~ppc
-=dev-qt/qtdeclarative-5.7.1 ~ppc
-=dev-qt/qtgui-5.7.1 ~ppc
-=dev-qt/qtnetwork-5.7.1 ~ppc
-=dev-qt/qtsvg-5.7.1 ~ppc
-=dev-qt/qttest-5.7.1 ~ppc
-=dev-qt/qtwayland-5.7.1 ~ppc
-=dev-qt/qtwidgets-5.7.1 ~ppc
-=dev-qt/qtx11extras-5.7.1 ~ppc
-=dev-qt/qtxml-5.7.1 ~ppc
-
-
-# KDE Plasma 5.8.5 and dependencies
-=dev-qt/designer-5.7.1 ~ppc
-=dev-qt/qdbus-5.7.1 ~ppc
-=dev-qt/qtgraphicaleffects-5.7.1 ~ppc
-=dev-qt/qtpaths-5.7.1 ~ppc
-=dev-qt/qtprintsupport-5.7.1 ~ppc
-=dev-qt/qtquickcontrols-5.7.1 ~ppc
-=dev-qt/qtscript-5.7.1 ~ppc
-=dev-qt/qtsql-5.7.1 ~ppc
-=dev-qt/qtxmlpatterns-5.7.1 ~ppc
-
-=kde-apps/kholidays-16.12.0 **
-=kde-apps/kio-extras-16.12.0 **
-
-=kde-frameworks/attica-5.29.0 **
-=kde-frameworks/baloo-5.29.0 **
-=kde-frameworks/breeze-icons-5.29.0 **
-=kde-frameworks/frameworkintegration-5.29.0 **
-=kde-frameworks/kactivities-5.29.0 **
-=kde-frameworks/kactivities-stats-5.29.0 **
-=kde-frameworks/karchive-5.29.0 **
-=kde-frameworks/kauth-5.29.0 **
-=kde-frameworks/kbookmarks-5.29.0 **
-=kde-frameworks/kcmutils-5.29.0 **
-=kde-frameworks/kcompletion-5.29.0 **
-=kde-frameworks/kcodecs-5.29.0 **
-=kde-frameworks/kconfig-5.29.0 **
-=kde-frameworks/kconfigwidgets-5.29.0 **
-=kde-frameworks/kcoreaddons-5.29.0 **
-=kde-frameworks/kcrash-5.29.0 **
-=kde-frameworks/kdbusaddons-5.29.0 **
-=kde-frameworks/kdeclarative-5.29.0 **
-=kde-frameworks/kded-5.29.0 **
-=kde-frameworks/kdelibs4support-5.29.0 **
-=kde-frameworks/kdesignerplugin-5.29.0 **
-=kde-frameworks/kdesu-5.29.0 **
-=kde-frameworks/kdnssd-5.29.0 **
-=kde-frameworks/kdoctools-5.29.0 **
-=kde-frameworks/kemoticons-5.29.0 **
-=kde-frameworks/kfilemetadata-5.29.0 **
-=kde-frameworks/kglobalaccel-5.29.0 **
-=kde-frameworks/khtml-5.29.0 **
-=kde-frameworks/ki18n-5.29.0 **
-=kde-frameworks/kiconthemes-5.29.0 **
-=kde-frameworks/kinit-5.29.0 **
-=kde-frameworks/kio-5.29.0 **
-=kde-frameworks/kitemmodels-5.29.0 **
-=kde-frameworks/kitemviews-5.29.0 **
-=kde-frameworks/kjobwidgets-5.29.0 **
-=kde-frameworks/kjs-5.29.0 **
-=kde-frameworks/kjsembed-5.29.0 **
-=kde-frameworks/knewstuff-5.29.0 **
-=kde-frameworks/knotifications-5.29.0 **
-=kde-frameworks/knotifyconfig-5.29.0 **
-=kde-frameworks/kpackage-5.29.1 **
-=kde-frameworks/kparts-5.29.0 **
-=kde-frameworks/kpeople-5.29.0 **
-=kde-frameworks/kpty-5.29.0 **
-=kde-frameworks/krunner-5.29.0 **
-=kde-frameworks/kservice-5.29.0 **
-=kde-frameworks/ktexteditor-5.29.0 **
-=kde-frameworks/ktextwidgets-5.29.0 **
-=kde-frameworks/kunitconversion-5.29.0 **
-=kde-frameworks/kwallet-5.29.0-r1 **
-=kde-frameworks/kwidgetsaddons-5.29.0 **
-=kde-frameworks/kxmlgui-5.29.0 **
-=kde-frameworks/kxmlrpcclient-5.29.0 **
-=kde-frameworks/plasma-5.29.0 **
-=kde-frameworks/sonnet-5.29.0 **
-=kde-frameworks/syntax-highlighting-5.29.0 **
-=kde-frameworks/threadweaver-5.29.0 **
-
-=kde-plasma/breeze-5.8.5 **
-=kde-plasma/kactivitymanagerd-5.8.5 **
-=kde-plasma/kdecoration-5.8.5 **
-=kde-plasma/kde-cli-tools-5.8.5 **
-=kde-plasma/kscreenlocker-5.8.5 **
-=kde-plasma/ksysguard-5.8.5 **
-=kde-plasma/kwin-5.8.5 **
-=kde-plasma/libksysguard-5.8.5 **
-=kde-plasma/milou-5.8.5 **
-=kde-plasma/oxygen-5.8.5 **
-=kde-plasma/plasma-integration-5.8.5-r1 **
-=kde-plasma/plasma-desktop-5.8.5-r1 **
-=kde-plasma/plasma-workspace-5.8.5 **
-=kde-plasma/polkit-kde-agent-5.8.5 **
-
-=media-fonts/hack-2.020 **
-
-=x11-libs/libva-1.7.3 **
-
-
-# Further plasma-meta deps
-=dev-libs/grantlee-5.1.0 ~ppc
-
-=kde-apps/khelpcenter-16.12.0 **
-
-=kde-frameworks/kross-5.29.0 **
-
-=kde-plasma/kde-gtk-config-5.8.5 **
-=kde-plasma/kdeplasma-addons-5.8.5 **
-=kde-plasma/kgamma-5.8.5 **
-=kde-plasma/khotkeys-5.8.5 **
-=kde-plasma/kinfocenter-5.8.5 **
-=kde-plasma/kmenuedit-5.8.5 **
-=kde-plasma/kscreen-5.8.5 **
-=kde-plasma/ksshaskpass-5.8.5 **
-=kde-plasma/kwallet-pam-5.8.5 **
-=kde-plasma/kwayland-integration-5.8.5 **
-=kde-plasma/kwrited-5.8.5 **
-=kde-plasma/plasma-meta-5.8.5 **
-=kde-plasma/plasma-workspace-wallpapers-5.8.5 **
-=kde-plasma/powerdevil-5.8.5 **
-=kde-plasma/sddm-kcm-5.8.5 **
-=kde-plasma/systemsettings-5.8.5 **
-=kde-plasma/user-manager-5.8.5 **
-
-=sys-auth/polkit-pkla-compat-0.1 ~ppc
-=x11-libs/libvdpau-1.1.1 **
-
-
-=kde-apps/konsole-16.12.0 **
-=kde-apps/spectacle-16.12.0 **
diff --git a/profiles/arch/ppc/package.mask b/profiles/arch/ppc/package.mask
deleted file mode 100644
index 96a730359..000000000
--- a/profiles/arch/ppc/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# A. Wilcox <awilfox@adelielinux.org> (20 Jan 2017)
-# Broken on PowerPC.  Fails test suite with segmentation fault.
-media-libs/libvpx
-
-# A. Wilcox <awilfox@adelielinux.org> (20 Jan 2017)
-# Broken on big endian.  Fails 52 tests.
-media-libs/openjpeg
diff --git a/profiles/arch/ppc/package.use b/profiles/arch/ppc/package.use
deleted file mode 100644
index 7e9f139d5..000000000
--- a/profiles/arch/ppc/package.use
+++ /dev/null
@@ -1,2 +0,0 @@
-dev-vcs/git -blksha1 ppcsha1
-sys-boot/grub device-mapper fonts sdl themes truetype grub_platforms_ieee1275
diff --git a/profiles/arch/ppc/package.use.mask b/profiles/arch/ppc/package.use.mask
deleted file mode 100644
index 78b3f8fc8..000000000
--- a/profiles/arch/ppc/package.use.mask
+++ /dev/null
@@ -1,12 +0,0 @@
-# A. Wilcox <awilfox@adelielinux.org> (15 Jan 2017)
-# Does not work on PowerPC (unsupported arch)
-media-sound/pulseaudio webrtc-aec
-
-# A. Wilcox <awilfox@adelielinux.org> (20 Jan 2017)
-# media-libs/libvpx is masked for non-functional PowerPC code.
-media-video/ffmpeg vpx
-media-video/vlc vpx
-
-# A. Wilcox <awilfox@adelielinux.org> (20 Jan 2017)
-# media-libs/openjpeg is masked for endian brokenness.
-app-text/poppler jpeg2k
diff --git a/profiles/arch/ppc/parent b/profiles/arch/ppc/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/ppc64/make.defaults b/profiles/arch/ppc64/make.defaults
deleted file mode 100644
index 00d069092..000000000
--- a/profiles/arch/ppc64/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-ARCH=ppc64
diff --git a/profiles/arch/ppc64/parent b/profiles/arch/ppc64/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/ppc64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/sparc64/make.defaults b/profiles/arch/sparc64/make.defaults
deleted file mode 100644
index 06b2dc819..000000000
--- a/profiles/arch/sparc64/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-ARCH=sparc64
diff --git a/profiles/arch/sparc64/parent b/profiles/arch/sparc64/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/sparc64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/x86/i486/make.defaults b/profiles/arch/x86/i486/make.defaults
deleted file mode 100644
index 5b52853dd..000000000
--- a/profiles/arch/x86/i486/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-CHOST="i486-foxkit-linux-musl"
-
-# -O2           -> Perform second-level optimisations.
-#                  Not -Os because most/all x86 aren't starved for space.
-# -ggdb         -> Generate GDB debugging information.
-#                  This is used with splitdebug to make -dbg split packages.
-# -march=i486   -> Require an i486 or newer.
-# -mtune=pen... -> Tune for Pentium processors.
-CFLAGS="-O2 -ggdb -march=i486 -mtune=pentium"
diff --git a/profiles/arch/x86/i486/parent b/profiles/arch/x86/i486/parent
deleted file mode 100644
index f3229c5b9..000000000
--- a/profiles/arch/x86/i486/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/x86/i525/make.defaults b/profiles/arch/x86/i525/make.defaults
deleted file mode 100644
index a0b5e2df7..000000000
--- a/profiles/arch/x86/i525/make.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-CHOST="pentium3-foxkit-linux-musl"
-
-# -O2           -> Perform second-level optimisations.
-#                  Not -Os because most/all x86 aren't starved for space.
-# -ggdb         -> Generate GDB debugging information.
-#                  This is used with splitdebug to make -dbg split packages.
-# -march=pen... -> Require a Pentium III or newer.
-# -mtune=pen... -> Tune for Pentium M processors.
-#                  More Pentium M netbooks exist than many realise, and they
-#                  are more likely users of Adélie than Pentium III.  This
-#                  makes code more performant on the larger base of machines.
-# -mfpmath=sse  -> Use SSE for all floating point math.
-#                  Since SSE is always available, this knob ensures that GCC
-#                  will take advantage of it over preferring 387 math.
-CFLAGS="-O2 -ggdb -march=pentium3 -mtune=pentium-m -mfpmath=sse"
diff --git a/profiles/arch/x86/i525/parent b/profiles/arch/x86/i525/parent
deleted file mode 100644
index f3229c5b9..000000000
--- a/profiles/arch/x86/i525/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
deleted file mode 100644
index 0694bbcda..000000000
--- a/profiles/arch/x86/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# CHOST is defined in each subarch.
-
-# We definitely use 32-bit ABI.
-ABI_X86="32"
-IUSE_IMPLICIT="abi_x86_32"
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-USE="pam threads"
-
-INPUT_DEVICES="${INPUT_DEVICES} vmmouse"
-VIDEO_CARDS="${VIDEO_CARDS} amdgpu apm ast i128 i740 intel neomagic openchrome qxl radeonsi rendition siliconmotion tga tseng vesa via vmware"
diff --git a/profiles/arch/x86/parent b/profiles/arch/x86/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
deleted file mode 100644
index db7ada688..000000000
--- a/profiles/arch/x86/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-abi_x86_64
diff --git a/profiles/arch/x86_64/make.defaults b/profiles/arch/x86_64/make.defaults
deleted file mode 100644
index b085a8358..000000000
--- a/profiles/arch/x86_64/make.defaults
+++ /dev/null
@@ -1,35 +0,0 @@
-CHOST="x86_64-foxkit-linux-musl"
-
-# We definitely use 64-bit ABI.
-ABI_X86="64"
-IUSE_IMPLICIT="abi_x86_64 amd64-linux"
-
-ARCH="x86_64"
-ACCEPT_KEYWORDS="${ARCH} amd64"  # HACK for using Gentoo ebuilds
-
-# -O2           -> Perform second-level optimisations.
-#                  Not -Os because most/all x86_64 aren't starved for space.
-# -ggdb         -> Generate GDB debugging information.
-#                  This is used with splitdebug to make -dbg split packages.
-# -march=nocona -> Require a "Nocona" Pentium 4 or newer.
-#                  At some point, pending user demand, this may change to core2.
-#                  !!!NOTE!!! If that happens, Nocona P4 will no longer work!
-# -mtune=core2  -> Tune for Core 2 processors.
-#                  Most tuning for Core 2 is applicable to * Bridge and *well,
-#                  and makes code more performant on the much larger base of
-#                  those machines.
-# -fno-omit-... -> Never omit the frame pointer.
-#                  This is crucial for proper debugging.
-# -mfpmath=sse  -> Use SSE for all floating point math.
-#                  Since SSE is always available, this knob ensures that GCC
-#                  will take advantage of it over preferring 387 math, which
-#                  can drag down performance on modern x86_64.
-CFLAGS="-O2 -ggdb -march=nocona -mtune=core2 -fno-omit-frame-pointer -mfpmath=sse"
-CXXFLAGS="${CFLAGS}"
-
-ELIBC="musl"
-
-USE="amd64 amd64-linux pam threads"
-
-INPUT_DEVICES="${INPUT_DEVICES} vmmouse"
-VIDEO_CARDS="${VIDEO_CARDS} amdgpu apm ast i128 i740 intel neomagic openchrome qxl radeonsi rendition siliconmotion tga tseng vesa via vmware"
diff --git a/profiles/arch/x86_64/package.accept_keywords b/profiles/arch/x86_64/package.accept_keywords
deleted file mode 100644
index 83605cd84..000000000
--- a/profiles/arch/x86_64/package.accept_keywords
+++ /dev/null
@@ -1,2 +0,0 @@
-=sys-boot/syslinux-6.03 **
-=sys-boot/elilo-3.16 **
diff --git a/profiles/arch/x86_64/package.use b/profiles/arch/x86_64/package.use
deleted file mode 100644
index 966752d48..000000000
--- a/profiles/arch/x86_64/package.use
+++ /dev/null
@@ -1 +0,0 @@
-sys-boot/grub device-mapper fonts sdl themes truetype grub_platforms_efi-64
diff --git a/profiles/arch/x86_64/parent b/profiles/arch/x86_64/parent
deleted file mode 100644
index 985c694a0..000000000
--- a/profiles/arch/x86_64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/base/eapi b/profiles/base/eapi
deleted file mode 100644
index 1e8b31496..000000000
--- a/profiles/base/eapi
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
deleted file mode 100644
index e57bec504..000000000
--- a/profiles/base/make.defaults
+++ /dev/null
@@ -1,73 +0,0 @@
-# Welcome to Adélie Linux.
-# This file contains the default settings for Portage(++) under Adélie Linux.
-
-IUSE_IMPLICIT="amd64 kernel_Darwin kernel_FreeBSD prefix prefix-guest"
-USE_EXPAND_UNPREFIXED="ARCH"
-USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-
-# Tier 1 and Tier 2 only, for now.  Consult Platform Group before *ever* changing this.
-TIER1_ARCH="x86 x86_64 ppc ppc64 mips arm"
-TIER2_ARCH="alpha arm64 hppa ia64 sparc sparc64"
-UNFORTUNATE_STUPID_XORG_EBUILD_ARCH="x86-interix ppc-aix x86-winnt s390 sh x64-macos x86-fbsd amd64-fbsd x86-linux amd64-linux"
-USE_EXPAND_VALUES_ARCH="${TIER1_ARCH} ${TIER2_ARCH} ${UNFORTUNATE_STUPID_XORG_EBUILD_ARCH}"
-
-# We only support these libcs right now.
-# Darwin, FreeBSD, glibc, mintlib, SunOS, and uclibc must be added due to stupid gentoo ebuilds
-USE_EXPAND_VALUES_ELIBC="AIX Darwin FreeBSD glibc mintlib musl SunOS uclibc"
-
-# XXX Someday fix it to know that busybox != GNU
-USE_EXPAND_VALUES_KERNEL="linux"
-USE_EXPAND_VALUES_USERLAND="BSD GNU"
-
-# and set the defaults (can be overridden in other profiles)
-ELIBC="musl"
-KERNEL="linux"
-USERLAND="GNU"
-
-# lightly copied from gentoo/profiles/base/make.defaults, edited to fit
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NOXCUSE_APPS OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS ROS_MESSAGES"
-
-# we do not hide CROSSCOMPILE_OPTS or ELIBC from the user.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_X86"
-
-CONFIG_PROTECT="/etc"
-CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
-
-# again, useful from gentoo/profiles/base/make.defaults
-PROFILE_ONLY_VARIABLES="ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
-
-# we attempt to be python3-clean in the base system profile.
-PYTHON_TARGETS="python3_5"
-PYTHON_SINGLE_TARGET="python3_5"
-
-# Ruby 2.4 will be supported until at least December 2019.
-RUBY_TARGETS="ruby24"
-
-# These USE will be forced onto every system running Adélie.  DO NOT MODIFY THIS LIGHTLY!
-USE="cxx icu -introspection ipv6 modules ssl unicode xattr"
-
-# Auto-build .apks, always
-PORTAGE_BINPKG_FORMAT="apk"
-FEATURES="buildpkg splitdebug"
-
-# Use curl instead of wget for fetching.
-FETCHCOMMAND="curl -f -L -o \"\${DISTDIR}\"/\"\${FILE}\" \"\${URI}\""
-
-# This masks files on EVERY SYSTEM running Adélie.  BE CAREFUL!
-# Specifically, do not mask systemd unit files or such from the base profile.
-# It can't be overriden in the systemd profile!
-INSTALL_MASK="/usr/lib/charset.alias"
-
-PORTAGE_TMPDIR="/usr/src"
-
-APACHE2_MODULES="access_compat actions alias auth_basic auth_digest authn_alias authn_anon authn_core authn_file authz_core authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta cgi cgid charset_lite dav deflate dir dumpio env expires ext_filter file_cache filter headers ident imagemap include info lbmethod_bybusyness lbmethod_byrequests lbmethod_bytraffic lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation proxy proxy_balancer proxy_connect proxy_fcgi proxy_html proxy_http proxy_scgi ratelimit remoteip reqtimeout rewrite setenvif slotmem_shm socache_shmcb speling status substitute unique_id unixd userdir usertrack version vhost_alias"
-APACHE2_MPMS="event"
-
-# vmmouse is x86 only
-INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard libinput mouse mutouch penmount synaptics tslib void wacom"
-
-# only put video cards in the base profile that are supported on all architectures (at least tier 1)
-VIDEO_CARDS="chips cirrus dummy epson fbdev glint mach64 mga nouveau nv r128 radeon s3 s3virge savage sisusb tdfx trident voodoo"
-
-DISTRO="Adélie"
-DISTRO_BUG_URL="http://bts.adelielinux.org/"
diff --git a/profiles/base/package.accept_keywords b/profiles/base/package.accept_keywords
deleted file mode 100644
index 8188a1402..000000000
--- a/profiles/base/package.accept_keywords
+++ /dev/null
@@ -1,141 +0,0 @@
-=app-arch/gzip-1.7 **
-=app-arch/libarchive-3.2.1-r3 **
-=app-arch/pax-20160306 **
-=app-crypt/gnupg-2.1.12-r1 **
-=app-crypt/gpgme-1.8.0-r2 **
-=app-eselect/eselect-python-20160222 **
-=app-eselect/eselect-timezone-0.2 **
-=app-misc/mc-4.8.17 **
-=app-shells/rc-1.7.4 **
-=dev-lang/python-3.5.2 **
-=dev-lang/python-exec-2.4.3 **
-=dev-libs/glib-2.48.2 **
-=dev-libs/libassuan-2.4.2 **
-=dev-libs/libgcrypt-1.7.1 **
-=dev-libs/libgpg-error-1.22 **
-=dev-libs/skalibs-2.4.0.2 **
-=dev-libs/xapian-1.4.2 **
-=dev-python/ply-3.8 **
-=dev-python/pyasn1-0.1.9 **
-=dev-python/pycrypto-2.6.1-r1 **
-=dev-util/cflow-1.4 **
-=dev-util/checkbashisms-2.16.13 **
-=dev-util/gdbus-codegen-2.48.2 **
-=dev-util/pkgconf-1.1.0 **
-=games-misc/ponysay-3.0.2 **
-=kde-frameworks/kwallet-5.29.0-r1 **
-=mail-client/mutt-1.7.2-r1 **
-=media-libs/mesa-11.2.2 **
-=media-libs/netpbm-10.70.00 **
-=media-libs/phonon-4.9.0 **
-=media-video/mpv-0.18.1 **
-=net-dns/s6-dns-2.1.0.0 **
-=net-fs/nfs-utils-1.3.4 **
-=net-irc/weechat-1.7-r1 **
-=net-libs/libtirpc-1.0.1 **
-=net-misc/youtube-dl-2016.12.15 **
-=sys-apps/less-483-r1 **
-=sys-apps/net-tools-1.60_p20160215155418 **
-=sys-apps/shadow-4.2.1-r2 **
-=sys-devel/gcc-5.4.0-r2 **
-=sys-devel/gcc-config-1.8-r1 **
-=sys-devel/clang-3.8.1-r100 **
-=sys-devel/llvm-3.8.1 **
-=sys-devel/m4-1.4.17 **
-=sys-kernel/linux-headers-4.4 **
-=sys-libs/argp-standalone-1.3-r1 **
-=sys-process/fcron-3.2.0-r1 **
-=sys-process/procps-3.3.11-r3 **
-<www-client/firefox-46.0 **
-=x11-drivers/xf86-video-nouveau-1.0.12 **
-=x11-libs/libdrm-2.4.70 **
-=x11-libs/libva-vdpau-driver-0.7.4-r4 **
-=x11-misc/ftmenu-0.4.0 **
-=x11-misc/genmenu-1.1.0 **
-=x11-misc/xscreensaver-5.35 **
-
-
-=dev-lang/python-3.4.3-r7 **
-
-
-=dev-libs/libqtxdg-2.0.0 **
-=lxqt-base/liblxqt-0.11.0-r1 **
-=lxqt-base/libsysstat-0.3.2 **
-=lxqt-base/lxqt-about-0.11.0 **
-=lxqt-base/lxqt-admin-0.11.0 **
-=lxqt-base/lxqt-common-0.11.0 **
-=lxqt-base/lxqt-config-0.11.0 **
-=lxqt-base/lxqt-globalkeys-0.11.0 **
-=lxqt-base/lxqt-meta-0.11.0 **
-=lxqt-base/lxqt-notificationd-0.11.0 **
-=lxqt-base/lxqt-openssh-askpass-0.11.0 **
-=lxqt-base/lxqt-panel-0.11.0 **
-=lxqt-base/lxqt-policykit-0.11.0 **
-=lxqt-base/lxqt-powermanagement-0.11.0 **
-=lxqt-base/lxqt-qtplugin-0.11.0 **
-=lxqt-base/lxqt-runner-0.11.0 **
-=lxqt-base/lxqt-session-0.11.0 **
-=lxqt-base/lxqt-sudo-0.11.0 **
-=x11-libs/libfm-qt-0.11.1 **
-=x11-misc/obconf-qt-0.9.0_p20150729 **
-=x11-misc/pcmanfm-qt-0.11.1 **
-
-# === KDE 5 ===
-# Games
-=kde-apps/bovo-16.12.1 **
-=kde-apps/granatier-16.12.1 **
-=kde-apps/kapman-16.12.1 **
-=kde-apps/katomic-16.12.1 **
-=kde-apps/kblackbox-16.12.1 **
-=kde-apps/kblocks-16.12.1 **
-=kde-apps/kbounce-16.12.1 **
-=kde-apps/kbreakout-16.12.1 **
-=kde-apps/kdiamond-16.12.1 **
-=kde-apps/kfourinline-16.12.1 **
-=kde-apps/killbots-16.12.1 **
-=kde-apps/kiriki-16.12.1 **
-=kde-apps/kjumpingcube-16.12.1 **
-=kde-apps/klickety-16.12.1 **
-=kde-apps/klines-16.12.1 **
-=kde-apps/kmahjongg-16.12.1 **
-=kde-apps/kmines-16.12.1 **
-=kde-apps/knetwalk-16.12.1 **
-=kde-apps/kollision-16.12.1 **
-=kde-apps/kpat-16.12.1 **
-=kde-apps/kshisen-16.12.1 **
-=kde-apps/ksquares-16.12.1 **
-=kde-apps/ktuberling-16.12.1 **
-=kde-apps/libkdegames-16.12.1 **
-=kde-apps/libkmahjongg-16.12.1 **
-
-# Graphics
-=dev-libs/libzip-1.1.3-r1 **
-=kde-apps/gwenview-16.12.2 **
-=kde-apps/kcolorchooser-16.12.2 **
-=kde-apps/kdegraphics-mobipocket-16.12.2 **
-=kde-apps/kolourpaint-16.12.2 **
-=kde-apps/kruler-16.12.2 **
-=kde-apps/libkexiv2-16.12.2 **
-=kde-apps/libkipi-16.12.2 **
-=kde-apps/okular-16.12.2 **
-=kde-apps/spectacle-16.12.2 **
-=media-gfx/krita-3.1.2-r2 **
-=media-gfx/kxstitch-2.0.0 **
-=media-libs/lensfun-0.3.2 **
-
-# === Ruby 2.4 ===
-=app-eselect/eselect-ruby-20161226 **
-~dev-lang/ruby-2.4.0 **
-=dev-ruby/did_you_mean-1.1.0 **
-=dev-ruby/json-2.0.3 **
-=dev-ruby/kpeg-1.1.0 **
-=dev-ruby/minitest-5.10.1 **
-=dev-ruby/net-telnet-0.1.1-r1 **
-=dev-ruby/power_assert-1.0.1-r1 **
-=dev-ruby/racc-1.4.14 **
-=dev-ruby/rake-12.0.0 **
-=dev-ruby/rdoc-5.0.0-r3 **
-=dev-ruby/rubygems-2.6.10 **
-=dev-ruby/test-unit-3.2.3 **
-=dev-ruby/xmlrpc-0.3.0 **
-=virtual/rubygems-12 **
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
deleted file mode 100644
index 76148cc4e..000000000
--- a/profiles/base/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# awilfox <awilfox@adelielinux.org> (12 Dec 2016)
-# ncurses 6.0 refuses to build.
-=sys-libs/ncurses-6.0-r1:0/6
-=sys-libs/ncurses-6.0:5/6
diff --git a/profiles/base/package.provided b/profiles/base/package.provided
deleted file mode 100644
index 23830c94a..000000000
--- a/profiles/base/package.provided
+++ /dev/null
@@ -1,11 +0,0 @@
-# We do not need perl-cleaner on Adélie machines.
-app-admin/perl-cleaner-2.19
-
-# We do not need python-updater on Adélie machines.
-app-admin/python-updater-0.11
-
-# This is such an ugly hack...
-provided/gcc-5.4.0
-
-# We already provide a baselayout-like package with sys-apps/adelie-base.
-sys-apps/baselayout-2.2
diff --git a/profiles/base/package.use b/profiles/base/package.use
deleted file mode 100644
index 8fe430068..000000000
--- a/profiles/base/package.use
+++ /dev/null
@@ -1,199 +0,0 @@
-app-arch/libarchive -e2fsprogs
-
-# Needed for correct building of Linux-PAM
-sys-libs/pam -audit -berkdb cracklib -filecaps -nis pie
-
-# Needed for POSIX® conformance on musl
-sys-apps/noxcuse noxcuse_apps_iconv
-sys-apps/util-linux ncurses tty-helpers udev
-
-# Discussed on #Adelie re: local user postfix installations
-mail-mta/postfix mbox
-
-# Security-related USE
-dev-db/sqlite secure-delete
-dev-libs/apr-util openssl
-
-# Needed for build-tools
-app-crypt/pinentry ncurses
-dev-lang/python sqlite
-dev-libs/boost python
-dev-util/cmake doc ncurses
-dev-vcs/cvs doc
-dev-vcs/git -python
-dev-vcs/subversion -http
-net-misc/curl ssl
-sys-devel/gcc doc fortran libssp
-
-# Needed for Horizon
-sys-block/parted device-mapper
-sys-fs/lvm2 lvm1 readline thin udev
-
-# Needed for X
-media-fonts/comfortaa X
-media-fonts/liberation-fonts X
-media-fonts/urw-fonts X
-media-libs/freetype X utils
-media-libs/mesa llvm vaapi video_cards_radeon -video_cards_vmware wayland xa xvmc
-sys-devel/clang multitarget static-analyzer
-sys-devel/llvm clang lldb multitarget python_targets_python2_7 static-analyzer xml
-x11-base/xorg-server glamor nptl xnest xorg xvfb
-x11-drivers/xf86-video-amdgpu glamor
-x11-drivers/xf86-video-intel dri sna udev uxa xvmc
-x11-drivers/xf86-video-mach64 dri
-x11-drivers/xf86-video-mga dri
-x11-drivers/xf86-video-nouveau glamor
-x11-drivers/xf86-video-r128 dri
-x11-drivers/xf86-video-savage dri
-x11-drivers/xf86-video-tdfx dri
-x11-libs/cairo X opengl xcb
-x11-libs/gdk-pixbuf X jpeg jpeg2k tiff
-x11-libs/libdrm libkms
-x11-libs/libva X
-x11-libs/libva-intel-driver X
-x11-libs/libXfont truetype
-x11-libs/pango X
-
-# Needed for polkit
-dev-libs/glib dbus
-sys-apps/dbus X
-sys-auth/consolekit cgroups pm-utils policykit
-sys-auth/polkit pam
-
-# Needed for Qt 5
-dev-libs/libpcre pcre16
-dev-qt/qtgui:5 accessibility dbus egl evdev jpeg
-dev-qt/qtscript:5 scripttools
-dev-qt/qtwayland:5 egl
-x11-libs/libxcb xkb
-x11-libs/libxkbcommon X
-
-# Needed for KDE Plasma 5
-app-crypt/gpgme qt5
-app-text/poppler cairo png qt5 tiff
-dev-libs/libdbusmenu-qt -qt4 qt5
-kde-apps/ark bzip2 lzma zlib
-kde-apps/dolphin thumbnail
-kde-apps/gwenview X kipi
-kde-apps/kmix alsa pulseaudio
-kde-apps/konsole X
-kde-apps/kruler X
-kde-apps/marble -webkit
-kde-apps/okular chm ebook mobi
-kde-apps/spectacle kipi
-kde-frameworks/frameworkintegration X
-kde-frameworks/kcrash X
-kde-frameworks/kdbusaddons X
-kde-frameworks/kdelibs4support X
-kde-frameworks/kdesu X  # moshi moshi k desu
-kde-frameworks/kfilemetadata exif pdf
-kde-frameworks/khtml X
-kde-frameworks/kio X
-kde-frameworks/kio-extras exif mtp phonon
-kde-frameworks/kjobwidgets X
-kde-frameworks/knotifications X dbus
-kde-frameworks/knotifyconfig phonon
-kde-frameworks/kpackage man
-kde-frameworks/kwallet gpg
-kde-frameworks/kwindowsystem X
-kde-frameworks/plasma X
-kde-frameworks/sonnet hunspell -aspell
-kde-plasma/kde-cli-tools X
-kde-plasma/kde-gtk-config -gtk3
-kde-plasma/kinfocenter ieee1394
-kde-plasma/ksysguard lm_sensors
-kde-plasma/libksysguard X -detailedmemory
-kde-plasma/oxygen-fonts X
-kde-plasma/plasma-desktop -qt4
-kde-plasma/plasma-workspace dbus -geolocation
-kde-plasma/powerdevil -wireless
-kde-plasma/systemsettings gtk
-media-fonts/noto X
-# KPhotoAlbum deps on marble anyway; might as well let digiKam take it too.
-media-gfx/digikam gphoto2 marble -panorama scanner semantic-desktop
-media-gfx/exiv2 png xmp
-media-gfx/fontforge X cairo gtk jpeg png readline svg -python
-media-gfx/imagemagick X bzip2 fontconfig fpx jpeg jpeg2k lcms lzma openexr openmp png postscript svg tiff truetype webp wmf xml zlib
-media-gfx/krita color-management openexr tiff
-media-libs/gd fontconfig jpeg png tiff truetype webp xpm zlib
-media-libs/libgphoto2 exif gd jpeg
-media-libs/libsndfile minimal
-media-libs/opencolorio opengl
-media-libs/openimageio ffmpeg gif jpeg2k opengl python
-media-libs/opencv -python -qt4 qt5
-media-libs/phonon -qt4 qt5 pulseaudio vlc
-media-libs/phonon-vlc -qt4 qt5
-media-libs/plotutils X
-media-libs/vigra openexr -python
-media-plugins/alsa-plugins pulseaudio
-media-sound/pulseaudio bluetooth dbus libsamplerate native-headset realtime
-sys-auth/polkit-qt -qt4 qt5
-x11-libs/wxGTK opengl
-
-# Needed for XFCE 4
-app-accessibility/at-spi2-core:2 X
-app-crypt/gcr gtk
-dev-perl/IO-Socket-SSL idn
-gnome-base/gvfs afp gtk http mtp nfs udev udisks
-media-fonts/dejavu X
-media-libs/imlib2 X gif jpeg png tiff zlib
-media-libs/netpbm X jpeg jpeg2k png rle tiff zlib
-media-libs/urt X gif tiff
-net-libs/gnutls -dane
-x11-libs/gtk+:3 X xinerama
-x11-libs/libfm automount gtk exif udisks -vala
-x11-misc/xscreensaver jpeg new-login opengl pam perl xinerama
-xfce-base/thunar dbus exif libnotify udisks
-xfce-base/xfce4-session policykit upower xscreensaver
-xfce-base/xfce4-settings libinput libnotify upower
-xfce-base/xfdesktop libnotify
-xfce-base/xfwm4 dri xcomposite
-
-# Needed for GNOME 3
-media-libs/clutter X
-
-# Other package configuration:
-# User-requested tweaks, recommended flags, and Adélie-specific features.
-app-crypt/gnupg bzip2 -gnutls readline smartcard usb
-app-emulation/BasiliskII bincue gtk
-app-emulation/wine cups fontconfig jpeg ncurses openal opengl perl pipelight png pulseaudio run-exes s3tc scanner staging truetype udisks vaapi xcomposite xinerama xml
-app-shells/rc readline
-app-text/evince djvu nsplugin -postscript tiff xps
-dev-cpp/cairomm X
-dev-cpp/gtkmm X
-dev-python/pillow jpeg jpeg2k tiff truetype zlib
-games-emulation/dosbox alsa opengl
-games-engines/scummvm alsa flac fluidsynth jpeg mp3 opengl png theora truetype vorbis zlib
-games-simulation/openttd aplaymidi iconv -timidity zlib
-gnome-base/nautilus exif -previewer
-lxqt-base/lxqt-meta powermanagement sddm
-lxqt-base/lxqt-panel colorpicker networkmonitor pulseaudio sensors statusnotifier sysstat worldclock
-mail-client/claws-mail clamav dbus imap nntp perl rss session spam-report spell startup-notification xface -libcanberra -libindicate -python
-mail-client/mutt gpg idn imap mbox nntp pop smime smtp
-media-gfx/sane-backends usb
-media-gfx/xsane jpeg png tiff
-media-libs/gst-plugins-bad X gtk opengl vnc
-media-libs/gst-plugins-base X theora
-media-libs/libpng apng
-media-libs/libsdl X alsa opengl pulseaudio
-media-libs/openal pulseaudio  # WINE.
-media-libs/sdl-sound flac modplug mp3 mpeg vorbis
-media-libs/tiff jpeg zlib
-media-plugins/audacious-plugins aac alsa cdda cue ffmpeg flac fluidsynth http lame libnotify mp3 nls pulseaudio qt5 vorbis
-media-sound/audacious qt5
-media-sound/fluidsynth alsa pulseaudio readline sndfile
-media-sound/timidity++ alsa
-media-video/ffmpeg X cdio cpudetection faac gsm ladspa lzma opus pulseaudio speex theora truetype vaapi vorbis vpx wavpack webp
-media-video/mpv jpeg pulseaudio
-media-video/vlc X -audioqueue bluray cdda dbus dts dvd ffmpeg flac fluidsynth fontconfig jpeg libnotify mp3 mpeg ogg opengl optimisememory opus png pulseaudio -qt4 qt5 theora truetype udev vorbis vpx x264
-net-im/pidgin gstreamer gtk idn pie spell
-net-irc/hexchat libnotify libproxy spell
-net-libs/libnice -upnp
-net-wireless/wpa_supplicant dbus readline ssl
-sys-fs/cryptsetup -gcrypt nls openssl python udev
-sys-libs/zlib minizip  # VLC
-www-client/elinks ftp gopher idn javascript nntp xml zlib
-# While system-* flags in general are frowned upon, this is required to build on musl.  Firefox's bundled libs don't.
-mail-client/thunderbird bindist pulseaudio system-icu system-libevent system-sqlite
-www-client/firefox bindist dbus pulseaudio system-icu system-libevent system-sqlite
-x11-terms/gnome-terminal -gnome-shell
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
deleted file mode 100644
index 60ec1eced..000000000
--- a/profiles/base/package.use.mask
+++ /dev/null
@@ -1,39 +0,0 @@
-# awilfox <awilfox@adelielinux.org> (27 Mar 2016)
-# libsanitizer does not work on musl.
-sys-devel/gcc sanitize
-
-# awilfox <awilfox@adelielinux.org> (22 Apr 2016)
-# we don't want Gentoo branding on our LibreOffice packages.
-app-office/libreoffice branding
-
-# awilfox <awilfox@adelielinux.org> (23 Apr 2016)
-# GDB server is not compatible with musl.
-sys-devel/gdb server
-
-# awilfox <awilfox@adelielinux.org> (10 Jul 2016)
-# GCC Go requires ucontext, which is deprecated and has been removed from musl.
-# libvtv requires execinfo.h, which is not going to be implemented in musl:
-#     http://www.openwall.com/lists/musl/2015/04/09/3
-sys-devel/gcc go vtv
-
-# awilfox <awilfox@adelielinux.org> (06 Aug 2016)
-# WeeChat's spelling requires aspell, which not only doesn't work with musl,
-# but is also broken on Gentoo in general and unmaintained upstream.
-net-irc/weechat spell
-
-# awilfox <awilfox@adelielinux.org> (03 Dec 2016)
-# elfutils maintainers said thread support is broken; testsuite locks on musl.
-dev-libs/elfutils threads
-
-# awilfox <awilfox@adelielinux.org> (04 Dec 2016)
-# Broken on musl.
-media-libs/mesa nptl
-x11-base/xorg-server nptl
-
-# awilfox <awilfox@adelielinux.org> (15 Jan 2017)
-# Does not support musl.
-lxqt-base/lxqt-panel cpuload networkmonitor
-
-# awilfox <awilfox@adelielinux.org> (29 Jan 2017)
-# Hopelessly broken on musl.
-sys-apps/iproute2 iptables
diff --git a/profiles/base/packages b/profiles/base/packages
deleted file mode 100644
index f5a708dd6..000000000
--- a/profiles/base/packages
+++ /dev/null
@@ -1,280 +0,0 @@
-# Welcome to Adélie Linux.
-# 
-# This is the base system profile package list.  It is used by Portage to
-# determine @system for *every* architecture.
-# 
-# Therefore, it must be very lightweight and compatible with every arch.
-
-# Also note that Portage requires * before each package name used for the
-# system set.
-
-
-
-# This is satisfied by apk-tools *or* Portage++ on Adélie.
-*virtual/package-manager
-
-# This is required to use a Unix computer at all ;)
-*app-arch/libarchive
-*virtual/libc
-
-# Satisfy the mta virtual with the one closest to being POSIX.
-*mail-mta/postfix
-
-# Satisfy the logger virtual
-*app-admin/syslog-ng
-
-# Satisfy the pkgconfig virtual
-*dev-util/pkgconf
-
-#
-# Required utilities from 1003.1 S&U Issue 7 (2013 Ed.)
-#
-
-
-# Base
-
-# alias(1)
-# cd(1)
-# command(1)
-# getopts(1)
-# hash(1)
-# printf(1)
-# pwd(1)
-# read(1)
-# sh(1)
-# test(1) - and sys-apps/coreutils
-# time(1)
-# true(1) - and sys-apps/coreutils
-# ulimit(1)
-# umask(1)
-# unalias(1)
-# wait(1)
-*app-shells/zsh
-
-# ar(1)
-# strings(1)
-*sys-devel/binutils
-
-# at(1)
-# batch(1)
-*sys-process/at
-
-# basename(1)
-# cat(1)
-# chgrp(1)
-# chmod(1)
-# chown(1)
-# cksum(1)
-# comm(1)
-# csplit(1)
-# cut(1)
-# date(1)
-# dd(1)
-# df(1)
-# dirname(1)
-# du(1)
-# env(1)
-# expand(1)
-# expr(1)
-# false(1)
-# fold(1)
-# head(1)
-# id(1)
-# join(1)
-# ln(1)
-# logname(1)
-# ls(1)
-# mkdir(1)
-# mkfifo(1)
-# mv(1)
-# nice(1)
-# nohup(1)
-# od(1)
-# paste(1)
-# pathchk(1)
-# pr(1)
-# pwd(1) - and app-shells/zsh
-# sleep(1)
-# sort(1)
-# split(1)
-# stty(1)
-# tee(1)
-# test(1) - and app-shells/zsh
-# touch(1)
-# tr(1)
-# true(1) - and app-shells/zsh
-# tsort(1)
-# tty(1)
-# uname(1)
-# unexpand(1)
-# uniq(1)
-# wc(1)
-*sys-apps/coreutils
-
-# cmp(1)
-# diff(1)
-*sys-apps/diffutils
-
-# crontab(1)
-*sys-process/fcron
-
-# ed(1)
-*sys-apps/ed
-
-# file(1)
-*sys-apps/file
-
-# find(1)
-# xargs(1)
-*sys-apps/findutils
-
-# gencat(1) -> NOT PROVIDED pending patch to sys-libs/musl
-
-# getconf(1)
-# localedef(1)
-*sys-apps/shimmy
-
-# grep(1)
-*sys-apps/grep
-
-# iconv(1)
-*sys-apps/noxcuse[noxcuse_apps_iconv]
-
-# kill(1)
-# ps(1)
-*sys-process/procps[kill]
-
-# locale(1) -> NOT PROVIDED
-
-# logger(1)
-# mesg(1)
-# renice(1)
-# write(1)
-*sys-apps/util-linux[tty-helpers]
-
-# lp(1)
-net-print/cups
-
-# m4(1)
-*sys-devel/m4
-
-# mailx(1)
-*mail-client/nail
-
-# man(1)
-*sys-apps/man-db
-
-# newgrp(1)
-*virtual/shadow
-
-# patch(1)
-*sys-devel/patch
-
-# pax(1)
-*app-arch/pax
-
-# sed(1)
-*sys-apps/sed
-
-# tabs(1)
-# tput(1)
-*sys-libs/ncurses:0
-
-# uudecode(1)
-# uuencode(1)
-*app-arch/sharutils
-
-
-# User Portability Utilities option
-
-# bc(1)
-*sys-devel/bc
-
-# bg(1)
-# fc(1)
-# fg(1)
-# jobs(1)
-#*app-shells/zsh (already provided above)
-
-# ex(1)
-# vi(1)
-*app-editors/vim
-
-# more(1)
-#*sys-apps/util-linux (already provided above)
-
-# talk(1)
-# NOT PROVIDED (net-misc/netkit-talk)
-
-
-# X/Open System Interface (XSI) option
-
-# admin(1)
-# delta(1)
-# get(1)
-# prs(1)
-# rmdel(1)
-# sact(1)
-# sccs(1)
-# unget(1)
-# val(1)
-# what(1)
-# NOT PROVIDED (sccs)
-
-# cal(1)
-# ipcrm(1)
-# ipcs(1)
-#*sys-apps/util-linux (already provided above)
-
-# cflow(1)
-*dev-util/cflow
-
-# compress(1)
-# uncompress(1)
-*app-arch/ncompress
-
-# fuser(1)
-*sys-process/psmisc
-
-# link(1)
-# nl(1)
-# unlink(1)
-# who(1)
-#*sys-apps/coreutils (already provided above)
-
-# nm(1)
-#*sys-devel/binutils (already provided above)
-
-# type(1)
-# ulimit(1)
-#*app-shells/zsh (already provided above)
-
-# zcat(1) -> NOT PROVIDED
-
-#
-# Utilities required by FHS 3.0
-#
-
-# cp(1)
-# mknod(1)
-# mv(1)
-# rm(1)
-# rmdir(1)
-# sync(1)
-#*sys-apps/coreutils (already provided above)
-
-# dmesg(1)
-# mount(8)
-# umount(8)
-#*sys-apps/util-linux (already provided above)
-
-# hostname(1)
-# netstat(8)
-*sys-apps/net-tools[hostname]
-
-# login(1)
-# su(1)
-#*virtual/shadow (already provided above)
-
-# ping(8)
-*net-misc/iputils
diff --git a/profiles/base/use.force b/profiles/base/use.force
deleted file mode 100644
index 5f0d4cb18..000000000
--- a/profiles/base/use.force
+++ /dev/null
@@ -1 +0,0 @@
-elibc_musl
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
deleted file mode 100644
index 52f6feeba..000000000
--- a/profiles/base/use.mask
+++ /dev/null
@@ -1,18 +0,0 @@
-# We do not use prefix installations here
-prefix
-prefix-guest
-
-# We do not, under any circumstances, support alt/BSD installs
-elibc_FreeBSD
-
-# We do not, under any circumstances, support glibc
-elibc_glibc
-
-# We do not run on Atari computers...
-elibc_mintlib
-
-# We likewise do not support the unmaintained uclibc any more
-elibc_uclibc
-
-# eesh.
-elibc_interix
diff --git a/profiles/base/virtuals b/profiles/base/virtuals
deleted file mode 100644
index 03c5ace2e..000000000
--- a/profiles/base/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/pkgconfig	dev-util/pkgconf
diff --git a/profiles/categories b/profiles/categories
deleted file mode 100644
index 5ed39f659..000000000
--- a/profiles/categories
+++ /dev/null
@@ -1,18 +0,0 @@
-app-emulation
-app-text
-dev-libs
-dev-python
-dev-util
-games-misc
-media-fonts
-media-gfx
-meta-desktop
-net-wireless
-sys-apps
-sys-boot
-sys-devel
-sys-fs
-sys-kernel
-sys-libs
-virtual
-x11-libs
diff --git a/profiles/eapi b/profiles/eapi
deleted file mode 100644
index 1e8b31496..000000000
--- a/profiles/eapi
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/profiles/package.provided b/profiles/package.provided
deleted file mode 100644
index 24aead45b..000000000
--- a/profiles/package.provided
+++ /dev/null
@@ -1 +0,0 @@
-dev-libs/openssl-1.0.2e:0
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
deleted file mode 100644
index 118bcfce5..000000000
--- a/profiles/profiles.desc
+++ /dev/null
@@ -1,46 +0,0 @@
-# Welcome to Adélie Linux.
-# This file is a mapping of each profile available for each architecture and
-# its current stability.
-
-# All Tier 2 architectures are experimental, and have base profiles only.
-alpha	adelie/1.0/alpha			exp
-arm64	adelie/1.0/arm64			exp
-hppa	adelie/1.0/hppa				exp
-ppc	adelie/1.0/ppc/cell			exp
-sparc64	adelie/1.0/sparc64			exp
-
-# Supported profiles for ARM
-arm	adelie/1.0/arm				stable
-arm	adelie/1.0/arm/s6			exp
-arm	adelie/1.0/arm/systemd			exp
-
-# Supported profiles for MIPS
-mips	adelie/1.0/mips				stable
-mips	adelie/1.0/mips/s6			exp
-mips	adelie/1.0/mips/systemd			exp
-
-# Supported profiles for PowerPC (32-bit)
-ppc	adelie/1.0/ppc				stable
-#ppc	adelie/1.0/ppc/g3			stable
-#ppc	adelie/1.0/ppc/g4			stable
-ppc	adelie/1.0/ppc/s6			exp
-#ppc	adelie/1.0/ppc/g3/s6			exp
-#ppc	adelie/1.0/ppc/g4/s6			exp
-ppc	adelie/1.0/ppc/systemd			exp
-#ppc	adelie/1.0/ppc/g3/systemd		exp
-#ppc	adelie/1.0/ppc/g4/systemd		exp
-
-# Supported profiles for PowerPC (64-bit)
-ppc64	adelie/1.0/ppc64			stable
-ppc64	adelie/1.0/ppc64/s6			exp
-ppc64	adelie/1.0/ppc64/systemd		exp
-
-# Supported profiles for x86 (32-bit)
-x86	adelie/1.0/x86				stable
-x86	adelie/1.0/x86/s6			exp
-x86	adelie/1.0/x86/systemd			exp
-
-# Supported profiles for x86 (64-bit)
-x86_64	adelie/1.0/x86_64			stable
-x86_64	adelie/1.0/x86_64/s6			exp
-x86_64	adelie/1.0/x86_64/systemd		exp
diff --git a/profiles/repo_name b/profiles/repo_name
deleted file mode 100644
index 81f396d7e..000000000
--- a/profiles/repo_name
+++ /dev/null
@@ -1 +0,0 @@
-adelie
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
deleted file mode 100644
index 4665b2d65..000000000
--- a/profiles/thirdpartymirrors
+++ /dev/null
@@ -1 +0,0 @@
-foxkit	https://distfiles.adelielinux.org/source/
diff --git a/profiles/use.desc b/profiles/use.desc
deleted file mode 100644
index f52f29f49..000000000
--- a/profiles/use.desc
+++ /dev/null
@@ -1,5 +0,0 @@
-ipv6 - Enable IPv6 support
-lua - Enable bindings to the Lua programming langauge
-ssl - Enable TLS support
-static - Link statically instead of dynamically when possible
-static-libs - Build static libraries in addition to dynamic ones
diff --git a/harmony/attr/APKBUILD b/system/attr/APKBUILD
index 1a05e8d7b..1a05e8d7b 100644
--- a/harmony/attr/APKBUILD
+++ b/system/attr/APKBUILD
diff --git a/harmony/attr/fix-decls.patch b/system/attr/fix-decls.patch
index 0de70a93d..0de70a93d 100644
--- a/harmony/attr/fix-decls.patch
+++ b/system/attr/fix-decls.patch
diff --git a/harmony/attr/fix-throw.patch b/system/attr/fix-throw.patch
index 220e3ad28..220e3ad28 100644
--- a/harmony/attr/fix-throw.patch
+++ b/system/attr/fix-throw.patch
diff --git a/harmony/attr/test-runner-musl.patch b/system/attr/test-runner-musl.patch
index 082217477..082217477 100644
--- a/harmony/attr/test-runner-musl.patch
+++ b/system/attr/test-runner-musl.patch
diff --git a/harmony/attr/test-runner-perl.patch b/system/attr/test-runner-perl.patch
index 67e117034..67e117034 100644
--- a/harmony/attr/test-runner-perl.patch
+++ b/system/attr/test-runner-perl.patch
diff --git a/harmony/autoconf/APKBUILD b/system/autoconf/APKBUILD
index deceea9f9..deceea9f9 100644
--- a/harmony/autoconf/APKBUILD
+++ b/system/autoconf/APKBUILD
diff --git a/harmony/autoconf/autoconf-2.69-fix-perl-regex.patch b/system/autoconf/autoconf-2.69-fix-perl-regex.patch
index 9cccf912b..9cccf912b 100644
--- a/harmony/autoconf/autoconf-2.69-fix-perl-regex.patch
+++ b/system/autoconf/autoconf-2.69-fix-perl-regex.patch
diff --git a/harmony/boost/APKBUILD b/system/boost/APKBUILD
index 9024cb9fe..9024cb9fe 100644
--- a/harmony/boost/APKBUILD
+++ b/system/boost/APKBUILD
diff --git a/harmony/boost/boost-1.57.0-python-abi_letters.patch b/system/boost/boost-1.57.0-python-abi_letters.patch
index 7df3ee704..7df3ee704 100644
--- a/harmony/boost/boost-1.57.0-python-abi_letters.patch
+++ b/system/boost/boost-1.57.0-python-abi_letters.patch
diff --git a/harmony/boost/boost-1.57.0-python-libpython_dep.patch b/system/boost/boost-1.57.0-python-libpython_dep.patch
index 57bfc2677..57bfc2677 100644
--- a/harmony/boost/boost-1.57.0-python-libpython_dep.patch
+++ b/system/boost/boost-1.57.0-python-libpython_dep.patch
diff --git a/harmony/boost/dual-python.patch b/system/boost/dual-python.patch
index 6a0647888..6a0647888 100644
--- a/harmony/boost/dual-python.patch
+++ b/system/boost/dual-python.patch
diff --git a/harmony/boost/libressl.patch b/system/boost/libressl.patch
index 30c13bfcc..30c13bfcc 100644
--- a/harmony/boost/libressl.patch
+++ b/system/boost/libressl.patch
diff --git a/harmony/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch b/system/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch
index e4ba6ece5..e4ba6ece5 100644
--- a/harmony/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch
+++ b/system/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch
diff --git a/harmony/busybox/0001-ash-exec-busybox.static.patch b/system/busybox/0001-ash-exec-busybox.static.patch
index fdf134960..fdf134960 100644
--- a/harmony/busybox/0001-ash-exec-busybox.static.patch
+++ b/system/busybox/0001-ash-exec-busybox.static.patch
diff --git a/harmony/busybox/0002-app-location-for-cpio-vi-and-lspci.patch b/system/busybox/0002-app-location-for-cpio-vi-and-lspci.patch
index 8c8e4ee7a..8c8e4ee7a 100644
--- a/harmony/busybox/0002-app-location-for-cpio-vi-and-lspci.patch
+++ b/system/busybox/0002-app-location-for-cpio-vi-and-lspci.patch
diff --git a/harmony/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch b/system/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
index 5671ee1b0..5671ee1b0 100644
--- a/harmony/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
+++ b/system/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
diff --git a/harmony/busybox/0004-ping-make-ping-work-without-root-privileges.patch b/system/busybox/0004-ping-make-ping-work-without-root-privileges.patch
index 77fa5ed76..77fa5ed76 100644
--- a/harmony/busybox/0004-ping-make-ping-work-without-root-privileges.patch
+++ b/system/busybox/0004-ping-make-ping-work-without-root-privileges.patch
diff --git a/harmony/busybox/0005-fbsplash-support-console-switching.patch b/system/busybox/0005-fbsplash-support-console-switching.patch
index 792c2d6c8..792c2d6c8 100644
--- a/harmony/busybox/0005-fbsplash-support-console-switching.patch
+++ b/system/busybox/0005-fbsplash-support-console-switching.patch
diff --git a/harmony/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch b/system/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
index 65c423178..65c423178 100644
--- a/harmony/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
+++ b/system/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
diff --git a/harmony/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch b/system/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
index 8b89902de..8b89902de 100644
--- a/harmony/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
+++ b/system/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
diff --git a/harmony/busybox/0008-diff-add-support-for-no-dereference.patch b/system/busybox/0008-diff-add-support-for-no-dereference.patch
index 95063a863..95063a863 100644
--- a/harmony/busybox/0008-diff-add-support-for-no-dereference.patch
+++ b/system/busybox/0008-diff-add-support-for-no-dereference.patch
diff --git a/harmony/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch b/system/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
index 2624675c4..2624675c4 100644
--- a/harmony/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
+++ b/system/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
diff --git a/harmony/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch b/system/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
index 75fe62dfd..75fe62dfd 100644
--- a/harmony/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
+++ b/system/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
diff --git a/harmony/busybox/0011-testsuite-fix-cpio-tests.patch b/system/busybox/0011-testsuite-fix-cpio-tests.patch
index a6eb803de..a6eb803de 100644
--- a/harmony/busybox/0011-testsuite-fix-cpio-tests.patch
+++ b/system/busybox/0011-testsuite-fix-cpio-tests.patch
diff --git a/harmony/busybox/0012-microcom-segfault.patch b/system/busybox/0012-microcom-segfault.patch
index 4789079b3..4789079b3 100644
--- a/harmony/busybox/0012-microcom-segfault.patch
+++ b/system/busybox/0012-microcom-segfault.patch
diff --git a/harmony/busybox/APKBUILD b/system/busybox/APKBUILD
index a97c301f4..0c09b1126 100644
--- a/harmony/busybox/APKBUILD
+++ b/system/busybox/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.27.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -15,7 +15,7 @@ checkdepends="zip"
 provides="/bin/sh /sbin/init"
 install="$pkgname.post-install $pkgname.post-upgrade
 	$pkgname-extras.post-install $pkgname-extras.pre-deinstall"
-subpackages="$pkgname-static $pkgname-suid $pkgname-extras"
+subpackages="$pkgname-static $pkgname-suid $pkgname-extras $pkgname-binsh"
 options="suid !check"
 triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
@@ -164,6 +164,14 @@ suid() {
 	install -m4111 bbsuid "$subpkgdir"/bin/bbsuid
 }
 
+binsh() {
+	pkgdesc="Provide /bin/sh with BusyBox ash"
+	depends="${pkgname}"
+
+	mkdir -p "$subpkgdir"/bin
+	mv "$pkgdir"/bin/sh "$subpkgdir"/bin
+}
+
 static() {
 	pkgdesc="Statically linked Busybox"
 	mkdir -p "$subpkgdir"/bin
diff --git a/harmony/busybox/acpid.logrotate b/system/busybox/acpid.logrotate
index a37763540..a37763540 100644
--- a/harmony/busybox/acpid.logrotate
+++ b/system/busybox/acpid.logrotate
diff --git a/harmony/busybox/bbsuid.c b/system/busybox/bbsuid.c
index 8be2671b1..8be2671b1 100644
--- a/harmony/busybox/bbsuid.c
+++ b/system/busybox/bbsuid.c
diff --git a/harmony/busybox/busybox-extras.post-install b/system/busybox/busybox-extras.post-install
index a0327a691..a0327a691 100644
--- a/harmony/busybox/busybox-extras.post-install
+++ b/system/busybox/busybox-extras.post-install
diff --git a/harmony/busybox/busybox-extras.pre-deinstall b/system/busybox/busybox-extras.pre-deinstall
index 15461302c..15461302c 100644
--- a/harmony/busybox/busybox-extras.pre-deinstall
+++ b/system/busybox/busybox-extras.pre-deinstall
diff --git a/harmony/busybox/busybox.post-install b/system/busybox/busybox.post-install
index a986b2f76..a986b2f76 100644
--- a/harmony/busybox/busybox.post-install
+++ b/system/busybox/busybox.post-install
diff --git a/harmony/busybox/busybox.post-upgrade b/system/busybox/busybox.post-upgrade
index 291ed7a6d..291ed7a6d 100644
--- a/harmony/busybox/busybox.post-upgrade
+++ b/system/busybox/busybox.post-upgrade
diff --git a/harmony/busybox/busybox.trigger b/system/busybox/busybox.trigger
index e531a45b8..e531a45b8 100644
--- a/harmony/busybox/busybox.trigger
+++ b/system/busybox/busybox.trigger
diff --git a/harmony/busybox/busyboxconfig b/system/busybox/busyboxconfig
index 979646071..979646071 100644
--- a/harmony/busybox/busyboxconfig
+++ b/system/busybox/busyboxconfig
diff --git a/harmony/busybox/busyboxconfig-extras b/system/busybox/busyboxconfig-extras
index c460d0144..c460d0144 100644
--- a/harmony/busybox/busyboxconfig-extras
+++ b/system/busybox/busyboxconfig-extras
diff --git a/harmony/busybox/dad.if-up b/system/busybox/dad.if-up
index e76bb60bf..e76bb60bf 100644
--- a/harmony/busybox/dad.if-up
+++ b/system/busybox/dad.if-up
diff --git a/harmony/busybox/nologin.c b/system/busybox/nologin.c
index e0a4c56c7..e0a4c56c7 100644
--- a/harmony/busybox/nologin.c
+++ b/system/busybox/nologin.c
diff --git a/harmony/busybox/top-buffer-overflow.patch b/system/busybox/top-buffer-overflow.patch
index 14b23c648..14b23c648 100644
--- a/harmony/busybox/top-buffer-overflow.patch
+++ b/system/busybox/top-buffer-overflow.patch
diff --git a/harmony/c-ares/APKBUILD b/system/c-ares/APKBUILD
index 98fbe2eb1..98fbe2eb1 100644
--- a/harmony/c-ares/APKBUILD
+++ b/system/c-ares/APKBUILD
diff --git a/harmony/ca-certificates/APKBUILD b/system/ca-certificates/APKBUILD
index 81194471e..81194471e 100644
--- a/harmony/ca-certificates/APKBUILD
+++ b/system/ca-certificates/APKBUILD
diff --git a/harmony/ca-certificates/ca-certificates.post-deinstall b/system/ca-certificates/ca-certificates.post-deinstall
index ead634716..ead634716 100644
--- a/harmony/ca-certificates/ca-certificates.post-deinstall
+++ b/system/ca-certificates/ca-certificates.post-deinstall
diff --git a/harmony/ca-certificates/ca-certificates.trigger b/system/ca-certificates/ca-certificates.trigger
index eff198163..eff198163 100644
--- a/harmony/ca-certificates/ca-certificates.trigger
+++ b/system/ca-certificates/ca-certificates.trigger
diff --git a/harmony/check/APKBUILD b/system/check/APKBUILD
index 09af1b010..09af1b010 100644
--- a/harmony/check/APKBUILD
+++ b/system/check/APKBUILD
diff --git a/harmony/cmake/APKBUILD b/system/cmake/APKBUILD
index b89114090..b89114090 100644
--- a/harmony/cmake/APKBUILD
+++ b/system/cmake/APKBUILD
diff --git a/harmony/coreutils/051_all_coreutils-mangen.patch b/system/coreutils/051_all_coreutils-mangen.patch
index 388924d06..388924d06 100644
--- a/harmony/coreutils/051_all_coreutils-mangen.patch
+++ b/system/coreutils/051_all_coreutils-mangen.patch
diff --git a/harmony/coreutils/APKBUILD b/system/coreutils/APKBUILD
index c92568720..c92568720 100644
--- a/harmony/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
diff --git a/harmony/coreutils/coreutils.post-deinstall b/system/coreutils/coreutils.post-deinstall
index 24e0bdf25..24e0bdf25 100644
--- a/harmony/coreutils/coreutils.post-deinstall
+++ b/system/coreutils/coreutils.post-deinstall
diff --git a/harmony/coreutils/disable-mbrtowc-test.patch b/system/coreutils/disable-mbrtowc-test.patch
index d338e0324..d338e0324 100644
--- a/harmony/coreutils/disable-mbrtowc-test.patch
+++ b/system/coreutils/disable-mbrtowc-test.patch
diff --git a/harmony/coreutils/localename-test-fix.patch b/system/coreutils/localename-test-fix.patch
index f90d11866..f90d11866 100644
--- a/harmony/coreutils/localename-test-fix.patch
+++ b/system/coreutils/localename-test-fix.patch
diff --git a/harmony/coreutils/no-doc.patch b/system/coreutils/no-doc.patch
index a1d74623b..a1d74623b 100644
--- a/harmony/coreutils/no-doc.patch
+++ b/system/coreutils/no-doc.patch
diff --git a/harmony/coreutils/printf-musl.patch b/system/coreutils/printf-musl.patch
index 28a951635..28a951635 100644
--- a/harmony/coreutils/printf-musl.patch
+++ b/system/coreutils/printf-musl.patch
diff --git a/harmony/coreutils/seq-write-error.patch b/system/coreutils/seq-write-error.patch
index 4892a82ec..4892a82ec 100644
--- a/harmony/coreutils/seq-write-error.patch
+++ b/system/coreutils/seq-write-error.patch
diff --git a/harmony/coreutils/sort-debug-locale.patch b/system/coreutils/sort-debug-locale.patch
index 27921abbd..27921abbd 100644
--- a/harmony/coreutils/sort-debug-locale.patch
+++ b/system/coreutils/sort-debug-locale.patch
diff --git a/harmony/curl/APKBUILD b/system/curl/APKBUILD
index fd20e55dd..fd20e55dd 100644
--- a/harmony/curl/APKBUILD
+++ b/system/curl/APKBUILD
diff --git a/harmony/curl/curl-do-bounds-check-using-a-double-comparison.patch b/system/curl/curl-do-bounds-check-using-a-double-comparison.patch
index 34e2b6c71..34e2b6c71 100644
--- a/harmony/curl/curl-do-bounds-check-using-a-double-comparison.patch
+++ b/system/curl/curl-do-bounds-check-using-a-double-comparison.patch
diff --git a/harmony/diffutils/APKBUILD b/system/diffutils/APKBUILD
index 19331ecd8..19331ecd8 100644
--- a/harmony/diffutils/APKBUILD
+++ b/system/diffutils/APKBUILD
diff --git a/harmony/diffutils/disable-mbrtowc-test.patch b/system/diffutils/disable-mbrtowc-test.patch
index 1461a4093..1461a4093 100644
--- a/harmony/diffutils/disable-mbrtowc-test.patch
+++ b/system/diffutils/disable-mbrtowc-test.patch
diff --git a/system/emacs/APKBUILD b/system/emacs/APKBUILD
new file mode 100644
index 000000000..0092c9070
--- /dev/null
+++ b/system/emacs/APKBUILD
@@ -0,0 +1,140 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Horst Burkhardt <horst@adelielinux.org>
+pkgname=emacs
+pkgver=26.1
+pkgrel=0
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+arch="all"
+depends="emacs-nox"
+options="!check !dbg"
+url="https://www.gnu.org/software/emacs/emacs.html"
+license="GPL-3.0"
+makedepends="autoconf automake linux-headers paxmark 
+	librsvg-dev giflib-dev libxpm-dev gtk+2.0-dev gconf-dev alsa-lib-dev
+	glib-dev fontconfig-dev libpng-dev
+	libxml2-dev pango-dev tiff-dev libjpeg-turbo-dev ncurses-dev
+	ncurses-libs gnutls-dev libxaw-dev"
+subpackages="$pkgname-doc $pkgname-nox $pkgname-x11 $pkgname-gtk2"
+source="ftp://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz
+	gamedir.patch"
+
+prepare() {
+	cd "$builddir/$1"
+	default_prepare || return 1
+	./autogen.sh || return 1
+}
+
+builddir="$srcdir/emacs-$pkgver"
+_build_variant() {
+	cd "$builddir/$1"
+	shift
+	CFLAGS=-fno-pie \
+	LDFLAGS=-no-pie \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib \
+		--localstatedir=/var \
+		--without-makeinfo \
+		--with-gameuser=:games \
+		"${@}"
+	make
+}
+
+_build_x11() {
+	_build_variant x11 \
+		--with-x-toolkit=athena \
+		--without-toolkit-scroll-bars \
+		--without-dbus \
+		--with-xft \
+		--with-jpeg=yes \
+		--with-tiff=yes
+}
+
+_build_gtk2() {
+	 _build_variant gtk2 \
+		--with-x-toolkit=gtk2 \
+		--with-xft \
+		--with-jpeg=yes \
+		--with-tiff=no
+}
+
+_build_nox() {
+	_build_variant nox \
+		--without-sound \
+		--without-x \
+		--without-file-notification
+}
+
+build() {
+	cd "$builddir"
+	mkdir -p nox
+	mv * nox || true
+	cp -a nox gtk2
+	cp -a nox x11
+	_build_x11
+	_build_nox
+	_build_gtk2
+}
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+doc() {
+	mkdir -p "$subpkgdir"
+	cd "$builddir/gtk2"
+	make DESTDIR="$subpkgdir" install
+	# remove conflict with ctags package
+	mv "$subpkgdir"/usr/share/man/man1/ctags.1.gz "$subpkgdir"/usr/share/man/man1/ctags.emacs.1.gz
+	# only keep info and man directories, all other is in the specific package
+	rm -rf "$subpkgdir"/usr/bin \
+		"$subpkgdir"/usr/lib \
+		"$subpkgdir"/usr/share/appdata \
+		"$subpkgdir"/usr/share/applications \
+		"$subpkgdir"/usr/share/emacs \
+		"$subpkgdir"/usr/share/icons \
+		"$subpkgdir"/var
+}
+
+_subpackage() {
+	cd "$builddir/$1"
+	make DESTDIR="$subpkgdir" install
+
+	# remove conflict with ctags package
+	mv "$subpkgdir"/usr/bin/ctags "$subpkgdir"/usr/bin/ctags.emacs
+	rm -rf "$subpkgdir"/usr/share/info \
+		"$subpkgdir"/usr/share/man
+
+	# fix user/root permissions on usr/share files
+	find "$subpkgdir"/usr/share/emacs/ -exec chown root:root {} \;
+	find "$subpkgdir"/usr/lib -perm -g+s,g+x ! -type d -exec chmod g-s {} \;
+	# fix perms on /var/games
+	chmod 775 "$subpkgdir"/var/games
+	chmod 775 "$subpkgdir"/var/games/emacs
+	chmod 664 "$subpkgdir"/var/games/emacs/*
+	chown -R root:games "$subpkgdir"/var/games
+}
+
+nox() {
+	pkgdesc="$pkgdesc - without X11"
+	depends="!emacs-x11 !emacs-gtk2"
+	_subpackage nox
+}
+
+x11() {
+	pkgdesc="$pkgdesc - with X11"
+	depends="!emacs-nox !emacs-gtk2 hicolor-icon-theme desktop-file-utils"
+	_subpackage x11
+}
+
+gtk2() {
+	pkgdesc="$pkgdesc - with GTK2"
+	depends="!emacs-nox !emacs-x11 hicolor-icon-theme desktop-file-utils"
+	_subpackage gtk2
+}
+
+sha512sums="537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2  emacs-26.1.tar.xz
+8898f309aeaf274366849bd5c56c8e2a1be94dfee2f01b20f1700bf26203f49b9600237e5090fc3d8eaad3ea246f803ffd493d0c04cb3512084a4e3bf58f8f5e  gamedir.patch"
diff --git a/system/emacs/gamedir.patch b/system/emacs/gamedir.patch
new file mode 100644
index 000000000..c1bcbadd6
--- /dev/null
+++ b/system/emacs/gamedir.patch
@@ -0,0 +1,11 @@
+diff -urw emacs-25.1/lib-src/Makefile.in emacs-25.1-gamedir/lib-src/Makefile.in
+--- emacs-25.1/lib-src/Makefile.in	2016-06-29 09:49:18.000000000 +0000
++++ emacs-25.1-gamedir/lib-src/Makefile.in	2016-10-24 15:37:46.718699816 +0000
+@@ -414,7 +414,6 @@
+ 
+ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
+ 	$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} \
+-	  -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
+ 	  $< $(NTLIB) $(LOADLIBES) -o $@
+ 
+ emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
diff --git a/harmony/gamin/APKBUILD b/system/gamin/APKBUILD
index 360161d27..360161d27 100644
--- a/harmony/gamin/APKBUILD
+++ b/system/gamin/APKBUILD
diff --git a/harmony/gamin/fix-deprecated-const.patch b/system/gamin/fix-deprecated-const.patch
index 3d5f6133f..3d5f6133f 100644
--- a/harmony/gamin/fix-deprecated-const.patch
+++ b/system/gamin/fix-deprecated-const.patch
diff --git a/harmony/gamin/fix-pthread-mutex.patch b/system/gamin/fix-pthread-mutex.patch
index c8c5b0005..c8c5b0005 100644
--- a/harmony/gamin/fix-pthread-mutex.patch
+++ b/system/gamin/fix-pthread-mutex.patch
diff --git a/harmony/git/0001-gc-use-s-type-character-for-fscanf.patch b/system/git/0001-gc-use-s-type-character-for-fscanf.patch
index e3fe78cf6..e3fe78cf6 100644
--- a/harmony/git/0001-gc-use-s-type-character-for-fscanf.patch
+++ b/system/git/0001-gc-use-s-type-character-for-fscanf.patch
diff --git a/harmony/git/APKBUILD b/system/git/APKBUILD
index 0a400b851..0a400b851 100644
--- a/harmony/git/APKBUILD
+++ b/system/git/APKBUILD
diff --git a/harmony/git/bb-tar.patch b/system/git/bb-tar.patch
index d9433ef12..d9433ef12 100644
--- a/harmony/git/bb-tar.patch
+++ b/system/git/bb-tar.patch
diff --git a/harmony/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch
index 98949bc1b..98949bc1b 100644
--- a/harmony/git/dont-test-other-encodings.patch
+++ b/system/git/dont-test-other-encodings.patch
diff --git a/harmony/git/git-daemon.confd b/system/git/git-daemon.confd
index 69b209ff1..69b209ff1 100644
--- a/harmony/git/git-daemon.confd
+++ b/system/git/git-daemon.confd
diff --git a/harmony/git/git-daemon.initd b/system/git/git-daemon.initd
index 394feb97e..394feb97e 100644
--- a/harmony/git/git-daemon.initd
+++ b/system/git/git-daemon.initd
diff --git a/harmony/iproute2/APKBUILD b/system/iproute2/APKBUILD
index 755d5e21a..755d5e21a 100644
--- a/harmony/iproute2/APKBUILD
+++ b/system/iproute2/APKBUILD
diff --git a/harmony/iproute2/iproute2.post-install b/system/iproute2/iproute2.post-install
index 36d567ea2..36d567ea2 100644
--- a/harmony/iproute2/iproute2.post-install
+++ b/system/iproute2/iproute2.post-install
diff --git a/harmony/iproute2/musl-fixes.patch b/system/iproute2/musl-fixes.patch
index 0149f6dae..0149f6dae 100644
--- a/harmony/iproute2/musl-fixes.patch
+++ b/system/iproute2/musl-fixes.patch
diff --git a/harmony/kyua/APKBUILD b/system/kyua/APKBUILD
index 588e4bfcf..588e4bfcf 100644
--- a/harmony/kyua/APKBUILD
+++ b/system/kyua/APKBUILD
diff --git a/harmony/libevent/APKBUILD b/system/libevent/APKBUILD
index d49dfa5e1..d49dfa5e1 100644
--- a/harmony/libevent/APKBUILD
+++ b/system/libevent/APKBUILD
diff --git a/harmony/libevent/dont-test-fallback.patch b/system/libevent/dont-test-fallback.patch
index 42a40094a..42a40094a 100644
--- a/harmony/libevent/dont-test-fallback.patch
+++ b/system/libevent/dont-test-fallback.patch
diff --git a/harmony/libevent/fix-test-on-32bit.patch b/system/libevent/fix-test-on-32bit.patch
index ec120a78c..ec120a78c 100644
--- a/harmony/libevent/fix-test-on-32bit.patch
+++ b/system/libevent/fix-test-on-32bit.patch
diff --git a/harmony/libevent/libressl.patch b/system/libevent/libressl.patch
index 21a750c2c..21a750c2c 100644
--- a/harmony/libevent/libressl.patch
+++ b/system/libevent/libressl.patch
diff --git a/harmony/libevent/py3_dumpevents.patch b/system/libevent/py3_dumpevents.patch
index 3c012ef89..3c012ef89 100644
--- a/harmony/libevent/py3_dumpevents.patch
+++ b/system/libevent/py3_dumpevents.patch
diff --git a/harmony/libevent/py3_rpcgen.patch b/system/libevent/py3_rpcgen.patch
index 2ebe974a6..2ebe974a6 100644
--- a/harmony/libevent/py3_rpcgen.patch
+++ b/system/libevent/py3_rpcgen.patch
diff --git a/harmony/libexecinfo/10-execinfo.patch b/system/libexecinfo/10-execinfo.patch
index 97bd8cd5d..97bd8cd5d 100644
--- a/harmony/libexecinfo/10-execinfo.patch
+++ b/system/libexecinfo/10-execinfo.patch
diff --git a/harmony/libexecinfo/20-define-gnu-source.patch b/system/libexecinfo/20-define-gnu-source.patch
index ac18f6eeb..ac18f6eeb 100644
--- a/harmony/libexecinfo/20-define-gnu-source.patch
+++ b/system/libexecinfo/20-define-gnu-source.patch
diff --git a/harmony/libexecinfo/30-linux-makefile.patch b/system/libexecinfo/30-linux-makefile.patch
index f832adce7..f832adce7 100644
--- a/harmony/libexecinfo/30-linux-makefile.patch
+++ b/system/libexecinfo/30-linux-makefile.patch
diff --git a/harmony/libexecinfo/APKBUILD b/system/libexecinfo/APKBUILD
index bdc921c11..bdc921c11 100644
--- a/harmony/libexecinfo/APKBUILD
+++ b/system/libexecinfo/APKBUILD
diff --git a/harmony/libffi/APKBUILD b/system/libffi/APKBUILD
index 4f4923b38..4f4923b38 100644
--- a/harmony/libffi/APKBUILD
+++ b/system/libffi/APKBUILD
diff --git a/harmony/libffi/disable-ppc-ldvariant.patch b/system/libffi/disable-ppc-ldvariant.patch
index 8b3f9cea0..8b3f9cea0 100644
--- a/harmony/libffi/disable-ppc-ldvariant.patch
+++ b/system/libffi/disable-ppc-ldvariant.patch
diff --git a/harmony/libffi/fix-testsuite-longdouble.patch b/system/libffi/fix-testsuite-longdouble.patch
index 20fe4b8c6..20fe4b8c6 100644
--- a/harmony/libffi/fix-testsuite-longdouble.patch
+++ b/system/libffi/fix-testsuite-longdouble.patch
diff --git a/harmony/libffi/gnu-linux-define.patch b/system/libffi/gnu-linux-define.patch
index 8dcae738b..8dcae738b 100644
--- a/harmony/libffi/gnu-linux-define.patch
+++ b/system/libffi/gnu-linux-define.patch
diff --git a/harmony/libffi/pax-dlmmap.patch b/system/libffi/pax-dlmmap.patch
index ec4150410..ec4150410 100644
--- a/harmony/libffi/pax-dlmmap.patch
+++ b/system/libffi/pax-dlmmap.patch
diff --git a/harmony/libtool/APKBUILD b/system/libtool/APKBUILD
index 518d33a0a..518d33a0a 100644
--- a/harmony/libtool/APKBUILD
+++ b/system/libtool/APKBUILD
diff --git a/harmony/libtool/libtool-fix-cross-compile.patch b/system/libtool/libtool-fix-cross-compile.patch
index 585897e0d..585897e0d 100644
--- a/harmony/libtool/libtool-fix-cross-compile.patch
+++ b/system/libtool/libtool-fix-cross-compile.patch
diff --git a/harmony/libtool/libtool.patch b/system/libtool/libtool.patch
index 4302b7e07..4302b7e07 100644
--- a/harmony/libtool/libtool.patch
+++ b/system/libtool/libtool.patch
diff --git a/harmony/libxml2/APKBUILD b/system/libxml2/APKBUILD
index 8f7207c16..8f7207c16 100644
--- a/harmony/libxml2/APKBUILD
+++ b/system/libxml2/APKBUILD
diff --git a/harmony/libxml2/libxml2-2.9.4-remove-pyverify_fd.patch b/system/libxml2/libxml2-2.9.4-remove-pyverify_fd.patch
index d05d4cb60..d05d4cb60 100644
--- a/harmony/libxml2/libxml2-2.9.4-remove-pyverify_fd.patch
+++ b/system/libxml2/libxml2-2.9.4-remove-pyverify_fd.patch
diff --git a/harmony/libxml2/python-segfault-fix.patch b/system/libxml2/python-segfault-fix.patch
index f1f7554eb..f1f7554eb 100644
--- a/harmony/libxml2/python-segfault-fix.patch
+++ b/system/libxml2/python-segfault-fix.patch
diff --git a/harmony/libxslt/APKBUILD b/system/libxslt/APKBUILD
index a43c0ffd3..a43c0ffd3 100644
--- a/harmony/libxslt/APKBUILD
+++ b/system/libxslt/APKBUILD
diff --git a/harmony/linux-pam/APKBUILD b/system/linux-pam/APKBUILD
index f55963c5c..f55963c5c 100644
--- a/harmony/linux-pam/APKBUILD
+++ b/system/linux-pam/APKBUILD
diff --git a/harmony/linux-pam/base-account.pamd b/system/linux-pam/base-account.pamd
index 591092944..591092944 100644
--- a/harmony/linux-pam/base-account.pamd
+++ b/system/linux-pam/base-account.pamd
diff --git a/harmony/linux-pam/base-auth.pamd b/system/linux-pam/base-auth.pamd
index 012445aa3..012445aa3 100644
--- a/harmony/linux-pam/base-auth.pamd
+++ b/system/linux-pam/base-auth.pamd
diff --git a/harmony/linux-pam/base-password.pamd b/system/linux-pam/base-password.pamd
index a146a93fe..a146a93fe 100644
--- a/harmony/linux-pam/base-password.pamd
+++ b/system/linux-pam/base-password.pamd
diff --git a/harmony/linux-pam/base-session-noninteractive.pamd b/system/linux-pam/base-session-noninteractive.pamd
index 85e07d594..85e07d594 100644
--- a/harmony/linux-pam/base-session-noninteractive.pamd
+++ b/system/linux-pam/base-session-noninteractive.pamd
diff --git a/harmony/linux-pam/base-session.pamd b/system/linux-pam/base-session.pamd
index bf5bcb734..bf5bcb734 100644
--- a/harmony/linux-pam/base-session.pamd
+++ b/system/linux-pam/base-session.pamd
diff --git a/harmony/linux-pam/fix-compat.patch b/system/linux-pam/fix-compat.patch
index 4096c3a47..4096c3a47 100644
--- a/harmony/linux-pam/fix-compat.patch
+++ b/system/linux-pam/fix-compat.patch
diff --git a/harmony/linux-pam/libpam-fix-build-with-eglibc-2.16.patch b/system/linux-pam/libpam-fix-build-with-eglibc-2.16.patch
index 1a0716598..1a0716598 100644
--- a/harmony/linux-pam/libpam-fix-build-with-eglibc-2.16.patch
+++ b/system/linux-pam/libpam-fix-build-with-eglibc-2.16.patch
diff --git a/harmony/linux-pam/musl-fix-pam_exec.patch b/system/linux-pam/musl-fix-pam_exec.patch
index b6b999fae..b6b999fae 100644
--- a/harmony/linux-pam/musl-fix-pam_exec.patch
+++ b/system/linux-pam/musl-fix-pam_exec.patch
diff --git a/harmony/linux-pam/other.pamd b/system/linux-pam/other.pamd
index 8c9797e71..8c9797e71 100644
--- a/harmony/linux-pam/other.pamd
+++ b/system/linux-pam/other.pamd
diff --git a/harmony/linux-pam/su.pamd b/system/linux-pam/su.pamd
index 84f2ae7ea..84f2ae7ea 100644
--- a/harmony/linux-pam/su.pamd
+++ b/system/linux-pam/su.pamd
diff --git a/system/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch b/system/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch
new file mode 100644
index 000000000..012738163
--- /dev/null
+++ b/system/mkinitfs/0001-features-add-virtio_net-to-network-modules.patch
@@ -0,0 +1,21 @@
+From d15cc41a7892d48f8255225003a89b91f0c13349 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@alpinelinux.org>
+Date: Sun, 29 Apr 2018 11:15:18 +0000
+Subject: [PATCH] features: add virtio_net to network modules
+
+---
+ features.d/network.modules | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/features.d/network.modules b/features.d/network.modules
+index 311df0b..caa37a8 100644
+--- a/features.d/network.modules
++++ b/features.d/network.modules
+@@ -2,3 +2,4 @@ kernel/drivers/net/ethernet
+ kernel/net/packet/af_packet.ko
+ kernel/drivers/net/hyperv
+ kernel/drivers/net/vmxnet3
++kernel/drivers/net/virtio_net*
+-- 
+2.17.0
+
diff --git a/system/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch b/system/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch
new file mode 100644
index 000000000..8b01d294a
--- /dev/null
+++ b/system/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch
@@ -0,0 +1,23 @@
+From 56d4208345b8da08ada6e6176a0a46cf94f89516 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@alpinelinux.org>
+Date: Sun, 29 Apr 2018 21:14:36 +0000
+Subject: [PATCH] features: virtio_net depends on virtio_pci
+
+---
+ features.d/network.modules | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/features.d/network.modules b/features.d/network.modules
+index caa37a8..e4f084c 100644
+--- a/features.d/network.modules
++++ b/features.d/network.modules
+@@ -2,4 +2,5 @@ kernel/drivers/net/ethernet
+ kernel/net/packet/af_packet.ko
+ kernel/drivers/net/hyperv
+ kernel/drivers/net/vmxnet3
+-kernel/drivers/net/virtio_net*
++kernel/drivers/virtio/virtio_pci.ko
++kernel/drivers/net/virtio_net.ko
+-- 
+2.17.0
+
diff --git a/system/mkinitfs/0001-generate-mkinitfs.conf.patch b/system/mkinitfs/0001-generate-mkinitfs.conf.patch
new file mode 100644
index 000000000..a556879d7
--- /dev/null
+++ b/system/mkinitfs/0001-generate-mkinitfs.conf.patch
@@ -0,0 +1,49 @@
+From 9e1b472701fa1785989f6757243a3d81e97944f2 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 14 May 2018 16:32:08 +0200
+Subject: [PATCH 1/3] generate mkinitfs.conf
+
+we may want have conditional default config depending on architecture
+---
+ Makefile      | 7 +++++--
+ mkinitfs.conf | 2 --
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+ delete mode 100644 mkinitfs.conf
+
+diff --git a/Makefile b/Makefile
+index 68959fe..fc01d1a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -70,12 +70,13 @@ SED_REPLACE	:= -e 's:@VERSION@:$(FULL_VERSION):g' \
+ 		-e 's:@sysconfdir@:$(sysconfdir):g' \
+ 		-e 's:@datadir@:$(datadir):g'
+ 
++DEFAULT_FEATURES ?= ata base cdrom ext2 ext4 keymap kms mmc raid scsi usb virtio
+ 
+ 
+-all:	$(SBIN_FILES) $(SCRIPTS)
++all:	$(SBIN_FILES) $(SCRIPTS) $(CONF_FILES)
+ 
+ clean:
+-	rm -f $(SCRIPTS)
++	rm -f $(SCRIPTS) mkinitfs.conf
+ 
+ help:
+ 	@echo mkinitfs $(VERSION)
+@@ -116,3 +117,5 @@ install: $(SBIN_FILES) $(SHARE_FILES) $(CONF_FILES)
+ 		$(INSTALL) -D $$i $(DESTDIR)/usr/share/mkinitfs/$$i;\
+ 	done
+ 
++mkinitfs.conf:
++	echo 'features="$(DEFAULT_FEATURES)"' > $@
+diff --git a/mkinitfs.conf b/mkinitfs.conf
+deleted file mode 100644
+index 67a5444..0000000
+--- a/mkinitfs.conf
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# run mkinitfs -L for a list of available features
+-features="ata base cdrom ext2 ext3 ext4 keymap kms mmc raid scsi usb virtio"
+-- 
+2.17.0
+
diff --git a/system/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch b/system/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
new file mode 100644
index 000000000..e6e580a14
--- /dev/null
+++ b/system/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
@@ -0,0 +1,28 @@
+From 1d115251816a3f83a008883f1b9665c3d8f4d3a4 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@alpinelinux.org>
+Date: Tue, 20 Feb 2018 10:18:11 +0000
+Subject: [PATCH] initramfs: do not relocate mountpoint for netboot
+
+mountpoint cannot be located when repo is external.
+---
+ initramfs-init.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/initramfs-init.in b/initramfs-init.in
+index 95fcd97..bf2d9bd 100755
+--- a/initramfs-init.in
++++ b/initramfs-init.in
+@@ -221,6 +221,10 @@ relocate_mount() {
+ 		return
+ 	fi
+ 	while read dir; do
++		# skip http(s)/ftp repos for netboot
++		if ! [ -d "$dir" ]; then
++			continue
++		fi
+ 		local dev=$(df -P "$dir" | tail -1 | awk '{print $1}')
+ 		local mnt=$(find_mnt $dev $fstab)
+ 		if [ -n "$mnt" ]; then
+-- 
+2.16.1
+
diff --git a/system/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch b/system/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch
new file mode 100644
index 000000000..7681be46b
--- /dev/null
+++ b/system/mkinitfs/0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch
@@ -0,0 +1,31 @@
+From 15e312961e1bc86da98f2d3dc1d43331bd6f98f7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sat, 20 Jan 2018 00:50:15 +0100
+Subject: [PATCH] nlplug-findfs: add primitive support for LUKS2 containers
+
+Since we previously specified an explicit request_type for the
+crypt_load() function nlplug-findfs couldn't open LUKS2 containers. By
+using CRYPT_LUKS crypt_load accepts any known LUKUS container format.
+
+We could add an additional command line flag to nlplug-finds for
+specifying the request_type but I guess this is good enough for now.
+---
+ nlplug-findfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nlplug-findfs.c b/nlplug-findfs.c
+index be525cc..7fb5468 100644
+--- a/nlplug-findfs.c
++++ b/nlplug-findfs.c
+@@ -582,7 +582,7 @@ static void *cryptsetup_thread(void *data)
+ 		goto notify_out;
+ 	}
+ 
+-	r = crypt_load(cd, CRYPT_LUKS1, params);
++	r = crypt_load(cd, CRYPT_LUKS, params);
+ 	if (r < 0) {
+ 		warnx("crypt_load(%s)", data_devnode);
+ 		goto free_out;
+-- 
+2.15.0
+
diff --git a/system/mkinitfs/0001-skip-hooks-on-diskless-install.patch b/system/mkinitfs/0001-skip-hooks-on-diskless-install.patch
new file mode 100644
index 000000000..a20ebc200
--- /dev/null
+++ b/system/mkinitfs/0001-skip-hooks-on-diskless-install.patch
@@ -0,0 +1,30 @@
+From 0bd97e8aef5208bc92c3e72049f7fea198a90bd1 Mon Sep 17 00:00:00 2001
+From: Henrik Riomar <henrik.riomar@gmail.com>
+Date: Mon, 8 Jan 2018 16:37:44 +0100
+Subject: [PATCH] skip hooks on diskless install
+
+We can not run hooks before musl and busybox is installed.
+
+Use the new flag --initramfs-diskless-boot in order to skip hooks.
+This flag also implies --initdb and the relevant --force flags for
+initramfs diskless boot.
+---
+ initramfs-init.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/initramfs-init.in b/initramfs-init.in
+index f3a3ee5..7c78c58 100755
+--- a/initramfs-init.in
++++ b/initramfs-init.in
+@@ -598,7 +598,7 @@ if [ "$KOPT_chart" = yes ]; then
+ 	pkgs="$pkgs acct"
+ fi
+ 
+-apkflags="--initdb --progress --force"
++apkflags="--initramfs-diskless-boot --progress"
+ if [ -z "$ALPINE_REPO" ]; then
+ 	apkflags="$apkflags --no-network"
+ else
+-- 
+2.15.0
+
diff --git a/system/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch b/system/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch
new file mode 100644
index 000000000..aef8293a1
--- /dev/null
+++ b/system/mkinitfs/0002-initramfs-init-add-disk-and-network-detection-on-s39.patch
@@ -0,0 +1,97 @@
+From 7f77e0b383330265be27f551b2e384a6a8648afa Mon Sep 17 00:00:00 2001
+From: "Tuan M. Hoang" <tmhoang@flatglobe.org>
+Date: Mon, 14 May 2018 10:14:29 -0500
+Subject: [PATCH 2/3] initramfs-init: add disk and network detection on s390x
+
+- Allow including dasd and qeth modules when building initramfs
+- Add detection for dasd and qeth devices from cmdline in init
+---
+ Makefile                    |  7 ++++++-
+ features.d/dasd_mod.modules |  1 +
+ features.d/qeth.modules     |  1 +
+ initramfs-init.in           | 21 ++++++++++++++++++++-
+ 4 files changed, 28 insertions(+), 2 deletions(-)
+ create mode 100644 features.d/dasd_mod.modules
+ create mode 100644 features.d/qeth.modules
+
+diff --git a/Makefile b/Makefile
+index fc01d1a..40dc284 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,9 @@ CONF_FILES	:= mkinitfs.conf \
+ 		features.d/xfs.files \
+ 		features.d/xfs.modules \
+ 		features.d/zfs.files \
+-		features.d/zfs.modules
++		features.d/zfs.modules \
++		features.d/qeth.modules \
++		features.d/dasd_mod.modules
+ 
+ SCRIPTS		:= mkinitfs bootchartd initramfs-init
+ IN_FILES	:= $(addsuffix .in,$(SCRIPTS))
+@@ -71,6 +73,9 @@ SED_REPLACE	:= -e 's:@VERSION@:$(FULL_VERSION):g' \
+ 		-e 's:@datadir@:$(datadir):g'
+ 
+ DEFAULT_FEATURES ?= ata base cdrom ext2 ext4 keymap kms mmc raid scsi usb virtio
++ifeq ($(shell uname -m), s390x)
++DEFAULT_FEATURES += qeth dasd_mod
++endif
+ 
+ 
+ all:	$(SBIN_FILES) $(SCRIPTS) $(CONF_FILES)
+diff --git a/features.d/dasd_mod.modules b/features.d/dasd_mod.modules
+new file mode 100644
+index 0000000..ce843c5
+--- /dev/null
++++ b/features.d/dasd_mod.modules
+@@ -0,0 +1 @@
++kernel/drivers/s390/block/dasd*
+diff --git a/features.d/qeth.modules b/features.d/qeth.modules
+new file mode 100644
+index 0000000..bb5c320
+--- /dev/null
++++ b/features.d/qeth.modules
+@@ -0,0 +1 @@
++kernel/drivers/s390/net/qeth*
+diff --git a/initramfs-init.in b/initramfs-init.in
+index bf2d9bd..933c8c1 100755
+--- a/initramfs-init.in
++++ b/initramfs-init.in
+@@ -269,7 +269,7 @@ set -- $(cat /proc/cmdline)
+ myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm cryptheader cryptoffset
+ 	cryptdiscards debug_init dma init_args keep_apk_new modules ovl_dev pkgs quiet
+ 	root_size root usbdelay ip alpine_repo apkovl alpine_start splash blacklist
+-	overlaytmpfs rootfstype rootflags nbd resume"
++	overlaytmpfs rootfstype rootflags nbd resume s390x_net dasd"
+ 
+ for opt; do
+ 	case "$opt" in
+@@ -345,6 +345,25 @@ mount -t devpts -o gid=5,mode=0620,noexec,nosuid devpts /dev/pts
+ [ -d /dev/shm ] || mkdir /dev/shm
+ mount -t tmpfs -o nodev,nosuid,noexec shm /dev/shm
+ 
++if [ -n "$dasd" ]; then
++	for mod in dasd_mod dasd_eckd_mod dasd_fba_mod; do
++		modprobe $mod
++	done
++	for _dasd in $(echo "$dasd" | tr ',' ' ' ); do
++		echo 1 > /sys/bus/ccw/devices/"${_dasd%%:*}"/online
++	done
++fi
++
++if [ "${s390x_net%%,*}" = "qeth_l2" ]; then
++	for mod in qeth qeth_l2 qeth_l3; do
++		modprobe $mod
++	done
++	_channel="${s390x_net#*,}"
++	echo "$_channel" > /sys/bus/ccwgroup/drivers/qeth/group
++	echo 1 > /sys/bus/ccwgroup/drivers/qeth/"${_channel%%,*}"/layer2
++	echo 1 > /sys/bus/ccwgroup/drivers/qeth/"${_channel%%,*}"/online
++fi
++
+ # load available drivers to get access to modloop media
+ ebegin "Loading boot drivers"
+ 
+-- 
+2.17.0
+
diff --git a/system/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch b/system/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch
new file mode 100644
index 000000000..bcc4e0d49
--- /dev/null
+++ b/system/mkinitfs/0003-initramfs-init-add-support-for-ssh-installer.patch
@@ -0,0 +1,121 @@
+From 64be7028a529d940f81fda31a8e1dfa2281e4989 Mon Sep 17 00:00:00 2001
+From: "Tuan M. Hoang" <tmhoang@flatglobe.org>
+Date: Mon, 21 May 2018 11:54:44 +0000
+Subject: [PATCH 3/3] initramfs-init: add support for ssh installer
+
+This commit allows starting 'firstboot' service (see aports/openrc),
+which will setup installation through SSH if specified in kernel
+parameters.
+
+Real wget is used instead since busybox's wget is broken without
+openssl binary #8917. Credits to clandmeter.
+
+- Allow adding DNS server in configure_ip()
+- Prefix kernel parameters with KOPT_
+---
+ initramfs-init.in | 37 ++++++++++++++++++++++++++++++++-----
+ 1 file changed, 32 insertions(+), 5 deletions(-)
+
+diff --git a/initramfs-init.in b/initramfs-init.in
+index 933c8c1..f33f010 100755
+--- a/initramfs-init.in
++++ b/initramfs-init.in
+@@ -183,6 +183,8 @@ configure_ip() {
+ 	local netmask="$4"
+ 	local device="$6"
+ 	local autoconf="$7"
++	local dns1="$8"
++	local dns2="$9"
+ 	case "$client_ip" in
+ 		off|none|'') return;;
+ 		dhcp) autoconf="dhcp";;
+@@ -209,6 +211,8 @@ configure_ip() {
+ 		ebegin "Setting IP ($device)..."
+ 		ip_set "$device" "$client_ip" "$netmask" "$gw_ip"
+ 		eend $?
++		[ -n "$dns1" ] && echo "nameserver $dns1" >> /etc/resolv.conf
++		[ -n "$dns2" ] && echo "nameserver $dns2" >> /etc/resolv.conf
+ 	fi
+ 	MAC_ADDRESS=$(cat /sys/class/net/$device/address)
+ }
+@@ -262,6 +266,19 @@ setup_nbd() {
+ 	[ "$n" != 0 ] || return 1
+ }
+ 
++# possible cmdline options which could have secure urls.
++# this does not include apkovl as it need to be fetched inside of initramfs
++need_wget() {
++	local opt= ret=1
++	for opt in modloop ssh_key; do
++		eval "opt=\$KOPT_$opt"
++		case "$opt" in
++			https://*|ftps://*) ret=0;;
++		esac
++	done
++	return $ret
++}
++
+ # read the kernel options. we need surve things like:
+ #  acpi_osi="!Windows 2006" xen-pciback.hide=(01:00.0)
+ set -- $(cat /proc/cmdline)
+@@ -269,7 +286,7 @@ set -- $(cat /proc/cmdline)
+ myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm cryptheader cryptoffset
+ 	cryptdiscards debug_init dma init_args keep_apk_new modules ovl_dev pkgs quiet
+ 	root_size root usbdelay ip alpine_repo apkovl alpine_start splash blacklist
+-	overlaytmpfs rootfstype rootflags nbd resume s390x_net dasd"
++	overlaytmpfs rootfstype rootflags nbd resume s390x_net dasd ssh_key ssh_pass"
+ 
+ for opt; do
+ 	case "$opt" in
+@@ -345,20 +362,20 @@ mount -t devpts -o gid=5,mode=0620,noexec,nosuid devpts /dev/pts
+ [ -d /dev/shm ] || mkdir /dev/shm
+ mount -t tmpfs -o nodev,nosuid,noexec shm /dev/shm
+ 
+-if [ -n "$dasd" ]; then
++if [ -n "$KOPT_dasd" ]; then
+ 	for mod in dasd_mod dasd_eckd_mod dasd_fba_mod; do
+ 		modprobe $mod
+ 	done
+-	for _dasd in $(echo "$dasd" | tr ',' ' ' ); do
++	for _dasd in $(echo "$KOPT_dasd" | tr ',' ' ' ); do
+ 		echo 1 > /sys/bus/ccw/devices/"${_dasd%%:*}"/online
+ 	done
+ fi
+ 
+-if [ "${s390x_net%%,*}" = "qeth_l2" ]; then
++if [ "${KOPT_s390x_net%%,*}" = "qeth_l2" ]; then
+ 	for mod in qeth qeth_l2 qeth_l3; do
+ 		modprobe $mod
+ 	done
+-	_channel="${s390x_net#*,}"
++	_channel="${KOPT_s390x_net#*,}"
+ 	echo "$_channel" > /sys/bus/ccwgroup/drivers/qeth/group
+ 	echo 1 > /sys/bus/ccwgroup/drivers/qeth/"${_channel%%,*}"/layer2
+ 	echo 1 > /sys/bus/ccwgroup/drivers/qeth/"${_channel%%,*}"/online
+@@ -540,6 +557,8 @@ if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then
+ 	rc_add killprocs shutdown
+ 	rc_add savecache shutdown
+ 
++	rc_add firstboot default
++
+ 	rm -f "$sysroot/etc/.default_boot_services"
+ fi
+ 
+@@ -622,6 +641,14 @@ if [ "$KOPT_chart" = yes ]; then
+ 	pkgs="$pkgs acct"
+ fi
+ 
++# add openssh
++if [ -n "$KOPT_ssh_key" ] || [ -n "$KOPT_ssh_pass" ]; then
++	pkgs="$pkgs openssh"
++fi
++
++# add wget if using secure urls in cmdline
++need_wget && pkgs="$pkgs wget"
++
+ apkflags="--initramfs-diskless-boot --progress"
+ if [ -z "$ALPINE_REPO" ]; then
+ 	apkflags="$apkflags --no-network"
+-- 
+2.17.0
+
diff --git a/system/mkinitfs/APKBUILD b/system/mkinitfs/APKBUILD
new file mode 100644
index 000000000..ecb51abeb
--- /dev/null
+++ b/system/mkinitfs/APKBUILD
@@ -0,0 +1,48 @@
+# Maintainer: 
+pkgname=mkinitfs
+pkgver=3.2.0
+_ver=${pkgver%_git*}
+pkgrel=14
+pkgdesc="Tool to generate initramfs images for Alpine"
+url="https://git.alpinelinux.org/cgit/mkinitfs"
+arch="all"
+license="GPL-2.0"
+# currently we do not ship any testsuite
+options="!check"
+makedepends_build=""
+makedepends_host="busybox kmod-dev util-linux-dev cryptsetup-dev linux-headers"
+makedepends="$makedepends_build $makedepends_host"
+depends="busybox>=1.28.2-r1 apk-tools>=2.9.1 lddtree>=1.25"
+install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
+triggers="$pkgname.trigger=/usr/share/kernel/*"
+source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
+	0001-skip-hooks-on-diskless-install.patch
+	0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch
+	0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
+	0001-features-add-virtio_net-to-network-modules.patch
+	0001-features-virtio_net-depends-on-virtio_pci.patch
+	0001-generate-mkinitfs.conf.patch
+	0002-initramfs-init-add-disk-and-network-detection-on-s39.patch
+	0003-initramfs-init-add-support-for-ssh-installer.patch
+	"
+builddir="$srcdir/$pkgname-$_ver"
+
+build() {
+	cd "$builddir"
+	make VERSION=$pkgver-r$pkgrel
+}
+
+package() {
+	cd "$builddir"
+	make install DESTDIR="$pkgdir"
+}
+
+sha512sums="906bfbce677d4ece9c9fea7b2a529121740bc9d96ea011be083303cc5c56162f09271b0a673e9e335234ccf2f293109bda1eda333698a95357d0772c86f498af  mkinitfs-3.2.0.tar.xz
+f5c9b21e53c663dac1b8f33f929dbe067492f0dc1bd5ef5310ef531033f31fc3fa0b6de6dce03cecaf90b8ed47b278d0f1f7c64dbbeede7621c895ee3ea79864  0001-skip-hooks-on-diskless-install.patch
+4d298d73cc6e557c51de805721ef4b9f002498af5dd9f0aebfd6620ec84d1fadde76888bc2d40efc71dc0a8497aa0586ac65d596eb0021bfed633adcc3aca3b4  0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch
+4387357cfcd3441c5d8777e42c0e62a73fa446aacd2faac081947afc39bdd8fb91e12b34f3b69a6827bd7d0705f54514b77c0ff4c38ee0d70553050117c42576  0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
+530a33638e7ba1faceed9a5cb0a2e08bec5d29d160a99730b7a2fb6c98f93a511908df8ab14cc47884397c9affee899a23896aab1c6c9073015ce077cc16552f  0001-features-add-virtio_net-to-network-modules.patch
+e5a6a25ea51b0ef16f525af20f8e44e64f5c4bb56f46b220151fc03cfa2c530ec55e2755a5dca766f9dad467815b5949bd22e029bcda89fbcef0d40bb3fd1a0f  0001-features-virtio_net-depends-on-virtio_pci.patch
+3dfc39cf9c97ed63869b7d36f9c666b6d4d2250240ed64a6e827056e4fc0ed2d2cb03f63772761404e745fa57e8ea2e3157107c323866fa8f32f7195c0555770  0001-generate-mkinitfs.conf.patch
+92ef3fb695aa060ff4d7c682eead8eae0065c4e28dc155d233cfdbd6b7ac55d1d5ba0258e3f48fb47512acd8594a893c809c5b93ad7715c99a1697331c27491d  0002-initramfs-init-add-disk-and-network-detection-on-s39.patch
+64840c34d91549c6e68a22a6eb0093d84a53a78ebbe3f12287e0ccb0fabbb1bb7829ca246522e0bdfdb45c32b0afb598447dfc688f261911c3d1d48d55f05503  0003-initramfs-init-add-support-for-ssh-installer.patch"
diff --git a/system/mkinitfs/mkinitfs.post-install b/system/mkinitfs/mkinitfs.post-install
new file mode 100644
index 000000000..a2a404b09
--- /dev/null
+++ b/system/mkinitfs/mkinitfs.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# safety. if nlplug-findfs is missing in the initramfs image we may end up
+# with an unbootable system.
+
+if ! grep -q -w /sbin/nlplug-findfs /etc/mkinitfs/features.d/base.files; then
+	echo "/sbin/nlplug-findfs" >> /etc/mkinitfs/features.d/base.files
+fi
diff --git a/system/mkinitfs/mkinitfs.post-upgrade b/system/mkinitfs/mkinitfs.post-upgrade
new file mode 120000
index 000000000..78caf2e57
--- /dev/null
+++ b/system/mkinitfs/mkinitfs.post-upgrade
@@ -0,0 +1 @@
+mkinitfs.post-install
\ No newline at end of file
diff --git a/system/mkinitfs/mkinitfs.pre-upgrade b/system/mkinitfs/mkinitfs.pre-upgrade
new file mode 100644
index 000000000..0ece527f9
--- /dev/null
+++ b/system/mkinitfs/mkinitfs.pre-upgrade
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+mkdir -p /etc/mkinitfs/features.d
+for i in files modules; do
+	for j in /etc/mkinitfs/$i.d/*; do
+		[ -e "$j" ] || continue
+		case "$j" in
+		*.apk-new) continue;;
+		esac
+		mv $j /etc/mkinitfs/features.d/${j##*/}.$i
+	done
+done
+exit 0
diff --git a/system/mkinitfs/mkinitfs.trigger b/system/mkinitfs/mkinitfs.trigger
new file mode 100644
index 000000000..e8acc9785
--- /dev/null
+++ b/system/mkinitfs/mkinitfs.trigger
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+for i in "$@"; do
+	# get last element in path
+	flavor=${i##*/}
+	if ! [ -f "$i"/kernel.release ]; then
+		# kernel was uninstalled
+		rm -f $( readlink -f /boot/initramfs-$flavor ) \
+			/boot/initramfs-$flavor /boot/vmlinuz-$flavor \
+			/boot/$flavor /boot/$flavor.gz /$flavor /$flavor.gz
+		continue
+	fi
+	abi_release=$(cat "$i"/kernel.release)
+	initfs=initramfs-$flavor
+	mkinitfs -o /boot/$initfs $abi_release
+done
+
+# extlinux will use path relative partition, so if /boot is on a
+# separate partition we want /boot/<kernel> resolve to /<kernel>
+if ! [ -e /boot/boot ]; then
+	ln -sf . /boot/boot
+fi
+
+# cleanup unused initramfs
+for i in /boot/initramfs-[0-9]*; do
+	[ -f $i ] || continue
+	if ! [ -f /boot/vmlinuz-${i#/boot/initramfs-} ]; then
+		rm "$i"
+	fi
+done
+
+sync
+exit 0
diff --git a/harmony/parted/APKBUILD b/system/parted/APKBUILD
index 0a4680a60..0a4680a60 100644
--- a/harmony/parted/APKBUILD
+++ b/system/parted/APKBUILD
diff --git a/harmony/parted/disable-two-tests.patch b/system/parted/disable-two-tests.patch
index a6481dde3..a6481dde3 100644
--- a/harmony/parted/disable-two-tests.patch
+++ b/system/parted/disable-two-tests.patch
diff --git a/harmony/parted/fix-includes.patch b/system/parted/fix-includes.patch
index c6eff0eb2..c6eff0eb2 100644
--- a/harmony/parted/fix-includes.patch
+++ b/system/parted/fix-includes.patch
diff --git a/harmony/parted/fix-libintl-header-s390x.patch b/system/parted/fix-libintl-header-s390x.patch
index 68ae7d270..68ae7d270 100644
--- a/harmony/parted/fix-libintl-header-s390x.patch
+++ b/system/parted/fix-libintl-header-s390x.patch
diff --git a/harmony/parted/tests-call-name-correctly.patch b/system/parted/tests-call-name-correctly.patch
index 27a6287e8..27a6287e8 100644
--- a/harmony/parted/tests-call-name-correctly.patch
+++ b/system/parted/tests-call-name-correctly.patch
diff --git a/harmony/parted/tests-python3.patch b/system/parted/tests-python3.patch
index 8811b7237..8811b7237 100644
--- a/harmony/parted/tests-python3.patch
+++ b/system/parted/tests-python3.patch
diff --git a/harmony/pcre/APKBUILD b/system/pcre/APKBUILD
index 43ac2a9d6..43ac2a9d6 100644
--- a/harmony/pcre/APKBUILD
+++ b/system/pcre/APKBUILD
diff --git a/harmony/pcre2/APKBUILD b/system/pcre2/APKBUILD
index d06c4b22c..d06c4b22c 100644
--- a/harmony/pcre2/APKBUILD
+++ b/system/pcre2/APKBUILD
diff --git a/harmony/postgresql/APKBUILD b/system/postgresql/APKBUILD
index e618eeb39..e618eeb39 100644
--- a/harmony/postgresql/APKBUILD
+++ b/system/postgresql/APKBUILD
diff --git a/harmony/postgresql/conf-unix_socket_directories.patch b/system/postgresql/conf-unix_socket_directories.patch
index 24c51e7b9..24c51e7b9 100644
--- a/harmony/postgresql/conf-unix_socket_directories.patch
+++ b/system/postgresql/conf-unix_socket_directories.patch
diff --git a/harmony/postgresql/disable-broken-tests.patch b/system/postgresql/disable-broken-tests.patch
index 0bb5b03fa..0bb5b03fa 100644
--- a/harmony/postgresql/disable-broken-tests.patch
+++ b/system/postgresql/disable-broken-tests.patch
diff --git a/harmony/postgresql/initdb.patch b/system/postgresql/initdb.patch
index 59a872a49..59a872a49 100644
--- a/harmony/postgresql/initdb.patch
+++ b/system/postgresql/initdb.patch
diff --git a/harmony/postgresql/perl-rpath.patch b/system/postgresql/perl-rpath.patch
index a2505acf7..a2505acf7 100644
--- a/harmony/postgresql/perl-rpath.patch
+++ b/system/postgresql/perl-rpath.patch
diff --git a/harmony/postgresql/pg-restore.confd b/system/postgresql/pg-restore.confd
index 84a179f6c..84a179f6c 100644
--- a/harmony/postgresql/pg-restore.confd
+++ b/system/postgresql/pg-restore.confd
diff --git a/harmony/postgresql/pg-restore.initd b/system/postgresql/pg-restore.initd
index e9fe65c19..e9fe65c19 100644
--- a/harmony/postgresql/pg-restore.initd
+++ b/system/postgresql/pg-restore.initd
diff --git a/harmony/postgresql/pltcl_create_tables.sql b/system/postgresql/pltcl_create_tables.sql
index 76c7a954a..76c7a954a 100644
--- a/harmony/postgresql/pltcl_create_tables.sql
+++ b/system/postgresql/pltcl_create_tables.sql
diff --git a/harmony/postgresql/postgresql.confd b/system/postgresql/postgresql.confd
index 6a25cc381..6a25cc381 100644
--- a/harmony/postgresql/postgresql.confd
+++ b/system/postgresql/postgresql.confd
diff --git a/harmony/postgresql/postgresql.initd b/system/postgresql/postgresql.initd
index 846229a40..846229a40 100644
--- a/harmony/postgresql/postgresql.initd
+++ b/system/postgresql/postgresql.initd
diff --git a/harmony/postgresql/postgresql.pre-upgrade b/system/postgresql/postgresql.pre-upgrade
index 6116252c1..6116252c1 100644
--- a/harmony/postgresql/postgresql.pre-upgrade
+++ b/system/postgresql/postgresql.pre-upgrade
diff --git a/harmony/py-mako/APKBUILD b/system/py-mako/APKBUILD
index 2ef83e096..2ef83e096 100644
--- a/harmony/py-mako/APKBUILD
+++ b/system/py-mako/APKBUILD
diff --git a/harmony/rsync/APKBUILD b/system/rsync/APKBUILD
index af06ccd38..af06ccd38 100644
--- a/harmony/rsync/APKBUILD
+++ b/system/rsync/APKBUILD
diff --git a/harmony/rsync/rsyncd.conf b/system/rsync/rsyncd.conf
index 6318016e9..6318016e9 100644
--- a/harmony/rsync/rsyncd.conf
+++ b/system/rsync/rsyncd.conf
diff --git a/harmony/rsync/rsyncd.confd b/system/rsync/rsyncd.confd
index 7128f97fd..7128f97fd 100644
--- a/harmony/rsync/rsyncd.confd
+++ b/system/rsync/rsyncd.confd
diff --git a/harmony/rsync/rsyncd.initd b/system/rsync/rsyncd.initd
index eb05b3b59..eb05b3b59 100644
--- a/harmony/rsync/rsyncd.initd
+++ b/system/rsync/rsyncd.initd
diff --git a/harmony/rsync/rsyncd.logrotate b/system/rsync/rsyncd.logrotate
index 34bcf72d2..34bcf72d2 100644
--- a/harmony/rsync/rsyncd.logrotate
+++ b/system/rsync/rsyncd.logrotate
diff --git a/harmony/sed/APKBUILD b/system/sed/APKBUILD
index 08fe6a55a..08fe6a55a 100644
--- a/harmony/sed/APKBUILD
+++ b/system/sed/APKBUILD
diff --git a/harmony/sed/disable-mbrtowc-test.patch b/system/sed/disable-mbrtowc-test.patch
index 51cdf3c25..51cdf3c25 100644
--- a/harmony/sed/disable-mbrtowc-test.patch
+++ b/system/sed/disable-mbrtowc-test.patch
diff --git a/harmony/sed/localename-test-fix.patch b/system/sed/localename-test-fix.patch
index 8a5d68dde..8a5d68dde 100644
--- a/harmony/sed/localename-test-fix.patch
+++ b/system/sed/localename-test-fix.patch
diff --git a/harmony/sed/sed.post-deinstall b/system/sed/sed.post-deinstall
index 5ec0031a4..5ec0031a4 100644
--- a/harmony/sed/sed.post-deinstall
+++ b/system/sed/sed.post-deinstall
diff --git a/harmony/ssmtp/APKBUILD b/system/ssmtp/APKBUILD
index b7ae28bc7..b7ae28bc7 100644
--- a/harmony/ssmtp/APKBUILD
+++ b/system/ssmtp/APKBUILD
diff --git a/harmony/ssmtp/generate_config.patch b/system/ssmtp/generate_config.patch
index 23285b193..23285b193 100644
--- a/harmony/ssmtp/generate_config.patch
+++ b/system/ssmtp/generate_config.patch
diff --git a/harmony/ssmtp/inet6-getaddrinfo.patch b/system/ssmtp/inet6-getaddrinfo.patch
index bbc2d90ba..bbc2d90ba 100644
--- a/harmony/ssmtp/inet6-getaddrinfo.patch
+++ b/system/ssmtp/inet6-getaddrinfo.patch
diff --git a/harmony/ssmtp/libcrypto-underlinking.patch b/system/ssmtp/libcrypto-underlinking.patch
index 4928f271c..4928f271c 100644
--- a/harmony/ssmtp/libcrypto-underlinking.patch
+++ b/system/ssmtp/libcrypto-underlinking.patch
diff --git a/harmony/strace/APKBUILD b/system/strace/APKBUILD
index aecde405f..aecde405f 100644
--- a/harmony/strace/APKBUILD
+++ b/system/strace/APKBUILD
diff --git a/harmony/strace/disable-fortify.patch b/system/strace/disable-fortify.patch
index 26b2978c5..26b2978c5 100644
--- a/harmony/strace/disable-fortify.patch
+++ b/system/strace/disable-fortify.patch
diff --git a/harmony/strace/fix-ppc-pt-regs-collision.patch b/system/strace/fix-ppc-pt-regs-collision.patch
index 6de0fcdd6..6de0fcdd6 100644
--- a/harmony/strace/fix-ppc-pt-regs-collision.patch
+++ b/system/strace/fix-ppc-pt-regs-collision.patch
diff --git a/harmony/strace/nlattr-fix.patch b/system/strace/nlattr-fix.patch
index 6d480fabb..6d480fabb 100644
--- a/harmony/strace/nlattr-fix.patch
+++ b/system/strace/nlattr-fix.patch
diff --git a/harmony/tzdata/0001-posixtz-fix-up-lseek.patch b/system/tzdata/0001-posixtz-fix-up-lseek.patch
index 4bf164fec..4bf164fec 100644
--- a/harmony/tzdata/0001-posixtz-fix-up-lseek.patch
+++ b/system/tzdata/0001-posixtz-fix-up-lseek.patch
diff --git a/harmony/tzdata/APKBUILD b/system/tzdata/APKBUILD
index e4ff75efd..e4ff75efd 100644
--- a/harmony/tzdata/APKBUILD
+++ b/system/tzdata/APKBUILD
diff --git a/harmony/zsh/APKBUILD b/system/zsh/APKBUILD
index 3672a0445..3672a0445 100644
--- a/harmony/zsh/APKBUILD
+++ b/system/zsh/APKBUILD
diff --git a/harmony/zsh/zprofile b/system/zsh/zprofile
index 363d4863c..363d4863c 100644
--- a/harmony/zsh/zprofile
+++ b/system/zsh/zprofile
diff --git a/harmony/zsh/zsh.post-install b/system/zsh/zsh.post-install
index d2399cd8b..d2399cd8b 100644
--- a/harmony/zsh/zsh.post-install
+++ b/system/zsh/zsh.post-install
diff --git a/harmony/zsh/zsh.post-upgrade b/system/zsh/zsh.post-upgrade
index 1b42f8258..1b42f8258 100644
--- a/harmony/zsh/zsh.post-upgrade
+++ b/system/zsh/zsh.post-upgrade
diff --git a/harmony/zsh/zsh.pre-deinstall b/system/zsh/zsh.pre-deinstall
index 215f9a2e8..215f9a2e8 100644
--- a/harmony/zsh/zsh.pre-deinstall
+++ b/system/zsh/zsh.pre-deinstall
diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD
index 9afa44db6..1e33e8a74 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library for integrating contact lists with Akonadi"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="36b8c18d31661857d47bbe1dca3d912f1a3b4969ad03002014d18cd7978857dde100d95b5736799c0e18d2b6564820bcb865258d1848f2965dd3c675bd978729  akonadi-contacts-17.12.2.tar.xz"
+sha512sums="30c6f45fe5ccbc3394144388ffe6c3314c1a1fd85b67e58e0d606b14c31209091ac8f6e5281f22c295bc8bb45d2265a471cc4173952a406963046138ebada929  akonadi-contacts-18.04.1.tar.xz"
diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD
index b381bd39b..68964c7c3 100644
--- a/user/akonadi-mime/APKBUILD
+++ b/user/akonadi-mime/APKBUILD
@@ -1,11 +1,12 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=akonadi-mime
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Libraries to implement basic MIME message handling"
 url="https://www.kde.org/"
 arch="all"
+options="!check"  # regression?
 license="LGPL-2.1"
 depends=""
 depends_dev="qt5-qtbase-dev kmime-dev kdbusaddons-dev kio-dev kitemmodels-dev
@@ -43,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a0bc9110bbc4d51910b17efdc3347c84f409d21bd43bdb2b44552dcaca6bbc16424ea89e95296351a7bec655fe3c0601a960fb8367238eebaf4c7ed7f1ae757f  akonadi-mime-17.12.2.tar.xz"
+sha512sums="b797a7a964f6277bc5d8e63b19511f1613ec61fe5d2fbb18668e96c291532e4a2e24eef110903fd26676f0269fbebc42d6ff9bee341a5384a90e5190a02cdb91  akonadi-mime-18.04.1.tar.xz"
diff --git a/user/akonadi-notes/APKBUILD b/user/akonadi-notes/APKBUILD
index 46ba2f531..dea2a0f07 100644
--- a/user/akonadi-notes/APKBUILD
+++ b/user/akonadi-notes/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=akonadi-notes
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library for integrating notes into Akonadi"
 url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8c10178dd8d0de8b9d405a45aff8f70f58a4c66e79355f831c08202665b24e2584f716e32694ade4acfb07cd8707d37c82c3c1feba9fb219a67aec7f01abe4f7  akonadi-notes-17.12.2.tar.xz"
+sha512sums="966b917ba7c2c015132bda325ac04765ae0abe035ad899c9b10b5667213a20887208f67af2ca16b027895410d10fe0b673072a2e44b62412714ca78eeeff1f56  akonadi-notes-18.04.1.tar.xz"
diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD
index f29a5993c..b384f4beb 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Libraries and storage system for PIM data"
 url="https://community.kde.org/KDE_PIM/Akonadi"
@@ -51,5 +51,5 @@ package() {
 		"$pkgdir"/usr/share/config/akonadi
 }
 
-sha512sums="c0004d09cae94b4f8a348c0439830a3ec6e906b04a95e8db7f3d15c6aa159910e764c06e3d92ade20e02c16598378cf2eb3f6e99018f2f47d7505bd0fb968905  akonadi-17.12.2.tar.xz
+sha512sums="db76bbe6e31ff8fa2b0a59a43bd86e86fd73e17c0c30f3e8ce64ba90d2c2f284b1b3422ed00fbdae83d43124cae57aa39a0d80ee116978ccdb6fa38dd7a9a07e  akonadi-18.04.1.tar.xz
 b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab  akonadiserverrc"
diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD
index f2d0dde57..fe4f325a6 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=17.12.2
+pkgver=18.04.1
 pkgrel=1
 pkgdesc="Mathematical object library"
 url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html"
@@ -41,5 +41,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e326d397db3193492258f156cd71f63e4544abd9724b58769a1593ff57242b18de09291a433ea37658015bd57f75e430ed95bdf99d3863fccfc4b546a9686933  analitza-17.12.2.tar.xz
+sha512sums="76547578bf2ac88123ba70ff8f35643cf17c14acf72b720f1dee9cd73f4033741cc99157ec1284cd3ae8d60162a40b202c3bbe3d3f3f6ba22090deb0449b7c11  analitza-18.04.1.tar.xz
 c38ce1f8265224aebfa8dcf8ef93a83bb2abd4eb757add3a7578660753bf9f16cbd497c9d696f22a6345602585a06bf4bad2bd89b2ea75e70baf9f8739198da9  pmmx-test-failure.patch"
diff --git a/harmony/apr-util/APKBUILD b/user/apr-util/APKBUILD
index 415c3e9cd..415c3e9cd 100644
--- a/harmony/apr-util/APKBUILD
+++ b/user/apr-util/APKBUILD
diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD
index fa470d168..fb2e6d7f4 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Graphical file compression/decompression utility with support for multiple formats"
 url="https://utils.kde.org/projects/ark/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8b87bb8e96ed1483503ebd26ce505962cafe96b9294dac9dd548a0659c0ff8795cf1e699c86ec2168f761819906d8958cedbe3858e05d50f7cb41a9d780a78af  ark-17.12.2.tar.xz"
+sha512sums="0a6a390f3771c4dc1d6386fcb17eac0416bc7494f6517d60a8007a676322b1986f6ff526ba8514a9f68913bd67f2105dfe9bfd1aa24feb2f19f67b442b1d1f8e  ark-18.04.1.tar.xz"
diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD
index 31a45e447..843fee5a7 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Pronunciation trainer for languages"
 url="https://www.kde.org/applications/education/artikulate/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a5157cb099e32069e30fdee0be3cbc484a5e13b9f968da8bc04526c49db3ba47d07c5deb9a432bcef9154e616aba9ff7911cbb7bc09307e44fbd2149bfd2e9a9  artikulate-17.12.2.tar.xz"
+sha512sums="503c4fac6f5ecf5bccdaad9f66f4743732b2a2b1fd435a147c2d58dbed58a22002bf5fce04949bf73ed816c90d610e6346fe5d68cee2541b28c4a69292dbae96  artikulate-18.04.1.tar.xz"
diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD
index 851889c49..17ea63d35 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Memory enhancement game"
 url="https://www.kde.org/applications/education/blinken/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a09b23b2cc91513c2cbabbdb94b2d45aa987f21d5f135f3f878163d3ee9211eab6a2c26d7e0c979122b6361df7b8f9147f457432bb3a6277eb1e513b1c811dbc  blinken-17.12.2.tar.xz"
+sha512sums="08eb8734657aed72eb47c5bd8822126ebf39535dc4da38b59b680f68d95d442db0a74a5d717e987f653d34d3beda1cd85dcc88d4810e09f427c0a01a45956c10  blinken-18.04.1.tar.xz"
diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD
index f86f18197..06cfc21b9 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Arcade bombing game"
 url="https://www.kde.org/applications/games/bomber/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="27563ac622e4b3e2eb796ddc9aa7a90b6971775f2873464466e9c82e5c813afcfb2ea4f37bb7d1eb22c42d3f2300e4d75f6fa96ce262ad072710ddc48a27edc1  bomber-17.12.2.tar.xz"
+sha512sums="24b97268905abe7a57f77c56eec1c4c63374b024becd1802b0b00378f7f236ae57a2a63a8048d686dfb4f77774088e7447a1aa14e5381aeec5fcfabb4c3878c9  bomber-18.04.1.tar.xz"
diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD
index a14d75396..a6dd0d453 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Gomoku or Connect Five game"
 url="https://www.kde.org/applications/games/bovo/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="42b37cf929755e730b30125977ef19858a9f006582eed62d20646b1fe5428c9731aaf840966d67c6e251c1cf279ee852e5bb4d31e58c2e93e92225a55f407ed0  bovo-17.12.2.tar.xz"
+sha512sums="e35bccc587f3fbd08eeaea4ece58e3d533d9c3fd4ac587df792a6183c95c9e8a05fc6d2e47b987723360ddbad1c0d8b747de6f3212e10a3c16528a5b1b6a0998  bovo-18.04.1.tar.xz"
diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD
index a52aa23bd..1fb07cccd 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Lightweight desktop file manager"
 url="https://www.kde.org/applications/system/dolphin/"
@@ -45,4 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3c576d6eeb373790b8b4c6a13b01df606bbfde7b0c08da5965d31e77a1f88a3ccc79387b0546bfc039a1abc65b4bc466b39f7e128e67ecfe0f613c3d51e85d21  dolphin-17.12.2.tar.xz"
+sha512sums="13c9f45282168a4ae68b9d0977b1734918c662028043167ab36bc67b7b7f1756930a613e7bbd25bafc6db7e1591524f2ec3002247838ddbf0dc49037d4c7a0fd  dolphin-18.04.1.tar.xz"
diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD
index 618d6f60d..b319e2121 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Multimedia player with a focus on simplicity"
 url="https://www.kde.org/applications/multimedia/dragonplayer/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8df5e3b846b01cf56fe19413aa16ec99933fe85bc15a5e04d3203d6020c335c715e7ce23a424edb3f3544f12a0f647988777f7c0ac213b618008f270edb7ffd9  dragon-17.12.2.tar.xz"
+sha512sums="8ba785d3ad30e4adc2bc63e9547945799074e49c14fd93b20923fe2c7cee7f0f7afd5b5477582f700c729e3e36fbdf3cc334e16e79735b2da574e2e53f0368b4  dragon-18.04.1.tar.xz"
diff --git a/harmony/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
index 93e3ac995..93e3ac995 100644
--- a/harmony/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+++ b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
diff --git a/harmony/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index a963e33f8..a963e33f8 100644
--- a/harmony/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
diff --git a/harmony/freetype/0001-Enable-table-validation-modules.patch b/user/freetype/0001-Enable-table-validation-modules.patch
index 3e9451fa8..3e9451fa8 100644
--- a/harmony/freetype/0001-Enable-table-validation-modules.patch
+++ b/user/freetype/0001-Enable-table-validation-modules.patch
diff --git a/harmony/freetype/0002-Enable-subpixel-rendering.patch b/user/freetype/0002-Enable-subpixel-rendering.patch
index dfb57966e..dfb57966e 100644
--- a/harmony/freetype/0002-Enable-subpixel-rendering.patch
+++ b/user/freetype/0002-Enable-subpixel-rendering.patch
diff --git a/harmony/freetype/0003-Enable-infinality-subpixel-hinting.patch b/user/freetype/0003-Enable-infinality-subpixel-hinting.patch
index bbfa2a2cd..bbfa2a2cd 100644
--- a/harmony/freetype/0003-Enable-infinality-subpixel-hinting.patch
+++ b/user/freetype/0003-Enable-infinality-subpixel-hinting.patch
diff --git a/harmony/freetype/0004-Enable-long-PCF-family-names.patch b/user/freetype/0004-Enable-long-PCF-family-names.patch
index 675423a7c..675423a7c 100644
--- a/harmony/freetype/0004-Enable-long-PCF-family-names.patch
+++ b/user/freetype/0004-Enable-long-PCF-family-names.patch
diff --git a/harmony/freetype/40-memcpy-fix.patch b/user/freetype/40-memcpy-fix.patch
index 89e61cd0b..89e61cd0b 100644
--- a/harmony/freetype/40-memcpy-fix.patch
+++ b/user/freetype/40-memcpy-fix.patch
diff --git a/harmony/freetype/APKBUILD b/user/freetype/APKBUILD
index fbb4e0103..fbb4e0103 100644
--- a/harmony/freetype/APKBUILD
+++ b/user/freetype/APKBUILD
diff --git a/harmony/freetype/freetype-profile.sh b/user/freetype/freetype-profile.sh
index a4cc6423b..a4cc6423b 100644
--- a/harmony/freetype/freetype-profile.sh
+++ b/user/freetype/freetype-profile.sh
diff --git a/harmony/glib-networking/APKBUILD b/user/glib-networking/APKBUILD
index 65ae109a0..65ae109a0 100644
--- a/harmony/glib-networking/APKBUILD
+++ b/user/glib-networking/APKBUILD
diff --git a/harmony/glib-networking/proxy-test.patch b/user/glib-networking/proxy-test.patch
index 2cab5d9f6..2cab5d9f6 100644
--- a/harmony/glib-networking/proxy-test.patch
+++ b/user/glib-networking/proxy-test.patch
diff --git a/harmony/glib/0001-gquark-fix-initialization-with-c-constructors.patch b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch
index 50a9a8c28..50a9a8c28 100644
--- a/harmony/glib/0001-gquark-fix-initialization-with-c-constructors.patch
+++ b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch
diff --git a/harmony/glib/APKBUILD b/user/glib/APKBUILD
index 89a98754f..89a98754f 100644
--- a/harmony/glib/APKBUILD
+++ b/user/glib/APKBUILD
diff --git a/harmony/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch
index d7006db87..d7006db87 100644
--- a/harmony/glib/broken-gio-tests.patch
+++ b/user/glib/broken-gio-tests.patch
diff --git a/harmony/glib/fix-spawn.patch b/user/glib/fix-spawn.patch
index df352fdc3..df352fdc3 100644
--- a/harmony/glib/fix-spawn.patch
+++ b/user/glib/fix-spawn.patch
diff --git a/harmony/glib/glib.trigger b/user/glib/glib.trigger
index cf23eff7d..cf23eff7d 100644
--- a/harmony/glib/glib.trigger
+++ b/user/glib/glib.trigger
diff --git a/harmony/glib/i386-fpu-test.patch b/user/glib/i386-fpu-test.patch
index 986c33164..986c33164 100644
--- a/harmony/glib/i386-fpu-test.patch
+++ b/user/glib/i386-fpu-test.patch
diff --git a/harmony/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch
index 4b36b0b2e..4b36b0b2e 100644
--- a/harmony/glib/musl-no-locale.patch
+++ b/user/glib/musl-no-locale.patch
diff --git a/harmony/glib/ridiculous-strerror-nonconformance.patch b/user/glib/ridiculous-strerror-nonconformance.patch
index 3ffc0aafa..3ffc0aafa 100644
--- a/harmony/glib/ridiculous-strerror-nonconformance.patch
+++ b/user/glib/ridiculous-strerror-nonconformance.patch
diff --git a/harmony/glib/thread-test-fix.patch b/user/glib/thread-test-fix.patch
index bcfcfc441..bcfcfc441 100644
--- a/harmony/glib/thread-test-fix.patch
+++ b/user/glib/thread-test-fix.patch
diff --git a/harmony/gnutls/APKBUILD b/user/gnutls/APKBUILD
index b64faaa64..b64faaa64 100644
--- a/harmony/gnutls/APKBUILD
+++ b/user/gnutls/APKBUILD
diff --git a/harmony/gnutls/tests-date-compat.patch b/user/gnutls/tests-date-compat.patch
index 2717ab230..2717ab230 100644
--- a/harmony/gnutls/tests-date-compat.patch
+++ b/user/gnutls/tests-date-compat.patch
diff --git a/harmony/gpgme/APKBUILD b/user/gpgme/APKBUILD
index 10ffc83de..10ffc83de 100644
--- a/harmony/gpgme/APKBUILD
+++ b/user/gpgme/APKBUILD
diff --git a/harmony/gpgme/fix-bashism.patch b/user/gpgme/fix-bashism.patch
index 19508c96e..19508c96e 100644
--- a/harmony/gpgme/fix-bashism.patch
+++ b/user/gpgme/fix-bashism.patch
diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD
index 45742a180..8db580d44 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Clone of the classic Bomberman game"
 url="https://www.kde.org/applications/games/granatier/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0a7747d65918c90d47d83bb3056c3e05a4ecb560c64b37dc4eb52b7e7329ce76ec45e99bbfa102e21f3877d147d8121e97c858bcb4804832187c5e41723a8217  granatier-17.12.2.tar.xz"
+sha512sums="8a752ae32bdfa3c3c459f7ed2fb80883494a03eaebac8555a18fd3bee823894a47c5802b3e9da17ee050c02f927bb2812e449e4651d34f9bf367213962b7a0a3  granatier-18.04.1.tar.xz"
diff --git a/harmony/graphviz/0001-clone-nameclash.patch b/user/graphviz/0001-clone-nameclash.patch
index 6222238d8..6222238d8 100644
--- a/harmony/graphviz/0001-clone-nameclash.patch
+++ b/user/graphviz/0001-clone-nameclash.patch
diff --git a/harmony/graphviz/APKBUILD b/user/graphviz/APKBUILD
index 7f5b34c1f..7f5b34c1f 100644
--- a/harmony/graphviz/APKBUILD
+++ b/user/graphviz/APKBUILD
diff --git a/harmony/graphviz/graphviz.pre-deinstall b/user/graphviz/graphviz.pre-deinstall
index cfc43bf6a..cfc43bf6a 100644
--- a/harmony/graphviz/graphviz.pre-deinstall
+++ b/user/graphviz/graphviz.pre-deinstall
diff --git a/harmony/graphviz/graphviz.trigger b/user/graphviz/graphviz.trigger
index 99d447b9b..99d447b9b 100644
--- a/harmony/graphviz/graphviz.trigger
+++ b/user/graphviz/graphviz.trigger
diff --git a/harmony/gsl/APKBUILD b/user/gsl/APKBUILD
index 2820f36d6..2820f36d6 100644
--- a/harmony/gsl/APKBUILD
+++ b/user/gsl/APKBUILD
diff --git a/harmony/gsl/aarch64-test-failure.patch b/user/gsl/aarch64-test-failure.patch
index 0b6e80380..0b6e80380 100644
--- a/harmony/gsl/aarch64-test-failure.patch
+++ b/user/gsl/aarch64-test-failure.patch
diff --git a/harmony/gsl/dont-disable-deprecated.patch b/user/gsl/dont-disable-deprecated.patch
index 40a7c3bce..40a7c3bce 100644
--- a/harmony/gsl/dont-disable-deprecated.patch
+++ b/user/gsl/dont-disable-deprecated.patch
diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD
index 470387207..3dfcc60f2 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Fast and easy image viewer by KDE"
 url="https://www.kde.org/applications/graphics/gwenview/"
@@ -45,4 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d6fca3dc4435f2bcd77ad8428edbee022af88a6a2d959f5b142ab91e0ed2514b51ba34dc214f808bdf44dc0e3c2eb4992f1918499f36b194eca6b78dc5b4b1ea  gwenview-17.12.2.tar.xz"
+sha512sums="cd26954dd050fa2b5e0750c7c07067f86078e7b249f827b2de31c185ac6a2569a2401a70a5c71526af3ab052ddef6be8138d716f5d861cd0adbe947428424364  gwenview-18.04.1.tar.xz"
diff --git a/harmony/hexchat/APKBUILD b/user/hexchat/APKBUILD
index 5f43c168d..5f43c168d 100644
--- a/harmony/hexchat/APKBUILD
+++ b/user/hexchat/APKBUILD
diff --git a/harmony/hexchat/libressl.patch b/user/hexchat/libressl.patch
index d829dee39..d829dee39 100644
--- a/harmony/hexchat/libressl.patch
+++ b/user/hexchat/libressl.patch
diff --git a/harmony/hexchat/pixdata.patch b/user/hexchat/pixdata.patch
index 4e720a848..4e720a848 100644
--- a/harmony/hexchat/pixdata.patch
+++ b/user/hexchat/pixdata.patch
diff --git a/harmony/i3lock/APKBUILD b/user/i3lock/APKBUILD
index c11e9bca8..c11e9bca8 100644
--- a/harmony/i3lock/APKBUILD
+++ b/user/i3lock/APKBUILD
diff --git a/harmony/jasper/APKBUILD b/user/jasper/APKBUILD
index 74504d503..74504d503 100644
--- a/harmony/jasper/APKBUILD
+++ b/user/jasper/APKBUILD
diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD
index 5a3efc433..24d2c9638 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="KDE Jukebox"
 url="https://juk.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="32f35ba5d1f7bc0d38555ab5a1da3deda0055e96ec2ca993f18f5339b3e231d903fa73d1a26a72413a159708cd08575b111bae8046603672f80f20678c36a362  juk-17.12.2.tar.xz"
+sha512sums="2d460d212fd20edd50c2c48d690fc58ba616686109c9392a8d85daa49c299dbde72152500463b571979e1f6cec025219546932678effe362fe0884373ab3f271  juk-18.04.1.tar.xz"
diff --git a/user/kalarmcal/APKBUILD b/user/kalarmcal/APKBUILD
index e123a0929..2069fb00b 100644
--- a/user/kalarmcal/APKBUILD
+++ b/user/kalarmcal/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kalarmcal
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Calendar library to integrate with your alarm clock"
 url="https://www.kde.org/"
@@ -9,7 +9,7 @@ arch="all"
 license="LGPL-2.1"
 depends=""
 depends_dev="qt5-qtbase-dev kcalcore-dev kidentitymanagement-dev kholidays-dev
-	kdelibs4support-dev akonadi-dev"
+	kdelibs4support-dev akonadi-dev kcalutils-dev"
 makedepends="$depends_dev cmake extra-cmake-modules"
 install=""
 subpackages="$pkgname-dev $pkgname-lang"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c3946dde1609e8925c4bcfbfb3403e2e536eb84724dd5007d8d0ef14210c14e7aaadd6349117d55a57d522904b90413052200790d060553058684f0c2f01c5b4  kalarmcal-17.12.2.tar.xz"
+sha512sums="d2e03a8630850488246f3bcf1dc6d4aa808358096dc08abccd33992bac7d1587137eb78a8772cef0b488a69b582d6084c7c23acdd88d54a9dca0fe641b4094e1  kalarmcal-18.04.1.tar.xz"
diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD
index 7ef317ded..f7b9edbe0 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Graph calculator and plotter"
 url="https://www.kde.org/applications/education/kalgebra/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="28263c27a8f26c880237ab0fabc103dd4810e1bd42ce28a5890319105178289c96579dd15c6ef511b60860ebea5f8080bc5a5c0d3984fe3976375abbfc839fc7  kalgebra-17.12.2.tar.xz"
+sha512sums="2a32ad208eb452335ca21a27ddf37e751d57ef2e9c639eac6cb44160a7b61586c06847b473675ce1d8b1435b30267acef3d02d14a3d2af3d003d5023fda4e658  kalgebra-18.04.1.tar.xz"
diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD
index 032a5269d..2c28f1381 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Periodic table of elements (PSE) with calculators"
 url="https://www.kde.org/applications/education/kalzium/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2f2c4ed44cd0302b63819a4b6ec0ec15038aae74f825b30ae84ccb15eb593380b77a6de84a11d94dd20ae9e66225ad977e8d127b3c120bcaa02950ffe62737c7  kalzium-17.12.2.tar.xz"
+sha512sums="e98aa1e097cc47d87c37dcc4837afbe0721296c6df14924e13f5df9d9fe180e8ffd67e3f44dd6b524a797824be682d447dd3b4ea98f1a5fbf96ee0116d9bc5fe  kalzium-18.04.1.tar.xz"
diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD
index aef3dfa19..9cf2398b1 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Letter order (anagram) game"
 url="https://www.kde.org/applications/education/kanagram/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3de3df86c5f2b7c4a1590e9c3cb16509b5ef4f36e63981e1842c30e8034d34cac5626eb8ac00d3c8137a90975f64c14bc69dc6bf53551faf94d7e7991d3e5fe4  kanagram-17.12.2.tar.xz"
+sha512sums="be0372a7e195ac9ffdbfbd770551a02408ec4f32941888510221c2fe917fdb34666a4b37788be261ad132a700bd58975cb54b1d5061ebd076b25a6088828d597  kanagram-18.04.1.tar.xz"
diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD
index 49724c3d6..a36f20abb 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Pac-Man clone"
 url="https://www.kde.org/applications/games/kapman/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="718f4ed82d71be259cc07f0b0001004e28880db6b0cc1a3931f641653a318d289b6b70687ff8a9815baa20181553d8713eb2f800dc462f116fa8ec831dcb964b  kapman-17.12.2.tar.xz"
+sha512sums="527ca891e3c50d241eeda84859f27410a748606d4d7b6bff4cd4f9ed25eec40ab884cd8e43cb6d9920d5d1fc6fe1a4382f950fc18c8677b5d40c3a76cc70cf7d  kapman-18.04.1.tar.xz"
diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD
index 4e29ab3ac..13a5d4126 100644
--- a/user/kate/APKBUILD
+++ b/user/kate/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kate
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=1
 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more"
 url="https://kate-editor.org/"
@@ -94,4 +94,4 @@ kwrite_lang() {
 	done
 }
 
-sha512sums="cb71a569e4bd04c9ca1aeed81a7261b3838bf78d6bd731e31163f1eb254d81e78b13889d2118483de0d9cae6a92ebbc4e4dec9f3c62e29444ac1c3fd8dc7efe1  kate-17.12.2.tar.xz"
+sha512sums="c892c90e2f01b1540bd8eb6bc8e23532dff680bd5d8980f69b18ece3a7cfd8fd695653cd461f9f9676d1990f8eda18a89710ae536696f17442e16bd60432542f  kate-18.04.1.tar.xz"
diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD
index 78e0bdac1..2626a6d08 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Fun, educational game involving molecular geometry"
 url="https://games.kde.org/game.php?game=katomic"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4d6129fabab44cb9b5eea083e7ba3c406581c3b382fda417aad3988de8321b5a17f5ea8af6fc2437a5eb04f87311b964551e54547edbfb854fd2e19e0658dafd  katomic-17.12.2.tar.xz"
+sha512sums="f616d2074036f8377c63ad123c2ac302c8d8caec20669f33812f0c5146163cfd4c94d782e9adb23dfc41ae2ead789f2a761a3550df49545545338e3fd5b9b173  katomic-18.04.1.tar.xz"
diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD
index e68351d6e..f32edb01d 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Hide-and-seek logic game"
 url="https://www.kde.org/applications/games/kblackbox/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fe68f2162233f77a734099a4520d53c9a404900076d474ad93f98b3fe1c818ff7e04b8a51530f887cb0565d8032dc7902f91c112a0f8d7ea55a99d803f91eac0  kblackbox-17.12.2.tar.xz"
+sha512sums="7f4a42f6810bf8f01e1dd0f10e62b074e7209fda970425e0641099b096396ff9eb2e0b79a45e9ac09405a96dc6e9a31027f85cd0498cfbe515277b392233680d  kblackbox-18.04.1.tar.xz"
diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD
index 9aed79891..85d01a0fa 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Falling blocks game"
 url="https://www.kde.org/applications/games/kblocks/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6f36b752a4313f8b8345cb54d18e145cf06dbdc00954adfb54831f93643d94e9da130417433aeccfc537d383d60002fc979b2f3b9dd55b7e43808c4e7a760b7f  kblocks-17.12.2.tar.xz"
+sha512sums="409c8627e9d4afc7e815c4f0e8862342c2b8f2bef52038268574b2581d0491e807c587a981f7809ce0eea0c40ea5a8addfe0f09d22aa12f5bc134ef072c8ff11  kblocks-18.04.1.tar.xz"
diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD
index 00bec3956..a716b5b69 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Puzzle/arcade game to build walls"
 url="https://games.kde.org/game.php?game=kbounce"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d680381f4c63eee640befbca643948f6671b1601e0d2a700b42f366af9cc242f2446d862f43b1876f3c62653863a54aced101f729314240e66454b7cdaba5436  kbounce-17.12.2.tar.xz"
+sha512sums="09028226cbbf755aa3380cad36402faeecf14e62dd0a9517551b4baf9c60300daae5b329653dc82b7411fe42255d6921f9c6c067d4b9ae2c0e8c6b9dcaed4380  kbounce-18.04.1.tar.xz"
diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD
index 483cf8285..c0bf62719 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Break-Out like game with a ball and paddle"
 url="https://games.kde.org/game.php?game=kbreakout"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d14a0a0493f5f265578c62a403e7f422efcb322e5de2657d1461c027599b13b43e35ef296b29ddcf0db4147caeee70d8f0cbe44dd4141d37d9fc8fdc19f1f5e2  kbreakout-17.12.2.tar.xz"
+sha512sums="05c27a0f2c2ed8f582ede5fae6c343a53b918d8df4108a2a7b18d660a9d9c7d31739a338da007c8010d58929389171b798d94f73c15a2241c43089bd8c878d53  kbreakout-18.04.1.tar.xz"
diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD
index 2962c54a5..ff48f26c9 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Practice calculating percentages and fractions"
 url="https://www.kde.org/applications/education/kbruch/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fe8d14961034f6f85e568803ce5c12976d5396e8025cd6d53927edc83e10cb4b145fda18793798fcf91b3879aa2f093e41611d569acb709e2e5bcf9a30e43d2d  kbruch-17.12.2.tar.xz"
+sha512sums="6fd1f6e1983c8e8c5cc5cdc5dd68c9514ee8f17962723619b65b784c1191f2e7f1c4977909ccc1700b6face3c63f05c512b63f222fdce6a25f5743262496e572  kbruch-18.04.1.tar.xz"
diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD
index 30364d146..a33540411 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Calculator with many mathematical, scientific, and logic functions"
 url="https://utils.kde.org/projects/kcalc/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="902e64eb0bca993b557be9ca2c4807645913fbbfb8cbd3964df18de84d8a90c62fc0a0dedca10c9aa709bfb82d1be0cbd63087d79be92866947af938feb6d631  kcalc-17.12.2.tar.xz"
+sha512sums="4c6527389b79373b71fcd5a55b3687ac3c136b8b182d58ad61b2f0d4f1ad53fbfe3e6ca16e69d7524b032de9f3e599247c20b5ae0cb3cf78dcb5f4be10dc00a3  kcalc-18.04.1.tar.xz"
diff --git a/user/kcalcore/APKBUILD b/user/kcalcore/APKBUILD
index e8dd3a776..6123a52bd 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library for managing a calendar of events"
 url="https://www.kde.org/"
@@ -13,8 +13,7 @@ makedepends="$depends_dev cmake extra-cmake-modules bison"
 checkdepends="tzdata"
 install=""
 subpackages="$pkgname-dev"
-source="http://download.kde.org/stable/applications/$pkgver/src/kcalcore-$pkgver.tar.xz
-	posix-header.patch"
+source="http://download.kde.org/stable/applications/$pkgver/src/kcalcore-$pkgver.tar.xz"
 builddir="$srcdir/kcalcore-$pkgver"
 
 build() {
@@ -43,5 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ed9195e902cbeff2d48a013cb4c7cade458109696476496a4f8a7a340016c46c9e90d707292d16dde9d80b19290c6d4562297b71f81a5bfdea0eefe76889943c  kcalcore-17.12.2.tar.xz
-d911c2a03b1db1f9f3b19e7087ae5cbee59ced24ded3b43f2d3286651d13e5f531d171cf7dc6c26906116d4b51a79f2801828956fa1f4e7094fa2f53fe2b888f  posix-header.patch"
+sha512sums="2ce97d97b15bacec0ae208d5f987abc76d5b5712b99030c38170be5712adaeb76fb376d26bad42bde5fc144e3cc182c1e0430e885f4617d5514dd50a86635032  kcalcore-18.04.1.tar.xz"
diff --git a/user/kcalcore/posix-header.patch b/user/kcalcore/posix-header.patch
deleted file mode 100644
index 27522ae35..000000000
--- a/user/kcalcore/posix-header.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b8a362ea78d945e54155b2538dcc1df8dd64d533 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Wed, 11 Oct 2017 20:51:27 -0500
-Subject: [PATCH] versit: include strings.h for strcasecmp
-
----
- src/versit/vcc.y     | 1 +
- src/versit/vobject.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/versit/vcc.y b/src/versit/vcc.y
-index b9fbb0f..3e68795 100644
---- a/src/versit/vcc.y
-+++ b/src/versit/vcc.y
-@@ -99,6 +99,7 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
- #endif
- 
- #include <string.h>
-+#include <strings.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <ctype.h>
-diff --git a/src/versit/vobject.c b/src/versit/vobject.c
-index db13f9e..a57c417 100644
---- a/src/versit/vobject.c
-+++ b/src/versit/vobject.c
-@@ -46,6 +46,7 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
- 
- #include "vobject.h"
- #include <string.h>
-+#include <strings.h>
- #include <stdio.h>
- 
- #define NAME_OF(o)          o->id
--- 
-2.10.0
-
diff --git a/user/kcalutils/APKBUILD b/user/kcalutils/APKBUILD
index 17683d175..bb2a6c306 100644
--- a/user/kcalutils/APKBUILD
+++ b/user/kcalutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcalutils
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Utility library for managing a calendar of events"
 url="https://www.kde.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="51f5b1fa076360c6b6ffd30af4a94970905cc14d5c23017ba4a163cdd1e27d762674403d2b78473cdb4c671a8190e0e4f8f5003d687fb873b7e4f5abbd2d3d7a  kcalutils-17.12.2.tar.xz"
+sha512sums="9944bd39de795ea1ea9eadde756205bcc8c905bbfd4fb079d6347eaf6107f8f31b7a96f5ebc53af37e0ca5e6dd16243f90b81834ba0cf47e529c795cfa489cb7  kcalutils-18.04.1.tar.xz"
diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD
index 784ec5fe1..43784bacf 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Tool to select special characters from all installed fonts"
 url="https://utils.kde.org/projects/kcharselect/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9b4bce1fbabc8b51b8d18a1d9b9a754fed7de3809c7bdc392a875061344ab213cd7c1b06c2e30fafb6bbd4e1e7923bebd5a688ca00c9e00323977f39e4206509  kcharselect-17.12.2.tar.xz"
+sha512sums="1ef8ed4d0e250d2d0e478fdcafd5703fd307eb82a1d3ca8f697852e803c26a5587dc786b9f984775a3959292ef156f7a59ff6c4b722f3a3507cb591733fc9fc0  kcharselect-18.04.1.tar.xz"
diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD
index 09e6b565e..098ed443b 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Simple application to choose a colour from the screen"
 url="https://www.kde.org/applications/graphics/kcolorchooser/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1b3e75f86d0db24d0d32e831a5a95fec32adfc546b63f8def341f4a8844e21177e68ecda7e6f1d5603013af3ea983fff1a9f44df4d7197ab37c25c792b059792  kcolorchooser-17.12.2.tar.xz"
+sha512sums="e23fb2b4120fad07db0d3aed14e4dd2231b9766d7adb4a02ee1b111253eec9aee2079e33a1e02301a1763d58395951fe02e0a033f240fa7515de377fc672e381  kcolorchooser-18.04.1.tar.xz"
diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD
index b5ce62443..612a84154 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library for working with contact information"
 url="https://www.kde.org"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f6b18421b06d6991c0f99921ccfbe30b8ff79e6912fb1dda2fde06da21600ebcf231549176192ee6ff7f4ca043045a3134389c0b6189c8876a999b4d4d4a2a40  kcontacts-17.12.2.tar.xz"
+sha512sums="559be58b5236718ed71954866812d0b5f8429ef5d65f92374f1b0ab94fb57f9ea5fb72453c6fb84e706ad653c50b89ad7b39e0a760ef6918f668b57d7c40f81c  kcontacts-18.04.1.tar.xz"
diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD
index 27686bf6b..b4a47ac4c 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=17.12.2
+pkgver=18.04.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 c8c1778f4..6314e36ed 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="All the KDE games"
 url="https://www.kde.org/applications/games/"
diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD
index f99a5cb4e..5ae574be1 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=17.12.2
+pkgver=18.04.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 b7288b32d..ab9367d2f 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=17.12.2
+pkgver=18.04.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 9acc9b4c1..2d7ab443b 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=17.12.2
+pkgver=18.04.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 a74fa3d3a..3c89c66f4 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Desktop utiltiies from the KDE Software Collection"
 url="https://www.kde.org/applications/utilities/"
diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD
index 22a707446..7f3d0026a 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Libre video editor"
 url="https://kdenlive.org/"
@@ -45,4 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7a70ba8de9b034cabd6ce4fc6b92b01b57994327bab35e3410110b1d3dbe88fcae586a3f0ee82b387a205503b5853a3471c72d6c94bb6b0e9d5b96d7db24ecf0  kdenlive-17.12.2.tar.xz"
+sha512sums="0e9c12359c9a17475573fa15289d89313a12def4baaf44101c51057200b1e259f91663afad16cbd8b93fc27b46bac48a6f9fd3dd7f33c10f219bfacdb552cc0d  kdenlive-18.04.1.tar.xz"
diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD
index 265884b1b..332ae8cb0 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="View disk usage information"
 url="https://utils.kde.org/projects/kdf/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f7e3fb2a7336ba587295f6dd8b25f48aaf304e4130e05fa13a659c43277b4dfd98d6f3036d4e64d6cb95e44a16ff4888910db629cd982f23750f334438925080  kdf-17.12.2.tar.xz"
+sha512sums="8d2821a09831230da41de2c35f0173b7a8a7db7a87132919ca52945b3b4e14d993b8e9771a3718c6e0cca285cb181e5f8e9177d1f4ddd22a6dee9e344c98dfe0  kdf-18.04.1.tar.xz"
diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD
index 76bab2ecb..9b72d33a0 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Three-in-a-row game"
 url="https://games.kde.org/game.php?game=kdiamond"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f7e693c519c4d7c0ce2717540de4d456239760f65e6e00b191b76fcf78dd69d2bb0cac271d3676509c883b9580af415306de057a8f379d154da983ead145cde0  kdiamond-17.12.2.tar.xz"
+sha512sums="07b8ac34f5fdb940a694477bd0f52480498060ed73560d5babc95958ee6b9e5b9ed542c7be52a8ec6120a628cbce0f092ce800026fa9b31c7088d407a09bf8ec  kdiamond-18.04.1.tar.xz"
diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD
index 74f18c367..438bb5022 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Standalone search utility for KDE"
 url="https://www.kde.org/applications/utilities/kfind/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2de77210e6c2e84addc54c99d3b7329c490ae9c8c614281d904a70dcda8905945beaa92e9927c03a71f7bfd72a353f9361ecea8030c2761abbd872c7ebe45636  kfind-17.12.2.tar.xz"
+sha512sums="7cc2225b727273232226bbf2bb044cba200edf8ea222852bd4811fea2792030f04f58a69f2ded2f69a382500e5f029f9c839400651e8bcf5f1e8f6182943d278  kfind-18.04.1.tar.xz"
diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD
index 14c3f0db2..d5e841dd5 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Utility for formatting floppy diskettes"
 url="https://utils.kde.org/projects/kfloppy/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d95a7072754a4bcc95c2fc8a8c5149759e33717bd29377ebed78cfe40ee3e0f7793d537476d1807f830c11f9af5b5c15e1db6c82540b385bf46a6f4749ca8691  kfloppy-17.12.2.tar.xz"
+sha512sums="882f67eebd217289c71e3076f3d6f03abc9e3634aa6a16fd5f903630ca644572c1c587981e4b3cb1558cf63a95d4936c73d867478e410dce11e36bb32fb80835  kfloppy-18.04.1.tar.xz"
diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD
index 88dcd259d..6ea88c958 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Two player board game based on Connect Four"
 url="https://games.kde.org/game.php?game=kfourinline"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3f7e0b179347bbb2cafb43f02af8a99becd872c35419a432e213afec1f1767b53a07a2abcae193fe868c891cbb464768bf5ade33565b5fba8c6f2c452d234594  kfourinline-17.12.2.tar.xz"
+sha512sums="f83b2bf29f800dd3fa379dc05c6ae65387f9661a0e37b8862071f24c4ca269345d1889fdd9f92a404a571edefdaf665a94d16c8d690f920326e64e41706939d4  kfourinline-18.04.1.tar.xz"
diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD
index aed98eaaf..895584c45 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Geography learning tool and trainer"
 url="https://www.kde.org/applications/education/kgeography/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="31bb488144ce8c17d3aa11e7155a83dbec49281803c814076c92fc71b758aaebce87d796dfb2b20f22baad50e1b31c466436d627a40bfa1265a6c02b84d11c32  kgeography-17.12.2.tar.xz"
+sha512sums="dd6d72a3824bdf3a12ddc9f69a1193840698b03edad0a1850fa3c5d4d599d98f1ebf6587ecea90832eca52e356433649b3d6028edd9c91fb2e74d573e138c693  kgeography-18.04.1.tar.xz"
diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD
index a85e245fb..02a3433ac 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Versatile download manager"
 url="https://www.kde.org/applications/internet/kget/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="affc47f456946001ca0ad230720ed3a1b21ee274d1df865fe7b405b852dff55a1a85ae30cae15bcf4ef667e285719ec3d72d8adce994f96e92f3069f9fae541a  kget-17.12.2.tar.xz"
+sha512sums="b93a1503ee6440aebe304472c6faa88bc375b0a6279fb50b65e09a33132dc76d04793f30b2bf0ab8e8ae2b8766080044f03be58e9729777e73620cb50f72ead6  kget-18.04.1.tar.xz"
diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD
index 1a552e025..640fec69b 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around"
 url="https://games.kde.org/game.php?game=kgoldrunner"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a68a9b16fe8ae20b3613cd3d8dc872a0a222476cf6e9a4d0bd8b0563604703ef5eb910770499355e8f75fc20a44a3917234f1be88f06dff23a721d0049014ff6  kgoldrunner-17.12.2.tar.xz"
+sha512sums="9e563aad5a16e8b2e15c84eb867983291912a4560df151fd17d8675b75a5fb31debcb1f3e36765f17ca9d6571b646f47682a40bcd135c8b65b749953c0f4cc14  kgoldrunner-18.04.1.tar.xz"
diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD
index 77d2d5451..45d979d00 100644
--- a/user/kgpg/APKBUILD
+++ b/user/kgpg/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kgpg
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Simple interface for GnuPG, a powerful encryption utility"
 url="http://utils.kde.org/projects/kgpg/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5f5078b0a72d0837d023e89079f7d0206b5952ea437af2eb9ba76d9c3706c7e77e92ded7ae61a5ec18ff5b4b0dc93425b265200fe0acdec43ddccc1eaca9df44  kgpg-17.12.2.tar.xz"
+sha512sums="516f074b161fd545383bbd58e86ec33f7d4e8c654138af14a9e3cec78e5521b62b85ce3723474599b4377930a6bc9e1b0f09b6bb56e063c8381ac7bf441c8e35  kgpg-18.04.1.tar.xz"
diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD
index 08f129dae..7f9a3031e 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Hangman word game"
 url="https://www.kde.org/applications/education/khangman/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fbaa1ef829f53966ab754d9d2ec2efc184505421c08f2f86cacdd2e05088deb9fead44db9b90556b9b5006dc0630f72ddd49b8b0214b179ffac501f204621000  khangman-17.12.2.tar.xz"
+sha512sums="300a1cfcf9b35facc765001914dcf639cbfbaac9fe263f9741a93c26e092fa4cc5cef090893bbaa115eb95393335fcfe147cba594dcaa7870c185e096a58210c  khangman-18.04.1.tar.xz"
diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD
index b3b709350..109d64ed0 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Graphical documentation viewer"
 url="https://www.kde.org/applications/system/khelpcenter/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5f2bca81072a21c26853c66b5ae3fd228c92b8c74474797cf45eddbde0d9954b62c6277957698a30538ef28445f83c6e9ca570a8cfe747762486465dea6db6f8  khelpcenter-17.12.2.tar.xz"
+sha512sums="f99273d6d7dc9753b973112ede2dc606fda430d0f02f7a0a14e8db6359d91d4c73fcb1b6573da2a2363aa83e397e2bb1512f88eb5c40016850624f22065022f0  khelpcenter-18.04.1.tar.xz"
diff --git a/user/kidentitymanagement/APKBUILD b/user/kidentitymanagement/APKBUILD
index 65b4b2b91..df1683941 100644
--- a/user/kidentitymanagement/APKBUILD
+++ b/user/kidentitymanagement/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kidentitymanagement
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library for managing user identities"
 url="https://www.kde.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="81a97151b0c7db2b44305b479d5673e42dffd04c5d707f2072db92cc44dc40a412e47000b916fce6be941bc59419f6968debe5ad8173852952378d1b801cbd0e  kidentitymanagement-17.12.2.tar.xz"
+sha512sums="fcf40085f5f12b21c371308db378e0a15bae45389597eb224840bc43c08e8add479414f5409873f9ff8e1aafac462084aa92d3144b6e096e8061afa4aad32254  kidentitymanagement-18.04.1.tar.xz"
diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD
index fc2c4cc70..a64909771 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Interactive geometry learning and exploration tool"
 url=" https://www.kde.org/applications/education/kig/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3bd9496e17e77ed475e6bb6d28ccb5d2a91dd261ffa7a4b3f8a7d5603b3688ca865da7cf1480411646efcc3a24a1f83bcb5078498ed8534d048b69becc71c653  kig-17.12.2.tar.xz"
+sha512sums="53a7c8d391629f387d99f47d7e710392a61d49c30395a0381927d949b70c237b1ec3cd200d5a94519ac39deac86a09354c0bd6a43c5839a1bb61eabbba604e03  kig-18.04.1.tar.xz"
diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD
index b9dbe4e9f..97777aef4 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Go or Igo game for KDE"
 url="https://www.kde.org/applications/games/kigo/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d758f72efcc797f9b060b6b01065cce4649a69a5031d358ddae3dc3cfc167d9c10cc2ed577089e1dd23925f9ffe3e4d5c5636184678dd1a70ee0715a0b14eb9d  kigo-17.12.2.tar.xz"
+sha512sums="500107ab519a9f8969a84eae5d5868f2147f547dd8ad2c477fe9728ff8eeb42f999e4a11b65162c24997c4a5b843542a30ee6159f0f3d18808de5f53d0fcea0d  kigo-18.04.1.tar.xz"
diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD
index f0305831a..6a43fe499 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Simple game of evading killer robots"
 url="https://www.kde.org/applications/games/killbots/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="70ce103e39cc35e872d61afbb73d1f5498c35266d1715d56c595db17c9028eb264d7d4486254c3032812e9608812fbef95f935947f7138fca3ba5bd08a0e7f21  killbots-17.12.2.tar.xz"
+sha512sums="db51ab4e60d99765e0912e5b793d01155236187df1938b3072210d2e2e4b12663759ab243acbc5e0526547d21062997e04a26982b3a1a2228f368fd294a7fc42  killbots-18.04.1.tar.xz"
diff --git a/user/kimap/APKBUILD b/user/kimap/APKBUILD
index fe83fd937..e34ef4e2d 100644
--- a/user/kimap/APKBUILD
+++ b/user/kimap/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kimap
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="IMAP framework for KDE"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e4342382afc3694476608c561871d175aa1c2f9334e66dd7c8460ea8ffd6e016c48777fe7d9039b0d0934e92b5efba6d32acca3cc05fcff6082fc7aa2db38ac1  kimap-17.12.2.tar.xz"
+sha512sums="09dfca618d6911a2191f2280014e0c5f126df817a901ec8a393e8ae83f6666a99998ff828ec3552afe8497992ab6fd81697f03ca89ec47c3cfde798e2be274ef  kimap-18.04.1.tar.xz"
diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD
index 8a4892fc8..b6e0ebaed 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="KIO plugins for various data tasks"
 url="https://www.kde.org/"
@@ -46,4 +46,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5918057745fa201460c8a21e48e669313dce28c40c26ee663e53997af0a5109c6f8396c9ab6939527bf3d315ec29d23aa865290c3fec12896e47dd0526d07fb1  kio-extras-17.12.2.tar.xz"
+sha512sums="7a08fabf8ff3cc03b02e88f38e889798489e1997c6678635c07c7597bbd9142450030e28958d4ccfd5e1aabc2ba0b213faa981fc30256d7edb76217ae99e40bc  kio-extras-18.04.1.tar.xz"
diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD
index 1a6baad85..f806215e2 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Yahtzee-like dice game for one or more players"
 url="https://games.kde.org/game.php?game=kiriki"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6fcc187cf3cf25cf3056d6388094f203f533506ead4a8dbb77298cb34fb881958449131a1a89047ac59739fb17db448a95a54c04e9afdc85b96225256a03d2a3  kiriki-17.12.2.tar.xz"
+sha512sums="a230e09862fa11be20c780d671eaa47d2168ac468d89680fade39e5c012ea634243d7b5e79554cb70b96f7bb5d24b16b07c99887bbfe0199ca0c9f9293f9d86f  kiriki-18.04.1.tar.xz"
diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD
index 539a0ce9f..5ef6e535c 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Japanese reference and study tool"
 url="https://www.kde.org/applications/education/kiten/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3c10a77b3ba78cbeaa160ccd6ef1c0cd004c28b18042535a65b735cfaff2b1773ce1d65a15a4da078edb5237a4e45055a193be40d2cbf69d09bc01dae29e584c  kiten-17.12.2.tar.xz"
+sha512sums="7ebb52935b7a0344b51f950aaa8b546c442aae6a6abb4404cb0a29d6ba207f8474d1e5bde2cb015b815e65fc5cc11d68abda917db5bde909d2448cc30d024c1c  kiten-18.04.1.tar.xz"
diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD
index 0ebed81a7..eecc435a7 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Dice-driven tactical game"
 url="https://games.kde.org/game.php?game=kjumpingcube"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a85b094dc916d01b96a60037173c2e9e298814d575c66408d42de69b20674e65040bb6b4284edb2229b05849776d30e11e197d3d587fb76d7de77c09a3fa3f28  kjumpingcube-17.12.2.tar.xz"
+sha512sums="0569efb04303d9ac5f37989ce9a5646736430dc0447119c65bcbfcac53c2d63f5361dc4f459e2057fcaa0207c7bd709e00dd91026fd9ba976ddde1ea4a52d378  kjumpingcube-18.04.1.tar.xz"
diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD
index ced61dddc..fdca8254c 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Certificate manager and cryptography GUI"
 url="https://www.kde.org/applications/utilities/kleopatra/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e487d186b3b857929cbbe9023258273890104395b04394fefc7c7bb1a4391c85ff2f52da196ab13500b6d8ad243e646f62922b6dd7d0bee15c32ce92e66347e5  kleopatra-17.12.2.tar.xz"
+sha512sums="d4e404ef7ac8d6a97c57dd25fddfd0ca4f00cfbdbd158cdeb803f880137b583fa201fd1a60b4e00b083935a4784de9cd6d28961acce71eaaf36481f253950ad9  kleopatra-18.04.1.tar.xz"
diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD
index 9ae468535..01bf6f85c 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Learn alphabets for multiple languages"
 url="https://www.kde.org/applications/education/klettres/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="aac1bba83a093db707185ef77d514ac3f6d909065045b6beaaeb277fd03cf9c882ecd1a3ff35b7256e61517effeac302792e8a6e32a5de4c4cd3082aa257609e  klettres-17.12.2.tar.xz"
+sha512sums="8223bab25a60c515f3ff0d001e38cae1e9d97159eacbb5fa7a8154d1939a8e99ff1cea38162674a3c7f20d8d319e5cdfaba7568226a730ada0100c290f9c3b23  klettres-18.04.1.tar.xz"
diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD
index 29c251ffb..34a0ced55 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Fun, simple colour matching game"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d96dd76c8495c68ec52dabf328b0100ddf656ecce0463c65dfd899b46c30e69451c8a94bb00e73a53b492e27c6bb69971532baabba8047cdd063fe65ca8fea64  klickety-17.12.2.tar.xz"
+sha512sums="dff325417bfbe41ab7ecc83e203de638e781c3882eb966c2bce0c6ec7c564be66fd44437ddf349983afa5be0190b662c94c083f917194d227da3a27d68b36a77  klickety-18.04.1.tar.xz"
diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD
index 326129ea0..0a73be7da 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Simple yet addictive single-player game"
 url="https://games.kde.org/game.php?game=klines"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d22b242933f61c2c7c8ade81aeed5126a92398fe9754857adebf03adb7d02d88c642f1ac0dc0a3bea8aa62487314e80bf509645cfd642f97c6b7ec617b5379a0  klines-17.12.2.tar.xz"
+sha512sums="a4a3c5ec071d2acffd3e7badb26da103801b0ef9463b485dcf584f444b3615a6355058136e68efd6af974754396fa9ef8cff1cf178b34b0c3edc6088a65cbade  klines-18.04.1.tar.xz"
diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD
index b55934069..2be00a178 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Screen magnification utility"
 url="https://www.kde.org/applications/utilities/kmag/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c3819d26296e19558b6656c965410e97ff2cbd33b98b1cf8f428df8f7c8827f9d627556a975f246addbe5a1a3e7ebfe8a25195962bd2a218a7f4ebedb5f4793a  kmag-17.12.2.tar.xz"
+sha512sums="d7498a1b6f60383f0b23826d654412d8001e2179f96b8fb703cd982d53bde5202ebaa00c3527b4efb320767e6d92f22874d01703bf2b678cc0ae082c67e93288  kmag-18.04.1.tar.xz"
diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD
index d1a38af60..5e0cfb2da 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Mah Jongg desktop game"
 url="https://games.kde.org/game.php?game=kmahjongg"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="499d1e6eda3094dfbcf1e2535c650341bfc621bc2327a03b66d7539429231f8d6a92fbb360cce49357ad0e7a1bf1c3cdc960f2629a5790ab054a1f595803b41e  kmahjongg-17.12.2.tar.xz"
+sha512sums="72d787fd92db6a1a0f2f526157e8910a76b21eb2b5344534a8459b754de757a0b9d38047d5e8caa16ffd7c8c9edcf1da565824cd56276d38787de9a501beb736  kmahjongg-18.04.1.tar.xz"
diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD
index 933d54e34..bb2755952 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="KDE support library for MIME"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8687759164779e262ca2923a7fbc60cb37ecc7dd4cf24265ed290829cae4f067d3abbf021f823caeb17483731ee1712652c8cb1c1ce13a3c26b59af00aad2e5d  kmime-17.12.2.tar.xz"
+sha512sums="40f25aef78e1d91e2c75f7e0a5a30b22aadd481372b3a2d6965daebcd717d20e6b0d63a11e678ffc20c4f33875130d93ca263a3e43a32610b7a19f6e5fe1f8d6  kmime-18.04.1.tar.xz"
diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD
index fb8298b2f..0540f7c02 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Classic Minesweeper game"
 url="https://games.kde.org/game.php?game=kmines"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="447bcde5189365346d0fb9d752d42e58a0e1517496b262ac04c22ebc06392d7317b4d7b829b5bf3bc4debe0c3797fe6cad9d575cf92d141965c8d3c519cd5ae7  kmines-17.12.2.tar.xz"
+sha512sums="3f581f1713a83e9789ba7f19d5115b2108f6b54e644f53b123d548b715640e877af2719aa571bc12215de0f45ff7ab93c9a5888c04c4d967ba95d3b7cb385883  kmines-18.04.1.tar.xz"
diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD
index a0141faf6..fcb8391f9 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="KDE sound mixer"
 url="https://www.kde.org/applications/multimedia/kmix/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2fc67512e5f2dfa816a77215070e2c7f250169fe6029d7d5be9ab5676e9d22875cfd7ae92dc70153939553bd460934a5b6b45f919557f6ace4216db0c22849aa  kmix-17.12.2.tar.xz"
+sha512sums="c763548b76e2cd8e01654c4fe5499a21cfbd5152f927c007fa46518d6eadab022fdca02cc0c422a9882945897d85a61d1d05020dcad156fb5171bcfcef712a1d  kmix-18.04.1.tar.xz"
diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD
index a52a94160..6a93cd464 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Tool to assist with clicking the mouse button"
 url="https://userbase.kde.org/KMouseTool"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="260b5fa3af4720e8dd0d073fe27246f55127759aed264567631d722afc28ad6e256904e782ff4c64e6f79da3f28c896bda1a5ab1ba37e5ee02e620b5e88f905d  kmousetool-17.12.2.tar.xz"
+sha512sums="04baa9c22ff60cf61be4c60081b23d83d666e91e31b912c02407b8c784ce8d746673f640f94f3254a59048ed33224d8ced6163fd4e722e5e55b6e5d5c7f22140  kmousetool-18.04.1.tar.xz"
diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD
index c2a679954..354f91ec0 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Mathematical function plotter"
 url="https://www.kde.org/applications/education/kmplot/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c58acfc3847993e075b6099a694fe484064298ec7c2e7f3671b6c58cc76125817f41e1c7d0096483163a6b3dce8f8b802cbf0a0c882bbbcb2b70e8cafbf4c6ca  kmplot-17.12.2.tar.xz"
+sha512sums="1827a959c106348008d09ba7269b7adb40d2ec3ba71abc8163333dd25b82f062778cb53329aad79057a71cf174d5ddbb032149c284f4779ba84e5df302544373  kmplot-18.04.1.tar.xz"
diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD
index adafa9fee..f19fae16c 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Build up a computer network by placing the wires correctly"
 url="https://www.kde.org/applications/games/knetwalk/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="13f41a215694c3581ccd6ce4a508701dc043824523ee5d17c3011448d2f43209133bc0cb64453b3d9d2b08aaad0b0914a1a41e82f555c9f5f3317606ebb17dfd  knetwalk-17.12.2.tar.xz"
+sha512sums="d765742422f8439d30c7fde125b671d45cde76482a620b647fd2817a3a9de990bb19340c22760a76d098742486d41c56f2267e01be62d873710645dcb08bade7  knetwalk-18.04.1.tar.xz"
diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD
index 31112dcf7..37c4d3288 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Simple ball dodging game"
 url="https://games.kde.org/game.php?game=kollision"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="dd2b009858063a10e917ab0a71fc5ef799b91c3565807d525bc5357df18c8e1b89ec63e5975d8c41822451189ea651d0920cecc753577da3453a0e1e9ce8970c  kollision-17.12.2.tar.xz"
+sha512sums="2b7f4801089b290b9ce03d9b4d461f47427a15236fb5645f97017a5d5586dc4e17e866c0e547965bb28bd1bbaec1e181cf1f762e1dbf6d15c038e50412a3968f  kollision-18.04.1.tar.xz"
diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD
index 654a0aa99..2258a3420 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Simple painting program for KDE"
 url="http://www.kolourpaint.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="47965664a9749fad289f24975eddac726b266351820c2f94a82f714825d53c9bd6c37ff6f2cc30d47f8be759554c8f9682504e9b2acb4e95751b474f443fd527  kolourpaint-17.12.2.tar.xz"
+sha512sums="000a2534cbbb7bb026db9371c113e216b39ec48818cafe0bda8d04fcb2fa10a59b5532098d38584807de0e3e9368a2cf99ec83ab557a95b4778e2674bc917da5  kolourpaint-18.04.1.tar.xz"
diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD
index 2eadb80be..619e89f4f 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Galactic strategy game"
 url="https://games.kde.org/game.php?game=konquest"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d57db91847a636c22db9969631ac8ebb06fe1b262cbff1cb25bcf79face3791e3a7ca554c1d6a12af70f7cc1deb5a17c8ed29bfb190da5df17d51da863a4b3d6  konquest-17.12.2.tar.xz"
+sha512sums="44e0950c0de9dd988035cc6b9a77e20cd1860bc14769737772d92eb7971d23d6076f37ddab32c39a414ea2ec516d4ec2121152f4db651b61e7b05cac3baa46da  konquest-18.04.1.tar.xz"
diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD
index 672935863..b2ff70e40 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Terminal emulator for Qt/KDE"
 url="https://konsole.kde.org/"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kbookmarks-dev
 	kcrash-dev kguiaddons-dev kdbusaddons-dev gettext-dev python3 ki18n-dev
 	kiconthemes-dev kinit-dev kio-dev knotifications-dev knotifyconfig-dev
 	kparts-dev kpty-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev
-	kwindowsystem-dev kxmlgui-dev kdbusaddons-dev"
+	kwindowsystem-dev kxmlgui-dev kdbusaddons-dev knewstuff-dev"
 install=""
 subpackages="$pkgname-doc $pkgname-lang"
 source="http://download.kde.org/stable/applications/$pkgver/src/konsole-$pkgver.tar.xz"
@@ -45,4 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="daffd82608fcbe4ded65cae336d2d6ab6f6a70a665e2b1841cca39b2933e8c615c072bcfe02958be8e8193c05a0c1ad317e6cda554dcb8e3b434a2f4d8d80036  konsole-17.12.2.tar.xz"
+sha512sums="cc73eefe0c7fe4e9ef91f4085ae19f658a5ce31e0617f2cb06c7faee57feae33fee6071aed63b6a599d8d0cad6fa9877908d64eda8573edf406205bdf70f2570  konsole-18.04.1.tar.xz"
diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD
index e1013e864..40e3450a4 100644
--- a/user/kpat/APKBUILD
+++ b/user/kpat/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kpat
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Collection of card games for KDE"
 url="https://games.kde.org/game.php?game=kpat"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="605dca9da10b4a419e028f9f7339d685e2fa6399d388502970b23fa51f5385607554c27de3898c20e3e7a098068a1770202097c2b02122b187c76800188db3a6  kpat-17.12.2.tar.xz"
+sha512sums="4ebaeae39171fc9a26c1494a6eddf467cb6ef19d8b1293f9a4a7d0d24978b34671141917f4e8b2a1fc9874d31c3dab07b3fe6189487492d76df4c6a9fc20f760  kpat-18.04.1.tar.xz"
diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD
index 1fe51a2d9..213b77c75 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Text editor for Personal Information Managers (PIMs)"
 url="https://pim.kde.org/"
@@ -45,4 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="10c9a7766cf8ed83947f506d7664799601160a2041b8718aa5e124d0c4b400bb1c5da27c2e4ed1f8723697926ff7aa626f14e8bb4bbc47200733e7cf6040dfb4  kpimtextedit-17.12.2.tar.xz"
+sha512sums="c5b74261653cbe86e660d56f556d17da5d57798b6affc860e502fe8ce8675005204f62ff568fbe49df62ce237b4c6beae1196e5beba61412b59d263649e8b8a2  kpimtextedit-18.04.1.tar.xz"
diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD
index 9524e686b..fe245fdf1 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="View and control remote desktops (RDP and VNC)"
 url="https://www.kde.org/applications/internet/krdc/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b9a861754d87761ffc96ea10fcfdb5dec51a343515736054acb4c37675d02624cebcc3de061efb84f6492221ab4c1bf6b84ae885ec428f268245a2dc6b944779  krdc-17.12.2.tar.xz"
+sha512sums="06b9713adbb26be6b5f5e0201d78b4fd006b5b83b5b3e3dbd8e927e695ad008e7bef0d4273e75bae845fbc9164f5e293217f05174e19360758712624a7bd58b1  krdc-18.04.1.tar.xz"
diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD
index 66247200b..168cad483 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Reversi game"
 url="https://games.kde.org/game.php?game=kreversi"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e16bf1222acd61f00be68a9e6639243dbd2cea7264a909f79a5a1493790c8bdd9f6ab2fb7ce98339f55f25cdc8f60421671f360a9d867114c4878e0c02b0c506  kreversi-17.12.2.tar.xz"
+sha512sums="feb10efac9a8be20f813dda272d398e79b1df7c64ba69b51a38471bb91997e0146ef93c95076bf9c18fdf329cfdd85d1c66fff33e4b70f9779e200eee85afb92  kreversi-18.04.1.tar.xz"
diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD
index 7080fbb91..edaae9e3b 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Share your screen with others for remote watching or assistance"
 url="https://www.kde.org/applications/system/krfb/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="49d5afb3203777908310fb2ea490125827be7f921789c20ebb9cdc492daae34f793b3c0217e8b109aa542ae7c76e0da237d6cdaea1ca928f575d4a5802353f8e  krfb-17.12.2.tar.xz"
+sha512sums="f637055b8aaef32c28a5199a24b783e1e169791e9e28470c73c342eb7aad98c0b6ae517bee7da4be1692eb1a96fd05f73b1dc52b44630aebbf48a3fa36b0a4fa  krfb-18.04.1.tar.xz"
diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD
index 91599aa3d..4ab86966e 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Screen ruler"
 url="https://www.kde.org/applications/graphics/kruler/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7d57153d64af46e7a957d3c35089eea8382af4da5ea3e1365a86003f3199732c9ac5d38a3f400817f1b51e8db21b7ceed498ead9a567fec30f9d8a038e5e62ee  kruler-17.12.2.tar.xz"
+sha512sums="a373b1350eb294989c15bae586b79c114d8121337d159fc22e00444f20f6ba9ab0fbb895d99ef996ed30e95e675b6ce71be8330f8292297312aa6f4d76ea571e  kruler-18.04.1.tar.xz"
diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD
index b1c437df4..db3bf7473 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Mixture of Solitaire and Mah Jongg"
 url="https://games.kde.org/game.php?game=kshisen"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9228fedd9de5eafbb1eefdf76b12554a2b1cc190d3bab497357d70fde95b822d4f9034f08361fbaefff419316b185840ffa601fe9931bb0df6c88307b2991a1f  kshisen-17.12.2.tar.xz"
+sha512sums="1b05cc50e310ecc29d161de373f645e354777da34ae1c763f164f0db78474b9ee3264ef5cfc23979f8aafe57a40931b065999ed8fc4a694fb722fa034256065e  kshisen-18.04.1.tar.xz"
diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD
index fb197948b..c7b5fbf79 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Tron-like game"
 url="https://www.kde.org/applications/games/ksnakeduel/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a7aad7d1703cfb095738302490ef2f638520ba0a167ba5c67c77fa05388052b78938b6f1885350a72bdced1352f369eda4ff4635b7615e0e0db7298a24678fc9  ksnakeduel-17.12.2.tar.xz"
+sha512sums="58a67080e81a4dabb1e2816866dbc240168e9e1ee4ee3d264f98daa711ddf31b7f65c753fab540f2a593583f3d4e26bb7d902e0f1b1f6f74ebd28d12bc902640  ksnakeduel-18.04.1.tar.xz"
diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD
index e0f213c23..2e285ded2 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Fun and exciting game of Dots and Boxes"
 url="https://games.kde.org/game.php?game=ksquares"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="106e8f8b1e05ae2ab3b12d47a671a1d771bf9ba33a3f6dfc88555f37f3d6cec0aa3a5ae14306354821aaa1972d704d82cace20a867bc4b74987b96879d8dc018  ksquares-17.12.2.tar.xz"
+sha512sums="fbeb28e5eebea5b6fe808761d891d423e6f7503b031f5500a0582ad0fdd0310e8756d1bca578844c11c06c7d24cee079ea26e078aa3b5c48a4eba2112f0a3a65  ksquares-18.04.1.tar.xz"
diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD
index 6da1abe8c..ad460f79c 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Desktop Sudoku (symbol placement / logic) game"
 url="https://games.kde.org/game.php?game=ksudoku"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4026c85786abddd92d24fa8716a27974a7fafa7eedeab266ebc8f5c938f2425e5d15e940329e2163f839cf02f5e68ffea94cdefd9d2ced43c708d04f9c9aa939  ksudoku-17.12.2.tar.xz"
+sha512sums="9aa7e5e4d4038f902450193b1befb5f8529c129f68c1172139199f00c1829589c1ed2ad6682c0f78ae970a5a89edeeebaccba1c582ae6437ab75d04693420a02  ksudoku-18.04.1.tar.xz"
diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD
index 3c62489ad..10ea5d18c 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Friendly, powerful system log viewer tool"
 url="https://www.kde.org/applications/system/ksystemlog/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d4f6bfe35cde11e2675e32c2b31468c3c848ae065eccaf2b4ded9adb7b03d558d2a555aeb77643a84028865b09027820d0eb7689eede8cc5dfb855c51855ef20  ksystemlog-17.12.2.tar.xz"
+sha512sums="714cb96ccd5201c4e6716bf8520bc315cf17fcb3485568cb50578fc011c42c04d63704272209d959d70dc00e2457b46aefd2d011b0ddf8cd6f4dc1db00fad698  ksystemlog-18.04.1.tar.xz"
diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD
index 835abd38a..1bd2016f2 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Steep responsibly"
 url="https://www.kde.org/applications/games/kteatime/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="01de99319c555eba5c394c40532889183de37f962665a8e73ebe36d078185d757ced020e289c769b6062934d1e5a339def690711acf7d476e1f8f981d7048a5d  kteatime-17.12.2.tar.xz"
+sha512sums="5057bd44aed7101d2323040c2a0712a24a214b19ad1a965464295ce5ff0733902e8a55a98503fb3901000233a8b21831cc03f59335f617b7a5ac493ff82e84b6  kteatime-18.04.1.tar.xz"
diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD
index 833cca384..fd6b4c12d 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Tool to execute programs after some time"
 url="https://www.kde.org/applications/utilities/ktimer/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cc0d70be3f68b17705a1aead5a32510ea360283a5f0fc63a39341ed69dc233e4eff59f0a75688d9c845fb1feefa13278dbfe79e7aa96a214f2f15f642f15c27d  ktimer-17.12.2.tar.xz"
+sha512sums="fd43c136df4c3c740be74cdee9aabebfce8b1527b97f17f357c15d5963f53c743f4d63a39b231654c99eeef0728d200639bce2d0ec0c780f8d69ddafe14716ba  ktimer-18.04.1.tar.xz"
diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD
index 2f04f8ebb..56abf4df2 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Touch typing tutor"
 url="https://www.kde.org/applications/education/ktouch/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="449bc268254f21f3376a9b75a0aea97af5bf9d3617f7b7484361a615f3635cd60c74a37bfddd8674f20667325574adecaf42f362a3bbd6e5e66a3c6f5764f41a  ktouch-17.12.2.tar.xz"
+sha512sums="b907f0e32fada964cfbc58cae7555eaabf1b1b3f39b8d67a02af1b0d81abe9db15d6502e33116e46a3b263c2c14af1ad6d0536a602dfaf5a0087c47b5916ff49  ktouch-18.04.1.tar.xz"
diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD
index 834b37bc8..36e75383c 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Simple constructor game"
 url="https://games.kde.org/game.php?game=ktuberling"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f36e0b4ccc1fd849ef38d1b0a9f935c041a426356afc84c3799210f0b0359c25a4ba8c03eec7af5d3e3326aba5be4eebea4718a97bae312d48e2b6c00a0db195  ktuberling-17.12.2.tar.xz"
+sha512sums="eab5ba3c31a38be8d6f0db325856510752508dad843db5cb749e6a542437a7fbba45d2bb76d0dc78d6f53ed3146c687add677413c09aa67260d26709aa79016f  ktuberling-18.04.1.tar.xz"
diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD
index 10bbaddc3..9f7c6f696 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Educational programming environment"
 url="https://www.kde.org/applications/education/kturtle/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="20050ae4349a518940c9fb4e2646bc671a8c63979c19b2176b1f15e7b476e2d3bb2ecdcdb7e1ee6eea95e1b1e847f9e87ec7a87f3457edac110e0466549b6d5e  kturtle-17.12.2.tar.xz"
+sha512sums="4e5fb4f1994bf2eee633ecaefd888d745d589de16531a10ddc8a821212ce79d918a0b2b61e3af43d85bb33d9c2865d82f4d8bb6b7b5364de1cb1798b96c669f6  kturtle-18.04.1.tar.xz"
diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD
index 7beaf5d85..23376f9f5 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="3D cube puzzle solving game"
 url="https://www.kde.org/applications/games/kubrick/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4b7d74db13102479c43441540291d63523265daec4cfd763781e09ebc96bbeca5f263be8593bfdbf3477d4396f5d4f0edc11b09ab451630d6999f5b28c753792  kubrick-17.12.2.tar.xz"
+sha512sums="479d545c1dea21e3025de75c13c0c00e24ad7176ae4775d49b34ae7121e5856c550dde7672bcf97ac2cc5f03725225fd6a392a9d609a0eb3fc09d0e0c1f9a839  kubrick-18.04.1.tar.xz"
diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD
index 8cb1eb502..1695314e1 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Manage KDE wallets"
 url="https://www.kde.org/applications/system/kwalletmanager/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="406becb541024715d781df3c1b6cc4d022ed2714683c1ba5f5f6374410332f5f2e04218ca3d13b2adf747b89ed524cdd8ec1697117a4a6943f1649a295611595  kwalletmanager-17.12.2.tar.xz"
+sha512sums="6ce72cb891aaccbd1ec01225409455a70571083d0809a2d2eb91a1da7f3f0cfce66af2a51e3c14c0eda0c8089ee353ebd865f2d475f422b6d3f95fee82f1c747  kwalletmanager-18.04.1.tar.xz"
diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD
index 30fdf344d..5695c6696 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Sound editor built for KDE"
 url="http://kwave.sourceforge.net/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="84d6f72cb9e71a347d7e7e52660c317976634faeb9dd022a1eb3145301574ce61ac6f263f81de7913f9b443e8b5e0c80d0b22405f9f5a6218b1b67db2abc1692  kwave-17.12.2.tar.xz"
+sha512sums="91d11151ecf955d1c8d287c2f7d5f212302aec7b8b351a5318ba6e43638b1a6c53aa089dc544c05a401c6cf8ae99bfaaebb8467f44eb1e4e694caa5d924b906c  kwave-18.04.1.tar.xz"
diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD
index f247885d1..8f65e8c92 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Flash card trainer for KDE"
 url="https://www.kde.org/applications/education/kwordquiz/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f0210292f6c25b64dce00d221e5ba0797d45c7f1d6354be40dbd294534306f7b328b436f46fbad72d91b97867589694251f8fae7ed2367c1057198c942e3329b  kwordquiz-17.12.2.tar.xz"
+sha512sums="40adab7058d085c739f46f093814961a64fdb802479680c56641194ca9d04a37e6940a8228d20e33dac8dcf426babdb788bdb1b8399e6ec3611f93492d0f4994  kwordquiz-18.04.1.tar.xz"
diff --git a/harmony/libbluray/APKBUILD b/user/libbluray/APKBUILD
index 925ad2cfd..925ad2cfd 100644
--- a/harmony/libbluray/APKBUILD
+++ b/user/libbluray/APKBUILD
diff --git a/harmony/libcanberra/APKBUILD b/user/libcanberra/APKBUILD
index 31cae167b..31cae167b 100644
--- a/harmony/libcanberra/APKBUILD
+++ b/user/libcanberra/APKBUILD
diff --git a/harmony/libgit2/APKBUILD b/user/libgit2/APKBUILD
index e7e4bbfad..e7e4bbfad 100644
--- a/harmony/libgit2/APKBUILD
+++ b/user/libgit2/APKBUILD
diff --git a/harmony/libgit2/build-both-static-dynamic.patch b/user/libgit2/build-both-static-dynamic.patch
index eeb179a1e..eeb179a1e 100644
--- a/harmony/libgit2/build-both-static-dynamic.patch
+++ b/user/libgit2/build-both-static-dynamic.patch
diff --git a/harmony/libgit2/libressl.patch b/user/libgit2/libressl.patch
index 967cdc498..967cdc498 100644
--- a/harmony/libgit2/libressl.patch
+++ b/user/libgit2/libressl.patch
diff --git a/harmony/libgit2/pkgconfig-do-not-quote-Libs.patch b/user/libgit2/pkgconfig-do-not-quote-Libs.patch
index 86133612e..86133612e 100644
--- a/harmony/libgit2/pkgconfig-do-not-quote-Libs.patch
+++ b/user/libgit2/pkgconfig-do-not-quote-Libs.patch
diff --git a/user/libkcddb/APKBUILD b/user/libkcddb/APKBUILD
index 443d2323d..70e8d6ae6 100644
--- a/user/libkcddb/APKBUILD
+++ b/user/libkcddb/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkcddb
-pkgver=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library to retrieve audio CD metadata from the Internet"
 url="http://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
@@ -42,5 +42,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3c19f2f7b77ed6334dfeea725f996cdfe73531f0e2be1d42d689e810080d29f1f4f16d6f3e8c9c820e189a08ce560440d012b37aae465e60746e71ba9d9476ba  libkcddb-17.12.2.tar.xz
+sha512sums="344e846f35cfc5d9d29301eae8b966984c163e500e591546bfb34862f3fa93782277d254a24bcba4e61fb1bf78c9a710ccdd24c5fe05373d5241055fceef0da8  libkcddb-18.04.1.tar.xz
 81085d4fd1e34a14cdbd436c177904a3e1a4520381e85692abbc3b4126c7bd8b11da63d755ac51dc86dc1345482524cc6f74615afe23fac193c98227dffe0fa8  update-tests.patch"
diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD
index 89b2de68e..fc0ea556b 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library for common routines shared between KDE games"
 url="https://www.kde.org/applications/games/"
@@ -54,4 +54,4 @@ carddecks() {
 	mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/
 }
 
-sha512sums="48f00d7ee7fcad83bace4858659ca5b44138f8fbb1a92d7bba5394ba6a0689414ece948a7ee51ab1648b59ab0b64be0d091010493cd91f1247e53b769cf285e2  libkdegames-17.12.2.tar.xz"
+sha512sums="b2999a525de23312f28d146af590fad363ecf828449b892fd1a6c2d2d628d8fba9e998b7596fde8c88a090045a71c5f86f8b4c24528057ef7f5ee4350ea46a09  libkdegames-18.04.1.tar.xz"
diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD
index 6a2628f5f..7a6fb1e71 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library for manipulating KVTML files"
 url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="acf87a3931c6d21cd28a169084aa2ec72ea9f491c858111aa8bbc5267e12e654dd5ea05b2b21360327143e82fd730adde0bd7e1d50fd4e87af7905a90efabce6  libkeduvocdocument-17.12.2.tar.xz"
+sha512sums="e0b010f4b8d753667e5bc4a93a08023e4788f6aa7ca2f0c2f3cb49ec1208dfc204b46e31c2ad3aca48c36dabd669e072911c8263db61f55cdef74030b023df06  libkeduvocdocument-18.04.1.tar.xz"
diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD
index 87e786340..e64cc8f31 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="KDE Image Plugin Interface library"
 url="https://www.digikam.org/"
@@ -38,4 +38,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8f80bcc86174fa9a0e4e746b1b3e59dad4dc313fb1f6a8a28ea442a171a84059a70611eaff1c00469e156f89641f8c51cbcc4b997961caccf7309d64db0039fc  libkipi-17.12.2.tar.xz"
+sha512sums="b495ad4db5a29da2cf7d05d35e4abad2ded1b3b7497d601ab074b3604d14eef9c2c5e04ebcae0afcc53bdaa91f8522a4e4e601cfc2b298f49b6dfcf7d594704b  libkipi-18.04.1.tar.xz"
diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD
index 07b36d230..0fb1d9e19 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="KDE encryption library"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="bc697f39310d7fa84dfd3ac186b3f1f7715b272bb70b4505439ef64c6fb1b453274cf46c5cce7d89c579a3e5be197fcfb7aa9a097a22081964c2a16d90e17607  libkleo-17.12.2.tar.xz"
+sha512sums="be6979ea01c74974919771634272921a5d213a19dbc4e8befdd9882f1086f74c8c36afed5505d629a51a6712ad7703a37479a2b01eac1aa9effce33862ee6b8d  libkleo-18.04.1.tar.xz"
diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD
index b6dbba428..3d35b0215 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Library with Mah Jongg logic"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="72df346ca92610bcb49e2067a35b1ca441b4649139998f3ed36104f92bb0a93a1bcc5283fd49901b5b66ed35fd8e865d04360267edc75a779ac0bce02047944a  libkmahjongg-17.12.2.tar.xz"
+sha512sums="4926ef9b958fa3543dbf050534a0ed21fcfd25f16c9b7b15fa04b132fb0f7a4ee2ad2aec752b82ea6220a05cb545cfdb25512b11f1afeba31a77eefd8162220f  libkmahjongg-18.04.1.tar.xz"
diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD
index d15e9eee2..a62ba3091 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="KDE scanning library"
 url="https://www.kde.org"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8567fc8da31ded406dfe2e72ff0a209741e437e51ab4beca75feabbb915842e1b3e7f692c94b448512e76f2b60487030da94518d240422653a90eaa0ef3205c1  libksane-17.12.2.tar.xz"
+sha512sums="5a6a18e6b892f0c5151573b7040771c43ecd7d512c33b8102857876ce37e1cbf87381a2803816bc0ba0de14424a0dded2ffcc8460df939f543df446954a87b79  libksane-18.04.1.tar.xz"
diff --git a/harmony/libnih/APKBUILD b/user/libnih/APKBUILD
index f12895d65..f12895d65 100644
--- a/harmony/libnih/APKBUILD
+++ b/user/libnih/APKBUILD
diff --git a/harmony/libnih/disable-broken-test.patch b/user/libnih/disable-broken-test.patch
index 15027945a..15027945a 100644
--- a/harmony/libnih/disable-broken-test.patch
+++ b/user/libnih/disable-broken-test.patch
diff --git a/harmony/libnih/musl-enomem-message.patch b/user/libnih/musl-enomem-message.patch
index 2adeff852..2adeff852 100644
--- a/harmony/libnih/musl-enomem-message.patch
+++ b/user/libnih/musl-enomem-message.patch
diff --git a/harmony/libnih/musl-fix-signals.patch b/user/libnih/musl-fix-signals.patch
index 97ef8196d..97ef8196d 100644
--- a/harmony/libnih/musl-fix-signals.patch
+++ b/user/libnih/musl-fix-signals.patch
diff --git a/harmony/libnih/parse-test-fix.patch b/user/libnih/parse-test-fix.patch
index e993bf324..e993bf324 100644
--- a/harmony/libnih/parse-test-fix.patch
+++ b/user/libnih/parse-test-fix.patch
diff --git a/harmony/libnotify/APKBUILD b/user/libnotify/APKBUILD
index a59730e1b..a59730e1b 100644
--- a/harmony/libnotify/APKBUILD
+++ b/user/libnotify/APKBUILD
diff --git a/harmony/libsndfile/APKBUILD b/user/libsndfile/APKBUILD
index 66abef4f7..66abef4f7 100644
--- a/harmony/libsndfile/APKBUILD
+++ b/user/libsndfile/APKBUILD
diff --git a/harmony/libsndfile/CVE-2017-12562.patch b/user/libsndfile/CVE-2017-12562.patch
index f195e87e4..f195e87e4 100644
--- a/harmony/libsndfile/CVE-2017-12562.patch
+++ b/user/libsndfile/CVE-2017-12562.patch
diff --git a/harmony/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch b/user/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
index 1dc5b57f1..1dc5b57f1 100644
--- a/harmony/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
+++ b/user/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
diff --git a/harmony/libsndfile/CVE-2017-8362.patch b/user/libsndfile/CVE-2017-8362.patch
index 54fbfb44c..54fbfb44c 100644
--- a/harmony/libsndfile/CVE-2017-8362.patch
+++ b/user/libsndfile/CVE-2017-8362.patch
diff --git a/harmony/libsndfile/varargs-32bit.patch b/user/libsndfile/varargs-32bit.patch
index 81f149add..81f149add 100644
--- a/harmony/libsndfile/varargs-32bit.patch
+++ b/user/libsndfile/varargs-32bit.patch
diff --git a/harmony/libssh2/APKBUILD b/user/libssh2/APKBUILD
index 1bfdfdef9..1bfdfdef9 100644
--- a/harmony/libssh2/APKBUILD
+++ b/user/libssh2/APKBUILD
diff --git a/harmony/libvpx/APKBUILD b/user/libvpx/APKBUILD
index 27de30e06..27de30e06 100644
--- a/harmony/libvpx/APKBUILD
+++ b/user/libvpx/APKBUILD
diff --git a/harmony/libvpx/libm-pc.patch b/user/libvpx/libm-pc.patch
index 87f07a398..87f07a398 100644
--- a/harmony/libvpx/libm-pc.patch
+++ b/user/libvpx/libm-pc.patch
diff --git a/harmony/lighttpd/APKBUILD b/user/lighttpd/APKBUILD
index 356bce93e..356bce93e 100644
--- a/harmony/lighttpd/APKBUILD
+++ b/user/lighttpd/APKBUILD
diff --git a/harmony/lighttpd/char-signedness.patch b/user/lighttpd/char-signedness.patch
index 43f7f5faf..43f7f5faf 100644
--- a/harmony/lighttpd/char-signedness.patch
+++ b/user/lighttpd/char-signedness.patch
diff --git a/harmony/lighttpd/lighttpd.conf b/user/lighttpd/lighttpd.conf
index cfec00065..cfec00065 100644
--- a/harmony/lighttpd/lighttpd.conf
+++ b/user/lighttpd/lighttpd.conf
diff --git a/harmony/lighttpd/lighttpd.confd b/user/lighttpd/lighttpd.confd
index da524afb4..da524afb4 100644
--- a/harmony/lighttpd/lighttpd.confd
+++ b/user/lighttpd/lighttpd.confd
diff --git a/harmony/lighttpd/lighttpd.initd b/user/lighttpd/lighttpd.initd
index 614cb2132..614cb2132 100644
--- a/harmony/lighttpd/lighttpd.initd
+++ b/user/lighttpd/lighttpd.initd
diff --git a/harmony/lighttpd/lighttpd.logrotate b/user/lighttpd/lighttpd.logrotate
index 8fbb20fb0..8fbb20fb0 100644
--- a/harmony/lighttpd/lighttpd.logrotate
+++ b/user/lighttpd/lighttpd.logrotate
diff --git a/harmony/lighttpd/lighttpd.pre-install b/user/lighttpd/lighttpd.pre-install
index 81ccda1f9..81ccda1f9 100644
--- a/harmony/lighttpd/lighttpd.pre-install
+++ b/user/lighttpd/lighttpd.pre-install
diff --git a/harmony/lighttpd/lighttpd.pre-upgrade b/user/lighttpd/lighttpd.pre-upgrade
index 18a7fef66..18a7fef66 120000
--- a/harmony/lighttpd/lighttpd.pre-upgrade
+++ b/user/lighttpd/lighttpd.pre-upgrade
diff --git a/harmony/lighttpd/mime-types.conf b/user/lighttpd/mime-types.conf
index f24d4d858..f24d4d858 100644
--- a/harmony/lighttpd/mime-types.conf
+++ b/user/lighttpd/mime-types.conf
diff --git a/harmony/lighttpd/mod_cgi.conf b/user/lighttpd/mod_cgi.conf
index 1cb3770f9..1cb3770f9 100644
--- a/harmony/lighttpd/mod_cgi.conf
+++ b/user/lighttpd/mod_cgi.conf
diff --git a/harmony/lighttpd/mod_fastcgi.conf b/user/lighttpd/mod_fastcgi.conf
index 549b84c2e..549b84c2e 100644
--- a/harmony/lighttpd/mod_fastcgi.conf
+++ b/user/lighttpd/mod_fastcgi.conf
diff --git a/harmony/lighttpd/mod_fastcgi_fpm.conf b/user/lighttpd/mod_fastcgi_fpm.conf
index 926137a43..926137a43 100644
--- a/harmony/lighttpd/mod_fastcgi_fpm.conf
+++ b/user/lighttpd/mod_fastcgi_fpm.conf
diff --git a/harmony/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD
index 694adb868..694adb868 100644
--- a/harmony/lm_sensors/APKBUILD
+++ b/user/lm_sensors/APKBUILD
diff --git a/harmony/lm_sensors/fancontrol.initd b/user/lm_sensors/fancontrol.initd
index cb29a9ee9..cb29a9ee9 100644
--- a/harmony/lm_sensors/fancontrol.initd
+++ b/user/lm_sensors/fancontrol.initd
diff --git a/harmony/lm_sensors/musl-fix-includes.patch b/user/lm_sensors/musl-fix-includes.patch
index 501f2dd76..501f2dd76 100644
--- a/harmony/lm_sensors/musl-fix-includes.patch
+++ b/user/lm_sensors/musl-fix-includes.patch
diff --git a/harmony/lm_sensors/sensord.confd b/user/lm_sensors/sensord.confd
index d82841aeb..d82841aeb 100644
--- a/harmony/lm_sensors/sensord.confd
+++ b/user/lm_sensors/sensord.confd
diff --git a/harmony/lm_sensors/sensord.initd b/user/lm_sensors/sensord.initd
index c100b1aa1..c100b1aa1 100644
--- a/harmony/lm_sensors/sensord.initd
+++ b/user/lm_sensors/sensord.initd
diff --git a/harmony/lm_sensors/sensors-detect-alpine.patch b/user/lm_sensors/sensors-detect-alpine.patch
index 319fcec06..319fcec06 100644
--- a/harmony/lm_sensors/sensors-detect-alpine.patch
+++ b/user/lm_sensors/sensors-detect-alpine.patch
diff --git a/harmony/lm_sensors/sensors.install b/user/lm_sensors/sensors.install
index d593f8414..d593f8414 100644
--- a/harmony/lm_sensors/sensors.install
+++ b/user/lm_sensors/sensors.install
diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD
index d60d6d5df..c181a6edf 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Lieutenant Skat is an interactive two-player card game"
 url="https://games.kde.org/game.php?game=lskat"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="320d30ccb8511c7e7701bbd619973387da2ff6a5cf79d5dae0576627efa3d0b99870d58498a8baf5edbc26fcdf6e061d6c28c6a5344600c010db7d032f8c9003  lskat-17.12.2.tar.xz"
+sha512sums="522b1e09b19618e238ac19552094be463e148b543b2500e799d5047bb649d30ef898056c9d1bf10108b490fc723a2d269227ee1747a4de5c9b8cd8107f51932a  lskat-18.04.1.tar.xz"
diff --git a/harmony/ltrace/APKBUILD b/user/ltrace/APKBUILD
index bd07768bf..bd07768bf 100644
--- a/harmony/ltrace/APKBUILD
+++ b/user/ltrace/APKBUILD
diff --git a/harmony/ltrace/aarch-part2.patch b/user/ltrace/aarch-part2.patch
index c40d0a797..c40d0a797 100644
--- a/harmony/ltrace/aarch-part2.patch
+++ b/user/ltrace/aarch-part2.patch
diff --git a/harmony/ltrace/aarch64.patch b/user/ltrace/aarch64.patch
index a89c3073a..a89c3073a 100644
--- a/harmony/ltrace/aarch64.patch
+++ b/user/ltrace/aarch64.patch
diff --git a/harmony/ltrace/add_ppc64le.patch b/user/ltrace/add_ppc64le.patch
index 32efa8b52..32efa8b52 100644
--- a/harmony/ltrace/add_ppc64le.patch
+++ b/user/ltrace/add_ppc64le.patch
diff --git a/harmony/ltrace/musl.patch b/user/ltrace/musl.patch
index 2dc909c95..2dc909c95 100644
--- a/harmony/ltrace/musl.patch
+++ b/user/ltrace/musl.patch
diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD
index 559048a60..1b144c9a5 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Free, open-source map and virtual globe"
 url="https://marble.kde.org/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a8641e0d380f666b5402d83ccf01772442d8df0bb06d5de82f43abc56c19f544a1a3f148889f297758ae0ac6654e90cfdeac7a97b05be49c61985eb83bf7194f  marble-17.12.2.tar.xz"
+sha512sums="e5839042c80b6cd854a5c350ba87f3fc3193eda52c36caf5effe013b702f524facddba29a236883e4f12c889c01d28c270fd9d9ce424bfd7076dcbbf58e53332  marble-18.04.1.tar.xz"
diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD
index 8725696b6..31b555445 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Music education software"
 url="https://minuet.kde.org/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e9c45baf8d6ebc6055ca9d80ec5592916015307c8f961bc9fb204c3ecf843775854eeb3fb21284cf81f2493fae61c00507e119bd1d8aa6f68ffe7a0d6d67846b  minuet-17.12.2.tar.xz"
+sha512sums="03d5586d4c48168a64376c593d4d154c536bbe4215f912009a881e76bf472892036ff940fdc19b558074067c7e75ab0571eead8f6d957004e06cc252515dea4b  minuet-18.04.1.tar.xz"
diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD
new file mode 100644
index 000000000..0dc7d8041
--- /dev/null
+++ b/user/mlt/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer:
+pkgname=mlt
+pkgver=6.8.0
+pkgrel=0
+pkgdesc="MLT Multimedia Framework"
+url="https://www.mltframework.org/"
+arch="all !s390x" # depends on fftw which does not work on s390x
+options="!check"  # No test suite.
+license="LGPL-2.1"
+makedepends="ffmpeg-dev libsamplerate-dev sox-dev gtk+2.0-dev sdl_image-dev
+	frei0r-plugins-dev libxml2-dev fftw-dev sdl2-dev sdl-dev libexif-dev
+	bsd-compat-headers qt5-qttools-dev qt5-qtsvg-dev"
+subpackages="$pkgname-dev"
+source="https://github.com/mltframework/mlt/releases/download/v$pkgver/mlt-$pkgver.tar.gz
+	mlt-6.8.0-locale-header.patch
+	"
+builddir="$srcdir/mlt-$pkgver"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--avformat-swscale \
+		--enable-motion-est \
+		--enable-gpl \
+		--enable-gpl3 \
+		--disable-rtaudio
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="5f88d82b0b1656875d19c7cd322181cf974e1cad36692854835ae313723dfd412e6ba4fbb6cca9d70756ca83b512b0f78e95df517cfa007c76f94b26a9901ec8  mlt-6.8.0.tar.gz
+c7c9fe70475ccf78c719c1ca6e1a7f2189e08abe04d556fe558dd787799bd7808d61326cfb2818eefe4a6868eed300b0c0d1480aa3df302b65b79a9a9aacc1b1  mlt-6.8.0-locale-header.patch"
diff --git a/user/mlt/mlt-6.8.0-locale-header.patch b/user/mlt/mlt-6.8.0-locale-header.patch
new file mode 100644
index 000000000..5b45b600a
--- /dev/null
+++ b/user/mlt/mlt-6.8.0-locale-header.patch
@@ -0,0 +1,18 @@
+Extremely incorrect logic here; fix it so that locale_t is defined properly.
+
+--- mlt-6.8.0/src/framework/mlt_property.h.old	2018-05-10 20:16:56.000000000 -0500
++++ mlt-6.8.0/src/framework/mlt_property.h	2018-06-07 05:22:57.345580154 -0500
+@@ -30,10 +30,10 @@
+ #include <sys/param.h>
+ #endif
+ 
+-#if (defined(__GLIBC__) && !defined(__APPLE__)) || HAVE_LOCALE_H
+-#  include <locale.h>
+-#elif defined(__APPLE__) || (__FreeBSD_version >= 900506)
++#if defined(__APPLE__) || (__FreeBSD_version >= 900506)
+ #  include <xlocale.h>
++#elif defined(__linux__) || HAVE_LOCALE_H
++#  include <locale.h>
+ #else
+ typedef char* locale_t;
+ #endif
diff --git a/harmony/mutt/APKBUILD b/user/mutt/APKBUILD
index 2b3424421..2b3424421 100644
--- a/harmony/mutt/APKBUILD
+++ b/user/mutt/APKBUILD
diff --git a/harmony/neon/APKBUILD b/user/neon/APKBUILD
index a0ddbd5d4..a0ddbd5d4 100644
--- a/harmony/neon/APKBUILD
+++ b/user/neon/APKBUILD
diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD
index a47db7dff..f42929522 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Universal document reader developed by KDE"
 url="https://okular.kde.org/"
@@ -46,4 +46,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4bd6eda7a5ebe3b0fb4a0e4518a321e2e8ecb74984c89085eba24afe76828f0f7af16f066519b52926edbb593965ce294dc28d1281200e9d284a6b630e92da2a  okular-17.12.2.tar.xz"
+sha512sums="279b00539a2ea65e9d93eb6b73b3bd68e3468758c35120f4e733708d6b9a36eb5653af1d23cbb4d4ccf36a1bc143fa9e6d385d813c48292103056039addf3e26  okular-18.04.1.tar.xz"
diff --git a/harmony/openldap/APKBUILD b/user/openldap/APKBUILD
index 84cbc1471..84cbc1471 100644
--- a/harmony/openldap/APKBUILD
+++ b/user/openldap/APKBUILD
diff --git a/harmony/openldap/CVE-2017-9287.patch b/user/openldap/CVE-2017-9287.patch
index 1599c1331..1599c1331 100644
--- a/harmony/openldap/CVE-2017-9287.patch
+++ b/user/openldap/CVE-2017-9287.patch
diff --git a/harmony/openldap/configs.patch b/user/openldap/configs.patch
index e7ec65c4b..e7ec65c4b 100644
--- a/harmony/openldap/configs.patch
+++ b/user/openldap/configs.patch
diff --git a/harmony/openldap/fix-manpages.patch b/user/openldap/fix-manpages.patch
index 179569494..179569494 100644
--- a/harmony/openldap/fix-manpages.patch
+++ b/user/openldap/fix-manpages.patch
diff --git a/harmony/openldap/libressl.patch b/user/openldap/libressl.patch
index ac0106418..ac0106418 100644
--- a/harmony/openldap/libressl.patch
+++ b/user/openldap/libressl.patch
diff --git a/harmony/openldap/openldap-2.4-ppolicy.patch b/user/openldap/openldap-2.4-ppolicy.patch
index c05790e3e..c05790e3e 100644
--- a/harmony/openldap/openldap-2.4-ppolicy.patch
+++ b/user/openldap/openldap-2.4-ppolicy.patch
diff --git a/harmony/openldap/openldap-2.4.11-libldap_r.patch b/user/openldap/openldap-2.4.11-libldap_r.patch
index 448249a3b..448249a3b 100644
--- a/harmony/openldap/openldap-2.4.11-libldap_r.patch
+++ b/user/openldap/openldap-2.4.11-libldap_r.patch
diff --git a/harmony/openldap/openldap-mqtt-overlay.patch b/user/openldap/openldap-mqtt-overlay.patch
index 795480f1e..795480f1e 100644
--- a/harmony/openldap/openldap-mqtt-overlay.patch
+++ b/user/openldap/openldap-mqtt-overlay.patch
diff --git a/harmony/openldap/openldap.post-install b/user/openldap/openldap.post-install
index e90d25760..e90d25760 100644
--- a/harmony/openldap/openldap.post-install
+++ b/user/openldap/openldap.post-install
diff --git a/harmony/openldap/openldap.post-upgrade b/user/openldap/openldap.post-upgrade
index 7be8906a9..7be8906a9 100644
--- a/harmony/openldap/openldap.post-upgrade
+++ b/user/openldap/openldap.post-upgrade
diff --git a/harmony/openldap/openldap.pre-install b/user/openldap/openldap.pre-install
index eb6b10fa4..eb6b10fa4 100644
--- a/harmony/openldap/openldap.pre-install
+++ b/user/openldap/openldap.pre-install
diff --git a/harmony/openldap/slapd.confd b/user/openldap/slapd.confd
index f69f92b4a..f69f92b4a 100644
--- a/harmony/openldap/slapd.confd
+++ b/user/openldap/slapd.confd
diff --git a/harmony/openldap/slapd.initd b/user/openldap/slapd.initd
index 350cc0d50..350cc0d50 100644
--- a/harmony/openldap/slapd.initd
+++ b/user/openldap/slapd.initd
diff --git a/harmony/orbit2/APKBUILD b/user/orbit2/APKBUILD
index 5caf3dcbc..5caf3dcbc 100644
--- a/harmony/orbit2/APKBUILD
+++ b/user/orbit2/APKBUILD
diff --git a/harmony/orbit2/glib-2.36.patch b/user/orbit2/glib-2.36.patch
index c94f920f7..c94f920f7 100644
--- a/harmony/orbit2/glib-2.36.patch
+++ b/user/orbit2/glib-2.36.patch
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD
index 7f07caa02..bd5152a47 100644
--- a/user/php7/APKBUILD
+++ b/user/php7/APKBUILD
@@ -507,7 +507,7 @@ sha512sums="aace53b0b523484715b218e8e77ede355e73c6433e18ebd960a07c371940568d576f
 23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f  php-fpm.initd
 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb  php-fpm.logrotate
 a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48  php-module.conf
-d90595261686e7bdabc7f406c10b468df88e97742a2dff517eec94c8ff20cce7fbe5236ee8463d60cd563bdcad22c0d94d702ca5c65b738b4767abea2f6156dc  disabled-tests.list
+29d622c3818a9ebfd7534dd11b64eebce0215667cc2f7810cf9e61ffcf60645aee80cfc74193066ae71e88e8b4eb7216985ad8926666b96267fd6b27d0532269  disabled-tests.list
 f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505  install-pear.patch
 a77dd3bdf9dc7a0f2c06ff3e7c425d062bbaa29902c17402ce98701dc99499be863ad543aa5e6a7d1c249702d6afb193398dd3199ae58e42b32b95d434fb1883  fpm-paths.patch
 f8ecae241a90cbc3e98aa4deb3d5d35ef555f51380e29f4e182a8060dffeb84be74f030a14c6b452668471030d78964f52795ca74275db05543ccad20ef1f2cc  allow-build-recode-and-imap-together.patch
diff --git a/user/php7/disabled-tests.list b/user/php7/disabled-tests.list
index 96ad3b589..32e7086a5 100644
--- a/user/php7/disabled-tests.list
+++ b/user/php7/disabled-tests.list
@@ -7,6 +7,12 @@ ext/standard/tests/file/006_error.phpt
 # TEST_PHP_EXECUTABLE=sapi/cli/php sapi/cli/php run-tests.php -c test.ini $f
 Zend/tests/unset_cv05.phpt
 Zend/tests/unset_cv06.phpt
+# Tests undefined behavior (integer underflow or overflow)
+Zend/tests/dval_to_lval_32.phpt
+Zend/tests/int_underflow_32bit.phpt
+ext/date/tests/bug53437_var3.phpt
+ext/date/tests/bug53437_var5.phpt
+ext/date/tests/bug53437_var6.phpt
 
 # General glibc/musl incompatibility related failures
 # stdout printed in wrong order
@@ -76,11 +82,10 @@ ext/standard/tests/strings/crypt_des_error.phpt
 # crypt() *missing* deprecation warnings for invalid DES salt
 ext/standard/tests/crypt/des_fallback_invalid_salt.phpt
 
-# "Number overflow!?"
-ext/date/tests/bug53437_var5.phpt
-ext/date/tests/bug53437_var6.phpt
-
 # These two are marked as XFAIL and do as such normally
 # But with --enable-debug, they pass...
 #sapi/fpm/tests/010.phpt
 #sapi/fpm/tests/015.phpt
+
+# Times out on builders but runs fine manually
+ext/zlib/tests/inflate_add_basic.phpt
diff --git a/system/polkit/0001-Bug-50145-make-netgroup-support-optional.patch b/user/polkit/0001-Bug-50145-make-netgroup-support-optional.patch
index 1498e831a..1498e831a 100644
--- a/system/polkit/0001-Bug-50145-make-netgroup-support-optional.patch
+++ b/user/polkit/0001-Bug-50145-make-netgroup-support-optional.patch
diff --git a/system/polkit/APKBUILD b/user/polkit/APKBUILD
index fdc37d634..fdc37d634 100644
--- a/system/polkit/APKBUILD
+++ b/user/polkit/APKBUILD
diff --git a/system/polkit/CVE-2013-4288.patch b/user/polkit/CVE-2013-4288.patch
index 0ca8131e8..0ca8131e8 100644
--- a/system/polkit/CVE-2013-4288.patch
+++ b/user/polkit/CVE-2013-4288.patch
diff --git a/system/polkit/CVE-2015-3218.patch b/user/polkit/CVE-2015-3218.patch
index 977825102..977825102 100644
--- a/system/polkit/CVE-2015-3218.patch
+++ b/user/polkit/CVE-2015-3218.patch
diff --git a/system/polkit/CVE-2015-3255.patch b/user/polkit/CVE-2015-3255.patch
index 1bd7c6bcf..1bd7c6bcf 100644
--- a/system/polkit/CVE-2015-3255.patch
+++ b/user/polkit/CVE-2015-3255.patch
diff --git a/system/polkit/CVE-2015-4625.patch b/user/polkit/CVE-2015-4625.patch
index 4a43fb433..4a43fb433 100644
--- a/system/polkit/CVE-2015-4625.patch
+++ b/user/polkit/CVE-2015-4625.patch
diff --git a/system/polkit/automake.patch b/user/polkit/automake.patch
index 0f6825a26..0f6825a26 100644
--- a/system/polkit/automake.patch
+++ b/user/polkit/automake.patch
diff --git a/system/polkit/disable-ck-test.patch b/user/polkit/disable-ck-test.patch
index e1987d40d..e1987d40d 100644
--- a/system/polkit/disable-ck-test.patch
+++ b/user/polkit/disable-ck-test.patch
diff --git a/system/polkit/fix-consolekit-db-stat.patch b/user/polkit/fix-consolekit-db-stat.patch
index 3deceb639..3deceb639 100644
--- a/system/polkit/fix-consolekit-db-stat.patch
+++ b/user/polkit/fix-consolekit-db-stat.patch
diff --git a/system/polkit/fix-parallel-make.patch b/user/polkit/fix-parallel-make.patch
index b693a34dd..b693a34dd 100644
--- a/system/polkit/fix-parallel-make.patch
+++ b/user/polkit/fix-parallel-make.patch
diff --git a/system/polkit/fix-test-fgetpwent.patch b/user/polkit/fix-test-fgetpwent.patch
index 7bc6481cc..7bc6481cc 100644
--- a/system/polkit/fix-test-fgetpwent.patch
+++ b/user/polkit/fix-test-fgetpwent.patch
diff --git a/harmony/py-dbus/APKBUILD b/user/py-dbus/APKBUILD
index 87da11915..87da11915 100644
--- a/harmony/py-dbus/APKBUILD
+++ b/user/py-dbus/APKBUILD
diff --git a/harmony/qca/APKBUILD b/user/qca/APKBUILD
index 669389ac7..669389ac7 100644
--- a/harmony/qca/APKBUILD
+++ b/user/qca/APKBUILD
diff --git a/harmony/redis/APKBUILD b/user/redis/APKBUILD
index fc8ea8426..fc8ea8426 100644
--- a/harmony/redis/APKBUILD
+++ b/user/redis/APKBUILD
diff --git a/harmony/redis/fix-ppc-atomics.patch b/user/redis/fix-ppc-atomics.patch
index 0263bb531..0263bb531 100644
--- a/harmony/redis/fix-ppc-atomics.patch
+++ b/user/redis/fix-ppc-atomics.patch
diff --git a/harmony/redis/posix-runtest.patch b/user/redis/posix-runtest.patch
index 84d76ad10..84d76ad10 100644
--- a/harmony/redis/posix-runtest.patch
+++ b/user/redis/posix-runtest.patch
diff --git a/harmony/redis/redis.confd b/user/redis/redis.confd
index a79f61ccd..a79f61ccd 100644
--- a/harmony/redis/redis.confd
+++ b/user/redis/redis.confd
diff --git a/harmony/redis/redis.initd b/user/redis/redis.initd
index ce6aba7e3..ce6aba7e3 100755
--- a/harmony/redis/redis.initd
+++ b/user/redis/redis.initd
diff --git a/harmony/redis/redis.logrotate b/user/redis/redis.logrotate
index c77c9a0e8..c77c9a0e8 100644
--- a/harmony/redis/redis.logrotate
+++ b/user/redis/redis.logrotate
diff --git a/harmony/redis/redis.pre-install b/user/redis/redis.pre-install
index f73213126..f73213126 100644
--- a/harmony/redis/redis.pre-install
+++ b/user/redis/redis.pre-install
diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD
index 6bbc4486a..6c75453b1 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Graph theory IDE"
 url="https://www.kde.org/applications/education/rocs/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="db1311f627a5fa77811379d02b23c947236dce6febd5a8d14ca24ee46a8b54255f1befe98043c70b785c7fe01a50d1d3c0cde271f724b57f2a2100b80bb6933d  rocs-17.12.2.tar.xz"
+sha512sums="df96e1d1b21e065b38e2f054e51521b9113752491576a030bb65ec63b037dcaa81c9f9c1f0f79fa304c8755892dcdde3498424b743ece42991d6f7aadddb459f  rocs-18.04.1.tar.xz"
diff --git a/harmony/snappy/APKBUILD b/user/snappy/APKBUILD
index 588164d55..588164d55 100644
--- a/harmony/snappy/APKBUILD
+++ b/user/snappy/APKBUILD
diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD
index 0f3b0b31c..b23d2f18e 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Application for capturing desktop screenshots"
 url="https://www.kde.org/applications/graphics/spectacle/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
 	kcoreaddons-dev kwidgetsaddons-dev kdbusaddons-dev knotifications-dev
 	kconfig-dev ki18n-dev kio-dev kxmlgui-dev kwindowsystem-dev python3
 	kdoctools-dev kdeclarative-dev xcb-util-image-dev xcb-util-cursor-dev
-	libxcb-dev xcb-util-renderutil-dev"
+	libxcb-dev xcb-util-renderutil-dev knewstuff-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="http://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz"
 builddir="$srcdir/spectacle-$pkgver"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b6725931831d0faa02e2f4f65b53be7d2a2e25fab48b785432540d89c2f3fd4134c86f647f60a51c757428db2ea88aee7174295b50c14c3a5bfeb97b478443f4  spectacle-17.12.2.tar.xz"
+sha512sums="a85003842715f4e46a50da81f17403bd7d5e6ef4fa38d149bbfe30baaf9eee16251bc885821db7f14adb46453406bd3f07a64cadcaa11ab2cf919977a8881b08  spectacle-18.04.1.tar.xz"
diff --git a/system/spice/APKBUILD b/user/spice/APKBUILD
index a40b5853f..a40b5853f 100644
--- a/system/spice/APKBUILD
+++ b/user/spice/APKBUILD
diff --git a/user/step/APKBUILD b/user/step/APKBUILD
index 587587302..ad5d9fc7a 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Interactive physics simulation"
 url="https://www.kde.org/applications/education/step/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="025bdc9e3560feb93782a1462a3d2ed152ad9981194425de73fcaa26fbfae74a67016507ebe368776da27b1dda63863106567620e39ed82cc8e95e414f219616  step-17.12.2.tar.xz"
+sha512sums="cc790b66ba845bcc97820c3a81d9a5899a3977c99108dd286d09f06b0b8e6f91e2f92440bd8404af584f026e8e3c32ff14b7b7b8acada604ea39fa4261a3c5f3  step-18.04.1.tar.xz"
diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD
index a4407ad44..cf82ba9f9 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=17.12.2
+pkgver=18.04.1
 pkgrel=0
 pkgdesc="Software modelling tool and code generator"
 url="https://umbrello.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1ad128a798b429c3ccfaac2e754d57b3df9d62a697f43a0397f7f26958036a78e9a07d0bc62d923b3af39bcc97f830a88149e2505fcc0c36404a12190806254d  umbrello-17.12.2.tar.xz"
+sha512sums="2049d6f3b088fdd48b8f452ce521a992142b4d08c66028e0294c26e2ec21472bcec009921d3ddc4ea06fb934da59e212a5ac7e86c37347efd8d3971ab9c5e747  umbrello-18.04.1.tar.xz"
diff --git a/harmony/upower/APKBUILD b/user/upower/APKBUILD
index 9c596f3e0..9c596f3e0 100644
--- a/harmony/upower/APKBUILD
+++ b/user/upower/APKBUILD
diff --git a/harmony/upower/daemon-fix-get_critical_action.patch b/user/upower/daemon-fix-get_critical_action.patch
index 6afe9b7a9..6afe9b7a9 100644
--- a/harmony/upower/daemon-fix-get_critical_action.patch
+++ b/user/upower/daemon-fix-get_critical_action.patch
diff --git a/harmony/upower/lib-add-propererror-and-cancellable-handling-to-UpClient.patch b/user/upower/lib-add-propererror-and-cancellable-handling-to-UpClient.patch
index 47e2f4799..47e2f4799 100644
--- a/harmony/upower/lib-add-propererror-and-cancellable-handling-to-UpClient.patch
+++ b/user/upower/lib-add-propererror-and-cancellable-handling-to-UpClient.patch
diff --git a/harmony/valgrind/APKBUILD b/user/valgrind/APKBUILD
index c5371950d..c5371950d 100644
--- a/harmony/valgrind/APKBUILD
+++ b/user/valgrind/APKBUILD
diff --git a/harmony/valgrind/arm.patch b/user/valgrind/arm.patch
index 8281c8ba1..8281c8ba1 100644
--- a/harmony/valgrind/arm.patch
+++ b/user/valgrind/arm.patch
diff --git a/harmony/valgrind/coregrind-elfv2.patch b/user/valgrind/coregrind-elfv2.patch
index 7e4a2d636..7e4a2d636 100644
--- a/harmony/valgrind/coregrind-elfv2.patch
+++ b/user/valgrind/coregrind-elfv2.patch
diff --git a/harmony/valgrind/uclibc.patch b/user/valgrind/uclibc.patch
index 69281ab2c..69281ab2c 100644
--- a/harmony/valgrind/uclibc.patch
+++ b/user/valgrind/uclibc.patch
diff --git a/system/vlc/APKBUILD b/user/vlc/APKBUILD
index fd433bdf1..a11b883f7 100644
--- a/system/vlc/APKBUILD
+++ b/user/vlc/APKBUILD
@@ -5,7 +5,7 @@ pkgname=vlc
 pkgver=3.0.3
 _pkgver=${pkgver/_/-}
 _ver=${_pkgver%[a-z]}
-pkgrel=0
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
 pkgusers="vlc"
@@ -102,6 +102,7 @@ makedepends="
 	pulseaudio-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	qt5-qtx11extras-dev
 	sdl2-dev
 	speex-dev
 	speexdsp-dev
diff --git a/system/vlc/check-headless.patch b/user/vlc/check-headless.patch
index 25016f437..25016f437 100644
--- a/system/vlc/check-headless.patch
+++ b/user/vlc/check-headless.patch
diff --git a/system/vlc/disable-sub-autodetect-fuzzy-1-test.patch b/user/vlc/disable-sub-autodetect-fuzzy-1-test.patch
index b3dd8a1b7..b3dd8a1b7 100644
--- a/system/vlc/disable-sub-autodetect-fuzzy-1-test.patch
+++ b/user/vlc/disable-sub-autodetect-fuzzy-1-test.patch
diff --git a/system/vlc/fribidi-update.patch b/user/vlc/fribidi-update.patch
index fd293eea4..fd293eea4 100644
--- a/system/vlc/fribidi-update.patch
+++ b/user/vlc/fribidi-update.patch
diff --git a/system/vlc/omxil-rpi-codecs.patch b/user/vlc/omxil-rpi-codecs.patch
index 9b7accfe7..9b7accfe7 100644
--- a/system/vlc/omxil-rpi-codecs.patch
+++ b/user/vlc/omxil-rpi-codecs.patch
diff --git a/system/vlc/tar-compat.patch b/user/vlc/tar-compat.patch
index 34169ef56..34169ef56 100644
--- a/system/vlc/tar-compat.patch
+++ b/user/vlc/tar-compat.patch
diff --git a/system/vlc/test-s390x.patch b/user/vlc/test-s390x.patch
index 8f221ee06..8f221ee06 100644
--- a/system/vlc/test-s390x.patch
+++ b/user/vlc/test-s390x.patch
diff --git a/system/vlc/vlc-daemon.pre-install b/user/vlc/vlc-daemon.pre-install
index aed6c1893..aed6c1893 100644
--- a/system/vlc/vlc-daemon.pre-install
+++ b/user/vlc/vlc-daemon.pre-install
diff --git a/system/vlc/vlc-libs.trigger b/user/vlc/vlc-libs.trigger
index c13bace99..c13bace99 100644
--- a/system/vlc/vlc-libs.trigger
+++ b/user/vlc/vlc-libs.trigger
diff --git a/system/vlc/vlc.confd b/user/vlc/vlc.confd
index 9a58842bd..9a58842bd 100644
--- a/system/vlc/vlc.confd
+++ b/user/vlc/vlc.confd
diff --git a/system/vlc/vlc.initd b/user/vlc/vlc.initd
index 541a07180..541a07180 100755
--- a/system/vlc/vlc.initd
+++ b/user/vlc/vlc.initd
diff --git a/harmony/wayland/APKBUILD b/user/wayland/APKBUILD
index a25cc87a1..a25cc87a1 100644
--- a/harmony/wayland/APKBUILD
+++ b/user/wayland/APKBUILD
diff --git a/harmony/weechat/APKBUILD b/user/weechat/APKBUILD
index 2fe4eb629..2fe4eb629 100644
--- a/harmony/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
diff --git a/harmony/weechat/fix-python-linking.patch b/user/weechat/fix-python-linking.patch
index c94be8026..c94be8026 100644
--- a/harmony/weechat/fix-python-linking.patch
+++ b/user/weechat/fix-python-linking.patch
diff --git a/harmony/weechat/libintl-fix.patch b/user/weechat/libintl-fix.patch
index a67cb37b6..a67cb37b6 100644
--- a/harmony/weechat/libintl-fix.patch
+++ b/user/weechat/libintl-fix.patch
diff --git a/harmony/wget/APKBUILD b/user/wget/APKBUILD
index 5f7093ea5..5f7093ea5 100644
--- a/harmony/wget/APKBUILD
+++ b/user/wget/APKBUILD
diff --git a/harmony/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD
index 7aebbef1f..7aebbef1f 100644
--- a/harmony/wpa_supplicant/APKBUILD
+++ b/user/wpa_supplicant/APKBUILD
diff --git a/harmony/wpa_supplicant/config b/user/wpa_supplicant/config
index f35daa0d1..f35daa0d1 100644
--- a/harmony/wpa_supplicant/config
+++ b/user/wpa_supplicant/config
diff --git a/harmony/wpa_supplicant/eloop.patch b/user/wpa_supplicant/eloop.patch
index bab2cee4e..bab2cee4e 100644
--- a/harmony/wpa_supplicant/eloop.patch
+++ b/user/wpa_supplicant/eloop.patch
diff --git a/harmony/wpa_supplicant/libressl.patch b/user/wpa_supplicant/libressl.patch
index 56146eab5..56146eab5 100644
--- a/harmony/wpa_supplicant/libressl.patch
+++ b/user/wpa_supplicant/libressl.patch
diff --git a/harmony/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
index 727684865..727684865 100644
--- a/harmony/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
diff --git a/harmony/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
index 1802d664a..1802d664a 100644
--- a/harmony/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
diff --git a/harmony/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
index e2937b851..e2937b851 100644
--- a/harmony/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
diff --git a/harmony/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
index 22ee21794..22ee21794 100644
--- a/harmony/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
diff --git a/harmony/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
index c19c4c710..c19c4c710 100644
--- a/harmony/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
diff --git a/harmony/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
index e1bd5a572..e1bd5a572 100644
--- a/harmony/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
diff --git a/harmony/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
index 85ea1d62b..85ea1d62b 100644
--- a/harmony/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
diff --git a/harmony/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
index b9678f681..b9678f681 100644
--- a/harmony/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
diff --git a/harmony/wpa_supplicant/wpa_cli.sh b/user/wpa_supplicant/wpa_cli.sh
index 0a5a6cc03..0a5a6cc03 100644
--- a/harmony/wpa_supplicant/wpa_cli.sh
+++ b/user/wpa_supplicant/wpa_cli.sh
diff --git a/harmony/wpa_supplicant/wpa_supplicant.confd b/user/wpa_supplicant/wpa_supplicant.confd
index 104b9dc5d..104b9dc5d 100644
--- a/harmony/wpa_supplicant/wpa_supplicant.confd
+++ b/user/wpa_supplicant/wpa_supplicant.confd
diff --git a/harmony/wpa_supplicant/wpa_supplicant.initd b/user/wpa_supplicant/wpa_supplicant.initd
index 988b267d1..988b267d1 100644
--- a/harmony/wpa_supplicant/wpa_supplicant.initd
+++ b/user/wpa_supplicant/wpa_supplicant.initd
diff --git a/harmony/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD
index b5d128d60..b5d128d60 100644
--- a/harmony/xf86-video-ati/APKBUILD
+++ b/user/xf86-video-ati/APKBUILD