gentoo resync : 03.01.2018

5 files changed, 0 insertions, 290 deletions

diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 978d94f280a9..4767583a3bb5 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -1,9 +1,7 @@
 AUX bootpd.confd 183 BLAKE2B 76fb1b41204f2b3d07cc974ec996ff9127945dc638796b176cd8809ca46fb69fa307f3fa313d48d79a7deb532d393ab58839ed7ae53927280f0178c20c4df3c4 SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f
 AUX bootpd.initd 554 BLAKE2B 86c2128a8f17a1d8eb57ef935a6e5a2b04f5c8c6654ecf40b10559912f30effb189f55e7f34ef37b496d8f9f8eb8726ab6af2ca179cb215809d76d1293ffb338 SHA512 69bc8dc708d955e41d3e0cfb997f96b589e8a3d33b11b2728541082fc5ab0844d753ca036a6c70ddd23a2a0085c39a89340b0f7d332b1384c94671cf3fe09b66
-AUX freebsd-libexec-10.2-atf-check.patch 809 BLAKE2B 3fce1b54cb3710861aa8abe5d5cdb09039764124a3b179ddbe0836fc3df6d48760b89badf8b1706bd1551c89c5f978889e29eed059ffc4df59524c18ee4a5e0b SHA512 46b265db484d707e9e65906e8d5b3dbb06223c1c229c78b6cb92864f4a4a017b61cfd2de35e5533bae2eb8867adea5e1732c279bc5d90e60d07646b9a4b06681
 AUX freebsd-libexec-7.2-pic.patch 348 BLAKE2B 38c8f2be3aafa6ff92055bd61c3d1a9691fa6137322adf966971b72bc78f50e25dfdbb9598fae94974b4a2788babf250dee50916b9bcc9a8684005107d1b6214 SHA512 c77297582efccd799f6d0e67c0976f1ee5551617abf2df9ccd0e2fc0abd7fb76ecaf7f5e019356034fb47d3cc39590a5eecd9b9868d2c356467e43e845638ab5
 AUX freebsd-libexec-8.2-rtld.patch 1332 BLAKE2B c34d2e3a3f96ff619b86443b820b43d2d11c6ead43d5fa573b6541aed9dca116fbd92e94dff7504910dbbe7ee8447a8e398e56cdd3b0931abd1d41d3445e2350 SHA512 9abbac7dfb703a05b3f6f1d3dc96db7df106355e3641eeb6fb446ea5f9ba15cfb9375e00bfa02b5ae26e4c9cdb52e14e2260981908c40e2c44549a43a2865ad6
-AUX freebsd-libexec-9.2-no_ld32.patch 634 BLAKE2B 909d0f2e694c2e1af7eece7f2f4bcf7fa9f39c91f95b3adae1160af00968b2edbb72c44a2ef2929e50b2203e9ee428ed87edbc122fe4d3bb8c219b276caf9025 SHA512 df5421ad4d07d9f3d5f8dfd110eca588848ff55a63c70adf76f90746c1156ac50004a79bb626783ada8f96060fdd37e153e64da6ed43148c02a8eae4493c18d8
 AUX rquotad.xinetd 162 BLAKE2B 87633efa7d9732c498de807976fdc65e3ec15eaef596f7f3f52e3a065fd0b6a9d592c3823a3c84cb9d363df5870f81f00d4a140a6df6e54cbfe239157af05c6b SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f
 AUX rstatd.xinetd 218 BLAKE2B a998b50e4f3a49582529d0d1751a4111b0705f03e53e677395043db38b743a5d017799d4dbfa26eeb107d5d657d82af88198d6477452976b59458ce5f7912417 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011
 AUX rusersd.xinetd 220 BLAKE2B 60590eb0a4115ab0cdc3248beb4940f7cc6526967963e1e1791dee53a08b2ada06d2f740246bcf4e5c2a9665f612e7b613e5f437576df468ec6fd29712cb0d0f SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd
@@ -19,14 +17,10 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
 DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-libexec-10.3.ebuild 3513 BLAKE2B 2af7e0e8a643da2d9de83eba8b68f03dd306b2f95f2a2e40c7631a532cf84351850a042fdbd846c07a823eddbf324dea30de35808cbc49d333e8c8e1cb54afbe SHA512 73d96f63e2c1a7e1f3d24e7bbca68777d69e5647a3e3bf5e4911df55ae53bc26e05459799d64413a31121d4dfbf438791339608cb41bf72df551f42b3738197c
