[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

["Alexis Ballier" <aballier@gentoo.org>]

commit:     55145fbcf614ee6e537750c2b3371ef8315a1058
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 16:46:51 2012 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 16:46:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=55145fbc

remove freebsd-lib, merged to the main tree

---
 sys-freebsd/freebsd-lib/Manifest                   |   45 --
 .../files/freebsd-lib-6.0-flex-2.5.31.patch        |   13 -
 .../files/freebsd-lib-6.0-gccfloat.patch           |   16 -
 .../freebsd-lib/files/freebsd-lib-6.0-pmc.patch    |   13 -
 .../freebsd-lib/files/freebsd-lib-6.1-csu.patch    |   20 -
 .../files/freebsd-lib-6.2-bluetooth.patch          |   11 -
 .../files/freebsd-lib-7.0-CVE-2008-1391.patch      |   11 -
 .../files/freebsd-lib-7.1-types.h-fix.patch        |   15 -
 .../files/freebsd-lib-7.2-rtldnoload.patch         |   30 --
 .../freebsd-lib/files/freebsd-lib-8.0-gcc45.patch  |   28 -
 .../freebsd-lib/files/freebsd-lib-8.0-log2.patch   |   21 -
 .../files/freebsd-lib-8.0-rpcsec_gss.patch         |   12 -
 .../files/freebsd-lib-8.2-liblink.patch            |   19 -
 .../files/freebsd-lib-8.2-nlm_syscall.patch        |   10 -
 .../files/freebsd-lib-9.0-liblink.patch            |   21 -
 .../files/freebsd-lib-9.0-opieincludes.patch       |  122 -----
 .../files/freebsd-lib-9.0-trylock-adaptive.patch   |   14 -
 .../freebsd-lib/files/freebsd-lib-bsdxml.patch     |   13 -
 .../files/freebsd-lib-bsdxml2expat.patch           |   26 -
 .../freebsd-lib/files/freebsd-lib-includes.patch   |   13 -
 .../freebsd-lib/files/freebsd-lib-new_as.patch     |   68 ---
 .../files/freebsd-sources-9.0-sysctluint.patch     |   13 -
 sys-freebsd/freebsd-lib/files/libmap.conf          |    8 -
 sys-freebsd/freebsd-lib/files/libusb.pc.in         |   11 -
 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild  |  535 --------------------
 sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild |  535 --------------------
 26 files changed, 0 insertions(+), 1643 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
deleted file mode 100644
index 0a0c6e3..0000000
--- a/sys-freebsd/freebsd-lib/Manifest
+++ /dev/null
@@ -1,45 +0,0 @@
-AUX freebsd-lib-6.0-flex-2.5.31.patch 421 RMD160 6ef83c6b09e31a81ba3c25772b02aef34540dbe8 SHA1 1408a36a967b0ff5ba94e23921357f4296e31bc2 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4
-AUX freebsd-lib-6.0-gccfloat.patch 542 RMD160 564f5a1b1aba59479c22f91570635de717e8b7bf SHA1 94f463f123fdc3009d4ca1d5ab351aa76d768c6b SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951
-AUX freebsd-lib-6.0-pmc.patch 338 RMD160 bb284cc2f9eafd3f65090087af215c3da679fefa SHA1 18343fc612bd231ec722b579dff61c887542b1c2 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f
-AUX freebsd-lib-6.1-csu.patch 655 RMD160 d4fa9ade913ef3ce90351ae368f0944265eae2e4 SHA1 b165b704258d2ce600bcd2a900363d851a4a2a77 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1
-AUX freebsd-lib-6.2-bluetooth.patch 243 RMD160 eaaeafc3f8305d4755070d9d1354289a140bf6a1 SHA1 6988dfc998b18efd7a91e86a827e921cdabf4997 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658
-AUX freebsd-lib-7.0-CVE-2008-1391.patch 344 RMD160 44e20da80ab544895d8dd65b5c6bcdf693c2dd7a SHA1 50105f89d3296793857230a27f909f9c0d713293 SHA256 662a6f26d99257221fa686423fd9fe22862b827cd9ae146c2add5e5ac85290cc
-AUX freebsd-lib-7.1-types.h-fix.patch 371 RMD160 d514196ccf1ba246a158b5f421f009d96d2dd8c4 SHA1 b04bec25903446c20bdfd144796fe9924f9ba39f SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473
-AUX freebsd-lib-7.2-rtldnoload.patch 1037 RMD160 f7f0e833a4ba182f17731eb77ccd6dc8e39f8fad SHA1 2158d4a5183875d52acd0cd538630685d609fac6 SHA256 b9ba0e322f15d8761bb33cf9199b95cc61d6a9b5129d08399f49c89fdeaa095b
-AUX freebsd-lib-8.0-gcc45.patch 1264 RMD160 c2c6b5a3fa8efe0bcb3487cc71117a9411d18f73 SHA1 55e96a2f3a31f3a58ec5fc509a5d15ec47868773 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d
-AUX freebsd-lib-8.0-log2.patch 667 RMD160 63f115ff4262cbcb46377f7bfb2fc7a01167e50b SHA1 7daafed62b95bc8c2aeb19e3c0b1e697a152187d SHA256 dc421c3d92790da46360225de2dd4d707c314e962ecb95650799ee12f166a214
-AUX freebsd-lib-8.0-rpcsec_gss.patch 298 RMD160 155eeb638eedb291ea739ad64993817e5d985f7b SHA1 005d80f43b2558d1c8ecc41192b28e1dff53b39a SHA256 170d07c44d02a6b4dde1d0d209c57f3bbab567a5c4a592a82b270140a2a1d7f1
-AUX freebsd-lib-8.2-liblink.patch 510 RMD160 99364b405782a3cd7d7c4f84db9c74e976c0c8ba SHA1 54810b4414733691020ffd8db648fe46a8beef9f SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee
-AUX freebsd-lib-8.2-nlm_syscall.patch 385 RMD160 c3466ada961bd75248d0a62219898d5f936b33ce SHA1 a7bed1eff5f1cda67076b5661cf7ac3e8694ff82 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b
-AUX freebsd-lib-9.0-liblink.patch 627 RMD160 ea3f0d6f35457d70ee22461d5c6a5cf34285df93 SHA1 e4670e2c34f96f1e725ab10d3a38e2e6f742e7c5 SHA256 b0c71ae271e4a7a621bdf437254256afb80c3053961a8ad187ba28bc9084e813
-AUX freebsd-lib-9.0-opieincludes.patch 4495 RMD160 d7ffb8dbab8effbd0ca0b69708b99a9361ca3962 SHA1 848b66bd435a48d56e2e3593684ee9b30dd71d4f SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b
-AUX freebsd-lib-9.0-trylock-adaptive.patch 439 RMD160 056ea3082ef46645c5af0374aa092f8fe68221ae SHA1 759dc8dd9975a448c79f5fffafac1838ead91516 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612
-AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9
-AUX freebsd-lib-bsdxml2expat.patch 708 RMD160 4a973e39a5860bd7b0fbba438302c65ec2b66e33 SHA1 95ed47baf5e189865d3989fad625a2160d2abe13 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85
-AUX freebsd-lib-includes.patch 316 RMD160 655d20a7a86715983469dbda678bca0ae726c069 SHA1 65cd796b0f8747d8d063b1f6e3ea53f82cdcdbe1 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06
-AUX freebsd-lib-new_as.patch 1494 RMD160 36ac871434f9994d5a0d7e1b73765c055d49948a SHA1 10e2e6b7b27459548a17809ada287520e3ffeeea SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982
-AUX freebsd-sources-9.0-sysctluint.patch 403 RMD160 46bb18c424ea7011db86341e427fd095495c4bcc SHA1 9d3c1606c886d96a88c89283bc18a2717c87fc76 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e
-AUX libmap.conf 201 RMD160 ad0ab6c08b5c541e0e45636dcbbaa468bbae2f95 SHA1 df81db07a94d988f1c41b4696b4d3b0058e73f83 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742
-AUX libusb.pc.in 208 RMD160 13c7e5587c565453fc6a11d156da302fa7590ee0 SHA1 f0f9815fa27a8f1cf8405c1a8987df5d5d6a6b1b SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56
-DIST freebsd-cddl-9.0.tar.bz2 878299 RMD160 187504c1cd008c47d71a60be496eab62846bd3c8 SHA1 5eb6d065afe49ae48d1b3581038b30bf43532ca7 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b
-DIST freebsd-cddl-9.1_rc1.tar.bz2 910010 RMD160 54476d310621277b6d56ba6f7ffcff7bfe05dff2 SHA1 f92527d3dd6aa0278fb0882f3c633315c521ce49 SHA256 ac64b78bb3313d811d065bf1f4299897c3fd78d1f976eedf218ae361c56d0fd7
-DIST freebsd-contrib-9.0.tar.bz2 53993596 RMD160 b0e602dec32f4dc9ba29b132b3d27fb98fc95cb9 SHA1 e637f40d0f0ed2441b9a7737c88451e1327384c1 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c
-DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
-DIST freebsd-crypto-9.0.tar.bz2 5669925 RMD160 fb0a5815254ad1aa601e621349059edcccd2c493 SHA1 a6b5e8cb3214adbeef10f9f39058bfabb0c00f95 SHA256 98f1a203d20c1a8884a04a0349d49c75f257dddfd71a4c3c60414d535dd782a8
-DIST freebsd-crypto-9.1_rc1.tar.bz2 5698339 RMD160 204562bf67e6352d183909cbbddfdd4e74f710ad SHA1 936937335e158c0f9b0eb864099d7f388d9015f2 SHA256 56299e9cb51d325cfa0ce2b5a23df61110384b917826ef7f75584421727be2f1
-DIST freebsd-etc-9.0.tar.bz2 207258 RMD160 67688c29d95270f03a43ed3f15f31bae1ccbe1c7 SHA1 03a7d766a451d61cb9a5677f3cf49f4ef62f706a SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1
-DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
-DIST freebsd-gnu-9.0.tar.bz2 783723 RMD160 f0776cb32a30f173acbebb4bedfc103c029769dc SHA1 f0db654d836ad03e06adc2a528a612fb14503930 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c
-DIST freebsd-gnu-9.1_rc1.tar.bz2 802034 RMD160 663b9e12ef05446be9f465dea292267745c94124 SHA1 9628e7a6f11c7f1dc3a4efa275d9a9515cb4619a SHA256 00bebcad9d87f06b0b33a1eac62d2345d258f47fca2b8aaba3b955c70d40e985
-DIST freebsd-include-9.0.tar.bz2 141657 RMD160 5ad8d85f5c1d8adef755684b704e21db5e7fbff5 SHA1 3b6304699da72b15754c0f1a9cc6594a0c26fee1 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0
-DIST freebsd-include-9.1_rc1.tar.bz2 146409 RMD160 ced0903d8c1eff121e1b5c7acc8da946132227c0 SHA1 7cbaa00e333299eb8453ae551ac983f5333037f3 SHA256 c6febd4ace254d2109375d38c1ec4a960999aa62c1409c9ea9f2d336595d42c5
-DIST freebsd-lib-9.0.tar.bz2 3547388 RMD160 4b0de140bad6bb7fa9423d7d96ff695b0aba1ecd SHA1 6ffb802e0f8433b5a83128f55ead4e6759059a53 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a
-DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
-DIST freebsd-libexec-9.0.tar.bz2 298680 RMD160 2f27821e1e9cccc409a6f4762957dcf851306237 SHA1 f8c023cf511f5b53724124f062bd9c8269353bb1 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e
-DIST freebsd-libexec-9.1_rc1.tar.bz2 310066 RMD160 4635555af871b887a3385605132af25cbf020eff SHA1 e259145ea2b1a6b68a8e0f7af9d08f48edc709b4 SHA256 e2b7d0c0583b3053b5a91b547576eca78f4035826f056534b17824126c4d4cb8
-DIST freebsd-sys-9.0.tar.bz2 30369960 RMD160 137ac728d78767eae184ac0bf00014d1bfeffc37 SHA1 cc09df384bd519ddf39254605a5ad80f702f3d68 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54
-DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
-DIST freebsd-usbin-9.0.tar.bz2 2608252 RMD160 fb070b602615289a849ec19d35b670bc2290423b SHA1 db82960e36f7585b25b09fa686328bcd9f7cfcb3 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea
-DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
-EBUILD freebsd-lib-9.0-r3.ebuild 17211 RMD160 38e5f30c6407bab50d2775b77fc879f97e46516b SHA1 25b7a49e9e83b27d0bec49349a16d270c0824987 SHA256 4b06e34ecf076d35d041135cfe07ae76f40288de61d83ff966824cd1dc8d7926
-EBUILD freebsd-lib-9.1_rc1.ebuild 17198 RMD160 f97fca4ac58ad45c2b401d493d2e2c5dbe497fd7 SHA1 48c88d5a3f7e8285711f1377dfa179a32a958d0d SHA256 bbfc7cd976b580611e9a539a3d429ee01d21c9d7196ca359a0a8ed9797ea8ed5

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
deleted file mode 100644
index 00de8a6..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fbsd-6/lib/libipsec/policy_token.l
-===================================================================
---- fbsd-6.orig/lib/libipsec/policy_token.l
-+++ fbsd-6/lib/libipsec/policy_token.l
-@@ -138,8 +138,6 @@ void
- __policy__strbuffer__init__(msg)
- 	char *msg;
- {
--	if (yy_current_buffer)
--		yy_delete_buffer(yy_current_buffer);
- 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
- 	yy_switch_to_buffer(strbuffer);
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
deleted file mode 100644
index a3e7d5e..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is needed to avoid inclusion of GCC's float.h that defines
-LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
-
-Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-===================================================================
---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
-+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-@@ -28,7 +28,7 @@
- __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
- 
- #include <fenv.h>
--#include <float.h>
-+#include <machine/float.h>
- #include <math.h>
- 
- /*

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
deleted file mode 100644
index 2f6de46..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: freebsd-6.0_beta4/lib/libpmc/Makefile
-===================================================================
---- freebsd-6.0_beta4.orig/lib/libpmc/Makefile
-+++ freebsd-6.0_beta4/lib/libpmc/Makefile
-@@ -9,6 +9,8 @@ WARNS?=	6
- 
- MAN=	pmc.3 pmclog.3
- 
-+CFLAGS+= -I${.CURDIR}
-+
- MLINKS+= \
- 	pmc.3 pmc_allocate.3 \
- 	pmc.3 pmc_attach.3 \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
deleted file mode 100644
index 075f278..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/csu/amd64/Makefile.orig	2006-07-04 07:49:58 -0300
-+++ lib/csu/amd64/Makefile	2006-07-04 07:50:15 -0300
-@@ -16,6 +16,7 @@
- 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c
- 
- realinstall:
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${OBJS} ${DESTDIR}${LIBDIR}
- 
---- lib/csu/sparc64/Makefile.orig	2006-10-06 15:13:55 +0100
-+++ lib/csu/sparc64/Makefile	2006-10-06 15:15:06 +0100
-@@ -15,6 +15,7 @@
- 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC}
- 
- realinstall:
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${OBJS} ${DESTDIR}${LIBDIR}
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
deleted file mode 100644
index a9b8435..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libsdp/Makefile	2007-06-15 12:04:37 +0200
-+++ lib.sdp/libsdp/Makefile	2007-06-15 12:26:14 +0200
-@@ -5,7 +5,7 @@
- MAN=		sdp.3
- 
- WARNS?=		2
--CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}  -I${.CURDIR}/../libbluetooth
- 
- SHLIB_MAJOR=	2
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
deleted file mode 100644
index 2b8d401..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libc/stdlib/strfmon.c	2008/04/22 13:23:34
-+++ lib/libc/stdlib/strfmon.c	2008/04/24 07:49:00
-@@ -65,6 +65,8 @@
- #define GET_NUMBER(VAR)	do {					\
- 	VAR = 0;						\
- 	while (isdigit((unsigned char)*fmt)) {			\
-+		if (VAR > INT_MAX / 10)				\
-+			goto e2big_error;			\
- 		VAR *= 10;					\
- 		VAR += *fmt - '0';				\
- 		if (VAR < 0)					\

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
deleted file mode 100644
index 8de5df2..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a compile error if XOPEN_SOURCE 600 is defined.
-
-See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html
-
---- sys/sys/types.h.orig
-+++ sys/sys/types.h
-@@ -46,7 +46,7 @@
- 
- #include <sys/_pthreadtypes.h>
- 
--#if __BSD_VISIBLE
-+#ifndef _POSIX_SOURCE
- typedef	unsigned char	u_char;
- typedef	unsigned short	u_short;
- typedef	unsigned int	u_int;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
deleted file mode 100644
index 77bbe2e..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Backported from 8.0.
-Even if RTLD_NOLOAD is not standard, dev-libs/nss expects it.
-Since it has made it to 8.0 we can afford backporting it.
-
---- include/dlfcn.h.old	2010-01-10 18:42:04 +0100
-+++ include/dlfcn.h	2010-01-10 18:42:19 +0100
-@@ -47,6 +47,7 @@
- #define	RTLD_GLOBAL	0x100	/* Make symbols globally available. */
- #define	RTLD_LOCAL	0	/* Opposite of RTLD_GLOBAL, and the default. */
- #define	RTLD_TRACE	0x200	/* Trace loaded objects and exit. */
-+#define	RTLD_NOLOAD	0x02000	/* Do not load if not already loaded. */
- 
- /*
-  * Request arguments for dlinfo().
---- lib/libc/gen/dlopen.3.old	2010-01-10 18:43:15 +0100
-+++ lib/libc/gen/dlopen.3	2010-01-10 18:45:27 +0100
-@@ -141,6 +141,13 @@
- With this flag
- .Fn dlopen
- will return to the caller only in the case of error.
-+.It Dv RTLD_NOLOAD
-+Only return valid handle for the object if it is already loaded in
-+the process address space, otherwise
-+.Dv NULL
-+is returned.
-+Other mode flags may be specified, which will be applied for promotion
-+for the found object.
- .El
- .Pp
- If

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
deleted file mode 100644
index 2ddb9ea..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x
---- work.orig/include/rpcsvc/nis.x	2009-10-25 10:10:29.000000000 +0900
-+++ work/include/rpcsvc/nis.x	2011-04-13 21:25:13.000000000 +0900
-@@ -399,10 +399,7 @@
- %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
- %#define WORLD_DEFAULT (NIS_READ_ACC)
- %#define GROUP_DEFAULT (NIS_READ_ACC << 8)
--%#define OWNER_DEFAULT ((NIS_READ_ACC +\
--			 NIS_MODIFY_ACC +\
--			 NIS_CREATE_ACC +\
--			 NIS_DESTROY_ACC) << 16)
-+%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
- %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
- %
- %/* Result manipulation defines ... */
-@@ -431,10 +428,8 @@
- % * these definitions they take an nis_object *, and an int and return
- % * a u_char * for Value, and an int for length.
- % */
--%#define ENTRY_VAL(obj, col) \
--	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
--%#define ENTRY_LEN(obj, col) \
--	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-+%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-+%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
- %
- %#ifdef __cplusplus
- %}

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
deleted file mode 100644
index a9fd189..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-log2 and log2f are required by C99 and are not implemented.
-Workaround the deficiency.
-
---- lib/msun/src/math.h.old	2010-03-14 17:02:25.000000000 +0100
-+++ lib/msun/src/math.h	2010-03-14 17:07:03.000000000 +0100
-@@ -203,6 +203,7 @@
- double	frexp(double, int *);	/* fundamentally !__pure2 */
- double	ldexp(double, int);
- double	log(double);
-+#define log2(x) log(x)/log(2.0)
- double	log10(double);
- double	modf(double, double *);	/* fundamentally !__pure2 */
- 
-@@ -319,6 +320,7 @@
- float	log10f(float);
- float	log1pf(float);
- float	logf(float);
-+#define log2f(x) logf(x)/logf(2.0)
- float	modff(float, float *);	/* fundamentally !__pure2 */
- 
- float	powf(float, float);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
deleted file mode 100644
index 3b23387..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Without this linking fails during a stage3 build.
-
---- lib/librpcsec_gss/Makefile.orig
-+++ lib/librpcsec_gss/Makefile
-@@ -8,6 +8,7 @@
- 
- DPADD+=	${LIBGSSAPI}
- LDADD+=	-lgssapi
-+LDFLAGS+= 	-L${.CURDIR}/../libgssapi
- 
- VERSION_DEF=	${.CURDIR}/../libc/Versions.def
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
deleted file mode 100644
index c8be7f4..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/libproc/Makefile.old	2011-07-06 00:58:04.000000000 +0000
-+++ lib/libproc/Makefile	2011-07-06 00:58:58.000000000 +0000
-@@ -18,5 +18,6 @@
- WARNS?=	6
- 
- WITHOUT_MAN=	yes
-+LDADD=-lelf
- 
- .include <bsd.lib.mk>
---- lib/librtld_db/Makefile.old	2011-07-06 00:58:12.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-07-06 00:59:27.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD=-lutil -lproc
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
- 
- .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
deleted file mode 100644
index 556ade5..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/unistd.h	2010/12/20 20:39:49	216602
-+++ include/unistd.h	2010/12/20 21:12:18	216603
-@@ -529,6 +529,7 @@
- #define	_MKTEMP_DECLARED
- #endif
- int	 nfssvc(int, void *);
-+int	 nlm_syscall(int, int, int, char **);
- int	 profil(char *, size_t, vm_offset_t, int);
- int	 rcmd(char **, int, const char *, const char *, const char *, int *);
- int	 rcmd_af(char **, int, const char *,

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
deleted file mode 100644
index 5d7526f..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile
---- lib.ol/libproc/Makefile	2011-11-02 14:02:17.000000000 +0000
-+++ lib/libproc/Makefile	2011-11-02 14:03:09.000000000 +0000
-@@ -16,5 +16,6 @@
- SHLIB_MAJOR=	2
- 
- WITHOUT_MAN=
-+LDADD+=-lelf
- 
- .include <bsd.lib.mk>
-diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile
---- lib.ol/librtld_db/Makefile	2011-11-02 14:02:13.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-11-02 14:04:00.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD+=-lutil -lproc
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
- 
- .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
deleted file mode 100644
index bf77a0a..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Fixes warnings like:
-/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5:
-warning: incompatible implicit declaration of built-in function ‘strcpy’ 
-
-diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c
---- contrib.old/opie/libopie/accessfile.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/accessfile.c	2012-05-25 09:12:34.000000000 -0400
-@@ -46,6 +46,7 @@
- #ifdef DEBUG
- #include <syslog.h>
- #endif /* DEBUG */
-+#include <ctype.h>
- 
- #include "opie.h"
- 
-diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c
---- contrib.old/opie/libopie/generator.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/generator.c	2012-05-25 08:58:10.000000000 -0400
-@@ -50,6 +50,7 @@
- #include <syslog.h>
- #endif /* DEBUG */
- #include "opie.h"
-+#include <stdio.h>
- 
- static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" };
- 
-diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c
---- contrib.old/opie/libopie/lookup.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/lookup.c	2012-05-25 09:15:08.000000000 -0400
-@@ -14,6 +14,7 @@
- #include "opie_cfg.h"
- #include <stdio.h>
- #include "opie.h"
-+#include <string.h>
- 
- int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal)
- {
-diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c
---- contrib.old/opie/libopie/newseed.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/newseed.c	2012-05-25 09:14:37.000000000 -0400
-@@ -36,6 +36,9 @@
- #include <syslog.h>
- #endif /* DEBUG */
- #include "opie.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <time.h>
- 
- int opienewseed FUNCTION((seed), char *seed)
- {
-diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c
---- contrib.old/opie/libopie/parsechallenge.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/parsechallenge.c	2012-05-25 09:15:54.000000000 -0400
-@@ -20,6 +20,8 @@
- #include <string.h>
- #endif /* HAVE_STRING_H */
- #include "opie.h"
-+#include <stdlib.h>
-+#include <ctype.h>
- 
- struct algorithm {
-   char *name;
-diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c
---- contrib.old/opie/libopie/passwd.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/passwd.c	2012-05-25 09:13:45.000000000 -0400
-@@ -22,6 +22,7 @@
- 
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <string.h>
- 
- int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks)
- {
-diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c
---- contrib.old/opie/libopie/randomchallenge.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/randomchallenge.c	2012-05-25 09:00:27.000000000 -0400
-@@ -28,6 +28,9 @@
- 
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
- 
- static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" };
- 
-diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c
---- contrib.old/opie/libopie/verify.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/verify.c	2012-05-25 09:12:09.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <string.h>
- #endif /* HAVE_STRING_H */
- #include "opie.h"
-+#include <ctype.h>
- 
- #define RESPONSE_STANDARD  0
- #define RESPONSE_WORD      1
-diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c
---- contrib.old/opie/libopie/version.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/version.c	2012-05-25 09:13:15.000000000 -0400
-@@ -19,6 +19,8 @@
- */
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <stdio.h>
-+#include <stdlib.h>
- 
- VOIDRET opieversion FUNCTION_NOARGS
- {
-diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h
---- contrib.old/opie/opie.h	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/opie.h	2012-05-25 09:21:28.000000000 -0400
-@@ -158,6 +158,9 @@
- int __opiereadrec __P((struct opie *));
- int __opiewriterec __P((struct opie *));
- int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
-+VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n);
-+int opieinsecure FUNCTION_NOARGS;
-+int opienewseed FUNCTION((seed), char *seed);
- __END_DECLS
- 
- #define opiestrncpy(dst, src, n) \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
deleted file mode 100644
index e72b171..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://www.freebsd.org/cgi/query-pr.cgi?pr=168317
-
-Index: lib/libthr/thread/thr_mutex.c
-===================================================================
---- lib/libthr/thread/thr_mutex.c	(revision 235924)
-+++ lib/libthr/thread/thr_mutex.c	(working copy)
-@@ -538,6 +538,7 @@
- 	switch (PMUTEX_TYPE(m->m_flags)) {
- 	case PTHREAD_MUTEX_ERRORCHECK:
- 	case PTHREAD_MUTEX_NORMAL:
-+	case PTHREAD_MUTEX_ADAPTIVE_NP:
- 		ret = EBUSY; 
- 		break;
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
deleted file mode 100644
index ec90def..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
---- lib/libgeom/Makefile	2004-03-07 16:07:57 +0000
-+++ lib.xml/libgeom/Makefile	2005-05-06 10:38:41 +0000
-@@ -8,7 +8,8 @@
- SRCS+=	geom_ctl.c
- INCS=	libgeom.h
- 
--CFLAGS += -I${.CURDIR}
-+CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
-+LDFLAGS += -L${.CURDIR}/../libexpat
- 
- WARNS?=	3
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
deleted file mode 100644
index 1b4e791..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile
---- lib/libgeom.old/Makefile	2011-07-10 14:23:51.000000000 +0000
-+++ lib/libgeom/Makefile	2011-07-10 15:12:39.000000000 +0000
-@@ -13,8 +13,8 @@
- 
- WARNS?=	3
- 
--DPADD=	${LIBBSDXML} ${LIBSBUF}
--LDADD=	-lbsdxml -lsbuf
-+DPADD=	${LIBSBUF}
-+LDADD=	-lexpat -lsbuf
- 
- MAN=	libgeom.3
- 
-diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
---- lib/libgeom.old/geom_xml2tree.c	2010-12-21 17:09:25.000000000 +0000
-+++ lib/libgeom/geom_xml2tree.c	2011-07-10 15:12:52.000000000 +0000
-@@ -43,7 +43,7 @@
- #include <sys/sbuf.h>
- #include <sys/sysctl.h>
- #include <err.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <libgeom.h>
- 
- struct mystate {

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
deleted file mode 100644
index c2cf142..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix headers dependencies so that they can be included alone.
-
---- include/ifaddrs.h.old	2009-05-15 13:50:10 +0000
-+++ include/ifaddrs.h	2009-05-15 13:50:23 +0000
-@@ -28,6 +28,8 @@
- #ifndef	_IFADDRS_H_
- #define	_IFADDRS_H_
- 
-+#include <sys/types.h>
-+
- struct ifaddrs {
- 	struct ifaddrs  *ifa_next;
- 	char		*ifa_name;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
deleted file mode 100644
index c9288a4..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- lib/msun/i387/fenv.c.orig	2007-01-05 04:15:26 -0300
-+++ lib/msun/i387/fenv.c	2008-06-14 00:49:30 -0300
-@@ -152,7 +152,8 @@
- int
- feupdateenv(const fenv_t *envp)
- {
--	int mxcsr, status;
-+	int mxcsr;
-+	short status;
- 
- 	__fnstsw(&status);
- 	if (__HAS_SSE())
---- lib/msun/i387/fenv.h.orig	2007-01-06 18:46:23 -0300
-+++ lib/msun/i387/fenv.h	2008-06-14 01:06:40 -0300
-@@ -134,7 +134,8 @@
- static __inline int
- fegetexceptflag(fexcept_t *__flagp, int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__fnstsw(&__status);
- 	if (__HAS_SSE())
-@@ -151,7 +152,8 @@
- static __inline int
- fetestexcept(int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__fnstsw(&__status);
- 	if (__HAS_SSE())
---- lib/msun/amd64/fenv.c.orig	2007-01-05 04:15:26 -0300
-+++ lib/msun/amd64/fenv.c	2008-06-14 01:02:41 -0300
-@@ -101,7 +101,8 @@
- int
- feupdateenv(const fenv_t *envp)
- {
--	int mxcsr, status;
-+	int mxcsr;
-+	short status;
- 
- 	__fnstsw(&status);
- 	__stmxcsr(&mxcsr);
---- lib/msun/amd64/fenv.h.orig	2007-01-06 18:46:23 -0300
-+++ lib/msun/amd64/fenv.h	2008-06-14 01:08:23 -0300
-@@ -110,7 +110,8 @@
- static __inline int
- fegetexceptflag(fexcept_t *__flagp, int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__stmxcsr(&__mxcsr);
- 	__fnstsw(&__status);
-@@ -124,7 +125,8 @@
- static __inline int
- fetestexcept(int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__stmxcsr(&__mxcsr);
- 	__fnstsw(&__status);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
deleted file mode 100644
index 751a77c..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-u_int is defined in sys/types.h
-makes header usable alone.
-
---- sys/sys/sysctl.h.old	2012-05-25 11:08:53.000000000 -0400
-+++ sys/sys/sysctl.h	2012-05-25 11:09:16.000000000 -0400
-@@ -788,6 +788,7 @@
- 		    struct sysctl_req *);
- #else	/* !_KERNEL */
- #include <sys/cdefs.h>
-+#include <sys/types.h> /* for u_int */
- 
- __BEGIN_DECLS
- int	sysctl(const int *, u_int, void *, size_t *, const void *, size_t);

diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf
deleted file mode 100644
index 7a879f9..0000000
--- a/sys-freebsd/freebsd-lib/files/libmap.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/libmap.conf
-
-# Ensure that libthr does all threading
-libpthread.so.2         libthr.so.2
-libpthread.so           libthr.so
-libc_r.so.6             libthr.so.2
-libc_r.so               libthr.so
-

diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in
deleted file mode 100644
index f63c6e3..0000000
--- a/sys-freebsd/freebsd-lib/files/libusb.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=@LIBDIR@
-includedir=${prefix}/include
-
-Name: libusb
-Description: USB access library (FreeBSD version)
-Version: 0.1.12
-Libs: -L${libdir} -lusb
-Cflags: -I${includedir}
-

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
deleted file mode 100644
index d812ba3..0000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )
-		zfs? (
-			mirror://gentoo/${CDDL}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb !dev-libs/libusbx )
-		userland_GNU? ( sys-apps/mtree )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		!sys-libs/libutempter
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD multilib"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-9.0-trylock-adaptive.patch" )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - Clang (compiler_rt and blocksruntime)
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libcompiler_rt libblocksruntime \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libelf libedit"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-	export LDADD="-lssp_nonshared"
-}
-
-# What to build for a non-native build: cross-compiler, non-native abi in
-# multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	use multilib || return 0
-	[ "${ABI}" = "${DEFAULT_ABI}" ]
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${NON_NATIVE_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	elif use build ; then
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-	else
-		# Only build the csu parts and core libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-		# Finally, with a non-native ABI without USE=build, we build everything
-		# too.
-		#ret="${NATIVE_SUBDIRS}"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
-	need_bootstrap && do_bootstrap
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	#fixes bug 419477, multilib support
-	cd "${S}"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \
-		librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \
-		librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile"
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		append-flags "-I/usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		for ABI in $(get_all_abis) ; do
-			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				export ${i}_SAVE="${!i}"
-			done
-
-			multilib_toolchain_setup ${ABI}
-
-			local target="$(tc-arch-kernel ${CHOST})"
-			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
-			CFLAGADD=""
-			if ! is_native_abi ; then
-				mymakeopts="${mymakeopts} COMPAT_32BIT="
-			else
-				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
-			fi
-
-			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
-
-			CTARGET="${CHOST}" do_compile
-
-			# Restore the variables now.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				ii="${i}_SAVE"
-				export ${i}="${!ii}"
-			done
-		done
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-do_install() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	for i in $(get_subdirs) ; do
-		einfo "Installing in ${i}..."
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_install || die "Install ${i} failed"
-	done
-}
-
-src_install() {
-	[ "${CTARGET}" = "${CHOST}" ] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	dodir ${INCLUDEDIR}
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-	install_includes ${INCLUDEDIR}
-
-	use crosscompile_opts_headers-only && return 0
-	local mylibdir=$(get_libdir)
-
-	if is_crosscompile ; then
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-	else
-		if ! use multilib ; then
-			# Set SHLIBDIR and LIBDIR for multilib
-			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-			do_install
-		else
-			for ABI in $(get_all_abis) ; do
-				mymakeopts_SAVE="${mymakeopts}"
-				multilib_toolchain_setup ${ABI}
-				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-				do_install
-				mymakeopts="${mymakeopts_SAVE}"
-			done
-		fi
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	if is_crosscompile ; then
-		# This is to get it stripped with the correct tools, otherwise it gets
-		# stripped with the host strip.
-		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
-		export CHOST=${CTARGET}
-		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-		return 0
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts for core libraries that will go in /
-	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm m md procstat sbuf thr ufs util
-
-	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-	fi
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
deleted file mode 100644
index 39bb356..0000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )
-		zfs? (
-			mirror://gentoo/${CDDL}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb !dev-libs/libusbx )
-		userland_GNU? ( sys-apps/mtree )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		!sys-libs/libutempter
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD multilib"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - Clang (compiler_rt and blocksruntime)
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libcompiler_rt libblocksruntime \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libelf libedit"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-	export LDADD="-lssp_nonshared"
-}
-
-# What to build for a non-native build: cross-compiler, non-native abi in
-# multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	use multilib || return 0
-	[ "${ABI}" = "${DEFAULT_ABI}" ]
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${NON_NATIVE_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	elif use build ; then
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-	else
-		# Only build the csu parts and core libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-		# Finally, with a non-native ABI without USE=build, we build everything
-		# too.
-		#ret="${NATIVE_SUBDIRS}"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
-	need_bootstrap && do_bootstrap
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	#fixes bug 419477, multilib support
-	cd "${S}"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \
-		librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \
-		librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile"
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		append-flags "-I/usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		for ABI in $(get_all_abis) ; do
-			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				export ${i}_SAVE="${!i}"
-			done
-
-			multilib_toolchain_setup ${ABI}
-
-			local target="$(tc-arch-kernel ${CHOST})"
-			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
-			CFLAGADD=""
-			if ! is_native_abi ; then
-				mymakeopts="${mymakeopts} COMPAT_32BIT="
-			else
-				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
-			fi
-
-			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
-
-			CTARGET="${CHOST}" do_compile
-
-			# Restore the variables now.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				ii="${i}_SAVE"
-				export ${i}="${!ii}"
-			done
-		done
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-do_install() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	for i in $(get_subdirs) ; do
-		einfo "Installing in ${i}..."
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_install || die "Install ${i} failed"
-	done
-}
-
-src_install() {
-	[ "${CTARGET}" = "${CHOST}" ] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	dodir ${INCLUDEDIR}
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-	install_includes ${INCLUDEDIR}
-
-	use crosscompile_opts_headers-only && return 0
-	local mylibdir=$(get_libdir)
-
-	if is_crosscompile ; then
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-	else
-		if ! use multilib ; then
-			# Set SHLIBDIR and LIBDIR for multilib
-			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-			do_install
-		else
-			for ABI in $(get_all_abis) ; do
-				mymakeopts_SAVE="${mymakeopts}"
-				multilib_toolchain_setup ${ABI}
-				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-				do_install
-				mymakeopts="${mymakeopts_SAVE}"
-			done
-		fi
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	if is_crosscompile ; then
-		# This is to get it stripped with the correct tools, otherwise it gets
-		# stripped with the host strip.
-		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
-		export CHOST=${CTARGET}
-		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-		return 0
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts for core libraries that will go in /
-	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm m md procstat sbuf thr ufs util
-
-	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-	fi
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}