experimental/sbcl/APKBUILD

 # Contributor: Lee Starnes <lee@canned-death.us>
 # Maintainer: Lee Starnes <lee@canned-death.us>
 pkgname=sbcl
-pkgver=2.0.3
+pkgver=2.0.5
 pkgrel=0
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org"
@@ -11,9 +11,7 @@ depends=""
 makedepends="clisp clisp-dev"
 checkdepends="ed"
 subpackages="$pkgname-doc"
-# Patch provided by Eric Timmons: https://bugs.launchpad.net/sbcl/+bug/1768368
-source="https://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2
-	musl-libc.patch"
+source="https://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2"
 
 prepare() {
 	default_prepare
@@ -34,5 +32,4 @@ package() {
 	INSTALL_ROOT="$pkgdir"/usr sh install.sh 
 }
 
-sha512sums="c29c115fff0e118e5c05959dd8d73ae876458daeb5ddde67ce485b10e6d1583b1f8a9597b54b45606696ab1b1eea5392dcb09357c83fce31323f2a5a154f2dd1  sbcl-2.0.3-source.tar.bz2
-e6757e4cc623682c501ab5e255a881833ff393efac829ffe9f67fff0a005724c3c03a23352b4c88d58b3d15dbb0cf33c8cc58d72d3795abb2f12a4bca4302165  musl-libc.patch"
+sha512sums="0c27e22dd76d157a74ef7e97dcd03030096dde0eb46901ea27acb60faa0ab34881d76a9c6708d963b0e6f62da6331b85b8d3de76fd1fc9163c159e631759f808  sbcl-2.0.5-source.tar.bz2"

experimental/sbcl/musl-libc.patch

-diff --git a/contrib/sb-bsd-sockets/constants.lisp b/contrib/sb-bsd-sockets/constants.lisp
-index 88f5bb7c4..23fd87277 100644
---- a/contrib/sb-bsd-sockets/constants.lisp
-+++ b/contrib/sb-bsd-sockets/constants.lisp
-@@ -93,8 +93,8 @@
-  (:integer EAFNOSUPPORT "EAFNOSUPPORT")
-  (:integer EINPROGRESS "EINPROGRESS")
- 
-- (:integer NETDB-INTERNAL #+hpux "h_NETDB_INTERNAL" #-hpux "NETDB_INTERNAL" "See errno.")
-- (:integer NETDB-SUCCESS #+hpux "h_NETDB_SUCCESS" #-hpux "NETDB_SUCCESS" "No problem.")
-+ (:integer-no-check NETDB-INTERNAL #-os-provides-netdb-internal "-1" #+(and os-provides-netdb-internal hpux) "h_NETDB_INTERNAL" #+(and os-provides-netdb-internal (not hpux)) "NETDB_INTERNAL" "See errno.")
-+ (:integer-no-check NETDB-SUCCESS #-os-provides-netdb-internal "0" #+(and os-provides-netdb-internal hpux) "h_NETDB_SUCCESS" #+(and os-provides-netdb-internal (not hpux)) "NETDB_SUCCESS" "No problem.")
-  (:integer HOST-NOT-FOUND "HOST_NOT_FOUND" "Authoritative Answer Host not found.")
-  (:integer TRY-AGAIN "TRY_AGAIN" "Non-Authoritative Host not found, or SERVERFAIL.")
-  (:integer NO-RECOVERY "NO_RECOVERY" "Non recoverable errors, FORMERR, REFUSED, NOTIMP.")
-diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
-index fa4f5e490..60b5fea4e 100644
---- a/src/runtime/linux-os.c
-+++ b/src/runtime/linux-os.c
-@@ -187,8 +187,15 @@ isnptl (void)
-       if (strstr (buf, "NPTL")) {
-           return 1;
-       }
-+      else {
-+          return 0;
-+      }
-+  }
-+  else {
-+      /* If the configuration variable is empty, just assume we have a
-+       * good enough thread implementation. */
-+      return 1;
-   }
--  return 0;
- }
- #endif
- 
-diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh
-index 7fb757813..9ba8ed3cf 100755
---- a/tests/foreign.test.sh
-+++ b/tests/foreign.test.sh
-@@ -248,16 +248,23 @@ cat > $TEST_FILESTEM.test.lisp <<EOF
-   (assert (= 13 foo))
-   (assert (= 42 (bar)))
-   (note "/original definitions ok")
--  (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b.bak")
--  (rename-file "$TEST_FILESTEM-b2.so" "$TEST_FILESTEM-b.so")
--  (load-shared-object (truename "$TEST_FILESTEM-b.so"))
--  (note "/reloading ok")
--  (assert (= 42 foo))
--  (assert (= 13 (bar)))
--  (note "/redefined versions ok")
--  (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b2.so")
--  (rename-file "$TEST_FILESTEM-b.bak" "$TEST_FILESTEM-b.so")
--  (note "/renamed back to originals")
-+  ;; test late resolution
-+  (eval-when (:compile-toplevel :load-toplevel :execute)
-+   (setq *features* (union *features* sb-impl:+internal-features+)))
-+  #+dlclose-is-noop
-+  (note "/skipping reloading tests")
-+  #-dlclose-is-noop
-+  (progn
-+    (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b.bak")
-+    (rename-file "$TEST_FILESTEM-b2.so" "$TEST_FILESTEM-b.so")
-+    (load-shared-object (truename "$TEST_FILESTEM-b.so"))
-+    (note "/reloading ok")
-+    (assert (= 42 foo))
-+    (assert (= 13 (bar)))
-+    (note "/redefined versions ok")
-+    (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b2.so")
-+    (rename-file "$TEST_FILESTEM-b.bak" "$TEST_FILESTEM-b.so")
-+    (note "/renamed back to originals"))
- 
-   ;; test late resolution
-   #+linkage-table
-@@ -274,13 +278,17 @@ cat > $TEST_FILESTEM.test.lisp <<EOF
-     (load-shared-object (truename "$TEST_FILESTEM-c.so"))
-     (assert (= 43 late-foo))
-     (assert (= 14 (late-bar)))
--    (unload-shared-object (truename "$TEST_FILESTEM-c.so"))
--    (multiple-value-bind (val err) (ignore-errors late-foo)
--      (assert (not val))
--      (assert (typep err 'undefined-alien-error)))
--    (multiple-value-bind (val err) (ignore-errors (late-bar))
--      (assert (not val))
--      (assert (typep err 'undefined-alien-error)))
-+    #+dlclose-is-noop
-+    (note "/skipping unloading tests")
-+    #-dlclose-is-noop
-+    (progn
-+      (unload-shared-object (truename "$TEST_FILESTEM-c.so"))
-+      (multiple-value-bind (val err) (ignore-errors late-foo)
-+        (assert (not val))
-+        (assert (typep err 'undefined-alien-error)))
-+      (multiple-value-bind (val err) (ignore-errors (late-bar))
-+        (assert (not val))
-+        (assert (typep err 'undefined-alien-error))))
-     (note "/linkage table ok"))
- 
-   (sb-ext:exit :code $EXIT_LISP_WIN) ; success convention for Lisp program
-diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile
-index 3f6e4ecf9..39bab2b92 100644
---- a/tools-for-build/Makefile
-+++ b/tools-for-build/Makefile
-@@ -16,6 +16,9 @@ LDLIBS:=$(OS_LIBS)
- 
- all: grovel-headers determine-endianness where-is-mcontext
- 
-+dlclose-is-noop-test-helper.so: dlclose-is-noop-test-helper.c
-+	@$(CC) $(LDFLAGS) -shared $< -o $@ $(LOADLIBES) $(LDLIBS)
-+
- clean:
- 	rm -f *.o grovel-headers determine-endianness where-is-mcontext
- 	rm -f *.exe
-diff --git a/tools-for-build/dlclose-is-noop-test-helper.c b/tools-for-build/dlclose-is-noop-test-helper.c
-new file mode 100644
-index 000000000..4be7a8e5b
---- /dev/null
-+++ b/tools-for-build/dlclose-is-noop-test-helper.c
-@@ -0,0 +1 @@
-+int sbcl_dl_close_test = 42;
-diff --git a/tools-for-build/dlclose-is-noop-test.c b/tools-for-build/dlclose-is-noop-test.c
-new file mode 100644
-index 000000000..f4eab26a5
---- /dev/null
-+++ b/tools-for-build/dlclose-is-noop-test.c
-@@ -0,0 +1,19 @@
-+/* test to build and run so that we know if we have a noop dlclose
-+ */
-+
-+#include <dlfcn.h>
-+#include <stddef.h>
-+
-+int main ()
-+{
-+   void * handle = dlopen("./dlclose-is-noop-test-helper.so", RTLD_NOW | RTLD_GLOBAL);
-+   dlclose(handle);
-+
-+   handle = dlopen("./dlclose-is-noop-test-helper.so", RTLD_NOW | RTLD_NOLOAD);
-+
-+   if (handle != NULL) {
-+       return 104;
-+   } else {
-+       return 0;
-+   }
-+}
-diff --git a/tools-for-build/grovel-features.sh b/tools-for-build/grovel-features.sh
-index ffc4307eb..bf1448a6a 100644
---- a/tools-for-build/grovel-features.sh
-+++ b/tools-for-build/grovel-features.sh
-@@ -36,3 +36,12 @@
- if [ "$sbcl_arch" = arm ] ; then
-    featurep arm-softfp
- fi
-+
-+featurep os-provides-netdb-internal
-+
-+# We need a helper shared library to test dlclose-is-noop
-+$GNUMAKE dlclose-is-noop-test-helper.so > /dev/null 2>&1
-+
-+featurep dlclose-is-noop
-+
-+rm -f dlclose-is-noop-test-helper.so
-diff --git a/tools-for-build/os-provides-netdb-internal-test.c b/tools-for-build/os-provides-netdb-internal-test.c
-new file mode 100644
-index 000000000..cab08cc41
---- /dev/null
-+++ b/tools-for-build/os-provides-netdb-internal-test.c
-@@ -0,0 +1,12 @@
-+#include <netdb.h>
-+
-+int main ()
-+{
-+#if defined NETDB_INTERNAL && defined NETDB_SUCCESS
-+    return 104;
-+#elif defined h_NETDB_INTERNAL && defined h_NETDB_SUCCESS
-+    return 104;
-+#else
-+    return 0;
-+#endif
-+}

legacy/openjdk7/APKBUILD

@@ -25,6 +25,7 @@ install=""
 
 # upstream binary versions
 RHINO_VER=1.7.7.2
+_RHINO_VER=1_7_7_2
 ANT_VER=1.9.11
 
 case $CARCH in
@@ -50,6 +51,8 @@ _jrelib="$INSTALL_BASE/jre/lib/$_jarch"
 ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
 sonameprefix="$pkgname:"
 
+provides="$pkgname-bootstrap=$pkgver-r$pkgrel"
+
 subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase
 	$pkgname-doc:doc"
 
@@ -57,7 +60,7 @@ if [ "$BOOTSTRAP" != "no" ]; then
 	makedepends="$makedepends java-gcj-compat"
 	BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
 else
-	makedepends="$makedepends $pkgname fastjar"
+	makedepends="$makedepends $pkgname-bootstrap fastjar"
 	BOOTSTRAP_JAVA_HOME="$INSTALL_BASE"
 fi
 
@@ -73,7 +76,7 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.g
 	langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2
 	hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2
 	https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
-	https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_VER//./_}_Release/rhino-$RHINO_VER.zip
+	https://github.com/mozilla/rhino/releases/download/Rhino${_RHINO_VER}_Release/rhino-$RHINO_VER.zip
 
 	icedtea-hotspot-musl.patch
 	icedtea-hotspot-musl-ppc.patch

system/adelie-base/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=adelie-base
 pkgver=0.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The Adélie Linux Base System"
 url="https://www.adelielinux.org/"
 arch="noarch"
@@ -14,7 +14,7 @@ _core_depends="apk-tools adelie-keys musl-utils shadow
 	util-linux net-tools
 	nvi sed psmisc less tzdata"
 depends="adelie-core binutils debianutils file gettys-openrc
-	kbd libarchive-tools man-db patch sed sharutils sysklogd zsh"
+	kbd libarchive-tools mandoc patch sed sharutils sysklogd zsh"
 makedepends=""
 makedepends_host="$depends"
 subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev

system/bc/APKBUILD

 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bc
-pkgver=2.6.0
+pkgver=3.0.3
 pkgrel=0
 pkgdesc="An arbitrary precision numeric processing language (calculator)"
 url="https://github.com/gavinhoward/bc"
@@ -25,4 +25,4 @@ package() {
 	make install
 }
 
-sha512sums="809ca124d110bb96ded253fe8799786b48dc5ff8ab540aa97dc8ed43f5a835841d44a71ed082ded17c1df39b6fe5dc2ce7247be0c771b22d7d354aec40434411  bc-2.6.0.tar.xz"
+sha512sums="0b27aeb8c892b878a7bfd6105744704c09349048981f1636c8a94ba159f4ffd4406bea7cf5995541c94eb4d3644902f8bfb7578b928744096fea81eb1a6121e5  bc-3.0.3.tar.xz"

system/bison/APKBUILD

 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bison
-pkgver=3.5.3
+pkgver=3.5.4
 pkgrel=0
 pkgdesc="The GNU general-purpose parser generator"
 arch="all"
@@ -15,6 +15,10 @@ provider_priority=1
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz"
 
+# secfixes:
+#   3.5.4-r0:
+#     - CVE-2020-14150
+
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -40,4 +44,4 @@ package() {
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="888a1e8d4aeda3ff2d7d0a3a88b63bbfe89bdb718cc64d48c244e05fe6c6cd39526fd88143db379fef3071cf6c2dc2ab2fd69834c24acb23ed5f739584ff6308  bison-3.5.3.tar.xz"
+sha512sums="92f59122dc4d5cae1debdd5567253f269ef001c98582a5763a2051424fecb78e8710c80a09fc488f6784705e679a8bc82874bc11cc03e4eb83445cb9f418b331  bison-3.5.4.tar.xz"

system/byacc/APKBUILD

 # Contributor: Nathan Angelacos <nangel@alpinelinux.org>
 # Maintainer: 
 pkgname=byacc
-pkgver=20191103
+pkgver=20200330
 pkgrel=0
 pkgdesc="The Berkeley Yacc general-purpose parser generator"
 url="https://invisible-island.net/byacc/byacc.html"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="247cf5469da618733a9ce8d2f079e56ef485354c4fce462014ac9d3108ebf7eccb0147a3e005374a541895eff28b9a63f5f840a7576a26cb23ab34d968a2d05c  byacc-20191103.tgz"
+sha512sums="df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07  byacc-20200330.tgz"

system/ca-certificates/APKBUILD

 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ca-certificates
-pkgver=20190131
-pkgrel=1
+pkgver=20200603
+pkgrel=0
 pkgdesc="CA root certificates"
 url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
 arch="all"
@@ -13,12 +13,11 @@ makedepends_host="openssl-dev"
 subpackages="$pkgname-doc"
 triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d"
 install="$pkgname.post-deinstall"
-source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz
+source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz
 	certhash
 	"
 
 build() {
-	export CFLAGS="$CFLAGS -DSYMLINK_MAX=PATH_MAX"
 	make
 }
 
@@ -43,5 +42,5 @@ package() {
 	install -D -m755 "$srcdir"/certhash "$pkgdir"/etc/ca-certificates/update.d/certhash
 }
 
-sha512sums="aec43296636887a8ebefc08abe60c123b67002eb8cf450662b5ff8fcbd2ea10d3d24d17080b5924b13aed9a52b91ba55e93d306e27ed3196ca67cbbe30146328  ca-certificates-20190131.tar.xz
+sha512sums="0125600481666979e0b736572aca7d0e3c4bf01169bc67638ef7bdd4fc97a0ebbb70798df7275eac92dfc2d03b16de3f0adc8ad382fc9e2fb4d8223c923b2eef  ca-certificates-20200603.tar.gz
 1efe48235f150052da6b872d2ebff174359825ab3bd66086c9d7f4c18dcd8aa8953c634dbf1aa8416d30d5623babf589660a25cf6e3a4cdcce707c14cc2f348a  certhash"

system/curl/APKBUILD

@@ -10,7 +10,7 @@ url="https://curl.haxx.se"
 arch="all"
 license="MIT"
 depends="ca-certificates"
-makedepends_build="groff perl"
+makedepends_build="perl"
 makedepends_host="zlib-dev openssl-dev libssh2-dev"
 makedepends="$makedepends_build $makedepends_host"
 source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz"

system/dash/APKBUILD

 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=dash
-pkgver=0.5.10.2
+pkgver=0.5.11
 pkgrel=0
 pkgdesc="Small and fast POSIX-compliant shell"
 url="http://gondor.apana.org.au/~herbert/dash/"
@@ -41,4 +41,4 @@ binsh() {
 	ln -s /bin/dash "$subpkgdir"/bin/sh
 }
 
-sha512sums="0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640  dash-0.5.10.2.tar.gz"
+sha512sums="41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1  dash-0.5.11.tar.gz"

system/debianutils/APKBUILD

 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=debianutils
-pkgver=4.9.1
+pkgver=4.11
 pkgrel=0
 pkgdesc="Miscellaneous utilities from Debian"
 url="https://packages.qa.debian.org/d/debianutils.html"
@@ -37,4 +37,4 @@ which() {
 	mv "${pkgdir}-doc"/usr/share/man/man1/which* "$subpkgdir"/usr/share/man/man1/
 }
 
-sha512sums="b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1  debianutils_4.9.1.tar.xz"
+sha512sums="87f6b7d9fecbaff615a5529328d384d8adf4ed69c8cc00acc54681d91fc146f4241a761dde2c9b092cb279b63d30dcaa6c2d0309ef4d29d6a2b09600c53c0ac6  debianutils_4.11.tar.xz"

system/ed/APKBUILD

 # Maintainer: 
 pkgname=ed
-pkgver=1.15
+pkgver=1.16
 pkgrel=0
 pkgdesc="GNU version of standard text editor"
 url="https://www.gnu.org/software/ed/"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="27a16db41e88626b9718b1868f2fc629b609e436aca2450846f87492c61bf60cec3db0c54ff9a421d9bcbf59fe91a8c672aee5772e1b1eec8a365f227c30ecba  ed-1.15.tar.lz"
+sha512sums="1ca999edd7007c56bf9aa91436997a813e665910dda19a3307fa5b85adc05667eb120cb54cb6544b919f1c7f631baf3ee03079abe1171b875fb9653f535fa7bd  ed-1.16.tar.lz"

system/execline/APKBUILD

 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=execline
-pkgver=2.6.0.2
+pkgver=2.6.1.0
 pkgrel=0
 pkgdesc="A small scripting language for non-interactive scripts"
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
 options="!check"  # No test suite.
 license="ISC"
-_skalibs_version=2.9.1.0
+_skalibs_version=2.9.2.1
 makedepends="skalibs-dev>=$_skalibs_version"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -61,5 +61,4 @@ doc() {
         mkdir -p "$subpkgdir/usr/share/doc"
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
-
-sha512sums="915823af0d557fc7a181e088ce319568e62ea4bf743704e498786422c97b991e6b09447c7cff7d7dda520d391773ef4b2fea68e44479c02766966256719bb4c0  execline-2.6.0.2.tar.gz"
+sha512sums="5bddf400f4cddeb8ddf8c80415c426553f14c879feeb4e69d5e21adb517c76a781581e8b4769c8560b56dc6f89f10a8b38fcf296baa6989b86c73bdb2cd6603e  execline-2.6.1.0.tar.gz"

system/help2man/APKBUILD

 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=help2man
-pkgver=1.47.13
+pkgver=1.47.16
 pkgrel=0
 pkgdesc="Create simple man pages from --help output"
 url="https://www.gnu.org/software/help2man"
@@ -28,4 +28,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7bf4c75a42c103dd8413a94505f383c6e2b215f9a4cc506e11935acc7f108caad01a5fa489ee157ebef5fa02299145592f65cc828fc016417af557382975d57a  help2man-1.47.13.tar.xz"
+sha512sums="b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544  help2man-1.47.16.tar.xz"

system/kbd/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kbd
 pkgver=2.2.0_git20190823
-pkgrel=1
+pkgrel=2
 pkgdesc="Console keyboard and font management utilities"
 url="https://kbd-project.org/"
 arch="all"
@@ -11,7 +11,9 @@ license="GPL-2.0+"
 depends=""
 checkdepends="check-dev"
 makedepends="linux-headers linux-pam-dev autoconf automake libtool"
-subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-keymaps::noarch
+provides="$pkgname-keymaps"
+replaces="$pkgname-keymaps"
+subpackages="$pkgname-doc $pkgname-fonts::noarch
 	$pkgname-lang $pkgname-openrc"
 source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz
 	consolefont.confd
@@ -62,16 +64,8 @@ fonts() {
 	mkdir -p "$subpkgdir"/usr/share
 	mv "$pkgdir"/usr/share/consolefonts "$subpkgdir"/usr/share/
 }
-
-keymaps() {
-	pkgdesc="Legacy keymaps shipped with Linux kbd tools"
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/keymaps "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/unimaps "$subpkgdir"/usr/share/
-}
-
 sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e  kbd-2.2.0_git20190823.tar.xz
-19761fdd2b32c1bbcc9254b89b7893741e144b917a75410af3f274553fe61e2f56cbbd17ff77ac929e9377604663cbbfd9e53c73e7d41e71de6de573730950c7  consolefont.confd
+837054b29050b955b4c3f1ddd6481c79792a66e2415bafbcfbf3e12a27066ddd3ce35e069448dfb1b2a00e843cec180dd6940edbd9014cd2a0c2aaa1b76c9fb0  consolefont.confd
 1e67f75f27ec5de8f71489c83f78e53e8fd0925ae2d82dabf516f98905c5aff206a8e943e92b6af413eae5f0ecb9c2240526dfc3c56811a8dc1d19ced561bba3  consolefont.initd
-af7d37fc6be1382414ca8245ca6f8d2ee8b82650b8a08eebbd980cf6dd2b92524fce2851ce0b2cd67e915488c12044ab50c5ab1f01c3072af87eed3e058ac268  keymaps.confd
+9391671bbe8b3b7b4eba63ff4e4b7f17297712393abca69f0e24e3a5304a545faa213de8bc799de922b69ee52048d6e6cf352d7213b459991286ef6dea77e8c3  keymaps.confd
 510d7eb582a914fa7cfb868d0c3d55a21ee1519033117d0943a153528b5810d09f6421ddc02d93906c1a66fb7e07e86240f38dad0d38cfb5a8c7e9a6335a937f  keymaps.initd"

system/kbd/consolefont.confd

@@ -15,6 +15,6 @@
 #consoletranslation="8859-1_to_uni"
 
 # unicodemap is the unicode map file to use. Leave commented to use the
-# default one. Have a look in /usr/share/unimaps (from the kbd-keymaps
-# package) for a selection of map files you can use.
+# default one. Have a look in /usr/share/unimaps for a selection of map
+# files you can use.
 #unicodemap="iso01"

system/kbd/keymaps.confd

 # Use keymap to specify the default console keymap. There is a complete tree
-# of keymaps in /usr/share/keymaps to choose from (from the kbd-keymaps
-# package).
+# of keymaps in /usr/share/keymaps to choose from.
 keymap="us"
 
 # Should we first load the 'windowkeys' console keymap?  Most x86 users will