Don't build csu directory, as that is code coming from GCC and GCC will take care of building it; this way the sparc64 patch is unneeded and the GCC sources have no more reason to be keeped here. Also remove kerberos and ssl useflags as they were referring to cvs, and users are using dev-util/cvs. Remove all the patches as they are not needed anymore now.

(Portage version: 2.1.2_rc2-r1)
 (Signed Manifest commit)

7 files changed, 21 insertions, 251 deletions

diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index e2b80b335f13..24d7e264ddce 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1,54 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX freebsd-contrib-5.3-lib_csu-makefile.patch 327 RMD160 d2817b79e134cdd24f6163f0a72c5284cee1bdba SHA1 a845811de8bfd83271f5b87a0d177aff6d8e5cae SHA256 ee3ec95497ceea4e88101f10f89b7e161eed1684a624ea9eae257a20408080da
-MD5 19ed07f6a51e25c4021e799825aa6273 files/freebsd-contrib-5.3-lib_csu-makefile.patch 327
-RMD160 d2817b79e134cdd24f6163f0a72c5284cee1bdba files/freebsd-contrib-5.3-lib_csu-makefile.patch 327
-SHA256 ee3ec95497ceea4e88101f10f89b7e161eed1684a624ea9eae257a20408080da files/freebsd-contrib-5.3-lib_csu-makefile.patch 327
-AUX freebsd-contrib-6.2-sparc64.patch 3070 RMD160 08dfadeb3b4633091f1c32c42c8dd9fdb66da322 SHA1 33d26202661cfff4962c9140291bef1d5f52cb7b SHA256 bbbc009c4f1b77caa566172a5981347f250b2205ac0ba58f92c7fcb036f9842f
-MD5 3a7b1f27c47cc3219da7a217933af0a3 files/freebsd-contrib-6.2-sparc64.patch 3070
-RMD160 08dfadeb3b4633091f1c32c42c8dd9fdb66da322 files/freebsd-contrib-6.2-sparc64.patch 3070
-SHA256 bbbc009c4f1b77caa566172a5981347f250b2205ac0ba58f92c7fcb036f9842f files/freebsd-contrib-6.2-sparc64.patch 3070
 DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054
-DIST freebsd-contrib-6.2_beta3.tar.bz2 36555171 RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 SHA1 84e8c230815b47b9116b1e1c67684ae08b76a754 SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b
 DIST freebsd-contrib-6.2_rc1.tar.bz2 36554713 RMD160 e8a915fff9a2210bba5bfa33f1618b74f8f4317d SHA1 012c6a938b9b7148b17aad477265e33f3e89f2c0 SHA256 93748e95efc4d09f70225b58855e167ec21cae610c4ba2a1d7b2c5f84aa4f661
-DIST freebsd-gcc-3.4.2.tar.bz2 8447406 RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 SHA1 4bf1a6500f389d07050576b539bc32ffeb14255c SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f
 DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA1 93dbfd053132c54b927f6ca5605158b8ccd0f969 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1
-DIST freebsd-gnu-6.2_beta3.tar.bz2 872912 RMD160 2f6607a68a0abc52fdef86985f21cc442ffb9072 SHA1 18cc32a9b46963bd6bdfd0faea2443402d040cba SHA256 ecde4d432f0c5d9846f248280695ed44aa7d0fe95674654ad152aca8ba9afecc
 DIST freebsd-gnu-6.2_rc1.tar.bz2 874705 RMD160 10464dbc228b754f7b036f375bae1d4e3d216d22 SHA1 f57d6fdbebb16ff46c70c1eb6a8cabce47f3afa8 SHA256 5f3bbf2f398efe6cba057649a1808a0bd467740eaf18c74b87ddc534fe55a958
