Update to 6.1-RELEASE.

(Portage version: 2.1_pre10-r5)
 (Signed Manifest commit)

3 files changed, 16 insertions, 70 deletions

diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index cc6697498a01..e2d2f026c723 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -6,22 +6,22 @@ MD5 19ed07f6a51e25c4021e799825aa6273 files/freebsd-contrib-5.3-lib_csu-makefile.
 RMD160 d2817b79e134cdd24f6163f0a72c5284cee1bdba files/freebsd-contrib-5.3-lib_csu-makefile.patch 327
 SHA256 ee3ec95497ceea4e88101f10f89b7e161eed1684a624ea9eae257a20408080da files/freebsd-contrib-5.3-lib_csu-makefile.patch 327
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-gcc-3.4.2.tar.bz2 8447406 RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f size 8447406
 DIST freebsd-gnu-6.0.tar.bz2 866160 RMD160 7e98304027683188a9cbf12811fc3ce9e1923cff SHA256 ad1c93881074763daa0305d72eb365b5a2c7154f9fecfc73b8e369991ba6e6b3 size 866160
-DIST freebsd-gnu-6.1_rc2.tar.bz2 867149 RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 size 867149
+DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 size 867244
 EBUILD freebsd-contrib-6.0.ebuild 1430 RMD160 86afe865d2a94d5fe5a489d9e44f50cdc9b71b19 SHA1 1196d6bf47040ae25348872252ba27325fb4ae98 SHA256 368238ad7f0411387db6853293396e39a5f583ac5fb24b4d3a608f31d81fba35 size 1430
 MD5 33e86cc7aa4036521be3f2bc635dd81a freebsd-contrib-6.0.ebuild 1430
 RMD160 86afe865d2a94d5fe5a489d9e44f50cdc9b71b19 freebsd-contrib-6.0.ebuild 1430
 SHA256 368238ad7f0411387db6853293396e39a5f583ac5fb24b4d3a608f31d81fba35 freebsd-contrib-6.0.ebuild 1430
-EBUILD freebsd-contrib-6.1_rc2.ebuild 1434 RMD160 2dc5fb952a3f1e41304aeba8b57ee0313728e09c SHA1 216c48514dce9badb432c821192e941cbb29b6e6 SHA256 6cac6043c66e08d84f6b6c77a103cd5d847d0336dfda84867ad98a4b6fa8fefe size 1434
-MD5 24972d54879d32159c207673e86fb5db freebsd-contrib-6.1_rc2.ebuild 1434
-RMD160 2dc5fb952a3f1e41304aeba8b57ee0313728e09c freebsd-contrib-6.1_rc2.ebuild 1434
-SHA256 6cac6043c66e08d84f6b6c77a103cd5d847d0336dfda84867ad98a4b6fa8fefe freebsd-contrib-6.1_rc2.ebuild 1434
-MISC ChangeLog 1918 RMD160 8ccd1d29358fad47a67e0b0142554e8d273dae6f SHA1 a3ab6b422dec9cb67358ededd87a8e702edccc75 SHA256 08c233493f884fb206db0de5ec3f497fade6f635a69dead03aab60a04f2e90bf size 1918
-MD5 1caa375e5347581733d0bc38f6e75edd ChangeLog 1918
-RMD160 8ccd1d29358fad47a67e0b0142554e8d273dae6f ChangeLog 1918
-SHA256 08c233493f884fb206db0de5ec3f497fade6f635a69dead03aab60a04f2e90bf ChangeLog 1918
+EBUILD freebsd-contrib-6.1.ebuild 1430 RMD160 3273b253a8e0be403aeee8941e55921b4396a350 SHA1 8d8471d531bc2bffb600386bf92354e01df2cb56 SHA256 b0681e15d02a0c23e6ae62bf50a8ce787de6911e1fdaa78da73126a0082dd74a size 1430
+MD5 642a238167a63c50603a5d4d34a1af6e freebsd-contrib-6.1.ebuild 1430
+RMD160 3273b253a8e0be403aeee8941e55921b4396a350 freebsd-contrib-6.1.ebuild 1430
+SHA256 b0681e15d02a0c23e6ae62bf50a8ce787de6911e1fdaa78da73126a0082dd74a freebsd-contrib-6.1.ebuild 1430
+MISC ChangeLog 2097 RMD160 e70880b17c37d6efdfb22b1b1adcaa912c801999 SHA1 566ae2b875d7804c4385eecb3648cee5371a001c SHA256 02ca1eeca6af41f48e570ad08e97555714015137f5969d9feea83cca8b5e0097 size 2097
+MD5 c62dee66c68c93db8fc567c3d9090171 ChangeLog 2097
+RMD160 e70880b17c37d6efdfb22b1b1adcaa912c801999 ChangeLog 2097
+SHA256 02ca1eeca6af41f48e570ad08e97555714015137f5969d9feea83cca8b5e0097 ChangeLog 2097
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -29,13 +29,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 f488d58ca1870ae90c742a03dc86e617 files/digest-freebsd-contrib-6.0 777
 RMD160 70481972ba946ba0fe0affb5f5f45a12c842385a files/digest-freebsd-contrib-6.0 777
 SHA256 fa6bef7e5aa01e4001df26c9af455c6f2a305f113b7c486b73aa2f1dacddb1d4 files/digest-freebsd-contrib-6.0 777
-MD5 9c18d1f1a7810e53e143d0443be4d1d1 files/digest-freebsd-contrib-6.1_rc2 801
-RMD160 8c4f868d6058f288f41b84471728187b0c9cad17 files/digest-freebsd-contrib-6.1_rc2 801
-SHA256 b539b7b212f057bae6494328e01915045f1f357ded574b4cc144d87c900f61b8 files/digest-freebsd-contrib-6.1_rc2 801
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9S+AiZjviIA2XgRAgnPAKCGTQYOBJMg+gSiHc090Cwfb6WwMwCg5FxV
-vkslv9D3VkMs7PRXO/+K0dw=
-=yDX+
+iD8DBQFEYEYpAiZjviIA2XgRAm2WAKDD7F+IHw+mxoBGY8hochezmtvNzQCgsozM
+2fPDPPkrL2vo+2dMIJrtoqI=
+=YFCX
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc2 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc2
deleted file mode 100644
index a1f1a75f9d51..000000000000
--- a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-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 876061a056183fda4a8c6fd71b875dff freebsd-gnu-6.1_rc2.tar.bz2 867149
-RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc freebsd-gnu-6.1_rc2.tar.bz2 867149
-SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 freebsd-gnu-6.1_rc2.tar.bz2 867149
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc2.ebuild
deleted file mode 100644
index f557978d1466..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc2.ebuild
+++ /dev/null
@@ -1,45 +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_rc2.ebuild,v 1.1 2006/05/02 21:52:51 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"
-