sys-freebsd/freebsd-usbin: Remove last-rited pkg

Closes: https://bugs.gentoo.org/683284
Signed-off-by: Michał Górny <mgorny@gentoo.org>

19 files changed, 0 insertions, 828 deletions

diff --git a/profiles/package.mask b/profiles/package.mask
index b05ac5efb25a..48ecdff2807c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -761,7 +761,6 @@ sys-freebsd/freebsd-sbin
 sys-freebsd/freebsd-share
 sys-freebsd/freebsd-sources
 sys-freebsd/freebsd-ubin
-sys-freebsd/freebsd-usbin
 
 # Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
 # Unofficial build. Superseded by official 2.49.5 release.
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
deleted file mode 100644
index f3dcd89d595d..000000000000
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch
deleted file mode 100644
index 207b6ab6a50d..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c
-index 88c648e..edf9c8b 100644
---- a/usr.sbin/camdd/camdd.c
-+++ b/usr.sbin/camdd/camdd.c
-@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD: stable/10/usr.sbin/camdd/camdd.c 293409 2016-01-08 02:56:21Z
- #include <libutil.h>
- #include <pthread.h>
- #include <assert.h>
--#include <bsdxml.h>
-+#include <expat.h>
- 
- #include <cam/cam.h>
- #include <cam/cam_debug.h>
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch
deleted file mode 100644
index 04ba75a17ec5..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile
-index 033002c..d198f10 100644
---- a/usr.sbin/nmtree/Makefile
-+++ b/usr.sbin/nmtree/Makefile
-@@ -5,7 +5,7 @@
- .PATH: ${.CURDIR}/../../contrib/mtree
- 
- PROG=		mtree
--MAN=		mtree.5 mtree.8
-+MAN=		mtree.8
- SRCS=		compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
- 		only.c spec.c specspec.c verify.c
- 
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch
deleted file mode 100644
index 5317b256cb4c..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
-index 9a9d3ff..bf6b1b2 100644
---- a/usr.sbin/ctladm/ctladm.c
-+++ b/usr.sbin/ctladm/ctladm.c
-@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD: stable/11/usr.sbin/ctladm/ctladm.c 319152 2017-05-29 18:17:3
- #include <sys/queue.h>
- #include <sys/sbuf.h>
- #include <sys/stat.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <ctype.h>
- #include <err.h>
- #include <errno.h>
-diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
-index 7054a04..ee05214 100644
---- a/usr.sbin/ctld/kernel.c
-+++ b/usr.sbin/ctld/kernel.c
-@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD: stable/11/usr.sbin/ctld/kernel.c 319152 2017-05-29 18:17:34Z
- #include <sys/sbuf.h>
- #include <sys/stat.h>
- #include <assert.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
deleted file mode 100644
index 1d838655c88e..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr usr.sbin/newsyslog.old/pathnames.h usr.sbin/newsyslog/pathnames.h
---- usr.sbin/newsyslog.old/pathnames.h	2011-11-02 20:12:37.000000000 +0000
-+++ usr.sbin/newsyslog/pathnames.h	2011-11-02 20:12:50.000000000 +0000
-@@ -24,6 +24,6 @@
- 
- #define	_PATH_CONF	"/etc/newsyslog.conf"
- #define	_PATH_SYSLOGPID	_PATH_VARRUN "syslog.pid"
--#define	_PATH_BZIP2	"/usr/bin/bzip2"
--#define	_PATH_GZIP	"/usr/bin/gzip"
-+#define	_PATH_BZIP2	"/bin/bzip2"
-+#define	_PATH_GZIP	"/bin/gzip"
- #define	_PATH_XZ	"/usr/bin/xz"
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch
deleted file mode 100644
index 0cc67ad8f342..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- usr.sbin/cpucontrol/cpucontrol.8.orig
-+++ usr.sbin/cpucontrol/cpucontrol.8
-@@ -24,7 +24,7 @@
- .\"
- .\" $FreeBSD$
- .\"
--.Dd June 30, 2009
-+.Dd January 5, 2018
- .Dt CPUCONTROL 8
- .Os
- .Sh NAME
-@@ -36,44 +36,48 @@
- .Nm
- .Op Fl vh
- .Fl m Ar msr
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl m Ar msr Ns = Ns Ar value
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl m Ar msr Ns &= Ns Ar mask
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl m Ar msr Ns |= Ns Ar mask
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl i Ar level
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl i Ar level,level_type
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Op Fl d Ar datadir
- .Fl u
-+.Ar device
-+.Ek
- .Bk
-+.Nm
-+.Fl e
- .Ar device
- .Ek
- .Sh DESCRIPTION
-@@ -129,6 +133,20 @@
- .Nm
- utility will walk through the configured data directories
- and apply all firmware updates available for this CPU.
-+.It Fl e
-+Re-evaluate the kernel flags indicating the present CPU features.
-+This command is typically executed after a firmware update was applied
-+which changes information reported by the
-+.Dv CPUID
-+instruction.
-+.Pp
-+.Bf -symbolic
-+Only execute the
-+.Fl e
-+command after the microcode update was applied to all CPUs in the system.
-+The kernel does not operate correctly if the features of processors are
-+not identical.
-+.Ef
- .It Fl v
- Increase the verbosity level.
- .It Fl h
---- usr.sbin/cpucontrol/cpucontrol.c.orig
-+++ usr.sbin/cpucontrol/cpucontrol.c
-@@ -60,6 +60,7 @@
- #define	FLAG_I	0x01
- #define	FLAG_M	0x02
- #define	FLAG_U	0x04
-+#define	FLAG_E	0x10
- 
- #define	OP_INVAL	0x00
- #define	OP_READ		0x01
-@@ -114,7 +115,7 @@
- 	if (name == NULL)
- 		name = "cpuctl";
- 	fprintf(stderr, "Usage: %s [-vh] [-d datadir] [-m msr[=value] | "
--	    "-i level | -i level,level_type | -u] device\n", name);
-+	    "-i level | -i level,level_type | -e | -u] device\n", name);
- 	exit(EX_USAGE);
- }
- 
-@@ -338,6 +339,25 @@
- }
- 
- static int
-+do_eval_cpu_features(const char *dev)
-+{
-+	int fd, error;
-+
-+	assert(dev != NULL);
-+
-+	fd = open(dev, O_RDWR);
-+	if (fd < 0) {
-+		WARN(0, "error opening %s for writing", dev);
-+		return (1);
-+	}
-+	error = ioctl(fd, CPUCTL_EVAL_CPU_FEATURES, NULL);
-+	if (error < 0)
-+		WARN(0, "ioctl(%s, CPUCTL_EVAL_CPU_FEATURES)", dev);
-+	close(fd);
-+	return (error);
-+}
-+
-+static int
- do_update(const char *dev)
- {
- 	int fd;
-@@ -431,11 +451,14 @@
- 	 * Add all default data dirs to the list first.
- 	 */
- 	datadir_add(DEFAULT_DATADIR);
--	while ((c = getopt(argc, argv, "d:hi:m:uv")) != -1) {
-+	while ((c = getopt(argc, argv, "d:ehi:m:uv")) != -1) {
- 		switch (c) {
- 		case 'd':
- 			datadir_add(optarg);
- 			break;
-+		case 'e':
-+			flags |= FLAG_E;
-+			break;
- 		case 'i':
- 			flags |= FLAG_I;
- 			cmdarg = optarg;
-@@ -464,22 +487,25 @@
- 		/* NOTREACHED */
- 	}
- 	dev = argv[0];
--	c = flags & (FLAG_I | FLAG_M | FLAG_U);
-+	c = flags & (FLAG_E | FLAG_I | FLAG_M | FLAG_U);
- 	switch (c) {
--		case FLAG_I:
--			if (strstr(cmdarg, ",") != NULL)
--				error = do_cpuid_count(cmdarg, dev);
--			else
--				error = do_cpuid(cmdarg, dev);
--			break;
--		case FLAG_M:
--			error = do_msr(cmdarg, dev);
--			break;
--		case FLAG_U:
--			error = do_update(dev);
--			break;
--		default:
--			usage();	/* Only one command can be selected. */
-+	case FLAG_I:
-+		if (strstr(cmdarg, ",") != NULL)
-+			error = do_cpuid_count(cmdarg, dev);
-+		else
-+			error = do_cpuid(cmdarg, dev);
-+		break;
-+	case FLAG_M:
-+		error = do_msr(cmdarg, dev);
-+		break;
-+	case FLAG_U:
-+		error = do_update(dev);
-+		break;
-+	case FLAG_E:
-+		error = do_eval_cpu_features(dev);
-+		break;
-+	default:
-+		usage();	/* Only one command can be selected. */
- 	}
- 	SLIST_FREE(&datadirs, next, free);
- 	return (error == 0 ? 0 : 1);
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
deleted file mode 100644
index 39177b4a987d..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- usr.sbin/adduser/adduser.sh.old	2006-10-01 13:41:16 +0000
-+++ usr.sbin/adduser/adduser.sh	2006-10-01 13:41:38 +0000
-@@ -809,7 +809,7 @@
- NOHOME="/nonexistent"
- NOLOGIN="nologin"
- NOLOGIN_PATH="/usr/sbin/nologin"
--GREPCMD="/usr/bin/grep"
-+GREPCMD="/bin/grep"
- DATECMD="/bin/date"
- 
- # Set default values
-@@ -823,7 +823,7 @@
- uhome=
- upass=
- ushell=
--udotdir=/usr/share/skel
-+udotdir=/etc/skel
- ugroups=
- uexpire=
- upwexpire=
diff --git a/sys-freebsd/freebsd-usbin/files/iscsid.initd b/sys-freebsd/freebsd-usbin/files/iscsid.initd
deleted file mode 100644
index f16d00e876ab..000000000000
--- a/sys-freebsd/freebsd-usbin/files/iscsid.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting iscsid"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/iscsid -- $iscsidopts
-	eend $? "Error starting iscsid"
-}
-
-stop() {
-	ebegin "Stopping iscsid"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/iscsid
-	eend $? "Error stopping iscsid"
-}
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd
deleted file mode 100644
index 844252fdc54d..000000000000
--- a/sys-freebsd/freebsd-usbin/files/nfs.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/nfs
-# Options for nfsd (see man nfsd)
-# Example: 8 nfsd servers started:
-#nfsdopts="-n 8"
-
-# Options for mountd (see man mountd)
-# Example: allow non-root users to mount shares:
-#mountdopts="-n"
-# Specify t he exports file, this is the default:
-#exportsfile="/etc/exports"
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
deleted file mode 100644
index 17974ca0998a..000000000000
--- a/sys-freebsd/freebsd-usbin/files/nfs.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#---------------------------------------------------------------------------
-# This script starts/stops nfsd and mountd
-# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd
-# should be started from inetd on FreeBSD.
-#---------------------------------------------------------------------------
-
-extra_started_commands="reload"
-
-# The binary locations
-nfsd=/usr/sbin/nfsd
-mountd=/usr/sbin/mountd
-
-depend() {
-	use ypbind net rpc.lockd
-	need rpcbind
-	after quota
-}
-
-start() {
-	ebegin "Starting NFS daemon"
-	start-stop-daemon --start --quiet --exec \
-		$nfsd -- ${nfsdopts}
-	eend $? "Error starting NFS daemon"
-
-	# Start mountd
-	ebegin "Starting NFS mountd"
-	start-stop-daemon --start --quiet --exec \
-		$mountd -- ${mountdopts} ${exportsfile}
-	eend $? "Error starting NFS mountd"
-}
-
-stop() {
-	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --exec $mountd \
-		--pidfile /var/run/mountd.pid
-	eend $? "Error stopping NFS mountd"
-
-	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --signal USR1 --quiet \
-		--name nfsd --user root
-	eend $? "Error stopping NFS daemon"
-}
-
-reload() {
-	# Hangup signal to mountd reloads /etc/exports.
-	ebegin "Reloading /etc/exports"
-	start-stop-daemon --signal 1 --quiet --exec $mountd \
-		--pidfile /var/run/mountd.pid
-	eend $?
-}
diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd
deleted file mode 100644
index f8f3ea1e31de..000000000000
--- a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for /etc/init.d/nfsuserd
-# Options for nfsuserd (see man nfsuserd)
-# Example: set domain example.com:
-#nfsuserdopts="-domain example.com"
-
diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd b/sys-freebsd/freebsd-usbin/files/nfsuserd.initd
deleted file mode 100644
index d69007412fc6..000000000000
--- a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net nfs
-}
-
-start() {
-	ebegin "Starting nfsuserd"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/nfsuserd -- $nfsuserdopts
-	eend $? "Error starting nfsuserd"
-}
-
-stop() {
-	ebegin "Stopping nfsuserd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/nfsuserd
-	eend $? "Error stopping nfsuserd"
-}
diff --git a/sys-freebsd/freebsd-usbin/files/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf
deleted file mode 100644
index 29a246f72b8f..000000000000
--- a/sys-freebsd/freebsd-usbin/files/pw.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Change this to Gentoo's Default, instead of FreeBSD's default of
-# /usr/share/skel, so that bash and other packages installs the files on the
-# right place.
-skeleton /etc/skel
-
diff --git a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
deleted file mode 100644
index dd2fdbe8a756..000000000000
--- a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net rpcbind rpc.statd
-}
-
-start() {
-        ebegin "Starting NFS lockd"
-        start-stop-daemon --start --quiet --exec \
-                /usr/sbin/rpc.lockd -- $rpclockdopts
-        eend $? "Error starting NFS lockd"
-}
-
-stop() {
-        ebegin "Stopping NFS lockd"
-        start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd
-        eend $? "Error stopping NFS lockd"
-}
diff --git a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
deleted file mode 100644
index 163af5a4b4a1..000000000000
--- a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net rpcbind
-}
-
-start() {
-        ebegin "Starting NFS statd"
-        start-stop-daemon --start --quiet --exec \
-                /usr/sbin/rpc.statd -- $rpcstatdopts
-        eend $? "Error starting NFS statd"
-}
-
-stop() {
-        ebegin "Stopping NFS statd"
-        start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd
-        eend $? "Error stopping NFS statd"
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
deleted file mode 100644
index 5e4b26e2c2fd..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-# UPSTREAM_PATCHES=()
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	etc/
-	gnu/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl:0 )
-	>=app-arch/libarchive-3
-	sys-apps/tcp-wrappers
-	dev-util/dialog
-	>=dev-libs/libedit-20120311.3.0-r1
-	net-libs/libpcap
-	kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs"
-
-pkg_setup() {
-	# Add the required source files.
-	use nis && EXTRACTONLY+="libexec/ "
-	use build && EXTRACTONLY+="sys/ include/ "
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-11.1-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-10.3-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-11.0-workaround.patch"
-	)
-
-REMOVE_SUBDIRS="
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	pc-sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg freebsd-update service sysrc bsdinstall"
-
-src_prepare() {
-	if ! use build; then
-		[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-		[[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-}
-
-src_compile() {
-	# Preparing to build nmtree, ypldap
-	for dir in libnetbsd libopenbsd; do
-		cd "${WORKDIR}/lib/${dir}" || die
-		freebsd_src_compile -j1
-	done
-
-	cd "${S}" || die
-	freebsd_src_compile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	freebsd_src_install DOCDIR=/usr/share/doc/${PF}
-
-	# Most of these now come from openrc.
-	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util}
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util}
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf"
-
-	cd "${WORKDIR}/etc" || die
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/*
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	cd "${S}"/ppp || die
-	insinto /etc/ppp
-	doins ppp.conf
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic" || die
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1_p1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1_p1.ebuild
deleted file mode 100644
index 7eb0e4f04f7c..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1_p1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-# UPSTREAM_PATCHES=()
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	etc/
-	gnu/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl:0 )
-	>=app-arch/libarchive-3
-	sys-apps/tcp-wrappers
-	dev-util/dialog
-	>=dev-libs/libedit-20120311.3.0-r1
-	net-libs/libpcap
-	kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-	!build? ( =sys-freebsd/freebsd-sources-${RV}*
-		>=sys-freebsd/freebsd-sources-11.1_p3 )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs"
-
-pkg_setup() {
-	# Add the required source files.
-	use nis && EXTRACTONLY+="libexec/ "
-	use build && EXTRACTONLY+="sys/ include/ "
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-11.1-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-10.3-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-11.0-workaround.patch"
-	"${FILESDIR}/${PN}-SA-1803-speculative_execution-amd64-11.patch"
-	)
-
-REMOVE_SUBDIRS="
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	pc-sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg freebsd-update service sysrc bsdinstall"
-
-src_prepare() {
-	if ! use build; then
-		[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-		[[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-}
-
-src_compile() {
-	# Preparing to build nmtree, ypldap
-	for dir in libnetbsd libopenbsd; do
-		cd "${WORKDIR}/lib/${dir}" || die
-		freebsd_src_compile -j1
-	done
-
-	cd "${S}" || die
-	freebsd_src_compile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	freebsd_src_install DOCDIR=/usr/share/doc/${PF}
-
-	# Most of these now come from openrc.
-	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util}
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util}
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf"
-
-	cd "${WORKDIR}/etc" || die
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/*
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	cd "${S}"/ppp || die
-	insinto /etc/ppp
-	doins ppp.conf
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic" || die
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}
diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml
deleted file mode 100644
index 45c930b831cb..000000000000
--- a/sys-freebsd/freebsd-usbin/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>bsd@gentoo.org</email>
-    <name>BSD Project</name>
-  </maintainer>
-  <use>
-    <flag name="floppy">Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag>
-    <flag name="audit">
-      Build auditing tools.
-    </flag>
-    <flag name="netware">
-      Build libraries and tools to work with NetWare protocols (IPX
-      and NCP).
-    </flag>
-    <flag name='zfs'>Enable ZFS support.</flag>
-  </use>
-</pkgmetadata>