Drop old versions and stray patches.

(Portage version: 2.1.1_pre3-r5)

Simon: "Am I talking to Miranda now?"  (River makes a face)  "No.  Right."

 (Signed Manifest commit)

12 files changed, 7 insertions, 521 deletions

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 677b0a824317..1bac453ffb08 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,30 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX SA-06-04-ipfw.patch 637 RMD160 77e10b9e2148f59bd4a96eafa1f2e39c014d562e SHA1 a9ca5d49f269f578f4159a48c61acd83f0098e90 SHA256 4d7b1a9c39c51e4ef1d30f1af4df5aa77f04ef454821fefdc57060c0d4a5fda3
-MD5 ad048c616ac22cb627fd226084ca33e3 files/SA-06-04-ipfw.patch 637
-RMD160 77e10b9e2148f59bd4a96eafa1f2e39c014d562e files/SA-06-04-ipfw.patch 637
-SHA256 4d7b1a9c39c51e4ef1d30f1af4df5aa77f04ef454821fefdc57060c0d4a5fda3 files/SA-06-04-ipfw.patch 637
-AUX SA-06-05-80211.patch 1817 RMD160 c41ac33f42b5c4d979d070d002060cbdd65f571c SHA1 adfc2718690dec1ad1dc50e8b53c257b7f137a1c SHA256 9504860db3522b234cbb13a06c16b125056652ad8d96ad5637006c086cc82151
-MD5 2ff510d66e5940e1c560ad37d6cca1bd files/SA-06-05-80211.patch 1817
-RMD160 c41ac33f42b5c4d979d070d002060cbdd65f571c files/SA-06-05-80211.patch 1817
-SHA256 9504860db3522b234cbb13a06c16b125056652ad8d96ad5637006c086cc82151 files/SA-06-05-80211.patch 1817
-AUX SA-06-06-kmem60.patch 1556 RMD160 0f641a485c6e9f7150b44567024f9d965b52de29 SHA1 96bdff8a52f7267d06b0e3a8e960ddb8e0e5740b SHA256 b936aa96fb99cc58ac63f66172f0e2c51e8c603551f47e17e09b1d574960500d
-MD5 7fdf2781fcbb088f74b2f4101b465bc0 files/SA-06-06-kmem60.patch 1556
-RMD160 0f641a485c6e9f7150b44567024f9d965b52de29 files/SA-06-06-kmem60.patch 1556
-SHA256 b936aa96fb99cc58ac63f66172f0e2c51e8c603551f47e17e09b1d574960500d files/SA-06-06-kmem60.patch 1556
-AUX SA-06-07-pf.patch 647 RMD160 c605dcdfa97381edc7b5c16b8818c30deecabd4b SHA1 c552a46c784a8465a543d332bd78470d41588d25 SHA256 876dc53071bf2f743ae443eed42fa55a5d902a7c7902e1f1581dd20979be12c7
-MD5 525228df597306f1e2fb3b2981ed26ee files/SA-06-07-pf.patch 647
-RMD160 c605dcdfa97381edc7b5c16b8818c30deecabd4b files/SA-06-07-pf.patch 647
-SHA256 876dc53071bf2f743ae443eed42fa55a5d902a7c7902e1f1581dd20979be12c7 files/SA-06-07-pf.patch 647
-AUX SA-06-11-ipsec.patch 906 RMD160 dbd41d9ce4d2f0b6d5c45f915c9780c2ee43391a SHA1 b69b66e0550ecaed3cf6971727e4de176ede1a1a SHA256 33ee98a658ac5abaa8b1d1dea7e53c0e8a47aa11d109c3279defe29c734728ad
-MD5 afbee903132dd6d6d400b6d1ede0146f files/SA-06-11-ipsec.patch 906
-RMD160 dbd41d9ce4d2f0b6d5c45f915c9780c2ee43391a files/SA-06-11-ipsec.patch 906
-SHA256 33ee98a658ac5abaa8b1d1dea7e53c0e8a47aa11d109c3279defe29c734728ad files/SA-06-11-ipsec.patch 906
-AUX SA-06-14-fpu.patch 3778 RMD160 d76db671e257ad3310ddd02484c60829562ad9f7 SHA1 4f4c7f3fdcf8279ee934ddcdb92648bf46a7f992 SHA256 b8a630eb05974fc69424c0f64a90134976de12126131cad1ba472d316d3ff887
-MD5 fe620e5fe67345b123180d225957c9ee files/SA-06-14-fpu.patch 3778
-RMD160 d76db671e257ad3310ddd02484c60829562ad9f7 files/SA-06-14-fpu.patch 3778
-SHA256 b8a630eb05974fc69424c0f64a90134976de12126131cad1ba472d316d3ff887 files/SA-06-14-fpu.patch 3778
 AUX SA-06-16-smbfs.patch 874 RMD160 73c3680d7ed5c452c4160105baf1407e69b71eee SHA1 f6157a02e0cfdcdc2f3fceed56a15f451ba219ac SHA256 73dab3542ffb63818151b9d6fe21d6d0b0734da992c76d80525b711d02efaee6
 MD5 05e64e6f86c3e33185f6a1a0d2ccddf4 files/SA-06-16-smbfs.patch 874
 RMD160 73c3680d7ed5c452c4160105baf1407e69b71eee files/SA-06-16-smbfs.patch 874