-EBUILD freebsd-libexec-11.0.ebuild 4149 BLAKE2B 4f30c7ddb211c6e08a68074b49ea5f5b663a63fbbcab794d31dd24d5236c2cff754d237f4d66e5318e9b36e0758d38a4b0cd013a930404b17c71ddad6b65a764 SHA512 75668b5ded29355db9f7e595a7cff32210ede67ca8ed29c8e5fd677d4ed66febcdaf003e841873ad8acbb69e3e85078653c421bde7ac724387f37704df540fe8
 EBUILD freebsd-libexec-8.2-r1.ebuild 1762 BLAKE2B bdfd5c674d09618b3337d0a5922edbc8e962e442d3f943311c3f2106179e204d5dd64aae37ad85b6057041e5e21d3e0a2b3c3c471d21dcacc9bdcce10e2f4a1f SHA512 b5ff14afff032ebe2fc43fb4045d7705d6d0cf4b2853ef788ad0cc47dab343a19a655d881dd2965e4743d4c4212dc6ef7e5b3929885851fc2041ec97fc641cb8
 EBUILD freebsd-libexec-8.2.ebuild 1726 BLAKE2B 81734a0958b6d0a44d0257a9e77534d15170404f01821fc97ff8fb2ecfe506fc6c3717b81df02f9f667231036fff70e0d81698a0e64872922627a91387ee96cf SHA512 3b825ac1c7d44a3f288483b5b7a212a60800a36c326a29dca90cbfe1898735fc4a43c13866bc95b4cbbfdf3eaaf845e9bd191933ec63f807a3bf6b43887dd8f4
 EBUILD freebsd-libexec-9.1-r2.ebuild 2296 BLAKE2B ff662e3bbee7969539bf48139f6e921bef036dc003d2b4b5b16ba94c6d6de0291a54daccb81dc0856100f452202a2eb430b0d15fdedffb479365af18f545f0ac SHA512 e099494395ac06088175df3717f7936b2b41c4b98d176cecd6f345ce31c42e02401e60642f9919418fb0ef3f4944bebb7935432c920a080b503ef9fc2fef92c7
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch
deleted file mode 100644
index e9c092566303..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
-index b50e14e..e59a413 100644
---- a/libexec/atf/Makefile.inc
-+++ b/libexec/atf/Makefile.inc
-@@ -25,7 +25,7 @@
- #
- # $FreeBSD: stable/10/libexec/atf/Makefile.inc 271298 2014-09-09 04:00:30Z ngie $
- 
--CFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-DHAVE_CONFIG_H
- 
- WARNS?=		3
- 
-diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
-index 77c11db..7449ddb 100644
---- a/libexec/atf/atf-check/Makefile
-+++ b/libexec/atf/atf-check/Makefile
-@@ -34,8 +34,8 @@ PROG_CXX=	atf-check
- SRCS=		atf-check.cpp
- MAN=		atf-check.1
- 
--CFLAGS+=	-I${ATF}
--CFLAGS+=	-DATF_SHELL='"/bin/sh"'
-+CXXFLAGS+=	-I${ATF}
-+CXXFLAGS+=	-DATF_SHELL='"/bin/sh"'
- 
- LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c++
- LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
deleted file mode 100644
index d33000927424..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*.
-We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue
-about LD_32_* and thus fail to run from the build directory.
-
-diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h
---- libexec.old/rtld-elf/rtld.h	2013-08-24 12:30:26.000000000 -0400
-+++ libexec/rtld-elf/rtld.h	2013-08-26 17:10:19.000000000 -0400
-@@ -47,7 +47,6 @@
- #define	_PATH_ELF_HINTS		"/var/run/ld-elf32.so.hints"
- /* For running 32 bit binaries  */
- #define	STANDARD_LIBRARY_PATH	"/lib32:/usr/lib32"
--#define LD_ "LD_32_"
- #endif
- 
- #ifndef STANDARD_LIBRARY_PATH
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild
deleted file mode 100644
index e915c5115503..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	libexec/
-	usr.bin/
-	bin/
-	contrib/hyperv/
-	lib/
-	etc/
-	usr.sbin/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch"
-	"${FILESDIR}/${PN}-10.2-atf-check.patch" )
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
-	[[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
-
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-	# allow upgrade directly from 9.x to 10.2.
-	if has_version "<sys-freebsd/freebsd-lib-${RV}"; then
-		# taken from sys/sys/elf_common.h
-		echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h
-		echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h
-		echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h
-		echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h
-		echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/fcntl.h
-		echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/cdefs.h
-		echo '#define __compiler_membar()  __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/mman.h
-		echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h
-	fi
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/libexec/rtld-elf" || die
-		export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
-	else
-		cd "${S}" || die
-	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
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild
deleted file mode 100644
index 59376c1713b0..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	libexec/
-	usr.bin/
-	bin/
-	contrib/blacklist/
-	contrib/dma/
-	contrib/hyperv/
-	contrib/telnet/
-	lib/
-	etc/
-	usr.sbin/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-PATCHES=( "${FILESDIR}/${PN}-10.2-atf-check.patch" )
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-
-	if has_version "<sys-freebsd/freebsd-libexec-11.0"; then
-		REMOVE_SUBDIRS="${REMOVE_SUBDIRS} rpc.rstatd ulog-helper"
-	fi
-
-	if has_version "<sys-freebsd/freebsd-ubin-11.0"; then
-		mymakeopts="${mymakeopts} WITHOUT_MAN_UTILS= "
-	fi
-
-	if has_version "<sys-freebsd/freebsd-share-${RV}"; then
-		die ">=sys-freebsd/freebsd-share-${RV} is required."
-	fi
-}
-
-src_prepare() {
-	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
-	[[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
-
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-	# allow upgrade directly from 9.x to 10.2.
-	if has_version "<sys-freebsd/freebsd-lib-${RV}"; then
-		# taken from sys/sys/elf_common.h
-		echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h
-		echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h
-		echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h
-		echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h
-		echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h
-		echo "#define NT_FREEBSD_ABI_TAG 1" >> "${S}"/rtld-elf/rtld.h
-		echo "#define NT_FREEBSD_NOINIT_TAG 2" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/fcntl.h
-		echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h
-		echo "#define O_VERIFY 0x00200000" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/cdefs.h
-		echo '#define __compiler_membar()  __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/mman.h
-		echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h
-
-		export mymakeopts="${mymakeopts} WITHOUT_SYMVER= WITHOUT_BLACKLIST_SUPPORT= "
-	fi
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/libexec/rtld-elf" || die
-		export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
-	else
-		cd "${S}" || die
-	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
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}