-EBUILD freebsd-contrib-6.1.ebuild 1575 RMD160 878c93163e17e9e7a0d8fe4c253f8a8c361e8f49 SHA1 1125be764cf7ee8d760123eafe6f055a7c0f0356 SHA256 5b655b619f9cfccf22e1c0c4ee28f278ec2c0c7fcbb66401ccd38342c6fcfac9
-MD5 5f4a339504dd097ba96d7c8aadb5ac96 freebsd-contrib-6.1.ebuild 1575
-RMD160 878c93163e17e9e7a0d8fe4c253f8a8c361e8f49 freebsd-contrib-6.1.ebuild 1575
-SHA256 5b655b619f9cfccf22e1c0c4ee28f278ec2c0c7fcbb66401ccd38342c6fcfac9 freebsd-contrib-6.1.ebuild 1575
-EBUILD freebsd-contrib-6.2_beta3.ebuild 1630 RMD160 a8a0e494ac06f5ba631f9cd269c421883cbf22c4 SHA1 45094d40ed9fb00b63ceb4bede08a2e06e665887 SHA256 7bca1030df33fbe9afcd73c53d0f45e8b72100303c04de0ad2b25c0572569013
-MD5 f983ded46005f3b04b359758195783f3 freebsd-contrib-6.2_beta3.ebuild 1630
-RMD160 a8a0e494ac06f5ba631f9cd269c421883cbf22c4 freebsd-contrib-6.2_beta3.ebuild 1630
-SHA256 7bca1030df33fbe9afcd73c53d0f45e8b72100303c04de0ad2b25c0572569013 freebsd-contrib-6.2_beta3.ebuild 1630
-EBUILD freebsd-contrib-6.2_rc1.ebuild 1591 RMD160 56cd8bed59941c32eeab6b5768bfa77abc1bc12d SHA1 07cc9ad3922eb58d07deff00624daf13bc369759 SHA256 56aeada9dc47d6f205d618e9a3e0aacfb8a99825cc4d76bd716637c271f57859
-MD5 f271b0e3b11889b87b7bdad64208c69d freebsd-contrib-6.2_rc1.ebuild 1591
-RMD160 56cd8bed59941c32eeab6b5768bfa77abc1bc12d freebsd-contrib-6.2_rc1.ebuild 1591
-SHA256 56aeada9dc47d6f205d618e9a3e0aacfb8a99825cc4d76bd716637c271f57859 freebsd-contrib-6.2_rc1.ebuild 1591
-MISC ChangeLog 3647 RMD160 02edae1650b341eaa7cf11645d0ab6857c642520 SHA1 334a9fb5c375e203bdf263375b5721f4c9dd9220 SHA256 925c171ce6915f1af3410cd3a904b70426c37bbb63399e0234ae1010dfe6e700
-MD5 15d3978deb5d8854f359a1e6c7befbc0 ChangeLog 3647
-RMD160 02edae1650b341eaa7cf11645d0ab6857c642520 ChangeLog 3647
-SHA256 925c171ce6915f1af3410cd3a904b70426c37bbb63399e0234ae1010dfe6e700 ChangeLog 3647
+EBUILD freebsd-contrib-6.1-r1.ebuild 1149 RMD160 84b05e7775edf36c88cf4570aa280f4307522604 SHA1 9c9bd473bd71d6636a7a1ede24a9c0ceaff7f4cb SHA256 da565cd507776a0126b8300a4930fd8926d906b7e8d35916a2638c800c0152bb
+MD5 139803cd13db6fa2219b47289fa96f52 freebsd-contrib-6.1-r1.ebuild 1149
+RMD160 84b05e7775edf36c88cf4570aa280f4307522604 freebsd-contrib-6.1-r1.ebuild 1149
+SHA256 da565cd507776a0126b8300a4930fd8926d906b7e8d35916a2638c800c0152bb freebsd-contrib-6.1-r1.ebuild 1149
+EBUILD freebsd-contrib-6.2_rc1.ebuild 1162 RMD160 72b035f6c608f97ef89d8ba59d99a00dc581a188 SHA1 a21ca7932f77c7f67bdfc06c8eb668aa1eede16e SHA256 aa4482701afb3d880c8853a18ee957424b0e8ad5fa1a6077d297295b4e808635
+MD5 847aa1706d2f2ede0ddc5e71a8025506 freebsd-contrib-6.2_rc1.ebuild 1162
+RMD160 72b035f6c608f97ef89d8ba59d99a00dc581a188 freebsd-contrib-6.2_rc1.ebuild 1162
+SHA256 aa4482701afb3d880c8853a18ee957424b0e8ad5fa1a6077d297295b4e808635 freebsd-contrib-6.2_rc1.ebuild 1162
+MISC ChangeLog 4337 RMD160 73c4369ec1f8e51f87d13d0aa734527c90fcdfa7 SHA1 4e2a7853474b6f9957a0a21d0ec84ac02ad7e89b SHA256 12bf09057383caa675ae19db7fa3295f8f7e9d63d248bb5195998177422402a5
+MD5 352190a3cf80452aa925b94f135468c0 ChangeLog 4337
+RMD160 73c4369ec1f8e51f87d13d0aa734527c90fcdfa7 ChangeLog 4337
+SHA256 12bf09057383caa675ae19db7fa3295f8f7e9d63d248bb5195998177422402a5 ChangeLog 4337
 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 7337f39e121d6cad5948eb92fbee7eff files/digest-freebsd-contrib-6.1 777