@@ -37,10 +13,6 @@ AUX freebsd-sources-6.0-flex-2.5.31.patch 826 RMD160 a93341cfba5ddbd8df777273591
 MD5 cc7f31d9d11f552a06379d58f076a154 files/freebsd-sources-6.0-flex-2.5.31.patch 826
 RMD160 a93341cfba5ddbd8df777273591ce21164f3ed41 files/freebsd-sources-6.0-flex-2.5.31.patch 826
 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 files/freebsd-sources-6.0-flex-2.5.31.patch 826
-AUX freebsd-sources-6.0-gentoover.patch 653 RMD160 673b66cb91874a667546f9b39b973c6713f2832a SHA1 1b1caa33844065f1992b44f9969ec82f5e88b1c9 SHA256 16a6e168c993a64e4000bab47e3ba6c09e727198025422b3c89d52e88ceca76f
-MD5 c0b1372211b9f1eaa2d8a2715cb0b4b8 files/freebsd-sources-6.0-gentoover.patch 653
-RMD160 673b66cb91874a667546f9b39b973c6713f2832a files/freebsd-sources-6.0-gentoover.patch 653
-SHA256 16a6e168c993a64e4000bab47e3ba6c09e727198025422b3c89d52e88ceca76f files/freebsd-sources-6.0-gentoover.patch 653
 AUX freebsd-sources-6.0-werror.patch 898 RMD160 41a6f582a70018f29c96c08a5853bcbf167157d0 SHA1 70145f3a065987daf2ceedb0e696ebbef669eecd SHA256 7fbd139296e98697c94dcc6a4cd4d926b057779cb2415cb62bbb881b8acf26e5
 MD5 1c230261604f76eb3766df9769864942 files/freebsd-sources-6.0-werror.patch 898
 RMD160 41a6f582a70018f29c96c08a5853bcbf167157d0 files/freebsd-sources-6.0-werror.patch 898
@@ -58,39 +30,25 @@ MD5 91662a80d0cd0cd3dca34f3c1ca54830 files/freebsd-sources-gentoo.patch 1191
 RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 files/freebsd-sources-gentoo.patch 1191
 SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7 files/freebsd-sources-gentoo.patch 1191
 DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f
