[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-ubin/, profiles/, sys-freebsd/freebsd-ubin/files/

[Michał Górny]

commit:     bddc67d6177985c2a908d8b3c24c0ddc6da12a8f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 15:11:24 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 15:16:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bddc67d6

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

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

 profiles/package.mask                              |   1 -
 sys-freebsd/freebsd-ubin/Manifest                  |   9 -
 .../files/freebsd-ubin-10.2-bsdxml.patch           |  13 --
 .../files/freebsd-ubin-10.2-talk-workaround.patch  |  12 --
 .../files/freebsd-ubin-11.0-setXid.patch           | 147 --------------
 .../files/freebsd-ubin-11.1-fixmakefiles.patch     |  12 --
 .../files/freebsd-ubin-11.1-man-paths.patch        |  40 ----
 .../files/freebsd-ubin-6.0-bsdcmp.patch            |  13 --
 .../files/freebsd-ubin-8.0-xinstall.patch          |  26 ---
 .../files/freebsd-ubin-9.0-fixmakefiles.patch      |  11 --
 .../files/freebsd-ubin-9.1-ar-libarchive3.patch    |  19 --
 .../files/freebsd-ubin-9.1-bsdar.patch             |  25 ---
 .../freebsd-ubin/files/freebsd-ubin-9.1-grep.patch |  17 --
 .../files/freebsd-ubin-9.1-kdump-ioctl.patch       |  24 ---
 .../files/freebsd-ubin-9.1-minigzip.patch          |  10 -
 .../files/freebsd-ubin-lint-stdarg.patch           |  24 ---
 .../freebsd-ubin/files/freebsd-ubin-setXid.patch   | 129 -------------
 .../freebsd-ubin/files/locate-updatedb-cron        |   6 -
 sys-freebsd/freebsd-ubin/files/login.1.pamd        |   4 -
 sys-freebsd/freebsd-ubin/files/passwd.1.pamd       |   7 -
 sys-freebsd/freebsd-ubin/files/su.1.pamd           |  15 --
 .../freebsd-ubin/freebsd-ubin-11.1-r1.ebuild       | 214 ---------------------
 sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild  | 211 --------------------
 .../freebsd-ubin/freebsd-ubin-9.1-r2.ebuild        | 180 -----------------
 .../freebsd-ubin/freebsd-ubin-9.1-r3.ebuild        | 180 -----------------
 sys-freebsd/freebsd-ubin/metadata.xml              |  19 --
 26 files changed, 1368 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 48ecdff2807..b0be810d41b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -760,7 +760,6 @@ sys-freebsd/freebsd-rescue
 sys-freebsd/freebsd-sbin
 sys-freebsd/freebsd-share
 sys-freebsd/freebsd-sources
-sys-freebsd/freebsd-ubin
 
 # Lars Wendler <polynomial-c@g.o> (2019-09-04)
 # Unofficial build. Superseded by official 2.49.5 release.

diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
deleted file mode 100644
index f2d19a2e5f8..00000000000
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch
deleted file mode 100644
index 606471713fb..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
-index af6562b..3121c81 100644
---- a/usr.bin/mt/mt.c
-+++ b/usr.bin/mt/mt.c
-@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD: stable/10/usr.bin/mt/mt.c 280438 2015-03-24 14:36:10Z ken $"
- #include <unistd.h>
- #include <stdint.h>
- #include <errno.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <mtlib.h>
- 
- #include <cam/cam.h>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch
deleted file mode 100644
index 3a65b3714b7..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
-index 4daad7a..1fb9105 100644
---- a/usr.bin/talk/io.c
-+++ b/usr.bin/talk/io.c
-@@ -50,6 +50,7 @@ static const char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <wctype.h>
- #define _XOPEN_SOURCE_EXTENDED
- #include <curses.h>
- 

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch
deleted file mode 100644
index 946cc5b125f..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
-index d199a85..dc5cafd 100644
---- a/usr.bin/at/Makefile
-+++ b/usr.bin/at/Makefile
-@@ -17,6 +17,8 @@ BINOWN=	root
- BINMODE= 4555
- CLEANFILES+= at.1
- 
-+LDFLAGS+=-Wl,-z,now
-+
- at.1: at.man
- 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
- 	sed -e \
-diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
-index 4427417..4f774a1 100644
---- a/usr.bin/chpass/Makefile
-+++ b/usr.bin/chpass/Makefile
-@@ -17,6 +17,8 @@ CFLAGS+= -DYP
- #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
- CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
- 
-+LDFLAGS+=-Wl,-z,now
-+
- LIBADD=	crypt util
- .if ${MK_NIS} != "no"
- LIBADD+=	ypclnt
-diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
-index cd03a51..9a0fe6e 100644
---- a/usr.bin/fstat/Makefile
-+++ b/usr.bin/fstat/Makefile
-@@ -9,3 +9,5 @@ LIBADD=	procstat
- MAN1=	fuser.1 fstat.1
- 
- .include <bsd.prog.mk>
-+LDFLAGS+=-Wl,-z,now
-+
-diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
-index 07321f7..ed2c786 100644
---- a/usr.bin/lock/Makefile
-+++ b/usr.bin/lock/Makefile
-@@ -7,4 +7,6 @@ BINMODE=4555
- 
- LIBADD=	crypt
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
-index 3499575..62a7356 100644
---- a/usr.bin/login/Makefile
-+++ b/usr.bin/login/Makefile
-@@ -16,6 +16,8 @@ CFLAGS+= -DUSE_BSM_AUDIT
- LIBADD+=	bsm
- .endif
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .if ${MK_SETUID_LOGIN} != "no"
- BINOWN=	root
- BINMODE=4555
-diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
-index 52cc3c7..11ebb2f 100644
---- a/usr.bin/netstat/Makefile
-+++ b/usr.bin/netstat/Makefile
-@@ -57,6 +57,8 @@ BINGRP=	kmem
- BINMODE=2555
- LIBADD=	kvm memstat xo util
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .if ${MK_NETGRAPH_SUPPORT} != "no"
- SRCS+=	netgraph.c
- LIBADD+=	netgraph
-diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
-index 3114a92..5c41213 100644
---- a/usr.bin/opieinfo/Makefile
-+++ b/usr.bin/opieinfo/Makefile
-@@ -12,6 +12,8 @@ WARNS?=	0
- 
- LIBADD=	opie
- 
-+LDFLAGS+=-Wl,-z,now
-+
- BINOWN=	root
- BINMODE=4555
- PRECIOUSPROG=
-diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
-index ae35b20..32ba59b 100644
---- a/usr.bin/opiepasswd/Makefile
-+++ b/usr.bin/opiepasswd/Makefile
-@@ -12,6 +12,8 @@ WARNS?=	0
- 
- LIBADD=	opie
- 
-+LDFLAGS+=-Wl,-z,now
-+
- BINOWN=	root
- BINMODE=4555
- PRECIOUSPROG=
-diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
-index 758be2d..ebde1a6 100644
---- a/usr.bin/passwd/Makefile
-+++ b/usr.bin/passwd/Makefile
-@@ -13,6 +13,8 @@ SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd
- MLINKS	 = passwd.1 yppasswd.1
- .endif
- 
-+LDFLAGS+=-Wl,-z,now
-+
- beforeinstall:
- .for i in passwd yppasswd
- 	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
-diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
-index b3dd829..26eaa63 100644
---- a/usr.bin/su/Makefile
-+++ b/usr.bin/su/Makefile
-@@ -10,6 +10,8 @@ WARNS?=	5
- LIBADD=	util pam
- 
- .if ${MK_AUDIT} != "no"
-+LDFLAGS+=-Wl,-z,now
-+
- CFLAGS+= -DUSE_BSM_AUDIT
- LIBADD+=	bsm
- .endif
-diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile
-index 0579add..571be8d 100644
---- a/usr.bin/wall/Makefile
-+++ b/usr.bin/wall/Makefile
-@@ -6,4 +6,6 @@ SRCS=	ttymsg.c wall.c
- BINGRP=	tty
- BINMODE=2555
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff --git a/usr.bin/write/Makefile b/usr.bin/write/Makefile
-index ba06110..ba6ce04 100644
---- a/usr.bin/write/Makefile
-+++ b/usr.bin/write/Makefile
-@@ -5,4 +5,6 @@ PROG=	write
- BINMODE=2555
- BINGRP=	tty
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-fixmakefiles.patch
deleted file mode 100644
index c8589fc2434..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-fixmakefiles.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
-index c21fff9..06c0fe1 100644
---- a/usr.bin/calendar/Makefile
-+++ b/usr.bin/calendar/Makefile
-@@ -15,6 +15,7 @@ FR_LINKS=       fr_FR.ISO8859-15
- TEXTMODE?=	444
- 
- beforeinstall:
-+	${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
- 	${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
- 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
- .for lang in ${INTER}

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch
deleted file mode 100644
index c26a672f372..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -dupr a/usr.bin/man/man.sh b/usr.bin/man/man.sh
---- a/usr.bin/man/man.sh	2017-07-21 01:43:23.000000000 +0200
-+++ b/usr.bin/man/man.sh	2019-01-22 19:32:52.136578832 +0100
-@@ -883,12 +883,12 @@ search_whatis() {
- # Finds an appropriate decompressor based on extension
- setup_cattool() {
- 	case "$1" in
--	*.bz)	cattool='/usr/bin/bzcat' ;;
--	*.bz2)	cattool='/usr/bin/bzcat' ;;
--	*.gz)	cattool='/usr/bin/zcat' ;;
--	*.lzma)	cattool='/usr/bin/lzcat' ;;
--	*.xz)	cattool='/usr/bin/xzcat' ;;
--	*)	cattool='/usr/bin/zcat -f' ;;
-+	*.bz)	cattool='bzcat' ;;
-+	*.bz2)	cattool='bzcat' ;;
-+	*.gz)	cattool='zcat' ;;
-+	*.lzma)	cattool='lzcat' ;;
-+	*.xz)	cattool='xzcat' ;;
-+	*)	cattool='zcat -f' ;;
- 	esac
- }
- 
-@@ -903,7 +903,7 @@ setup_pager() {
- 			if [ -n "$PAGER" ]; then
- 				MANPAGER="$PAGER"
- 			else
--				MANPAGER="more -s"
-+				MANPAGER="less -sR"
- 			fi
- 		fi
- 	fi
-@@ -1008,7 +1008,7 @@ SYSCTL=/sbin/sysctl
- debug=0
- man_default_sections='1:8:2:3:n:4:5:6:7:9:l'
- man_default_path='/usr/share/man:/usr/share/openssl/man:/usr/local/man'
--cattool='/usr/bin/zcat -f'
-+cattool='zcat -f'
- 
- config_global='/etc/man.conf'
- 

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
deleted file mode 100644
index 1a855290965..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fbsd-6.0/usr.bin/cmp/Makefile
-===================================================================
---- fbsd-6.0.orig/usr.bin/cmp/Makefile
-+++ fbsd-6.0/usr.bin/cmp/Makefile
-@@ -1,7 +1,7 @@
- #	@(#)Makefile	8.1 (Berkeley) 6/6/93
- # $FreeBSD: src/usr.bin/cmp/Makefile,v 1.6.14.1 2005/09/17 11:33:41 brian Exp $
- 
--PROG=	cmp
-+PROG=	bsdcmp
- SRCS=	cmp.c link.c misc.c regular.c special.c
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
deleted file mode 100644
index e8f978aabc9..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Parallel make installs often cause 2 concurrent install -d to fail
-while they are creating the path to the target dirs.
-This patch changes the failure to a warning so that a make -j6 install doesn't
-fails as often as it does on Gentoo/FreeBSD, if it uses /usr/bin/install.
-
---- usr.bin/xinstall/xinstall.c.orig
-+++ usr.bin/xinstall/xinstall.c
-@@ -748,9 +748,17 @@
- 			ch = *p;
- 			*p = '\0';
- 			if (stat(path, &sb)) {
--				if (errno != ENOENT || mkdir(path, 0755) < 0) {
-+				if (errno != ENOENT) {
- 					err(EX_OSERR, "mkdir %s", path);
- 					/* NOTREACHED */
-+				} else if (mkdir(path, 0755) < 0) {
-+					/* Previous errno from stat() says that the directory didn't exist (ENOENT)
-+					 * But if errno is now EEXIST, then we just hit a parallel make bug.
-+					 */
-+					if (errno == EEXIST)
-+						warn("mkdir: %s now exists!", path); /* let me know when this happens */
-+					else
-+						err(EX_OSERR, "mkdir %s", path);
- 				} else if (verbose)
- 					(void)printf("install: mkdir %s\n",
- 						     path);

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch
deleted file mode 100644
index d34eb9ef91a..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr usr.bin.old/calendar/Makefile usr.bin/calendar/Makefile
---- usr.bin.old/calendar/Makefile	2011-11-02 18:22:09.000000000 +0000
-+++ usr.bin/calendar/Makefile	2011-11-02 18:22:48.000000000 +0000
-@@ -15,6 +15,7 @@
- WARNS?=		7
- 
- beforeinstall:
-+	${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
- 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
- .for lang in ${INTER}

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch
deleted file mode 100644
index d4d89e12e9e..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur usr.bin.orig/ar/ar.c usr.bin/ar/ar.c
---- usr.bin.orig/ar/ar.c	2012-01-03 12:23:45.000000000 +0900
-+++ usr.bin/ar/ar.c	2012-12-25 20:50:29.000000000 +0900
-@@ -386,13 +386,13 @@
- static void
- bsdar_version(void)
- {
--	(void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version());
-+	(void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version_string());
- 	exit(EX_OK);
- }
- 
- static void
- ranlib_version(void)
- {
--	(void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version());
-+	(void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version_string());
- 	exit(EX_OK);
- }

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch
deleted file mode 100644
index a65185fb757..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur work.orig/usr.bin/ar/Makefile work/usr.bin/ar/Makefile
---- work.orig/usr.bin/ar/Makefile	2012-07-16 03:59:48.000000000 +0900
-+++ work/usr.bin/ar/Makefile	2012-07-16 04:02:38.000000000 +0900
-@@ -2,7 +2,7 @@
- 
- .include <bsd.own.mk>
- 
--PROG=	ar
-+PROG=	freebsd-ar
- SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
- 
- DPADD=	${LIBARCHIVE} ${LIBELF}
-@@ -10,10 +10,7 @@
- 
- CFLAGS+=-I. -I${.CURDIR}
- 
--.if ${MK_SHARED_TOOLCHAIN} == "no"
--NO_SHARED?=	yes
--.endif
--LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
--MLINKS= ar.1 ranlib.1
-+LINKS=	${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib
-+MLINKS= freebsd-ar.1 freebsd-ranlib.1
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch
deleted file mode 100644
index 06cc5d28df8..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur work.orig/usr.bin/grep/Makefile work/usr.bin/grep/Makefile
---- work.orig/usr.bin/grep/Makefile	2012-07-16 04:59:01.000000000 +0900
-+++ work/usr.bin/grep/Makefile	2012-07-16 05:00:15.000000000 +0900
-@@ -40,13 +40,6 @@
- 	grep.1 lzfgrep.1
- .endif
- 
--LINKS+=	${BINDIR}/${PROG} ${BINDIR}/xzgrep \
--	${BINDIR}/${PROG} ${BINDIR}/xzegrep \
--	${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
--	${BINDIR}/${PROG} ${BINDIR}/lzgrep \
--	${BINDIR}/${PROG} ${BINDIR}/lzegrep \
--	${BINDIR}/${PROG} ${BINDIR}/lzfgrep
--
- LDADD=	-lz -llzma
- DPADD=	${LIBZ} ${LIBLZMA}
- 

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch
deleted file mode 100644
index d98e599a280..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur work.orig/usr.bin/kdump/Makefile work/usr.bin/kdump/Makefile
---- work.orig/usr.bin/kdump/Makefile	2012-07-12 13:24:01.000000000 +0900
-+++ work/usr.bin/kdump/Makefile	2012-07-16 03:54:14.000000000 +0900
-@@ -21,7 +21,7 @@
- 
- ioctl.c: mkioctls
- 	env CPP="${CPP}" \
--	   sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	   sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- kdump_subr.c: mksubr
- 	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET}
-diff -Nur work.orig/usr.bin/truss/Makefile work/usr.bin/truss/Makefile
---- work.orig/usr.bin/truss/Makefile	2012-07-12 13:24:03.000000000 +0900
-+++ work/usr.bin/truss/Makefile	2012-07-16 03:54:40.000000000 +0900
-@@ -24,7 +24,7 @@
- 
- ioctl.c: ${.CURDIR}/../kdump/mkioctls
- 	env CPP="${CPP}" \
--	    sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	    sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- .if ${MACHINE_CPUARCH} == "i386"
- SRCS+=	i386-linux.c linux_syscalls.h

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch
deleted file mode 100644
index a9c062229ac..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur work.orig/usr.bin/minigzip/Makefile work/usr.bin/minigzip/Makefile
---- work.orig/usr.bin/minigzip/Makefile	2012-07-16 04:39:31.000000000 +0900
-+++ work/usr.bin/minigzip/Makefile	2012-07-16 04:45:30.000000000 +0900
-@@ -10,4 +10,6 @@
- DPADD=	${LIBZ}
- LDADD=	-lz
- 
-+CFLAGS+= -I${.CURDIR}/../../lib/libz
-+
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
deleted file mode 100644
index 97747245552..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur usr.bin.orig/xlint/llib/llib-lposix usr.bin/xlint/llib/llib-lposix
---- usr.bin.orig/xlint/llib/llib-lposix	2005-04-29 17:30:03 +0000
-+++ usr.bin/xlint/llib/llib-lposix	2005-05-03 14:12:26 +0000
-@@ -42,7 +42,7 @@
- #include <sys/utsname.h>
- #include <sys/times.h>
- #include <stdio.h>
--#include <stdarg.h>
-+#include <machine/stdarg.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <math.h>
-diff -ur usr.bin.orig/xlint/llib/llib-lstdc usr.bin/xlint/llib/llib-lstdc
---- usr.bin.orig/xlint/llib/llib-lstdc	2005-04-29 17:30:03 +0000
-+++ usr.bin/xlint/llib/llib-lstdc	2005-05-03 14:12:35 +0000
-@@ -44,7 +44,7 @@
- #include <math.h>
- #include <setjmp.h>
- #include <signal.h>
--#include <stdarg.h>
-+#include <machine/stdarg.h>
- #include <stddef.h>
- #include <stdio.h>
- #include <stdlib.h>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
deleted file mode 100644
index 631ee4f7b4f..00000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -ur usr.bin.orig/at/Makefile usr.bin.setXid/at/Makefile
---- usr.bin.orig/at/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/at/Makefile	Thu Apr  7 21:21:02 2005
-@@ -15,6 +15,8 @@
- BINMODE= 4555
- CLEANFILES+= at.1
- 
-+LDFLAGS+=-Wl,-z,now
-+
- at.1: at.man
- 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
- 	sed -e \
-diff -ur usr.bin.orig/chpass/Makefile usr.bin.setXid/chpass/Makefile
---- usr.bin.orig/chpass/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/chpass/Makefile	Thu Apr  7 21:22:40 2005
-@@ -15,6 +15,8 @@
- #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
- CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
- 
-+LDFLAGS+=-Wl,-z,now
-+
- DPADD=	${LIBCRYPT} ${LIBUTIL}
- LDADD=	-lcrypt -lutil
- .if !defined(NO_NIS)
-diff -ur usr.bin.orig/fstat/Makefile usr.bin.setXid/fstat/Makefile
---- usr.bin.orig/fstat/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/fstat/Makefile	Thu Apr  7 21:24:35 2005
-@@ -9,4 +9,6 @@
- BINMODE=2555
- WARNS?=	6
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/lock/Makefile usr.bin.setXid/lock/Makefile
---- usr.bin.orig/lock/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/lock/Makefile	Thu Apr  7 21:24:45 2005
-@@ -7,4 +7,6 @@
- DPADD=	${LIBCRYPT}
- LDADD=	-lcrypt
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/login/Makefile usr.bin.setXid/login/Makefile
---- usr.bin.orig/login/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/login/Makefile	Thu Apr  7 21:24:55 2005
-@@ -13,4 +13,6 @@
- INSTALLFLAGS=-fschg
- .endif
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/netstat/Makefile usr.bin.setXid/netstat/Makefile
---- usr.bin.orig/netstat/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/netstat/Makefile	Thu Apr  7 21:25:08 2005
-@@ -14,4 +14,6 @@
- DPADD=	${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL}
- LDADD=	-lkvm -lipx -lnetgraph -lutil
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/opieinfo/Makefile usr.bin.setXid/opieinfo/Makefile
---- usr.bin.orig/opieinfo/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/opieinfo/Makefile	Thu Apr  7 21:25:20 2005
-@@ -11,6 +11,8 @@
- DPADD=	${LIBOPIE} ${LIBMD}
- LDADD=	-lopie -lmd
- 
-+LDFLAGS+=-Wl,-z,now
-+
- BINOWN=	root
- BINMODE=4555
- INSTALLFLAGS=-fschg
-diff -ur usr.bin.orig/opiepasswd/Makefile usr.bin.setXid/opiepasswd/Makefile
---- usr.bin.orig/opiepasswd/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/opiepasswd/Makefile	Thu Apr  7 21:25:29 2005
-@@ -11,6 +11,8 @@
- DPADD=	${LIBOPIE} ${LIBMD}
- LDADD=	-lopie -lmd
- 
-+LDFLAGS+=-Wl,-z,now
-+
- BINOWN=	root
- BINMODE=4555
- INSTALLFLAGS=-fschg
-diff -ur usr.bin.orig/passwd/Makefile usr.bin.setXid/passwd/Makefile
---- usr.bin.orig/passwd/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/passwd/Makefile	Thu Apr  7 21:25:37 2005
-@@ -10,6 +10,8 @@
- MLINKS	 = passwd.1 yppasswd.1
- WARNS	?= 4
- 
-+LDFLAGS+=-Wl,-z,now
-+
- beforeinstall:
- .for i in passwd yppasswd
- 	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
---- usr.bin.orig/su/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/su/Makefile	Thu Apr  7 21:26:00 2005
-@@ -10,4 +10,6 @@
- BINMODE=4555
- INSTALLFLAGS=-fschg
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/wall/Makefile usr.bin.setXid/wall/Makefile
---- usr.bin.orig/wall/Makefile	Thu Apr  7 20:52:59 2005
-+++ usr.bin.setXid/wall/Makefile	Thu Apr  7 21:26:07 2005
-@@ -5,4 +5,6 @@
- BINGRP=	tty
- BINMODE=2555
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/write/Makefile usr.bin.setXid/write/Makefile
---- usr.bin.orig/write/Makefile	Thu Apr  7 20:52:59 2005
-+++ usr.bin.setXid/write/Makefile	Thu Apr  7 21:26:13 2005
-@@ -4,4 +4,6 @@
- BINMODE=2555
- BINGRP=	tty
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron b/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron
deleted file mode 100644
index 323f455e9ba..00000000000
--- a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-if [ -x /usr/libexec/locate.updatedb ]
-then
-	echo /usr/libexec/locate.updatedb | nice  -n 5 su  -fm nobody
-fi

diff --git a/sys-freebsd/freebsd-ubin/files/login.1.pamd b/sys-freebsd/freebsd-ubin/files/login.1.pamd
deleted file mode 100644
index 2c09584f762..00000000000
--- a/sys-freebsd/freebsd-ubin/files/login.1.pamd
+++ /dev/null
@@ -1,4 +0,0 @@
-auth		include		system-local-login
-account		include		system-local-login
-session		include		system-local-login
-password	include		system-local-login

diff --git a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd b/sys-freebsd/freebsd-ubin/files/passwd.1.pamd
deleted file mode 100644
index 9c293865767..00000000000
--- a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# PAM configuration for the "passwd" service
-#
-
-# passwd(1) does not use the auth, account or session services.
-
-password	include		system-auth

diff --git a/sys-freebsd/freebsd-ubin/files/su.1.pamd b/sys-freebsd/freebsd-ubin/files/su.1.pamd
deleted file mode 100644
index 33b35e285b0..00000000000
--- a/sys-freebsd/freebsd-ubin/files/su.1.pamd
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# PAM configuration for the "su" service
-#
-
-# auth
-auth		sufficient	pam_rootok.so		no_warn
-auth		sufficient	pam_self.so		no_warn
-auth		requisite	pam_group.so		no_warn group=wheel root_only fail_safe
-auth		include		system-auth
-
-# account
-account		include		system-auth
-
-# session
-session		required	pam_permit.so

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild
deleted file mode 100644
index 1ed9907fc97..00000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-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.bin/
-	contrib/
-	lib/
-	etc/
-	bin/
-	include/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:0= )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9:0=
-	!sys-process/fuser-bsd
-	!dev-util/csup
-	!dev-libs/libiconv
-	!sys-apps/man
-	!sys-apps/man-db
-	!sys-freebsd/freebsd-contrib"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-sbin-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-11.1-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-11.0-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-10.2-talk-workaround.patch"
-	"${FILESDIR}/${PN}-10.2-bsdxml.patch"
-	"${FILESDIR}/${PN}-11.1-man-paths.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof minigzip
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	hesinfo host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp
-	addr2line bsdcat cxxfilt cxxfilt elfcopy nm readelf sdiff size soelim strings"
-
-pkg_setup() {
-	# Add the required source files.
-	use zfs && EXTRACTONLY+="cddl/ "
-	use build && EXTRACTONLY+="sys/ "
-	use nis && EXTRACTONLY+="usr.sbin/ypserv/ "
-
-	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 kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]]; then
-		rm -f "${ROOT}"/usr/bin/yacc || die
-	fi
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-
-	# Preparing to build xlint
-	export LINT=xlint
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}" || die
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS="${DEFAULT_ABI}"
-	# Preparing to build addr2line, elfcopy, m4, getaddrinfo
-	for dir in libelftc libpe libopenbsd libnetbsd; do
-		cd "${WORKDIR}/lib/${dir}" || die
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1
-	done
-
-	MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1
-}
-
-src_install() {
-	cd "${S}"/calendar/calendars || die
-	for dir in $(find . -type d ! -name "." ); do
-		dodir /usr/share/calendar/"$(basename ${dir})"
-	done
-
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf ; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc" || die
-	insinto /etc
-	doins remote phones opieaccess fbtab
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-
-	# create locate database #472468
-	local f=/var/db/locate.database
-	mkdir "${ED}${f%/*}" || die
-	touch "${ED}${f}" || die
-	fowners nobody:nobody ${f}
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die
-	fi
-}

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
deleted file mode 100644
index 4a52e0bedec..00000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
+++ /dev/null
@@ -1,211 +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 pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-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.bin/
-	contrib/
-	lib/
-	etc/
-	bin/
-	include/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:0= )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9:0=
-	!sys-process/fuser-bsd
-	!dev-util/csup
-	!dev-libs/libiconv
-	!sys-freebsd/freebsd-contrib"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-sbin-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-11.1-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-11.0-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-10.2-talk-workaround.patch"
-	"${FILESDIR}/${PN}-10.2-bsdxml.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof minigzip
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	hesinfo host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man
-	addr2line bsdcat cxxfilt cxxfilt elfcopy nm readelf sdiff size soelim strings"
-
-pkg_setup() {
-	# Add the required source files.
-	use zfs && EXTRACTONLY+="cddl/ "
-	use build && EXTRACTONLY+="sys/ "
-	use nis && EXTRACTONLY+="usr.sbin/ypserv/ "
-
-	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 kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]]; then
-		rm -f "${ROOT}"/usr/bin/yacc || die
-	fi
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-
-	# Preparing to build xlint
-	export LINT=xlint
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}" || die
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS="${DEFAULT_ABI}"
-	# Preparing to build addr2line, elfcopy, m4, getaddrinfo
-	for dir in libelftc libpe libopenbsd libnetbsd; do
-		cd "${WORKDIR}/lib/${dir}" || die
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1
-	done
-
-	MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1
-}
-
-src_install() {
-	cd "${S}"/calendar/calendars || die
-	for dir in $(find . -type d ! -name "." ); do
-		dodir /usr/share/calendar/"$(basename ${dir})"
-	done
-
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf ; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc" || die
-	insinto /etc
-	doins remote phones opieaccess fbtab
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-
-	# create locate database #472468
-	local f=/var/db/locate.database
-	mkdir "${ED}${f%/*}" || die
-	touch "${ED}${f}" || die
-	fowners nobody:nobody ${f}
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die
-	fi
-}

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild
deleted file mode 100644
index 51d1442d20f..00000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild
+++ /dev/null
@@ -1,180 +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 pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!sys-process/fuser-bsd
-	!dev-util/csup"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-9.1-minigzip.patch"
-	"${FILESDIR}/${PN}-9.1-grep.patch"
-	"${FILESDIR}/${PN}-9.1-ar-libarchive3.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	dig hesinfo nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man"
-
-pkg_setup() {
-	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 kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}"
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf fuser; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-
-	# create locate database #472468
-	local f=/var/db/locate.database
-	mkdir "${ED}${f%/*}" || die
-	touch "${ED}${f}" || die
-	fowners nobody:nobody ${f}
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
deleted file mode 100644
index 5c516589984..00000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
+++ /dev/null
@@ -1,180 +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 pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!sys-process/fuser-bsd
-	!dev-util/csup"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-9.1-minigzip.patch"
-	"${FILESDIR}/${PN}-9.1-grep.patch"
-	"${FILESDIR}/${PN}-9.1-ar-libarchive3.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	dig hesinfo nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man catman"
-
-pkg_setup() {
-	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 kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}"
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf fuser; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-
-	# create locate database #472468
-	local f=/var/db/locate.database
-	mkdir "${ED}${f%/*}" || die
-	touch "${ED}${f}" || die
-	fowners nobody:nobody ${f}
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}

diff --git a/sys-freebsd/freebsd-ubin/metadata.xml b/sys-freebsd/freebsd-ubin/metadata.xml
deleted file mode 100644
index ef58187231a..00000000000
--- a/sys-freebsd/freebsd-ubin/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@g.o</email>
-		<name>BSD Project</name>
-	</maintainer>
-	<use>
-		<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="ar">
-			Build FreeBSD's ar and ranlib replacements based on libarchive. The
-			toolchain will still use binutils' version but you can play with it.
-			They have been renamed to freebsd-ar and freebsd-ranlib not to collide
-			with binutils.
-		</flag>
-		<flag name="zfs">Enable ZFS support (for fstat actually).</flag>
-	</use>
-</pkgmetadata>