-RMD160 63f1776d876d27f2d3a5851d3ba9028eb3b5a941 files/digest-freebsd-contrib-6.1 777
-SHA256 714f12051a166b013c8137135b0f3c5ce403f39495abe8061fe24f656188bc7a files/digest-freebsd-contrib-6.1 777
-MD5 2d1d58382f1fb6dfe2a9e094362d58bb files/digest-freebsd-contrib-6.2_beta3 813
-RMD160 56a2971afdcce2ad2fb2e07375661b03fad83bdf files/digest-freebsd-contrib-6.2_beta3 813
-SHA256 1587731d2b1f32d2dc04d33c4a4a485d3c13cf10ce82b8418ef60eb84f350a7c files/digest-freebsd-contrib-6.2_beta3 813
-MD5 c93148b813f8699ad7e3c753a4c9ef2a files/digest-freebsd-contrib-6.2_rc1 801
-RMD160 10b89f23e3d177ff64c7264e15c77340c6655a60 files/digest-freebsd-contrib-6.2_rc1 801
-SHA256 d9b2410725542e0b38acfdd5f09a6496a194972acffa0135e804983405970485 files/digest-freebsd-contrib-6.2_rc1 801
+MD5 4147a41ac35cb4532a431de068205b3f files/digest-freebsd-contrib-6.1-r1 518
+RMD160 5ef5037ed3a36371fabb57fcbf5381404f92bfcf files/digest-freebsd-contrib-6.1-r1 518
+SHA256 a47187b86f4ca2da6f9884dc8418bb2e501e32e0e9776812c0a9e6243c9ccbd7 files/digest-freebsd-contrib-6.1-r1 518
+MD5 f7dbf9abc2d16d850c822024dfd1dd85 files/digest-freebsd-contrib-6.2_rc1 542
+RMD160 411f4d39b09056de539e517378df8c18f036cc25 files/digest-freebsd-contrib-6.2_rc1 542
+SHA256 ecb45d9f084ac05b839d2645fcfe1092f68c33ea64cc5e51e6087cb93cff55c5 files/digest-freebsd-contrib-6.2_rc1 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFX7TvAiZjviIA2XgRApqIAKCwK7o75mBsE3W3OtBSz0rbbSTDMQCbB+pL
-73s1dvVWWGKB/E2RL3E0IoM=
-=zlRM
+iD8DBQFFY5gyAiZjviIA2XgRAhv5AKDpfOf96/n0UA8Jb7HU3q57+aDdfACg8yan
+HxujlVq5dhdCw2t8+K6UD4A=
+=k6ve
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1
deleted file mode 100644
index 6fa51642140a..000000000000
--- a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
-RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
-SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
-MD5 4873a3aede8a8c121cab7b37c28487b5 freebsd-gcc-3.4.2.tar.bz2 8447406
-RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 freebsd-gcc-3.4.2.tar.bz2 8447406
-SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f freebsd-gcc-3.4.2.tar.bz2 8447406
-MD5 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244
-RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244
-SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_beta3 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_beta3
deleted file mode 100644
index 3a297c7534c7..000000000000
--- a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_beta3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171
-RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171
-SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171
-MD5 4873a3aede8a8c121cab7b37c28487b5 freebsd-gcc-3.4.2.tar.bz2 8447406
-RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 freebsd-gcc-3.4.2.tar.bz2 8447406
-SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f freebsd-gcc-3.4.2.tar.bz2 8447406
-MD5 c40f56e6128c1f1d9a56e6e9e4067f15 freebsd-gnu-6.2_beta3.tar.bz2 872912
-RMD160 2f6607a68a0abc52fdef86985f21cc442ffb9072 freebsd-gnu-6.2_beta3.tar.bz2 872912
-SHA256 ecde4d432f0c5d9846f248280695ed44aa7d0fe95674654ad152aca8ba9afecc freebsd-gnu-6.2_beta3.tar.bz2 872912
diff --git a/sys-freebsd/freebsd-contrib/files/freebsd-contrib-5.3-lib_csu-makefile.patch b/sys-freebsd/freebsd-contrib/files/freebsd-contrib-5.3-lib_csu-makefile.patch
deleted file mode 100644
index e00b2917c192..000000000000
--- a/sys-freebsd/freebsd-contrib/files/freebsd-contrib-5.3-lib_csu-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/csu/Makefile.orig	Thu Nov 11 22:49:34 2004
-+++ lib/csu/Makefile	Thu Nov 11 22:50:02 2004
-@@ -64,6 +64,7 @@
- 
- realinstall:
- .for file in ${OBJS} ${SOBJS} ${TGTOBJS}
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/}
- .endfor
diff --git a/sys-freebsd/freebsd-contrib/files/freebsd-contrib-6.2-sparc64.patch b/sys-freebsd/freebsd-contrib/files/freebsd-contrib-6.2-sparc64.patch
deleted file mode 100644
index 64a5b631f426..000000000000
--- a/sys-freebsd/freebsd-contrib/files/freebsd-contrib-6.2-sparc64.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-FreeBSD only works on Sparc64 and freeBSD code relies on the __sparc64__ define.
-gcc only defines __sparc64__ if -mcpu is not used.
-gcc-4 defaults to using -mcpu=ultrasparc on FreeBSD.
-
-This causes us a problem. Infact, FreeBSD developers sent gcc a patch to always
-define __sparc64__ when using -mcpu=ultrasparc, but this was rejected by most
-people including NetBSD developers.
-
-The correct solution is to use __sparc__.
-If platform detection is required, or the code is obviously 64 bit then we can
-use the __arch64__ define as well.
-This combination should be supported by all gcc versions:)
-
-diff -ur gnu.orig/usr.bin/binutils/gdb/freebsd-uthread.c gnu/usr.bin/binutils/gdb/freebsd-uthread.c
---- gnu.orig/usr.bin/binutils/gdb/freebsd-uthread.c	2003-11-12 08:33:18 +0000
-+++ gnu/usr.bin/binutils/gdb/freebsd-uthread.c	2006-10-10 20:27:16 +0100
-@@ -454,7 +454,7 @@
- 
- #endif
- 
--#ifdef __sparc64__
-+#ifdef __sparc__
- 
- static char jmpmap[125] = {
-   -1
-diff -ur gnu.orig/usr.bin/binutils/libbfd/bfd.h gnu/usr.bin/binutils/libbfd/bfd.h
---- gnu.orig/usr.bin/binutils/libbfd/bfd.h	2004-07-08 18:05:32 +0100
-+++ gnu/usr.bin/binutils/libbfd/bfd.h	2006-10-10 20:29:03 +0100
-@@ -63,7 +63,7 @@
- #define BFD_HOST_64BIT_LONG 0
- #define BFD_HOST_64_BIT long long
- #define BFD_HOST_U_64_BIT unsigned long long
--#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__)
-+#elif defined(__alpha__) || (defined(__sparc__) && defined(__arch64__)) || defined(__amd64__) || defined(__ia64__)
- /* The word size of the default bfd target.  */
- #define BFD_DEFAULT_TARGET_SIZE 64
- #define BFD_HOST_64BIT_LONG 1
-diff -ur gnu.orig/usr.bin/binutils/libiberty/config.h gnu/usr.bin/binutils/libiberty/config.h
---- gnu.orig/usr.bin/binutils/libiberty/config.h	2004-06-16 08:09:41 +0100
-+++ gnu/usr.bin/binutils/libiberty/config.h	2006-10-10 20:30:34 +0100
-@@ -7,7 +7,7 @@
- 
- 
- /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
--#ifdef __sparc64__
-+#ifdef __sparc__
- #define BYTEORDER 4321
- #else
- #define BYTEORDER 1234
-@@ -325,7 +325,7 @@
- 
- /* Define if the host machine stores words of multi-word integers in
-    big-endian order. */
--#ifdef __sparc64__
-+#ifdef __sparc__
- #define HOST_WORDS_BIG_ENDIAN 1
- #endif
- 
-@@ -366,7 +366,7 @@
- #define TIME_WITH_SYS_TIME 1
- 
- /* whether byteorder is bigendian */
--#ifdef __sparc64__
-+#ifdef __sparc__
- #define WORDS_BIGENDIAN 1
- #endif
- 
-diff -ur gnu.orig/usr.bin/cc/cc_tools/auto-host.h gnu/usr.bin/cc/cc_tools/auto-host.h
---- gnu.orig/usr.bin/cc/cc_tools/auto-host.h	2004-07-28 06:27:20 +0100
-+++ gnu/usr.bin/cc/cc_tools/auto-host.h	2006-10-10 20:31:36 +0100
-@@ -526,7 +526,7 @@
- #if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__)
- /* The number of bytes in type long */
- # define SIZEOF_LONG SIZEOF_INT
--#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
-+#elif defined(__alpha__) || (defined(__sparc__) && defined(__arch64__)) || defined(__ia64__) || defined(__amd64__)
- # define SIZEOF_LONG SIZEOF_LONG_LONG
- #else
- # error "I don't know what arch this is."
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild
deleted file mode 100644
index d4c1bd4435ff..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild
+++ /dev/null
@@ -1,52 +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-contrib/freebsd-contrib-6.1.ebuild,v 1.2 2006/09/09 16:25:52 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-GCC="freebsd-gcc-3.4.2"
-
-DESCRIPTION="Contributed sources for FreeBSD."
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
-IUSE="ssl kerberos"
-
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${GCC}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-RDEPEND="kerberos? ( virtual/krb5 )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-pkg_setup() {
-	if use kerberos && ! use ssl; then
-		error "You can't install with kerberos support and no ssl support"
-	fi
-
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-}
-
-REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty
-	lib/libobjc lib/libreadline lib/libregex lib/libstdc++ lib/libsupc++ usr.bin/bc
-	usr.bin/binutils usr.bin/cc usr.bin/cpio usr.bin/cvs usr.bin/dc usr.bin/dialog
-	usr.bin/diff usr.bin/diff3 usr.bin/gdb usr.bin/gperf usr.bin/grep usr.bin/groff
-	usr.bin/gzip usr.bin/man usr.bin/rcs usr.bin/sdiff usr.bin/send-pr
-	usr.bin/tar usr.bin/texinfo"
-
-PATCHES="${FILESDIR}/${PN}-5.3-lib_csu-makefile.patch"
-
-src_install() {
-	freebsd_src_install
-
-	# Move these to /bin for boot access
-	dodir /bin
-	mv "${D}/usr/bin/sort" "${D}/bin/" || die "mv failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_beta3.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_beta3.ebuild
deleted file mode 100644
index 8142923df507..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_beta3.ebuild
+++ /dev/null
@@ -1,53 +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-contrib/freebsd-contrib-6.2_beta3.ebuild,v 1.1 2006/11/01 16:08:10 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-GCC="freebsd-gcc-3.4.2"
-
-DESCRIPTION="Contributed sources for FreeBSD."
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
-IUSE="ssl kerberos"
-
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${GCC}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-RDEPEND="kerberos? ( virtual/krb5 )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-pkg_setup() {
-	if use kerberos && ! use ssl; then
-		error "You can't install with kerberos support and no ssl support"
-	fi
-
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-}
-
-REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty
-	lib/libobjc lib/libreadline lib/libregex lib/libstdc++ lib/libsupc++ usr.bin/bc
-	usr.bin/binutils usr.bin/cc usr.bin/cpio usr.bin/cvs usr.bin/dc usr.bin/dialog
-	usr.bin/diff usr.bin/diff3 usr.bin/gdb usr.bin/gperf usr.bin/grep usr.bin/groff
-	usr.bin/gzip usr.bin/man usr.bin/rcs usr.bin/sdiff usr.bin/send-pr
-	usr.bin/tar usr.bin/texinfo"
-
-PATCHES="${FILESDIR}/${PN}-5.3-lib_csu-makefile.patch
-	${FILESDIR}/${PN}-6.2-sparc64.patch"
-
-src_install() {
-	freebsd_src_install
-
-	# Move these to /bin for boot access
-	dodir /bin
-	mv "${D}/usr/bin/sort" "${D}/bin/" || die "mv failed"
-}