cleanup repo of stale builds, fix pkgcheck scan warnings

Signed-off-by: Jory Pratt <anarchy@gentoo.org>

19 files changed, 4 insertions, 702 deletions

diff --git a/dev-util/utmps/Manifest b/dev-util/utmps/Manifest
deleted file mode 100644
index e241d7d..0000000
--- a/dev-util/utmps/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX init.d.utmpd 837 BLAKE2B b74ca1ef40392a4ab64624fbd684841939b0903c55c2bc353bb1e54c79454688d32c3edcdbe5e102e8bc69540c2e2a456c34454b2c2e6effb7872032e867c6c2 SHA512 3f7f0e49d570a896e22a9d266be08bbf61fecb4378693112ce56a4a1c0eceab2425baa38eeff646fd543c13b2d0114b7b80e25a36c6ae5ea6e2668cd3d7d3071
-AUX init.d.wtmpd 837 BLAKE2B 749fbc4534c1eedbd87714fd5f6d2ea3635e4d464b7ab5f11f6d3b0da0a029cd947b8e9e184e0fc3a5ac2c68636610a02d8e7b66a0f531c102262e1d59e00b10 SHA512 0d894892885c609074986e6b2e1253169333b166edb5240769977155cdb25943a939645ddd18d7774feb17e39a1c72919eb5689c40ced9fadfb22ca20f7540b0
-DIST utmps-0.0.2.1.tar.gz 24791 BLAKE2B fcd77d40cb9d0e5c6de45f222b1491d8712ef6303cc4f093a251b51f239255fcd3ccc327ff82dcae2a7ab851adebb199ed8e6202e43a8f4e2dff1f1e6cd08cc0 SHA512 e0ead9dc4085ce778f22831eec0f79ad251c6f5cb83afa6e52a9ab47a4a0037695e70c2ff0624da8b406a8e3c79f0c8653600bc541fad90c4e21d241c53c27aa
-EBUILD utmps-0.0.2.1.ebuild 1535 BLAKE2B 339d353fedc83d07b057e18cc65dda5a8ce1c00b03b3222ff370adc0da788dcf163302cdf620f2ca313ef75041a664db7f66020ff3f0192297d844976ee1f400 SHA512 05984afe631ae09492b54d59f961fc1f563d343b3f08a956b8e5f9f39d4ef1511d063d9b971fecaed7b0789def4e2da9434d58a08b510ccb5c77e9f8ab798ef4
-MISC metadata.xml 247 BLAKE2B bb0c4580519983c53a70e44f1d4471f045b0854f8263d8ea98eee5259b10efdb2598f3fb94bf3c29f4377c00e2c0f29e69c1caa5276b49e7282185d2688c1b37 SHA512 565819549c1a52858efefc2a8341a12bd13ce37d33d1bf2c90eaf705504459f4ddae140e0bf31f040c3e47e62a1a97720eb3a7a41aa9b2c2d4959072f3f1328d
diff --git a/dev-util/utmps/files/init.d.utmpd b/dev-util/utmps/files/init.d.utmpd
deleted file mode 100755
index e4ba852..0000000
--- a/dev-util/utmps/files/init.d.utmpd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-description="start the secure utmpd"
-
-name="utmpd"
-command="s6-ipcserver"
-command_args="/run/utmps/utmpd-socket utmps-utmpd"
-command_background=yes
-command_user=utmp
-pidfile="/run/utmps/utmpd.pid"
-start_stop_daemon_args="-d /run/utmps"
-
-start_pre() {
-   checkpath -D -d -o utmp:utmp -m 0755 /run/utmps
-}
diff --git a/dev-util/utmps/files/init.d.wtmpd b/dev-util/utmps/files/init.d.wtmpd
deleted file mode 100755
index 3126e0d..0000000
--- a/dev-util/utmps/files/init.d.wtmpd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-description="start the secure wtmpd"
-
-name="wtmpd"
-command="s6-ipcserver"
-command_args="/run/utmps/wtmpd-socket utmps-wtmpd"
-command_background=yes
-command_user=utmp
-pidfile="/run/utmps/wtmpd.pid"
-start_stop_daemon_args="-d /run/utmps"
-
-start_pre() {
-   checkpath -D -d -o utmp:utmp -m 0755 /run/utmps
-}
diff --git a/dev-util/utmps/metadata.xml b/dev-util/utmps/metadata.xml
deleted file mode 100644
index 8be0c2e..0000000
--- a/dev-util/utmps/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>anarchy@gentoo.org</email>
-		<name>Jory A. Pratt</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/utmps/utmps-0.0.2.1.ebuild b/dev-util/utmps/utmps-0.0.2.1.ebuild
deleted file mode 100644
index 980deab..0000000
--- a/dev-util/utmps/utmps-0.0.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="skarnet.org implementation of the utmpx.h family of functions"
-HOMEPAGE="https://www.skarnet.org/software/${PN}/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-DEPEND=">=dev-libs/skalibs-2.8.0.0[static-libs?]"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.8.0.0:= )"
-
-DOCS="AUTHORS README*"
-HTML_DOCS="doc/*"
-
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-	enewuser utmp -1 -1 /dev/null utmp
-}
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/init.d.utmpd" utmpd
-	newinitd "${FILESDIR}/init.d.wtmpd" wtmpd
-}
\ No newline at end of file
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 9dcf5c1..3d15257 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -4,5 +4,5 @@ DIST kodi-18.3.tar.gz 51013397 BLAKE2B cce29d481397dddd3c942f83a034bc6d73eafc1be
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-18.3-r1.ebuild 9605 BLAKE2B 1f3713b9cb50d60e30593139bd56b41b22488fa0e634bc616b5bab8a37ccb93f0e81116d35fbe0ebf173cd20fa7c1463f3470dfca99977bdcfaabe1e5746a9a1 SHA512 c81528b6f711614a0ff13e660274229185cb481f00e899ffe45706019a2b20033f7bc109d0f14b150d52ae4d5de8d81dbe6c710cfa441ab2a3357fe4cf10ca64
+EBUILD kodi-18.3-r1.ebuild 9618 BLAKE2B c55518343829312b376e0a065908c78484b55ee5fa041e78d8877b4f7147363003159a11f506c54c1c70b81c2ef878a3204d7b5570b3c74638ee5e6997cdc9ca SHA512 085bee06084f8788fefca3cfb88cadfd9a6221846d05458a938a35a98dc9c62e9fd6d764e6e4f7b6c4f500fc6280903a444183e660372ecf2211ad76b04b3987
 MISC metadata.xml 1649 BLAKE2B c102ccbe3a0d3ca203b445b6ee98b6fd68e75678fd034bc72cdeebfb06c7afe85ab947cf1264d1ba64449a42d05ee3ab5334885f01b656582f69b1dbdb39d2a1 SHA512 caf69d7fc2ab53692ec44ba75bf7aef9adf3b85d768e4d930b8b7889971128aecd1c3e186ad48ccbe3970cd98e2ec3d3fd249f6b5d19513980bfc6f42c9b9f39
diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
index 1e65321..409a9ab 100644
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ b/media-tv/kodi/kodi-18.3-r1.ebuild
@@ -44,6 +44,9 @@ SLOT="0"
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
 IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles java lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+
+RESTRICT="!test? ( test )"
+
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
@@ -138,7 +141,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
-	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
 	upower? ( sys-power/upower )
 "
diff --git a/sys-apps/iucode_tool/Manifest b/sys-apps/iucode_tool/Manifest
deleted file mode 100644
index 916abe9..0000000
--- a/sys-apps/iucode_tool/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0001-support-musl-uclibc-argp-standalone.patch 916 BLAKE2B dfa30e2d59a8c82b66af18723b4f86988db7e1ea078783851bfc7375a0fccbc177cbf0defd82076c316695c7d0e121a5080ef4e2f4f804bf16390a264be7cc1e SHA512 b331f528c252bd623e8af53aaf9bba8e00631e876fa40ec68741583fd8fc73aabfe6598325c9cec38630429ae0a63d070aafffd3450727f384a1f055c3a451f3
-DIST iucode-tool_2.1.2.tar.xz 143352 BLAKE2B 4556403d1a25b1230e8a83532aa33a1d808578a542bc864b814d271b97781cc402684509a72caf165daa99c4964104636fb5f2f68f49dcb1c8d44208f2f8da03 SHA512 f1af71843160500fb9c0b56bffdb1d3db09acf42f6c0a84a5d5311eedfe809f9ac27f89bf1778cab8261d3a540cfe62f3698a45c76be76e7f40179b9c49050e0
-EBUILD iucode_tool-2.1.2.ebuild 577 BLAKE2B dc82422786666f5cbd05edf70f1711a5e9f5ca05b942f765c84336a93ff34182cd5e9160af6b203e9b55ef4a2e3c57217cc6cadfab0049e2b74215ee19858a01 SHA512 0c8b07524ee35b2fca508b8e935c20d245955389ae7c3c02705bd0a9fe111288f63745052f7602c57e19626ca4238966c337cba142d5dca9d06918e6ac18ceb3
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/iucode_tool/files/0001-support-musl-uclibc-argp-standalone.patch b/sys-apps/iucode_tool/files/0001-support-musl-uclibc-argp-standalone.patch
deleted file mode 100644
index ec1259b..0000000
--- a/sys-apps/iucode_tool/files/0001-support-musl-uclibc-argp-standalone.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c0d07bbc25eccac80e81b9924d729a95815d035e Mon Sep 17 00:00:00 2001
-From: 
-Date: Sun, 25 Jun 2017 14:31:30 -0500
-Subject: [PATCH] iucode-tool needs argp-standalone when used with MUSL,
-	add missing limits.h
-
----
- Makefile.am   | 2 ++
- iucode_tool.c | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 415a241..3094caa 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,6 +5,8 @@
- sbin_PROGRAMS	 = iucode_tool
- man_MANS	 = iucode_tool.8
- 
-+# Must use standalone on non GLIBC systems
-+iucode_tool_LDADD = -largp
- iucode_tool_SOURCES = intel_microcode.h intel_microcode.c iucode_tool.c
- EXTRA_DIST	= autogen.sh CONTRIBUTING
- 
-diff --git a/iucode_tool.c b/iucode_tool.c
-index 0d34427..5948b3f 100644
---- a/iucode_tool.c
-+++ b/iucode_tool.c
-@@ -31,6 +31,7 @@
- #include <dirent.h>
- #include <time.h>
- #include <cpuid.h>
-+#include <limits.h>
- 
- #include "intel_microcode.h"
- 
--- 
-2.13.2
-
diff --git a/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild b/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild
deleted file mode 100644
index 9dad526..0000000
--- a/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-WANT_AUTOMAKE="1.14"
-inherit autotools
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/argp-standalone"
-
-PATCHES=(
-	"${FILESDIR}"/0001-support-musl-uclibc-argp-standalone.patch
-)
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/iucode_tool/metadata.xml b/sys-apps/iucode_tool/metadata.xml
deleted file mode 100644
index 56c1244..0000000
--- a/sys-apps/iucode_tool/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
deleted file mode 100644
index 690174c..0000000
--- a/sys-apps/kmod/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kmod-26-libressl.patch 4641 BLAKE2B 0d1e20249e001729abfaaedf9cc16a30b470f449fd53cd276c1f8bd8ff56f69f0d2a8405a43f4792adc7fcdb1a1dedf45c5abe15982de22cea969478515f4766 SHA512 daeabca7dc3e53b72e9631d32b96b549e3b40e745015cf063b61aca6e01aa7f73f0159fcbe11492d94be8a328ee416f8b4eb2675a419eb0c4a8425da42c1d8a2
-AUX kmod-static-nodes-r1 497 BLAKE2B eced5e152e017fa01abad98083031c1439c854b73cfc6b186f0b18ad0f65b61385e2d51e4ba649026e9d04774d1aa6db4b9a6c487554a4eb6417fa575da5b924 SHA512 4020c75d20260d66e0158b8bc53eb8c340d4b2f60ff703467c968734cf96c2c511764f2c983062d77924858b3269e3d421f8440a8e3591eb372ac1f5aa8d4b8f
-DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
-EBUILD kmod-26-r1.ebuild 5129 BLAKE2B f44ee8421b3c130a73cc84939e1e39fa324c9603a7816273d2f7a00a508175f0b58b4960fb66f2db54b4fb56954ef6098bcbba5a67c0e07f8c25ba842ebf21a8 SHA512 8df7808e8ec34be0528077ac69c5a939c2aa09bb442f48a799ad7ff8a6859080192ca04b97f6d045204c2ee891885b82ee7c3bffa33cf30fad4cdef3ea6f2251
-MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/files/kmod-26-libressl.patch b/sys-apps/kmod/files/kmod-26-libressl.patch
deleted file mode 100644
index 7d70ed2..0000000
--- a/sys-apps/kmod/files/kmod-26-libressl.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From fd8b59fb8c576751aef6d59dd5ab208baee2ad49 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Fri, 15 Feb 2019 05:34:55 +0200
-Subject: [PATCH] libkmod-signature: use PKCS7 for LibreSSL or older OpenSSL
-
-Linux kernel uses either PKCS #7 or CMS signing modules (scripts/sign-file.c).
-CMS is not supported by LibreSSL, PKCS #7 is used instead.
-For now modinfo used CMS with no altenative requiring >=openssl-1.1.0
-built with CMS support.
-
-Use PKCS #7 for parsing module signature information when CMS is not available.
-
-Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10814147/]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- libkmod/libkmod-signature.c | 78 +++++++++++++++++++++++++++++++++++--
- 1 file changed, 75 insertions(+), 3 deletions(-)
-
-diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
-index 48d0145..aa2a60e 100644
---- a/libkmod/libkmod-signature.c
-+++ b/libkmod/libkmod-signature.c
-@@ -20,9 +20,16 @@
- #include <endian.h>
- #include <inttypes.h>
- #ifdef ENABLE_OPENSSL
--#include <openssl/cms.h>
--#include <openssl/ssl.h>
--#endif
-+# include <openssl/ssl.h>
-+# if defined(LIBRESSL_VERSION_NUMBER) || \
-+	OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+	defined(OPENSSL_NO_CMS)
-+#  define USE_PKCS7
-+#  include <openssl/pkcs7.h>
-+# else
-+#  include <openssl/cms.h>
-+# endif /* LIBRESSL_VERSION_NUMBER */
-+#endif /* ENABLE_OPENSSL */
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -122,7 +129,11 @@ static bool fill_default(const char *mem, off_t size,
- #ifdef ENABLE_OPENSSL
- 
- struct pkcs7_private {
-+#ifndef USE_PKCS7
- 	CMS_ContentInfo *cms;
-+#else
-+	PKCS7 *pkcs7;
-+#endif
- 	unsigned char *key_id;
- 	BIGNUM *sno;
- };
-@@ -132,7 +143,11 @@ static void pkcs7_free(void *s)
- 	struct kmod_signature_info *si = s;
- 	struct pkcs7_private *pvt = si->private;
- 
-+#ifndef USE_PKCS7
- 	CMS_ContentInfo_free(pvt->cms);
-+#else
-+	PKCS7_free(pvt->pkcs7);
-+#endif
- 	BN_free(pvt->sno);
- 	free(pvt->key_id);
- 	free(pvt);
-@@ -187,7 +202,13 @@ static const char *x509_name_to_str(X509_NAME *name)
- 		return NULL;
- 
- 	d = X509_NAME_ENTRY_get_data(e);
-+#if (defined(LIBRESSL_VERSION_NUMBER) && \
-+		LIBRESSL_VERSION_NUMBER < 0x20700000L) || \
-+	OPENSSL_VERSION_NUMBER < 0x10100000L
-+	str = (const char *)ASN1_STRING_data(d);
-+#else
- 	str = (const char *)ASN1_STRING_get0_data(d);
-+#endif
- 
- 	return str;
- }
-@@ -197,11 +218,18 @@ static bool fill_pkcs7(const char *mem, off_t size,
- 		       struct kmod_signature_info *sig_info)
- {
- 	const char *pkcs7_raw;
-+#ifndef USE_PKCS7
- 	CMS_ContentInfo *cms;
- 	STACK_OF(CMS_SignerInfo) *sis;
- 	CMS_SignerInfo *si;
- 	int rc;
- 	ASN1_OCTET_STRING *key_id;
-+#else
-+	PKCS7 *pkcs7;
-+	STACK_OF(PKCS7_SIGNER_INFO) *sis;
-+	PKCS7_SIGNER_INFO *si;
-+	PKCS7_ISSUER_AND_SERIAL *is;
-+#endif
- 	X509_NAME *issuer;
- 	ASN1_INTEGER *sno;
- 	ASN1_OCTET_STRING *sig;
-@@ -220,14 +248,23 @@ static bool fill_pkcs7(const char *mem, off_t size,
- 
- 	in = BIO_new_mem_buf(pkcs7_raw, sig_len);
- 
-+#ifndef USE_PKCS7
- 	cms = d2i_CMS_bio(in, NULL);
- 	if (cms == NULL) {
- 		BIO_free(in);
- 		return false;
- 	}
-+#else
-+	pkcs7 = d2i_PKCS7_bio(in, NULL);
-+	if (pkcs7 == NULL) {
-+		BIO_free(in);
-+		return false;
-+	}
-+#endif
- 
- 	BIO_free(in);
- 
-+#ifndef USE_PKCS7
- 	sis = CMS_get0_SignerInfos(cms);
- 	if (sis == NULL)
- 		goto err;
-@@ -245,8 +282,35 @@ static bool fill_pkcs7(const char *mem, off_t size,
- 		goto err;
- 
- 	CMS_SignerInfo_get0_algs(si, NULL, NULL, &dig_alg, &sig_alg);
-+#else
-+	sis = PKCS7_get_signer_info(pkcs7);
-+	if (sis == NULL)
-+		goto err;
-+
-+	si = sk_PKCS7_SIGNER_INFO_value(sis, 0);
-+	if (si == NULL)
-+		goto err;
-+
-+	is = si->issuer_and_serial;
-+	if (is == NULL)
-+		goto err;
-+	issuer = is->issuer;
-+	sno = is->serial;
-+
-+	sig = si->enc_digest;
-+	if (sig == NULL)
-+		goto err;
-+
-+	PKCS7_SIGNER_INFO_get0_algs(si, NULL, &dig_alg, &sig_alg);
-+#endif
- 
-+#if (defined(LIBRESSL_VERSION_NUMBER) && \
-+		LIBRESSL_VERSION_NUMBER < 0x20700000L) || \
-+	OPENSSL_VERSION_NUMBER < 0x10100000L
-+	sig_info->sig = (const char *)ASN1_STRING_data(sig);
-+#else
- 	sig_info->sig = (const char *)ASN1_STRING_get0_data(sig);
-+#endif
- 	sig_info->sig_len = ASN1_STRING_length(sig);
- 
- 	sno_bn = ASN1_INTEGER_to_BN(sno, NULL);
-@@ -277,7 +341,11 @@ static bool fill_pkcs7(const char *mem, off_t size,
- 	if (pvt == NULL)
- 		goto err3;
- 
-+#ifndef USE_PKCS7
- 	pvt->cms = cms;
-+#else
-+	pvt->pkcs7 = pkcs7;
-+#endif
- 	pvt->key_id = key_id_str;
- 	pvt->sno = sno_bn;
- 	sig_info->private = pvt;
-@@ -290,7 +358,11 @@ err3:
- err2:
- 	BN_free(sno_bn);
- err:
-+#ifndef USE_PKCS7
- 	CMS_ContentInfo_free(cms);
-+#else
-+	PKCS7_free(pkcs7);
-+#endif
- 	return false;
- }
- 
--- 
-2.20.1
-
diff --git a/sys-apps/kmod/files/kmod-static-nodes-r1 b/sys-apps/kmod/files/kmod-static-nodes-r1
deleted file mode 100644
index 9362f28..0000000
--- a/sys-apps/kmod/files/kmod-static-nodes-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Create list of required static device nodes for the current kernel"
-
-depend() {
-	after dev-mount
-	before tmpfiles.dev dev
-	keyword -lxc -systemd-nspawn
-}
-
-start() {
-	ebegin "Creating list of required static device nodes for the current kernel"
-	checkpath -q -d /run/tmpfiles.d
-	kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-	eend $?
-}
diff --git a/sys-apps/kmod/kmod-26-r1.ebuild b/sys-apps/kmod/kmod-26-r1.ebuild
deleted file mode 100644
index 2752b85..0000000
--- a/sys-apps/kmod/kmod-26-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-
-inherit bash-completion-r1 multilib python-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	inherit libtool
-fi
-
-DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc libressl lzma python ssl static-libs +tools zlib"
-
-# Upstream does not support running the test suite with custom configure flags.
-# I was also told that the test suite is intended for kmod developers.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
-RDEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	!<sys-apps/openrc-0.13.8
-	!<sys-apps/systemd-216-r3
-	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	lzma? ( virtual/pkgconfig )
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		virtual/pkgconfig
-		)
-	zlib? ( virtual/pkgconfig )"
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND}
-		dev-libs/libxslt"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS="NEWS README TODO"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch" # bug 677960
-)
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] ; then
-		if use doc; then
-			gtkdocize --copy --docdir libkmod/docs || die
-		else
-			touch libkmod/docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# Restore possibility of running --enable-static wrt #472608
-	sed -i \
-		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable doc gtk-doc)
-		$(use_enable static-libs static)
-		$(use_enable tools)
-		$(use_with lzma xz)
-		$(use_with ssl openssl)
-		$(use_with zlib)
-	)
-
-	local ECONF_SOURCE="${S}"
-
-	kmod_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir econf "${myeconfargs[@]}" "$@"
-	}
-
-	BUILD_DIR="${WORKDIR}/build"
-	kmod_configure --disable-python
-
-	if use python; then
-		python_foreach_impl kmod_configure --enable-python
-	fi
-}
-
-src_compile() {
-	emake -C "${BUILD_DIR}"
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}" -f Makefile -f - python \
-				VPATH="${native_builddir}:${S}" \
-				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
-				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-src_install() {
-	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	einstalldocs
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-				VPATH="${native_builddir}:${S}" \
-				install-pkgpyexecLTLIBRARIES \
-				install-dist_pkgpyexecPYTHON
-		}
-
-		python_foreach_impl python_install
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-
-	if use tools; then
-		local bincmd sbincmd
-		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${sbincmd}
-		done
-
-		# These are also usable as normal user
-		for bincmd in lsmod modinfo; do
-			dosym kmod /bin/${bincmd}
-		done
-	fi
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	softdep uhci_hcd pre: ehci_hcd
-	softdep ohci_hcd pre: ehci_hcd
-	EOF
-
-	insinto /lib/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf #260139
-
-	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
-}
-
-pkg_postinst() {
-	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
-		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
-	fi
-
-	# Add kmod to the runlevel automatically if this is the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
-		fi
-	fi
-
-	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
-			ewarn
-			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
-			ewarn "kernel modules to have required static nodes!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add kmod-static-nodes sysinit"
-		fi
-	fi
-}
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
deleted file mode 100644
index 188bf47..0000000
--- a/sys-apps/kmod/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>udev-bugs@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="lzma">Enable support for XZ compressed modules</flag>
-	<flag name="tools">Install module loading/unloading tools.</flag>
-	<flag name="zlib">Enable support for gzipped modules</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
deleted file mode 100644
index ad812c5..0000000
--- a/sys-apps/s6/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST s6-2.8.0.0.tar.gz 207958 BLAKE2B 8ef4c6b8272b1187072617c4007eba1a5a2b2879770f008725689657bd6c8fdb0142ada11ec0c7480d2768476c41e0c6bb841a74f05caf397eb7fdce5a37d9b3 SHA512 e2f2f0fb9481a745fc80b3b8c0aa2de979c0c8dbe066e2402cf7700a08edc32448d7ed3065a19a01a18dc5a12f3abcfd3aba5d2c5fefbbf49fee4a6f8396c106
-EBUILD s6-2.8.0.0.ebuild 1356 BLAKE2B 347f37cfd7611381201fde56bc69815b3f5886ec6ba557419bc89a89e2ab32c46bde0b23daa525269dfb98d7b1f38088a51259671515b2b55535f8b2caca2e0d SHA512 caefec093dfb7bed8ccfcdac362cce9e5117d4382570580ff4d83a823fcaff84d75bc5aec8529ec3c351656d78d6eaca24c04724428b58de1ba595287073e22e
-MISC metadata.xml 743 BLAKE2B 51cce1b0cbf5b0a026853d24c760d20cd8a82baae31bd4c7dc67af31933beaec632d8937dc8236ae2fec3807ffdc748f82cdd50a025179659ac3e3854f209006 SHA512 7391141506e39054d73b3ef9a336feaef887896603db105d493cfa50fa7dad721c8b0aaee16efb10be5aaa0561f2db19987de1431ee79e312cdb04e7edf77b6f
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
deleted file mode 100644
index b8be92c..0000000
--- a/sys-apps/s6/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>samuel@sholland.org</email>
-		<name>Samuel Holland</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		S6 is a small suite of programs for UNIX designed to allow
-		service supervision similar to daemontools or runit.
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-apps/s6/s6-2.8.0.0.ebuild b/sys-apps/s6/s6-2.8.0.0.ebuild
deleted file mode 100644
index c2fc165..0000000
--- a/sys-apps/s6/s6-2.8.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
-	>=dev-libs/skalibs-2.8.0.0[static-libs?]
-"
-RDEPEND=">=dev-lang/execline-2.5.0.1:=
-	!static? ( >=dev-libs/skalibs-2.8.0.0:= )
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}