-EBUILD freebsd-sources-6.1-r1.ebuild 2092 RMD160 78f9f6c91df307df6bd77b9d98f2b05ef0599ef3 SHA1 c304d37508e62f9af15fef30d82a92e98e709e8e SHA256 8b58f65cfa5647d2af9569b7d1fb0c95952b5207706baa8b521211619b918ee4
-MD5 6d231c1721fbe7949865df6434367ee7 freebsd-sources-6.1-r1.ebuild 2092
-RMD160 78f9f6c91df307df6bd77b9d98f2b05ef0599ef3 freebsd-sources-6.1-r1.ebuild 2092
-SHA256 8b58f65cfa5647d2af9569b7d1fb0c95952b5207706baa8b521211619b918ee4 freebsd-sources-6.1-r1.ebuild 2092
-EBUILD freebsd-sources-6.1-r2.ebuild 2163 RMD160 039e8387e588d2b479f3c9087b2869f8ee04434e SHA1 7b03434b371baf099bca1b83bf40fd703e958c27 SHA256 5fcb43ebe21fe4900d584475ef5d235400379e40be66dc4434bc27e666f545ff
-MD5 d29cc7093f498d51e1502003b0e9a81e freebsd-sources-6.1-r2.ebuild 2163
-RMD160 039e8387e588d2b479f3c9087b2869f8ee04434e freebsd-sources-6.1-r2.ebuild 2163
-SHA256 5fcb43ebe21fe4900d584475ef5d235400379e40be66dc4434bc27e666f545ff freebsd-sources-6.1-r2.ebuild 2163
 EBUILD freebsd-sources-6.1-r3.ebuild 2419 RMD160 0b883b91a5c9e6c4cd5139fb16982e4b00696a5b SHA1 9bbf8a010ea090eebcf64e204defc628289f65bc SHA256 bb0fa9e58602f70288ceb22f27f603bfb997686f48ddbc03e821abfa07f36e57
 MD5 242afb82662fb880568a677072a59eb9 freebsd-sources-6.1-r3.ebuild 2419
 RMD160 0b883b91a5c9e6c4cd5139fb16982e4b00696a5b freebsd-sources-6.1-r3.ebuild 2419
 SHA256 bb0fa9e58602f70288ceb22f27f603bfb997686f48ddbc03e821abfa07f36e57 freebsd-sources-6.1-r3.ebuild 2419
-MISC ChangeLog 6894 RMD160 0ead239c43e4737f7106bc1551ecc3583d524c66 SHA1 41e7dc7c0c29a941f2a41766542d6374163ae107 SHA256 07edfe2c7d44db5ed015e062385c573acc0b07c5e13be99415c9399ea68031b3
-MD5 34ab81b1c6bbc5a2715afa4b250aa3cb ChangeLog 6894
-RMD160 0ead239c43e4737f7106bc1551ecc3583d524c66 ChangeLog 6894
-SHA256 07edfe2c7d44db5ed015e062385c573acc0b07c5e13be99415c9399ea68031b3 ChangeLog 6894
+MISC ChangeLog 7274 RMD160 7e353bf7419ceddd77d71d2da166afdcfabf7b90 SHA1 5469a2b19c82e6ba338a2343e1568215e507fc77 SHA256 5379b5c327dc9bd2779d5faaf2883876f964cb11b1ac179c2d7eb22103369cc9
+MD5 c1d694bb2fb436449d8a36a062221524 ChangeLog 7274
+RMD160 7e353bf7419ceddd77d71d2da166afdcfabf7b90 ChangeLog 7274
+SHA256 5379b5c327dc9bd2779d5faaf2883876f964cb11b1ac179c2d7eb22103369cc9 ChangeLog 7274
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
-MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r1 256
-RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r1 256
-SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r1 256
-MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r2 256
-RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r2 256
-SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r2 256
 MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r3 256
 RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r3 256
 SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r3 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEyBckAiZjviIA2XgRAqzLAJ9m4s2CxggjSRWf9IxLzvU/rw5WnwCgwG7L
-lXKC0AU03UbSaPu28XIfYWs=
-=se2j
+iD8DBQFEyBpeAiZjviIA2XgRAj0DAKChJ/PHDQKHTOW05jtQi4Dt2rd5WACggkoJ
++TvANn3pPEaHDOURLnNFXJM=
+=0H9O
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-04-ipfw.patch b/sys-freebsd/freebsd-sources/files/SA-06-04-ipfw.patch
deleted file mode 100644
index e7a6a67973b4..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-04-ipfw.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sys/netinet/ip_fw2.c
-===================================================================
-RCS file: /home/ncvs/src/sys/netinet/ip_fw2.c,v
-retrieving revision 1.120
-diff -u -d -r1.120 ip_fw2.c
---- sys/netinet/ip_fw2.c	16 Dec 2005 13:10:32 -0000	1.120
-+++ sys/netinet/ip_fw2.c	1 Jan 2006 22:56:39 -0000
-@@ -3054,7 +3054,7 @@
- 				 * if the packet is not ICMP (or is an ICMP
- 				 * query), and it is not multicast/broadcast.
- 				 */
--				if (hlen > 0 && is_ipv4 &&
-+				if (hlen > 0 && is_ipv4 && offset == 0 &&
- 				    (proto != IPPROTO_ICMP ||
- 				     is_icmp_query(ICMP(ulp))) &&
- 				    !(m->m_flags & (M_BCAST|M_MCAST)) &&
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-05-80211.patch b/sys-freebsd/freebsd-sources/files/SA-06-05-80211.patch
deleted file mode 100644
index 7619e5a87838..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-05-80211.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: sys/net80211/ieee80211_ioctl.c
-===================================================================
-RCS file: /home/ncvs/src/sys/net80211/ieee80211_ioctl.c,v
-retrieving revision 1.41
-diff -u -p -I__FBSDID -r1.41 ieee80211_ioctl.c
---- sys/net80211/ieee80211_ioctl.c	14 Dec 2005 19:32:53 -0000	1.41
-+++ sys/net80211/ieee80211_ioctl.c	18 Jan 2006 04:39:48 -0000
-@@ -976,13 +976,25 @@ get_scan_result(struct ieee80211req_scan
- 	const struct ieee80211_node *ni)
- {
- 	struct ieee80211com *ic = ni->ni_ic;
-+	u_int ielen = 0;
- 
- 	memset(sr, 0, sizeof(*sr));
- 	sr->isr_ssid_len = ni->ni_esslen;
- 	if (ni->ni_wpa_ie != NULL)
--		sr->isr_ie_len += 2+ni->ni_wpa_ie[1];
-+		ielen += 2+ni->ni_wpa_ie[1];
- 	if (ni->ni_wme_ie != NULL)
--		sr->isr_ie_len += 2+ni->ni_wme_ie[1];
-+		ielen += 2+ni->ni_wme_ie[1];
-+
-+	/*
-+	 * The value sr->isr_ie_len is defined as a uint8_t, so we
-+	 * need to be careful to avoid an integer overflow.  If the
-+	 * value would overflow, we will set isr_ie_len to zero, and
-+	 * ieee80211_ioctl_getscanresults (below) will avoid copying
-+	 * the (overflowing) data.
-+	 */
-+	if (ielen > 255)
-+		ielen = 0;
-+	sr->isr_ie_len = ielen;
- 	sr->isr_len = sizeof(*sr) + sr->isr_ssid_len + sr->isr_ie_len;
- 	sr->isr_len = roundup(sr->isr_len, sizeof(u_int32_t));
- 	if (ni->ni_chan != IEEE80211_CHAN_ANYC) {
-@@ -1030,11 +1042,11 @@ ieee80211_ioctl_getscanresults(struct ie
- 		cp = (u_int8_t *)(sr+1);
- 		memcpy(cp, ni->ni_essid, ni->ni_esslen);
- 		cp += ni->ni_esslen;
--		if (ni->ni_wpa_ie != NULL) {
-+		if (sr->isr_ie_len > 0 && ni->ni_wpa_ie != NULL) {
- 			memcpy(cp, ni->ni_wpa_ie, 2+ni->ni_wpa_ie[1]);
- 			cp += 2+ni->ni_wpa_ie[1];
- 		}
--		if (ni->ni_wme_ie != NULL) {
-+		if (sr->isr_ie_len > 0 && ni->ni_wme_ie != NULL) {
- 			memcpy(cp, ni->ni_wme_ie, 2+ni->ni_wme_ie[1]);
- 			cp += 2+ni->ni_wme_ie[1];
- 		}
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-06-kmem60.patch b/sys-freebsd/freebsd-sources/files/SA-06-06-kmem60.patch
deleted file mode 100644
index 668ad3bd71ba..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-06-kmem60.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: sys/net/if_bridge.c
-===================================================================
-RCS file: /usr/ncvs/src/sys/net/if_bridge.c,v
-retrieving revision 1.11.2.12.2.3
-diff -u -r1.11.2.12.2.3 if_bridge.c
---- sys/net/if_bridge.c	27 Oct 2005 19:43:07 -0000	1.11.2.12.2.3
-+++ sys/net/if_bridge.c	22 Jan 2006 18:22:38 -0000
-@@ -583,6 +583,7 @@
- 			break;
- 		}
- 
-+		bzero(&args, sizeof args);
- 		if (bc->bc_flags & BC_F_COPYIN) {
- 			error = copyin(ifd->ifd_data, &args, ifd->ifd_len);
- 			if (error)
-@@ -914,6 +915,7 @@
- 
- 	count = 0;
- 	len = bifc->ifbic_len;
-+	bzero(&breq, sizeof breq);
- 	LIST_FOREACH(bif, &sc->sc_iflist, bif_next) {
- 		if (len < sizeof(breq))
- 			break;
-@@ -953,6 +955,7 @@
- 	getmicrotime(&tv);
- 
- 	len = bac->ifbac_len;
-+	bzero(&bareq, sizeof bareq);
- 	LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {
- 		if (len < sizeof(bareq))
- 			goto out;
-Index: sys/net80211/ieee80211_ioctl.c
-===================================================================
-RCS file: /usr/ncvs/src/sys/net80211/ieee80211_ioctl.c,v
-retrieving revision 1.25.2.3.2.1
-diff -u -r1.25.2.3.2.1 ieee80211_ioctl.c
---- sys/net80211/ieee80211_ioctl.c	18 Jan 2006 09:03:36 -0000	1.25.2.3.2.1
-+++ sys/net80211/ieee80211_ioctl.c	22 Jan 2006 18:21:50 -0000
-@@ -884,7 +884,7 @@
- ieee80211_ioctl_getchanlist(struct ieee80211com *ic, struct ieee80211req *ireq)
- {
- 
--	if (sizeof(ic->ic_chan_active) > ireq->i_len)
-+	if (sizeof(ic->ic_chan_active) < ireq->i_len)
- 		ireq->i_len = sizeof(ic->ic_chan_active);
- 	return copyout(&ic->ic_chan_active, ireq->i_data, ireq->i_len);
- }
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-07-pf.patch b/sys-freebsd/freebsd-sources/files/SA-06-07-pf.patch
deleted file mode 100644
index d85aaed5d0c4..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-07-pf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sys/contrib/pf/net/pf_norm.c
-===================================================================
-RCS file: /home/ncvs/src/sys/contrib/pf/net/pf_norm.c,v
-retrieving revision 1.11.2.2
-diff -u -p -I__FBSDID -r1.11.2.2 pf_norm.c
---- sys/contrib/pf/net/pf_norm.c	17 Jan 2006 13:05:32 -0000	1.11.2.2
-+++ sys/contrib/pf/net/pf_norm.c	22 Jan 2006 16:38:31 -0000
-@@ -818,7 +818,7 @@ pf_fragcache(struct mbuf **m0, struct ip
- 			} else {
- 				hosed++;
- 			}
--		} else {
-+		} else if (frp == NULL) {
- 			/* There is a gap between fragments */
- 			DPFPRINTF(("fragcache[%d]: gap %d %d-%d (%d-%d)\n",
- 			    h->ip_id, -aftercut, off, max, fra->fr_off,
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch b/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch
deleted file mode 100644
index 73dbb8f7b829..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: sys/netipsec/xform_esp.c
-===================================================================
-RCS file: /usr/ncvs/src/sys/netipsec/xform_esp.c,v
-retrieving revision 1.11
-diff -u -r1.11 xform_esp.c
---- sys/netipsec/xform_esp.c	15 Mar 2006 21:11:11 -0000	1.11
-+++ sys/netipsec/xform_esp.c	19 Mar 2006 17:20:07 -0000
-@@ -555,6 +555,23 @@
- 	 */
- 	m->m_flags |= M_DECRYPTED;
- 
-+	/*
-+	 * Update replay sequence number, if appropriate.
-+	 */
-+	if (sav->replay) {
-+		u_int32_t seq;
-+
-+		m_copydata(m, skip + offsetof(struct newesp, esp_seq),
-+			   sizeof (seq), (caddr_t) &seq);
-+		if (ipsec_updatereplay(ntohl(seq), sav)) {
-+			DPRINTF(("%s: packet replay check for %s\n", __func__,
-+			    ipsec_logsastr(sav)));
-+			espstat.esps_replay++;
-+			error = ENOBUFS;
-+			goto bad;
-+		}
-+	}
-+
- 	/* Determine the ESP header length */
- 	if (sav->flags & SADB_X_EXT_OLD)
- 		hlen = sizeof (struct esp) + sav->ivlen;
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-14-fpu.patch b/sys-freebsd/freebsd-sources/files/SA-06-14-fpu.patch
deleted file mode 100644
index 1758f124d49f..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-14-fpu.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Index: sys/amd64/amd64/fpu.c
-===================================================================
-RCS file: /home/ncvs/src/sys/amd64/amd64/fpu.c,v
-retrieving revision 1.157
-diff -u -I__FBSDID -r1.157 fpu.c
---- sys/amd64/amd64/fpu.c	11 Mar 2005 22:16:09 -0000	1.157
-+++ sys/amd64/amd64/fpu.c	16 Apr 2006 20:18:07 -0000
-@@ -96,6 +96,8 @@
- 
- typedef u_char bool_t;
- 
-+static	void	fpu_clean_state(void);
-+
- int	hw_float = 1;
- SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
- 	CTLFLAG_RD, &hw_float, 0, 
-@@ -407,6 +409,8 @@
- 	PCPU_SET(fpcurthread, curthread);
- 	pcb = PCPU_GET(curpcb);
- 
-+	fpu_clean_state();
-+
- 	if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) {
- 		/*
- 		 * This is the first time this thread has used the FPU,
-@@ -474,6 +478,7 @@
- 
- 	s = intr_disable();
- 	if (td == PCPU_GET(fpcurthread)) {
-+		fpu_clean_state();
- 		fxrstor(addr);
- 		intr_restore(s);
- 	} else {
-@@ -484,6 +489,37 @@
- }
- 
- /*
-+ * On AuthenticAMD processors, the fxrstor instruction does not restore
-+ * the x87's stored last instruction pointer, last data pointer, and last
-+ * opcode values, except in the rare case in which the exception summary
-+ * (ES) bit in the x87 status word is set to 1.
-+ *
-+ * In order to avoid leaking this information across processes, we clean
-+ * these values by performing a dummy load before executing fxrstor().
-+ */
-+static	double	dummy_variable = 0.0;
-+static void
-+fpu_clean_state(void)
-+{
-+	u_short status;
-+
-+	/*
-+	 * Clear the ES bit in the x87 status word if it is currently
-+	 * set, in order to avoid causing a fault in the upcoming load.
-+	 */
-+	fnstsw(&status);
-+	if (status & 0x80)
-+		fnclex();
-+
-+	/*
-+	 * Load the dummy variable into the x87 stack.  This mangles
-+	 * the x87 stack, but we don't care since we're about to call
-+	 * fxrstor() anyway.
-+	 */
-+	__asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable));
-+}
-+
-+/*
-  * This really sucks.  We want the acpi version only, but it requires
-  * the isa_if.h file in order to get the definitions.
-  */
-Index: sys/i386/isa/npx.c
-===================================================================
-RCS file: /home/ncvs/src/sys/i386/isa/npx.c,v
-retrieving revision 1.164
-diff -u -I__FBSDID -r1.164 npx.c
---- sys/i386/isa/npx.c	6 Apr 2006 17:17:45 -0000	1.164
-+++ sys/i386/isa/npx.c	16 Apr 2006 20:18:08 -0000
-@@ -142,6 +142,10 @@
- 
- typedef u_char bool_t;
- 
-+#ifdef CPU_ENABLE_SSE
-+static	void	fpu_clean_state(void);
-+#endif
-+
- static	void	fpusave(union savefpu *);
- static	void	fpurstor(union savefpu *);
- static	int	npx_attach(device_t dev);
-@@ -952,15 +956,49 @@
- 		fnsave(addr);
- }
- 
-+#ifdef CPU_ENABLE_SSE
-+/*
-+ * On AuthenticAMD processors, the fxrstor instruction does not restore
-+ * the x87's stored last instruction pointer, last data pointer, and last
-+ * opcode values, except in the rare case in which the exception summary
-+ * (ES) bit in the x87 status word is set to 1.
-+ *
-+ * In order to avoid leaking this information across processes, we clean
-+ * these values by performing a dummy load before executing fxrstor().
-+ */
-+static	double	dummy_variable = 0.0;
-+static void
-+fpu_clean_state(void)
-+{
-+	u_short status;
-+
-+	/*
-+	 * Clear the ES bit in the x87 status word if it is currently
-+	 * set, in order to avoid causing a fault in the upcoming load.
-+	 */
-+	fnstsw(&status);
-+	if (status & 0x80)
-+		fnclex();
-+
-+	/*
-+	 * Load the dummy variable into the x87 stack.  This mangles
-+	 * the x87 stack, but we don't care since we're about to call
-+	 * fxrstor() anyway.
-+	 */
-+	__asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable));
-+}
-+#endif /* CPU_ENABLE_SSE */
-+
- static void
- fpurstor(addr)
- 	union savefpu *addr;
- {
- 
- #ifdef CPU_ENABLE_SSE
--	if (cpu_fxsr)
-+	if (cpu_fxsr) {
-+		fpu_clean_state();
- 		fxrstor(addr);
--	else
-+	} else
- #endif
- 		frstor(addr);
- }
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r1 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r1
deleted file mode 100644
index ed81a3f45c74..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
-RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
-SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2
deleted file mode 100644
index ed81a3f45c74..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
-RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
-SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-gentoover.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-gentoover.patch
deleted file mode 100644
index 90e6e1c4732a..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-gentoover.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: fbsd-6.0/sys/conf/newvers.sh
-===================================================================
---- fbsd-6.0.orig/sys/conf/newvers.sh
-+++ fbsd-6.0/sys/conf/newvers.sh
-@@ -31,13 +31,13 @@
- # $FreeBSD: src/sys/conf/newvers.sh,v 1.69.2.8.2.1 2005/11/02 02:00:46 scottl Exp $
- 
- TYPE="FreeBSD"
--REVISION="6.0"
--BRANCH="RELEASE"
-+REVISION="%GENTOOPVR%"
-+BRANCH="Gentoo"
- if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
- 	BRANCH=${BRANCH_OVERRIDE}
- fi
- RELEASE=6.0-RELEASE
--VERSION="${TYPE} ${RELEASE}"
-+VERSION="${TYPE} ${BRANCH} ${REVISION}"
- 
- if [ "X${PARAMFILE}" != "X" ]; then
- 	RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
deleted file mode 100644
index 7dc9500dcbff..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild,v 1.3 2006/07/08 17:15:02 the_paya Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${PN}-6.0-asm.patch"
-	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
-
-	epatch "${FILESDIR}/SA-06-16-smbfs.patch"
-
-	# Disable SSP for the kernel
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild
deleted file mode 100644
index 451405194780..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild,v 1.2 2006/07/08 17:15:02 the_paya Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${PN}-6.0-asm.patch"
-	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
-	epatch "${FILESDIR}/${PN}-6.1-gcc41.patch"
-
-	epatch "${FILESDIR}/SA-06-16-smbfs.patch"
-
-	# Disable SSP for the kernel
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		"s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-}