Update to 6.1_rc2.

Package-Manager: portage-2.1_pre10-r2

44 files changed, 263 insertions, 1607 deletions

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 4b5759ae1c84..7b859ee8f8ce 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -6,19 +6,19 @@ MD5 f24689293c761803849391ade42168df files/boot0-6.0-gentoo.patch 4447
 RMD160 d84f8cef4483ae75c54da35ed792508932f86603 files/boot0-6.0-gentoo.patch 4447
 SHA256 ce71b949b57e965cbca86bd0ccb31a92201f92ee8dc95f69780e5be93084dd40 files/boot0-6.0-gentoo.patch 4447
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
-DIST freebsd-sys-6.1_rc1.tar.bz2 17096208 RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 size 17096208
+DIST freebsd-sys-6.1_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
 EBUILD boot0-6.0.ebuild 796 RMD160 a8a46b310052f2848ff7717d2f06c7e00a493787 SHA1 40c8361b47bba6c5877f2c6f5ab54eac8bbd392d SHA256 52839a5ea6f8bcab3233c2c7f71996564eac66bfb6abb9e7ac7b1d00c73a6248 size 796
 MD5 63da29647a285717a5b909bf8d4d9275 boot0-6.0.ebuild 796
 RMD160 a8a46b310052f2848ff7717d2f06c7e00a493787 boot0-6.0.ebuild 796
 SHA256 52839a5ea6f8bcab3233c2c7f71996564eac66bfb6abb9e7ac7b1d00c73a6248 boot0-6.0.ebuild 796
-EBUILD boot0-6.1_rc1.ebuild 800 RMD160 1b2c5b7e0f678c0e7c3d238c4ea81f527325ddcd SHA1 5dc68c57cbc477046408bf09da240707e499d986 SHA256 9efbabba96ed1e83abde29a72c7076b7a9fc886ebb81ddd0aa08d621c0713d3b size 800
-MD5 fbe544c863b08a724ae88136c1c5179b boot0-6.1_rc1.ebuild 800
-RMD160 1b2c5b7e0f678c0e7c3d238c4ea81f527325ddcd boot0-6.1_rc1.ebuild 800
-SHA256 9efbabba96ed1e83abde29a72c7076b7a9fc886ebb81ddd0aa08d621c0713d3b boot0-6.1_rc1.ebuild 800
-MISC ChangeLog 948 RMD160 7862a25d6a3803dc19f4f6510769548bec904c32 SHA1 7d0a1675a5c042267a939b8ff49a0e0891bb6153 SHA256 732c6bc6c42925f7af6c692b615759a10b0e4c26eecfd076dd1f7d3a2bcd41db size 948
-MD5 a2c445113cff5ab7613bba306d1ce177 ChangeLog 948
-RMD160 7862a25d6a3803dc19f4f6510769548bec904c32 ChangeLog 948
-SHA256 732c6bc6c42925f7af6c692b615759a10b0e4c26eecfd076dd1f7d3a2bcd41db ChangeLog 948
+EBUILD boot0-6.1_rc2.ebuild 800 RMD160 d6be834a7621437855e376fd1c906b49dca7746e SHA1 8b7bf1f67d71f8db9895053688e0e2ed57b6ad3e SHA256 5e2768d0a46b0f9c2657c67a590f28ab2e31140a8a8d5c6697b3692ff2651b24 size 800
+MD5 7ef998f0df55da9e769d2c861e34d873 boot0-6.1_rc2.ebuild 800
+RMD160 d6be834a7621437855e376fd1c906b49dca7746e boot0-6.1_rc2.ebuild 800
+SHA256 5e2768d0a46b0f9c2657c67a590f28ab2e31140a8a8d5c6697b3692ff2651b24 boot0-6.1_rc2.ebuild 800
+MISC ChangeLog 1101 RMD160 b7e6fa4d49fefbc0fdba4313dd931689e54f53ca SHA1 da0963161aecb8d8db31569c588f1bd830a72710 SHA256 e1e315bf3347ba22456036c20840ec364d1958cc9956a2ea08991faa5a748b36 size 1101
+MD5 ff54b6485540316e023a16754f1ebcb4 ChangeLog 1101
+RMD160 b7e6fa4d49fefbc0fdba4313dd931689e54f53ca ChangeLog 1101
+SHA256 e1e315bf3347ba22456036c20840ec364d1958cc9956a2ea08991faa5a748b36 ChangeLog 1101
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -26,13 +26,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-boot0-6.0 256
 RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-boot0-6.0 256
 SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-boot0-6.0 256
-MD5 49cb5a5eed62a75d2a7636ee4a22e438 files/digest-boot0-6.1_rc1 268
-RMD160 181c9e1485dda9d015f50a3a88362e25f765f27e files/digest-boot0-6.1_rc1 268
-SHA256 504156c3acaa74fdc7ad0234ed9f9fb86814eddcc1c373eb43d646f0029238e8 files/digest-boot0-6.1_rc1 268
+MD5 312a83074ad6b43772df3ac9eebae5b1 files/digest-boot0-6.1_rc2 268
+RMD160 50e8b7f065ea2fe44a8ee13c4ac10d454c08ab6b files/digest-boot0-6.1_rc2 268
+SHA256 aea6031fefafef2da116542265cc3bceeab3facafc11df30645a038a91a592e7 files/digest-boot0-6.1_rc2 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVW30AiZjviIA2XgRAlyIAKCNXx7nTg01UxvUXYt9B2zA7CEQXACfdyAS
-BIpHXQnVBTnifw8qvclQqhM=
-=oFVB
+iD8DBQFEV9RGAiZjviIA2XgRAubTAJwJ71sNdDwxjzBh0ejaqjYdwvhhdwCgkad9
+EI3p/z9I791mymbqRc6Mwh0=
+=SQKR
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/boot0/boot0-6.1_rc1.ebuild b/sys-freebsd/boot0/boot0-6.1_rc1.ebuild
deleted file mode 100644
index 5e13546e52b1..000000000000
--- a/sys-freebsd/boot0/boot0-6.1_rc1.ebuild
+++ /dev/null
@@ -1,34 +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/boot0/boot0-6.1_rc1.ebuild,v 1.1 2006/05/01 02:09:47 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
-}
-
-src_install() {
-	dodir /boot/defaults
-
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
-}
diff --git a/sys-freebsd/boot0/files/digest-boot0-6.1_rc1 b/sys-freebsd/boot0/files/digest-boot0-6.1_rc1
deleted file mode 100644
index 6229226ead06..000000000000
--- a/sys-freebsd/boot0/files/digest-boot0-6.1_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6045efaa93abaa1399d751d7eae279b2 freebsd-sys-6.1_rc1.tar.bz2 17096208
-RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 freebsd-sys-6.1_rc1.tar.bz2 17096208
-SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 freebsd-sys-6.1_rc1.tar.bz2 17096208
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index f07485469dce..b4e1604045d0 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -6,23 +6,23 @@ MD5 88b10ffe4168218251cdaee3994b36e2 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 RMD160 3dd13f280f462964feecd54ea9cafac8608955d4 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 SHA256 4c60ee85f4ec7dfb86eab1536eb0d6aae65c955c756362cd2b7f2b5a024dfb17 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc1.tar.bz2 405949 RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 size 405949
+DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
+DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 EBUILD freebsd-bin-6.0-r1.ebuild 988 RMD160 e637475e1559dff4703f9f907eff0b69db631914 SHA1 ca9fca4d8ae313938a0be610f888a81c692b2bed SHA256 05bc5b543958c5d0ab2cca2eb8dd05cdef8d16b1ec7c3c88414bf46d3069663e size 988
 MD5 be1e2131f1e998ab28c8feed43bc74c6 freebsd-bin-6.0-r1.ebuild 988
 RMD160 e637475e1559dff4703f9f907eff0b69db631914 freebsd-bin-6.0-r1.ebuild 988
 SHA256 05bc5b543958c5d0ab2cca2eb8dd05cdef8d16b1ec7c3c88414bf46d3069663e freebsd-bin-6.0-r1.ebuild 988
-EBUILD freebsd-bin-6.1_rc1.ebuild 987 RMD160 43f975edf87683c0e6f440b6b5d939a571f8614c SHA1 5a6dcd8f1f3158ad28c66edeaf5dcdd1aa63b5c3 SHA256 31f50c00882177dc334f23a75eed7557a301084e0379cefcf04f029f908c404b size 987
-MD5 3740955e4bb9efe5005430476207c69b freebsd-bin-6.1_rc1.ebuild 987
-RMD160 43f975edf87683c0e6f440b6b5d939a571f8614c freebsd-bin-6.1_rc1.ebuild 987
-SHA256 31f50c00882177dc334f23a75eed7557a301084e0379cefcf04f029f908c404b freebsd-bin-6.1_rc1.ebuild 987
-MISC ChangeLog 2532 RMD160 8d2ca206dcbfd0962738ecd024bb95e52b154e5b SHA1 59e1a3416b995546082ac6fb60d5d7fa082f5f65 SHA256 fa850cf028db6b549bf3f0ea3814ddb4dfe774b2b816d06a7026446efafd207e size 2532
-MD5 cdb462dfa5c46fd30d5d50f6336882f4 ChangeLog 2532
-RMD160 8d2ca206dcbfd0962738ecd024bb95e52b154e5b ChangeLog 2532
-SHA256 fa850cf028db6b549bf3f0ea3814ddb4dfe774b2b816d06a7026446efafd207e ChangeLog 2532
+EBUILD freebsd-bin-6.1_rc2.ebuild 987 RMD160 b418f961c422e5b8fc00e44eb0328682bbf23924 SHA1 e3880598f188f78604afe43a5d8f393b51e38c60 SHA256 c2a520427b6d6c9206342f367c77c48c57720f510fcf124f69bba4158b78465c size 987
+MD5 dbcc11254a0bbfb1b9c4fce842653e30 freebsd-bin-6.1_rc2.ebuild 987
+RMD160 b418f961c422e5b8fc00e44eb0328682bbf23924 freebsd-bin-6.1_rc2.ebuild 987
+SHA256 c2a520427b6d6c9206342f367c77c48c57720f510fcf124f69bba4158b78465c freebsd-bin-6.1_rc2.ebuild 987
+MISC ChangeLog 2703 RMD160 3acdab4c15f9599d27275a470d596b5539dc66dd SHA1 e97549fd03b37fe3517d9c10b75bd815da50e7f5 SHA256 f85104f0e0c2d6c5fed0d91d07273fdb5efd90c123fa2926d024835c25d741f5 size 2703
+MD5 fe76caf7051753bd14294d1c5afb5900 ChangeLog 2703
+RMD160 3acdab4c15f9599d27275a470d596b5539dc66dd ChangeLog 2703
+SHA256 f85104f0e0c2d6c5fed0d91d07273fdb5efd90c123fa2926d024835c25d741f5 ChangeLog 2703
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -30,13 +30,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 a146e77501dcf32e53101304b328ebfe files/digest-freebsd-bin-6.0-r1 759
 RMD160 e55fbe974b7e035199a3477c8be74d5f5164a3c5 files/digest-freebsd-bin-6.0-r1 759
 SHA256 4f9da8f253b899a320c59d639887a5308d20829337bf4a6153a1332b91672c13 files/digest-freebsd-bin-6.0-r1 759
-MD5 f569ad097292f2c060a719d4fe475389 files/digest-freebsd-bin-6.1_rc1 795
-RMD160 c058c0e267a8a58fe552fa5f1171c8226e08cac5 files/digest-freebsd-bin-6.1_rc1 795
-SHA256 fceec33eece1a6bf9c567af88cc291d2a1fc203b85b0200d914c97e85002aa50 files/digest-freebsd-bin-6.1_rc1 795
+MD5 b0e86e98adc7be6ce26b50915e1b9b52 files/digest-freebsd-bin-6.1_rc2 795
+RMD160 e350f4feb9e8fd5203d1373a275ce0cfab373b83 files/digest-freebsd-bin-6.1_rc2 795
+SHA256 7f54d219b145bd578a0c5f033663c6027510fce93ff272e9ea06d94aaf6b5452 files/digest-freebsd-bin-6.1_rc2 795
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVTpLAiZjviIA2XgRArRnAJ9YNZewQrwNwuSl7ezOoz1lCjgRVwCgkYak
-vU+kAovgqFNrXUCVuYMyRm4=
-=vanv
+iD8DBQFEV9R8AiZjviIA2XgRAvWoAKCUK3I5rViKWmjLeSGnHUwwTcXKUQCeKzph
+n3o5EcqLdbsE2lFjnyjjWEU=
+=wXMG
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1_rc1 b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1_rc1
deleted file mode 100644
index 49731afbe057..000000000000
--- a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1_rc1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 5dcbd5450bcc3bcfd592f0ec86e55921 freebsd-bin-6.1_rc1.tar.bz2 405949
-RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f freebsd-bin-6.1_rc1.tar.bz2 405949
-SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 freebsd-bin-6.1_rc1.tar.bz2 405949
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
-RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
-SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.1_rc1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.1_rc1.ebuild
deleted file mode 100644
index d4ec61bb0009..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-6.1_rc1.ebuild
+++ /dev/null
@@ -1,37 +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-bin/freebsd-bin-6.1_rc1.ebuild,v 1.1 2006/04/30 22:29:23 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="rcp nls"
-
-SRC_URI="mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	sys-libs/ncurses
-	sys-apps/ed
-	!app-admin/realpath"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	>=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-
-pkg_setup() {
-	use rcp || mymakeopts="${mymakeopts} NO_RCMNDS= "
-	use nls || mymakeopts="${mymakeopts} NO_NLS= "
-
-	mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= NO_OPENSSL= NO_CRYPT= "
-}
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed"
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index e676ef78b784..cc6697498a01 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_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 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_rc1.tar.bz2 867322 RMD160 bc9b19e7db79614e9830bb876b32b9e06f9ff89e SHA256 5795b8dd00887efcc212f560d4df93cf99a3a753680d8e7d9132d8c7a507de1f size 867322
+DIST freebsd-gnu-6.1_rc2.tar.bz2 867149 RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 size 867149
 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_rc1.ebuild 1434 RMD160 07b39470447297e3090de39754c42a46e2812545 SHA1 54dc7e84d34f28d288daecf93acacbe125d62aba SHA256 16f7a8aad785b50a4314444d27624b3f3747b12aa4cb800ea70567c61d798b5d size 1434
-MD5 0c2c5421380205517add9ea4863dc096 freebsd-contrib-6.1_rc1.ebuild 1434
-RMD160 07b39470447297e3090de39754c42a46e2812545 freebsd-contrib-6.1_rc1.ebuild 1434
-SHA256 16f7a8aad785b50a4314444d27624b3f3747b12aa4cb800ea70567c61d798b5d freebsd-contrib-6.1_rc1.ebuild 1434
-MISC ChangeLog 1735 RMD160 596c41072df3ff2f44974ad981b19b2296419fcc SHA1 64280f652c887d5a4e4446eff0eda545487d3654 SHA256 e5b22ab41fa5bfb7a8a9762e014988e0190f922985f42c1b1af963c23b12b208 size 1735
-MD5 3ee62bdd5c473ed7cbbd67cdbddfc76d ChangeLog 1735
-RMD160 596c41072df3ff2f44974ad981b19b2296419fcc ChangeLog 1735
-SHA256 e5b22ab41fa5bfb7a8a9762e014988e0190f922985f42c1b1af963c23b12b208 ChangeLog 1735
+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
 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 584226e68247a6286f4d0365c90b0057 files/digest-freebsd-contrib-6.1_rc1 801
-RMD160 9a28c115f7f70830915dc537f08e551820fec417 files/digest-freebsd-contrib-6.1_rc1 801
-SHA256 414c371b12d181631117bfcc20b900c9ac241b8319e54ac7f1b5d0efac1cbd21 files/digest-freebsd-contrib-6.1_rc1 801
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVWSEAiZjviIA2XgRAm2pAJ4xepBQKIlqvMGxfp4BBk7s1p2JxQCeL2Jq
-RUMZ0l4QndtFdK7bQG+SQaA=
-=urLm
+iD8DBQFEV9S+AiZjviIA2XgRAgnPAKCGTQYOBJMg+gSiHc090Cwfb6WwMwCg5FxV
+vkslv9D3VkMs7PRXO/+K0dw=
+=yDX+
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc1 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc1
deleted file mode 100644
index 50ba982c51d6..000000000000
--- a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-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 cadc8eee1e84543a67995c5165f2f82c freebsd-gnu-6.1_rc1.tar.bz2 867322
-RMD160 bc9b19e7db79614e9830bb876b32b9e06f9ff89e freebsd-gnu-6.1_rc1.tar.bz2 867322
-SHA256 5795b8dd00887efcc212f560d4df93cf99a3a753680d8e7d9132d8c7a507de1f freebsd-gnu-6.1_rc1.tar.bz2 867322
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc1.ebuild
deleted file mode 100644
index 3bbb8ea492e2..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc1.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_rc1.ebuild,v 1.1 2006/05/01 01:29:30 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"
-
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 09cb83a547ce..d2fbdb0ae227 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -30,33 +30,33 @@ MD5 eb10216ffda9c5f69fdb28728c574114 files/freebsd-lib-fixmp.patch 548
 RMD160 91cf241eaa972c13ea6ddd1ec03a6fd7f3a2a4b3 files/freebsd-lib-fixmp.patch 548
 SHA256 bd99697872b00a4275c80935f4f5188f4f859aa358be0ecfc0c5470e9979c354 files/freebsd-lib-fixmp.patch 548
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-crypto-6.0.tar.bz2 3978650 RMD160 361efbba1f651925a7cc2284665b044bc232f181 SHA256 e86223d40ef2747de98f575f3875a6ce8a5e913baa850a5ef547ffef00ace480 size 3978650
-DIST freebsd-crypto-6.1_rc1.tar.bz2 3977940 RMD160 220cbe0073aec15a306e7a253675fa8bbdbefe06 SHA256 be0aeb0e6923260bae34e0e93c8483c56e0c566721010ab9bc49b94c064d52cf size 3977940
+DIST freebsd-crypto-6.1_rc2.tar.bz2 3978366 RMD160 ea43846793f4fda0fd6861bebb4a816cc838d5f3 SHA256 fdc16e035efc422894c40a95d134d7fc68b3904c0b512ec62d8ab2c8a9caf468 size 3978366
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-include-6.0.tar.bz2 127219 RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b size 127219
-DIST freebsd-include-6.1_rc1.tar.bz2 127236 RMD160 b978bf654921e9f58f71b372881c494b39482b56 SHA256 4adecf2a0517b1c9040afe1df9f18873e76f6312ced22a7ed98ee1e7f61245ad size 127236
+DIST freebsd-include-6.1_rc2.tar.bz2 127237 RMD160 4235464be16e87e2f05022fe7024ee77f2afc3ae SHA256 5d346a1410f3daa2bbe2c2a4a158f7e0abf52f696b33ea332b2ad7c6aa14f730 size 127237
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
-DIST freebsd-sys-6.1_rc1.tar.bz2 17096208 RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 size 17096208
+DIST freebsd-sys-6.1_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 EBUILD freebsd-lib-6.0-r3.ebuild 6540 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e SHA1 f6d44373b904023fa915be186829a80024b67c5b SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 size 6540
 MD5 1bde4db8e821cdb167f10b4514a0dbe2 freebsd-lib-6.0-r3.ebuild 6540
 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e freebsd-lib-6.0-r3.ebuild 6540
 SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 freebsd-lib-6.0-r3.ebuild 6540
-EBUILD freebsd-lib-6.1_rc1.ebuild 6698 RMD160 3efc8c07863e8b883075b000179b7b27ee01073b SHA1 2608d1df1f828e5426f0f7895cb097c714412cb6 SHA256 a673eac6dbe6c2d7ed13ad67acd42da6eaddde734d98a4ce37fc9280abdb3837 size 6698
-MD5 3f23c072fb59e8591acbe1b3fbc95d5c freebsd-lib-6.1_rc1.ebuild 6698
-RMD160 3efc8c07863e8b883075b000179b7b27ee01073b freebsd-lib-6.1_rc1.ebuild 6698
-SHA256 a673eac6dbe6c2d7ed13ad67acd42da6eaddde734d98a4ce37fc9280abdb3837 freebsd-lib-6.1_rc1.ebuild 6698
-MISC ChangeLog 7760 RMD160 a74b31ef8814e9075ada1d5eb198e508df65c4f3 SHA1 304333162648005f36562c42e7b30dee4a2f19c0 SHA256 781e1435bbf1f43ba357e74f2aa124e556fcebb0c5b6736141b01366348d20dc size 7760
-MD5 a40c6234f1a6d4d056aaedde573ecd43 ChangeLog 7760
-RMD160 a74b31ef8814e9075ada1d5eb198e508df65c4f3 ChangeLog 7760
-SHA256 781e1435bbf1f43ba357e74f2aa124e556fcebb0c5b6736141b01366348d20dc ChangeLog 7760
+EBUILD freebsd-lib-6.1_rc2.ebuild 6698 RMD160 388a31d79728691295d20bf6eeb893f5a1b7fafe SHA1 c4ea3ecd580b78e61547b0d8b11718c83b1fa081 SHA256 21d2d18f7be5dd85517a20c4a9733f56961895f7d7ccea95efadabf6ee9da3e6 size 6698
+MD5 511d63198f471dbd1fff44d58308a84f freebsd-lib-6.1_rc2.ebuild 6698
+RMD160 388a31d79728691295d20bf6eeb893f5a1b7fafe freebsd-lib-6.1_rc2.ebuild 6698
+SHA256 21d2d18f7be5dd85517a20c4a9733f56961895f7d7ccea95efadabf6ee9da3e6 freebsd-lib-6.1_rc2.ebuild 6698
+MISC ChangeLog 7931 RMD160 f3a59f80ec9f3d997b6f07479b4b11f8ae3f0016 SHA1 57fd3229f84e1e2e037d4cc01d2e4810e5d09663 SHA256 12399d84486f423d669f244e4453cf5d19660e73ea058ac410536f410304b3af size 7931
+MD5 412b0d9d7aca491982c8aff775050bd0 ChangeLog 7931
+RMD160 f3a59f80ec9f3d997b6f07479b4b11f8ae3f0016 ChangeLog 7931
+SHA256 12399d84486f423d669f244e4453cf5d19660e73ea058ac410536f410304b3af ChangeLog 7931
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -64,13 +64,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 c15a1a49762c0863cbfa4bd5be03f174 files/digest-freebsd-lib-6.0-r3 2072
 RMD160 6c9ffd60849a62554acd27568cc21f1b76692ca3 files/digest-freebsd-lib-6.0-r3 2072
 SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/digest-freebsd-lib-6.0-r3 2072
-MD5 2a193712290cd9b29ce1b1af21254bbe files/digest-freebsd-lib-6.1_rc1 2168
-RMD160 48d493732bcc22b0cae6a5855fb5159dc3c5fcae files/digest-freebsd-lib-6.1_rc1 2168
-SHA256 01e78f57db74fd3a89f26781fa0f954a1532fd52a71c0128fc967e5eb5e54bcf files/digest-freebsd-lib-6.1_rc1 2168
+MD5 19a4bdb5966dcca60a662f86f590b7f8 files/digest-freebsd-lib-6.1_rc2 2168
+RMD160 b792913a908f615fe7f4ceec0f3e49d7b2176bc7 files/digest-freebsd-lib-6.1_rc2 2168
+SHA256 5624c750255e335562226628a8b72ac4726bea57ec6214a23ee4b86e1cdf5618 files/digest-freebsd-lib-6.1_rc2 2168
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVS5EAiZjviIA2XgRAqCuAJ9GwgC08TPi8tDvE/KKm7MYXntwSACdFIbL
-zgEeOSoFvTylHAcr6Q9hNro=
-=6EJL
+iD8DBQFEV9UBAiZjviIA2XgRAg0PAKDfGdJRTWPfQaP3ZuocXOxJMyZIagCbBJSD
+VgKNDi5+2q6ODglhuvi0LHw=
+=JPIF
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc1 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc1
deleted file mode 100644
index a071cf4ea523..000000000000
--- a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc1
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e8e8aefca8657f46f3065793490d1bb freebsd-crypto-6.1_rc1.tar.bz2 3977940
-RMD160 220cbe0073aec15a306e7a253675fa8bbdbefe06 freebsd-crypto-6.1_rc1.tar.bz2 3977940
-SHA256 be0aeb0e6923260bae34e0e93c8483c56e0c566721010ab9bc49b94c064d52cf freebsd-crypto-6.1_rc1.tar.bz2 3977940
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 8b52d1055322cf2b0cad3fc9c4c066b2 freebsd-include-6.1_rc1.tar.bz2 127236
-RMD160 b978bf654921e9f58f71b372881c494b39482b56 freebsd-include-6.1_rc1.tar.bz2 127236
-SHA256 4adecf2a0517b1c9040afe1df9f18873e76f6312ced22a7ed98ee1e7f61245ad freebsd-include-6.1_rc1.tar.bz2 127236
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 6045efaa93abaa1399d751d7eae279b2 freebsd-sys-6.1_rc1.tar.bz2 17096208
-RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 freebsd-sys-6.1_rc1.tar.bz2 17096208
-SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 freebsd-sys-6.1_rc1.tar.bz2 17096208
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc1.ebuild
deleted file mode 100644
index fb8d1b3b39a5..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc1.ebuild
+++ /dev/null
@@ -1,223 +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-lib/freebsd-lib-6.1_rc1.ebuild,v 1.1 2006/04/30 21:37:27 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="6.0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm bluetooth ssl ipv6 kerberos nis gpib"
-
-# 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
-		nis? ( mirror://gentoo/${USBIN}.tar.bz2 )
-		!kernel_FreeBSD? (
-			mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	!sys-freebsd/freebsd-headers"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.31-r2
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-if [[ ${CATEGORY/cross-} == {CATEGORY} ]]; then
-	PROVIDE="virtual/libc
-		virtual/os-headers"
-fi
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-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} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
-
-	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= "
-
-	replace-flags "-O?" -"O1"
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES="${FILESDIR}/${PN}-bsdxml.patch
-	${FILESDIR}/${PN}-fixmp.patch
-	${FILESDIR}/${PN}-6.0-pmc.patch
-	${FILESDIR}/${PN}-6.0-gccfloat.patch
-	${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
-	${FILESDIR}/${PN}-6.0-binutils-asm.patch
-	${FILESDIR}/${PN}-6.0-ssp.patch"
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-#
-# 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="libncurses libform libmenu libpanel \
-	libz libbz2 libarchive \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libsmb libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	if [[ ${CTARGET} == ${CHOST} ]]; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-	else
-		sed -i -e 's:/usr/include:/usr/'${CTARGET}'/usr/include:g' \
-			"${S}/libc/"{yp,rpc}"/Makefile.inc"
-	fi
-
-	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
-		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-
-	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
-}
-
-src_compile() {
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
-
-	use _E_CROSS_HEADERS_ONLY && return 0
-
-	# Don't use ssp until properly fixed
-	append-flags -fno-stack-protector -fno-stack-protector-all
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX
-
-		local machine
-		machine=$(tc-arch-kernel ${CTARGET})
-
-		local csudir
-		if [[ -d "${S}/csu/${machine}-elf" ]]; then
-			csudir="${S}/csu/${machine}-elf"
-		else
-			csudir="${S}/csu/${machine}"
-		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
-
-		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-B ${csudir}"
-		append-ldflags "-B ${csudir}"
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-
-		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-	else
-		strip-flags
-		# Forces to use the local copy of headers as they might be outdated in
-		# the system
-		append-flags "-isystem '${WORKDIR}/sys' -isystem '${WORKDIR}/include'"
-
-		cd "${S}"
-		NOFLAGSTRIP=yes freebsd_src_compile
-	fi
-}
-
-src_install() {
-	cd "${WORKDIR}/include"
-
-	[[ ${CTARGET} == ${CHOST} ]] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-
-	dodir "${INCLUDEDIR}"
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=$(tc-arch-kernel) \
-		DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed"
-
-	# Install math.h when crosscompiling, at this point
-	if [[ ${CHOST} != ${CTARGET} ]]; then
-		insinto "/usr/${CTARGET}/usr/include"
-		doins "${S}/msun/src/math.h"
-	fi
-
-	use _E_CROSS_HEADERS_ONLY && return 0
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		local csudir
-		if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
-		else
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
-		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
-			FILESDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
-
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
-
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-	else
-		cd "${S}"
-		mkinstall || die "Install failed"
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-
-	# install libstand files
-	dodir /usr/include/libstand
-	insinto /usr/include/libstand
-	doins ${S}/libstand/*.h
-
-	cd ${WORKDIR}/etc/
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	doins "etc.$(tc-arch-kernel)"/*
-}
-
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 34f39134ca68..0da4c3381d70 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -18,35 +18,31 @@ MD5 d91d1f0640a08e9bd0b02c0cd7d57116 files/ftpd.pamd 597
 RMD160 acb189e5e3166d21a5c3ad8e71d652386853f882 files/ftpd.pamd 597
 SHA256 dc779a1c0b0ad94660584e902d505ad0197b52a3944bc13666815d653790e090 files/ftpd.pamd 597
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc1.tar.bz2 405949 RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 size 405949
+DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
+DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 EBUILD freebsd-libexec-6.0.ebuild 1496 RMD160 8e513861b4a1e4d908c83ab735c589c16e2cd515 SHA1 14b9fc72e73f8302cf583fb8da5238852755c9b8 SHA256 885727451df47b2c4f6dd88456a0c29fae79b5ed652938ab6c7da331e66f4a08 size 1496
 MD5 dd3e0df4ac096173be1432d7f6d59df0 freebsd-libexec-6.0.ebuild 1496
 RMD160 8e513861b4a1e4d908c83ab735c589c16e2cd515 freebsd-libexec-6.0.ebuild 1496
 SHA256 885727451df47b2c4f6dd88456a0c29fae79b5ed652938ab6c7da331e66f4a08 freebsd-libexec-6.0.ebuild 1496
-EBUILD freebsd-libexec-6.1_rc1-r1.ebuild 1481 RMD160 6784a1caf78a3e9e884ca46e28037ad1a31f43a4 SHA1 38846f272b021a99f3e0070534b4054d40b88083 SHA256 2a327cc9a6c947af39753a4e23b6394bbeb03c391340dc53cbc2e383041075d0 size 1481
-MD5 896c82a75f218eda7e3b4e58fc297c87 freebsd-libexec-6.1_rc1-r1.ebuild 1481
-RMD160 6784a1caf78a3e9e884ca46e28037ad1a31f43a4 freebsd-libexec-6.1_rc1-r1.ebuild 1481
-SHA256 2a327cc9a6c947af39753a4e23b6394bbeb03c391340dc53cbc2e383041075d0 freebsd-libexec-6.1_rc1-r1.ebuild 1481
-EBUILD freebsd-libexec-6.1_rc1.ebuild 1500 RMD160 fda85c73bdafc44fa80d38348837582501738929 SHA1 df205ecd3992f4de2dc19711ce3e31becd59c0b5 SHA256 88cdb206c35d284d42ffd0c3b5ce20597fe40213a1a0958687a924a2bbf97565 size 1500
-MD5 775e1db69ccdca8e35c62d82bdafa40d freebsd-libexec-6.1_rc1.ebuild 1500
-RMD160 fda85c73bdafc44fa80d38348837582501738929 freebsd-libexec-6.1_rc1.ebuild 1500
-SHA256 88cdb206c35d284d42ffd0c3b5ce20597fe40213a1a0958687a924a2bbf97565 freebsd-libexec-6.1_rc1.ebuild 1500
-MISC ChangeLog 3367 RMD160 90b5fa1a3d9c387c979110a8a581d450b7387ce5 SHA1 b61a451ef44c9b7bf56f1808b1cac4dda5cb24f3 SHA256 ee0c7ab82d2c8101164b65514a6599c7842d7fff45104bd275c57e00af132273 size 3367
-MD5 0f7a4d9607799d09671ce73c17cdf480 ChangeLog 3367
-RMD160 90b5fa1a3d9c387c979110a8a581d450b7387ce5 ChangeLog 3367
-SHA256 ee0c7ab82d2c8101164b65514a6599c7842d7fff45104bd275c57e00af132273 ChangeLog 3367
+EBUILD freebsd-libexec-6.1_rc2.ebuild 1478 RMD160 df921cbcc02ea2fd7fc5ef4f8b20f3ead5dd01e7 SHA1 4dad49216684cb2b8458410575072fec981f2688 SHA256 abb651ffb5cba60571637d5e3ed9c512e3656169980e50ef8e343f7eff0dc7b3 size 1478
+MD5 a88656bf8f2dfbe5652662f560df874b freebsd-libexec-6.1_rc2.ebuild 1478
+RMD160 df921cbcc02ea2fd7fc5ef4f8b20f3ead5dd01e7 freebsd-libexec-6.1_rc2.ebuild 1478
+SHA256 abb651ffb5cba60571637d5e3ed9c512e3656169980e50ef8e343f7eff0dc7b3 freebsd-libexec-6.1_rc2.ebuild 1478
+MISC ChangeLog 3588 RMD160 202c171ee1441dd346d78818f29ec3b388ad77ce SHA1 bdba5b14593e51b388d4a9266f94d4e8b678a72e SHA256 7e521dd4a9cde4523dced56dfebceb6a53f3f0f5cdef2e3c6ea97b20a72d154c size 3588
+MD5 c0f009af15c0634fab1517e8ae47f467 ChangeLog 3588
+RMD160 202c171ee1441dd346d78818f29ec3b388ad77ce ChangeLog 3588
+SHA256 7e521dd4a9cde4523dced56dfebceb6a53f3f0f5cdef2e3c6ea97b20a72d154c ChangeLog 3588
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -54,16 +50,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 ddf68922a1d3f555d4cd1ba03f2defbe files/digest-freebsd-libexec-6.0 1798
 RMD160 16c39da9cf4c01e3a1b030647f5c506593c91b8c files/digest-freebsd-libexec-6.0 1798
 SHA256 5448a66939478317fe42bdcd92b7afa281bdfdbd77b86af55dcc21f11567a2dc files/digest-freebsd-libexec-6.0 1798
-MD5 667dfdba59a6ce926a352782e0b6a3af files/digest-freebsd-libexec-6.1_rc1 1882
-RMD160 42dedd3e2f16cca7016f5c92a20deabb13141354 files/digest-freebsd-libexec-6.1_rc1 1882
-SHA256 50f95987c1148d8e37da20aad578f54a64b0d6f7c72e28cae21a46bf48c4568b files/digest-freebsd-libexec-6.1_rc1 1882
-MD5 667dfdba59a6ce926a352782e0b6a3af files/digest-freebsd-libexec-6.1_rc1-r1 1882
-RMD160 42dedd3e2f16cca7016f5c92a20deabb13141354 files/digest-freebsd-libexec-6.1_rc1-r1 1882
-SHA256 50f95987c1148d8e37da20aad578f54a64b0d6f7c72e28cae21a46bf48c4568b files/digest-freebsd-libexec-6.1_rc1-r1 1882
+MD5 e337a298be2120e8c372fcb6b81c7922 files/digest-freebsd-libexec-6.1_rc2 1882
+RMD160 bda70c246a2c7d4f81774bbfd4caf0a2cfa3bcfe files/digest-freebsd-libexec-6.1_rc2 1882
+SHA256 2d97c7a65aeebbc195a0d34a472a487eafae48489f20e9d87bdce7b8b433eecf files/digest-freebsd-libexec-6.1_rc2 1882
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVikoAiZjviIA2XgRAt8zAJ9BcG/yo7yQwp4lwSXRsurX5BToWwCeNmT5
-DfO7Ze6DbcSCxWZziMM6WGg=
-=EQiA
+iD8DBQFEV9U9AiZjviIA2XgRAna/AJ4lnMFMrJwazdItPHIsK4lA06q5mgCfXghK
+rn9pFE5a9UqClCwph3lIyKk=
+=ZMyw
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1 b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1
deleted file mode 100644
index aa234a3f9a34..000000000000
--- a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 5dcbd5450bcc3bcfd592f0ec86e55921 freebsd-bin-6.1_rc1.tar.bz2 405949
-RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f freebsd-bin-6.1_rc1.tar.bz2 405949
-SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 freebsd-bin-6.1_rc1.tar.bz2 405949
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
-SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1-r1 b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1-r1
deleted file mode 100644
index aa234a3f9a34..000000000000
--- a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1-r1
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 5dcbd5450bcc3bcfd592f0ec86e55921 freebsd-bin-6.1_rc1.tar.bz2 405949
-RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f freebsd-bin-6.1_rc1.tar.bz2 405949
-SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 freebsd-bin-6.1_rc1.tar.bz2 405949
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
-SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1-r1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1-r1.ebuild
deleted file mode 100644
index e5ab3b76f60f..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1-r1.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-libexec/freebsd-libexec-6.1_rc1-r1.ebuild,v 1.1 2006/05/01 15:28:18 flameeyes Exp $
-
-inherit bsdmk freebsd pam
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="pam ssl kerberos ipv6 nis"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}/libexec"
-
-pkg_setup() {
-	use pam || mymakeopts="${mymakeopts} NO_PAM= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_PF= "
-}
-
-PATCHES="${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch
-	${FILESDIR}/${PN}-nossp.patch"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
-
-src_install() {
-	freebsd_src_install
-
-	insinto /etc
-	cd "${WORKDIR}/etc"
-	doins gettytab
-}
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1.ebuild
deleted file mode 100644
index 91da180fe01e..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1.ebuild
+++ /dev/null
@@ -1,54 +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-libexec/freebsd-libexec-6.1_rc1.ebuild,v 1.1 2006/04/30 23:09:55 flameeyes Exp $
-
-inherit bsdmk freebsd pam
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="pam ssl kerberos ipv6 nis"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}/libexec"
-
-pkg_setup() {
-	use pam || mymakeopts="${mymakeopts} NO_PAM= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_PF= "
-}
-
-PATCHES="${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch
-	${FILESDIR}/${PN}-nossp.patch"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind"
-
-src_install() {
-	freebsd_src_install
-
-	newpamd ${FILESDIR}/ftpd.pamd ftpd
-
-	insinto /etc
-	cd "${WORKDIR}/etc"
-	doins gettytab
-}
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index aed221802b9f..8778800901ae 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -26,19 +26,19 @@ MD5 7c6bf2b68cd685a9f76af8c0ea652599 files/freebsd-mk-defs-flex.patch 867
 RMD160 a6515de4317f00ec47765987ae3f5bbdd02bc489 files/freebsd-mk-defs-flex.patch 867
 SHA256 3373ded64bf6447a06e1a4e33acd0c3d758fee20488173ab9d6e891ed2399498 files/freebsd-mk-defs-flex.patch 867
 DIST freebsd-share-6.0.tar.bz2 3719732 RMD160 f2acb308d4f0d571e4ae1cb23b8248623a131017 SHA256 5314ba2f6abbc41b63c6f5aa30c802f373a0a398e5dff63402fa1225b77b7e86 size 3719732
-DIST freebsd-share-6.1_rc1.tar.bz2 3742648 RMD160 ac699af1badb985a93702e8fc632ee43685bbc88 SHA256 5e70f5cef76a1efa521923f9ea6de3c6ff9491bdbd648beca6f0b6865f991aee size 3742648
+DIST freebsd-share-6.1_rc2.tar.bz2 3746442 RMD160 d45311e50ec1d730f7db3fdbf944bfb381435941 SHA256 a163f2e448b65d1f1ce115638ce00294eae5804af238b6d4a78abe72c21420c5 size 3746442
 EBUILD freebsd-mk-defs-6.0-r1.ebuild 1034 RMD160 9c8cc2df3b4a5365aed4659e18fa9e903c48a527 SHA1 f1f701a23fb218acba2f4bd2296aceaf775c19af SHA256 2bc055ce1d2cf57276c1f894edf0a4c3ff880ad5d3599f481f9106dd7c1c5351 size 1034
 MD5 4080e59ebedc828d00e6324380a51d5e freebsd-mk-defs-6.0-r1.ebuild 1034
 RMD160 9c8cc2df3b4a5365aed4659e18fa9e903c48a527 freebsd-mk-defs-6.0-r1.ebuild 1034
 SHA256 2bc055ce1d2cf57276c1f894edf0a4c3ff880ad5d3599f481f9106dd7c1c5351 freebsd-mk-defs-6.0-r1.ebuild 1034
-EBUILD freebsd-mk-defs-6.1_rc1.ebuild 897 RMD160 58ee31de2e161ec308fed2d5dd78bb73665f2b8b SHA1 26139f08d09bc76e4238a3912a9fc4058fefd9cb SHA256 91845ae125556d1f28ec21d7ca8034c9169bf711895d8cd9038d0f96bfa02eda size 897
-MD5 183110883ce3878d5f53bf3c25a6c1a0 freebsd-mk-defs-6.1_rc1.ebuild 897
-RMD160 58ee31de2e161ec308fed2d5dd78bb73665f2b8b freebsd-mk-defs-6.1_rc1.ebuild 897
-SHA256 91845ae125556d1f28ec21d7ca8034c9169bf711895d8cd9038d0f96bfa02eda freebsd-mk-defs-6.1_rc1.ebuild 897
-MISC ChangeLog 3752 RMD160 707ae802cb811b61add93b13b2ca640391ec692b SHA1 8a5bf482ae484884efcb8ffdd500acf4f8e3dd76 SHA256 a2c08d7d3612bcbd06bd6f37119928cb484610962d4d2c0994f38b134bcfc59c size 3752
-MD5 5758e942887775058d2038801702511e ChangeLog 3752
-RMD160 707ae802cb811b61add93b13b2ca640391ec692b ChangeLog 3752
-SHA256 a2c08d7d3612bcbd06bd6f37119928cb484610962d4d2c0994f38b134bcfc59c ChangeLog 3752
+EBUILD freebsd-mk-defs-6.1_rc2.ebuild 897 RMD160 1a65a57335b9621ad58619a85dba33f8f10d860c SHA1 3d6624ae5ea57183d9879d54096b9a0d1d0f3b3c SHA256 6a892c5a48510be92d921ca8120963f7b2edfae7cf8f2469a0854b4e6af2a2cf size 897
+MD5 3618c77e9021f1adc567100763d2d5c9 freebsd-mk-defs-6.1_rc2.ebuild 897
+RMD160 1a65a57335b9621ad58619a85dba33f8f10d860c freebsd-mk-defs-6.1_rc2.ebuild 897
+SHA256 6a892c5a48510be92d921ca8120963f7b2edfae7cf8f2469a0854b4e6af2a2cf freebsd-mk-defs-6.1_rc2.ebuild 897
+MISC ChangeLog 3935 RMD160 102f9ed94c1265bc7416ed277a46d332320e7e6b SHA1 c92784d1d0c8f71d7763be102ce1b5e3930ae5e2 SHA256 f77d86d50927d0777a36693ade9804c524302f770af548253e96d2a5921c3009 size 3935
+MD5 35486aac4e3735fe7ede82c866875a63 ChangeLog 3935
+RMD160 102f9ed94c1265bc7416ed277a46d332320e7e6b ChangeLog 3935
+SHA256 f77d86d50927d0777a36693ade9804c524302f770af548253e96d2a5921c3009 ChangeLog 3935
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -46,13 +46,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 51273e3fe46983612a5f1fed9ca2b0e3 files/digest-freebsd-mk-defs-6.0-r1 259
 RMD160 46a82d1522095372780a69656537ff13cd6e636e files/digest-freebsd-mk-defs-6.0-r1 259
 SHA256 5cb4a1ab23ba7aeafa13416f967472520b4db1da1a8ad7fc9433df48ac754ed1 files/digest-freebsd-mk-defs-6.0-r1 259
-MD5 d133e7d3a96da8ba069ea82aee869979 files/digest-freebsd-mk-defs-6.1_rc1 271
-RMD160 8540ba5c959d902115d38656b2cf3ce7d7bb9879 files/digest-freebsd-mk-defs-6.1_rc1 271
-SHA256 7609160f31d6efae169137f2c98422d9f30972c50c29ccccce880342a442c734 files/digest-freebsd-mk-defs-6.1_rc1 271
+MD5 d587c27f1c060fb84b21e79ed5e62e07 files/digest-freebsd-mk-defs-6.1_rc2 271
+RMD160 f0ee45deb1e26c9ba089f4b9915077a14f413817 files/digest-freebsd-mk-defs-6.1_rc2 271
+SHA256 973fef7b4bd6751859c2436c84606c9bd89d34b86ed4529603cdb9863f51ac0c files/digest-freebsd-mk-defs-6.1_rc2 271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVv9hAiZjviIA2XgRAi+AAJ9gD7RqHHz0xPtcfPmPQWm0V6pDsACfXcbR
-kdtR0+wq18XLmyhWQh3CI2Q=
-=dOoD
+iD8DBQFEV9VuAiZjviIA2XgRAk6zAJ98Djx+YjsqxQv09zWmz//NkSXV7QCfbcok
+A09rN0ZED0TsRx/DWivQ/is=
+=YHlG
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1_rc1 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1_rc1
deleted file mode 100644
index db214df51ced..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 421c959ee3e6db692304d61459818aa1 freebsd-share-6.1_rc1.tar.bz2 3742648
-RMD160 ac699af1badb985a93702e8fc632ee43685bbc88 freebsd-share-6.1_rc1.tar.bz2 3742648
-SHA256 5e70f5cef76a1efa521923f9ea6de3c6ff9491bdbd648beca6f0b6865f991aee freebsd-share-6.1_rc1.tar.bz2 3742648
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1_rc1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1_rc1.ebuild
deleted file mode 100644
index 907276d79107..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1_rc1.ebuild
+++ /dev/null
@@ -1,42 +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-mk-defs/freebsd-mk-defs-6.1_rc1.ebuild,v 1.2 2006/05/02 06:42:33 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="nostrip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}/share
-	epatch "${FILESDIR}/${PN}-6.1-gentoo.patch"
-
-	[[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
-		epatch "${FILESDIR}/${PN}-6.0-gnu.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk
-}
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index da3415f25ffb..7e6ed588ce1d 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -26,19 +26,19 @@ MD5 252ec73a62c30ee7a502aab5f4ed4c3b files/freebsd-pam-modules-6.0-gentoo.patch
 RMD160 f907769f6f0ded416fac03a1fb6b5531ff682070 files/freebsd-pam-modules-6.0-gentoo.patch 701
 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d files/freebsd-pam-modules-6.0-gentoo.patch 701
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 EBUILD freebsd-pam-modules-6.0.ebuild 1314 RMD160 3ff22b76d89ddc271518b5e8237387944adab479 SHA1 464a3ca4167a0ad7f96ee5b6028ab0d8ae139b49 SHA256 1ef6c0be49991f23577f282dcf252a60034cd07cd2dda53febe3630068d8458c size 1314
 MD5 0c5072a8ce386c4c91203999f8af4097 freebsd-pam-modules-6.0.ebuild 1314
 RMD160 3ff22b76d89ddc271518b5e8237387944adab479 freebsd-pam-modules-6.0.ebuild 1314
 SHA256 1ef6c0be49991f23577f282dcf252a60034cd07cd2dda53febe3630068d8458c freebsd-pam-modules-6.0.ebuild 1314
-EBUILD freebsd-pam-modules-6.1_rc1.ebuild 1287 RMD160 eb47db6fde5f4cd29205b11a7e1af2d44544d79a SHA1 b52a9da9c3e4432e157f6a2610ca53d091f261d1 SHA256 729337d0698cab0b8e4d7611714d24651d378efcd67398370419e99e016bff27 size 1287
-MD5 eeb9a65e816311f1101d340c0b8086be freebsd-pam-modules-6.1_rc1.ebuild 1287
-RMD160 eb47db6fde5f4cd29205b11a7e1af2d44544d79a freebsd-pam-modules-6.1_rc1.ebuild 1287
-SHA256 729337d0698cab0b8e4d7611714d24651d378efcd67398370419e99e016bff27 freebsd-pam-modules-6.1_rc1.ebuild 1287
-MISC ChangeLog 2637 RMD160 928087023cacaa545ddf9ecdb694af2998cc3dee SHA1 bf8b1e532768ecbb9bec0f88a09873b6975df395 SHA256 1a1399fcad4ee5e25beb33532582d117bbc1ae6d84ae20084134984a0b4e28dc size 2637
-MD5 f5efc675a0e197d98544532ebd80c679 ChangeLog 2637
-RMD160 928087023cacaa545ddf9ecdb694af2998cc3dee ChangeLog 2637
-SHA256 1a1399fcad4ee5e25beb33532582d117bbc1ae6d84ae20084134984a0b4e28dc ChangeLog 2637
+EBUILD freebsd-pam-modules-6.1_rc2.ebuild 1287 RMD160 1b89c7adf140485a75ef867c6be5e4ca1ba6e92f SHA1 d09486011b0a89003ffa155e0bfdffb21a1b94ab SHA256 8481a7ec3ab176e0e3c416bf4d23a02c36debf2ee690e1d99d7bbd1453209e6a size 1287
+MD5 631de3d975f39f4eb9ba2b076d4cc223 freebsd-pam-modules-6.1_rc2.ebuild 1287
+RMD160 1b89c7adf140485a75ef867c6be5e4ca1ba6e92f freebsd-pam-modules-6.1_rc2.ebuild 1287
+SHA256 8481a7ec3ab176e0e3c416bf4d23a02c36debf2ee690e1d99d7bbd1453209e6a freebsd-pam-modules-6.1_rc2.ebuild 1287
+MISC ChangeLog 2832 RMD160 e0fdf93047128cb5a09d01bd2a843ed09d2b57bd SHA1 66b52a66ec3a94d82b70945cd34463ca1005af57 SHA256 414c01ee3edfb7c1b311de29e7e9e5759bbd398aef3887bd4a432184ecb4cbd8 size 2832
+MD5 157afae44451e7da90209619e67a0a17 ChangeLog 2832
+RMD160 e0fdf93047128cb5a09d01bd2a843ed09d2b57bd ChangeLog 2832
+SHA256 414c01ee3edfb7c1b311de29e7e9e5759bbd398aef3887bd4a432184ecb4cbd8 ChangeLog 2832
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -46,13 +46,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 3f8b30a7524ee60de45cfe483e4a98ef files/digest-freebsd-pam-modules-6.0 253
 RMD160 ddc8cde12a8205b150fa1584831471d8e6edc26f files/digest-freebsd-pam-modules-6.0 253
 SHA256 19259c95eb76120fb8b21ac7f9dc26d985edc4eae7828df6c41fe6d0d6bff59d files/digest-freebsd-pam-modules-6.0 253
-MD5 c00ad8af1c982368233de0a882abd3c7 files/digest-freebsd-pam-modules-6.1_rc1 265
-RMD160 aa321cba9315ee9988b83d5caa73dd699852d592 files/digest-freebsd-pam-modules-6.1_rc1 265
-SHA256 fb31c26e2c8424e2622cec87df8a5bec9e6998b7bf0697dcc96670a6f77bc16c files/digest-freebsd-pam-modules-6.1_rc1 265
+MD5 149608fee7d4956de1e2a38f9cad3d30 files/digest-freebsd-pam-modules-6.1_rc2 265
+RMD160 82fb841537780fec91cbae8e2d5597e701e60a0c files/digest-freebsd-pam-modules-6.1_rc2 265
+SHA256 94da21e6c258eaa31249ea7bdf9248799d981cc684e2cea1e92c64913d3345d4 files/digest-freebsd-pam-modules-6.1_rc2 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVWNAAiZjviIA2XgRArUeAKDqcyzqGOoLlEgqbBze1oVP1C8jVQCfQqoI
-Z2x6/zqvNcXIrDj7d4FO/xw=
-=KcFI
+iD8DBQFEV9WfAiZjviIA2XgRAhyBAKCv/qkDsWJm/7gepKoLZ7v9jXmeaQCeMLuZ
+/Y1G6qO+dS4x9fObKRm8ei8=
+=IDKl
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc1 b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc1
deleted file mode 100644
index d1cd54a7f465..000000000000
--- a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc1.ebuild
deleted file mode 100644
index d3103fc9bae1..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc1.ebuild
+++ /dev/null
@@ -1,49 +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-pam-modules/freebsd-pam-modules-6.1_rc1.ebuild,v 1.1 2006/05/01 01:24:09 flameeyes Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} NO_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${WORKDIR}/lib
-
-	for module in pam_deny pam_passwdqc pam_permit; do
-		sed -i -e "s:${module}::" ${S}/modules.inc
-	done
-
-	# Avoid using static versions; use gentoo /lib/security dir
-	epatch ${FILESDIR}/${PN}-6.0-gentoo.patch
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/5.4/README.pamd"
-	dopamd "${FILESDIR}/5.4/pam.d/"*
-}
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index bfe7632b00e2..225cda946454 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -14,27 +14,27 @@ MD5 63bc3f738d51075d091f6c6e5d7f5de6 files/pf.initd 921
 RMD160 ea7ae600979120282cc653a056309a1826507d6f files/pf.initd 921
 SHA256 03f35f86697fcdd6667ea4688304f7331b8c0aa56c755cad780563d65b8e6c25 files/pf.initd 921
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
+DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 EBUILD freebsd-pf-6.0-r1.ebuild 1329 RMD160 c1bc8c2aa307b8005378369b0c8d4691f0f77efd SHA1 3772f6d20515a2689469612fc3618fe19ee1ac12 SHA256 5230e829058399b3d0eabbe69d069ce7d05a1ca952a37a67f5dec012bfded212 size 1329
 MD5 f93b3c42a4a9135686df3ba810adaff8 freebsd-pf-6.0-r1.ebuild 1329
 RMD160 c1bc8c2aa307b8005378369b0c8d4691f0f77efd freebsd-pf-6.0-r1.ebuild 1329
 SHA256 5230e829058399b3d0eabbe69d069ce7d05a1ca952a37a67f5dec012bfded212 freebsd-pf-6.0-r1.ebuild 1329
-EBUILD freebsd-pf-6.1_rc1.ebuild 1352 RMD160 c228ddaa324179938dcac3c4034f38e9fb5c7fb8 SHA1 6e43189b4c354cc9a6f70344c87cbddc1d534540 SHA256 4d4e714b53f0ef102defcb83a75c343623f32dc61365172e158439a99f6538a0 size 1352
-MD5 a7325383e418609ce7abe5c26d3ad15b freebsd-pf-6.1_rc1.ebuild 1352
-RMD160 c228ddaa324179938dcac3c4034f38e9fb5c7fb8 freebsd-pf-6.1_rc1.ebuild 1352
-SHA256 4d4e714b53f0ef102defcb83a75c343623f32dc61365172e158439a99f6538a0 freebsd-pf-6.1_rc1.ebuild 1352
-MISC ChangeLog 1832 RMD160 72ecb6a808c0fb3ed728bf9c2ecb51bd11db957d SHA1 4cb0a77df7c2b6a00681b044591d509934e7756c SHA256 6de41b382a6e48a11be53fdea13467f217f5b3b77567661ac638b35c9d9d017c size 1832
-MD5 8ae55c4d18aaf9625b30e706e5e9fff7 ChangeLog 1832
-RMD160 72ecb6a808c0fb3ed728bf9c2ecb51bd11db957d ChangeLog 1832
-SHA256 6de41b382a6e48a11be53fdea13467f217f5b3b77567661ac638b35c9d9d017c ChangeLog 1832
+EBUILD freebsd-pf-6.1_rc2.ebuild 1352 RMD160 6987b1bb44ff781c6200c524d594c0ebb41c19ec SHA1 1fdac861aa725ff94ab5c1d7fd5028e868a3a8d2 SHA256 9cd4dfc2ddfb599c615bf3955b09b8bb44089144f0d8029bdaae695f3c073e94 size 1352
+MD5 36b8ece04fd4670f2b5a8899c82b82e0 freebsd-pf-6.1_rc2.ebuild 1352
+RMD160 6987b1bb44ff781c6200c524d594c0ebb41c19ec freebsd-pf-6.1_rc2.ebuild 1352
+SHA256 9cd4dfc2ddfb599c615bf3955b09b8bb44089144f0d8029bdaae695f3c073e94 freebsd-pf-6.1_rc2.ebuild 1352
+MISC ChangeLog 2000 RMD160 54a97b9676364e12f78f7b930f76f27168543da0 SHA1 b0dfc59f1c9f9f7b7f7dc52e9fca5a08a3950880 SHA256 370e09062842a8b28130e72f841f740c4b1df1656575b41d0fe9b6845c6a69a5 size 2000
+MD5 b912bfaacec0b44b2c768b9d6bdd251f ChangeLog 2000
+RMD160 54a97b9676364e12f78f7b930f76f27168543da0 ChangeLog 2000
+SHA256 370e09062842a8b28130e72f841f740c4b1df1656575b41d0fe9b6845c6a69a5 ChangeLog 2000
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -42,13 +42,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 85901762b1b5797d4c97aa0cdd7be3e1 files/digest-freebsd-pf-6.0-r1 1295
 RMD160 dfaa6acbcc3a5282d41b3204342dda0e0c906fa8 files/digest-freebsd-pf-6.0-r1 1295
 SHA256 24290e8449f22ded1c68fe86e421e332e96d5dc384d37a79b93aa68cbb8d2b60 files/digest-freebsd-pf-6.0-r1 1295
-MD5 fda308919fddaeddb718a6b6866d7815 files/digest-freebsd-pf-6.1_rc1 1355
-RMD160 eee0734bceb854e315f1b4185a64912739438c75 files/digest-freebsd-pf-6.1_rc1 1355
-SHA256 7fff603ee0036025c0310bd7bcebdcf69e9b8a5f15f03f7ec729d1fbd392e645 files/digest-freebsd-pf-6.1_rc1 1355
+MD5 88f9a516b656f762ce99377e79bbc717 files/digest-freebsd-pf-6.1_rc2 1355
+RMD160 16c148ddc7a0d1c48c793276b4befbb14398cd57 files/digest-freebsd-pf-6.1_rc2 1355
+SHA256 a22186b248c3e99bf6505f7cca752dbbfd4466b17d51534728fe563d7c40e8e3 files/digest-freebsd-pf-6.1_rc2 1355
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVWZcAiZjviIA2XgRAn92AKDf6ylMOWmBgpqp8KW1X5SXHyjAJACgrGBh
-R+i9nUCyoht9Bn/JMm9WV5I=
-=mUj/
+iD8DBQFEV9XZAiZjviIA2XgRAkAoAKCWmhM4fy1Wr9TCwyf6Tqatpj/6twCdE6M5
+89nlVl0bGiinNN/ctmpDe3Y=
+=gBlS
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1 b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1
deleted file mode 100644
index 7ae252c25993..000000000000
--- a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
-RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
-SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild
deleted file mode 100644
index f67529290735..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild
+++ /dev/null
@@ -1,59 +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-pf/freebsd-pf-6.1_rc1.ebuild,v 1.1 2006/05/01 01:37:19 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	sys-freebsd/freebsd-mk-defs
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="libexec/ftp-proxy usr.sbin/authpf sbin/pfctl sbin/pflogd"
-
-PATCHES="${FILESDIR}/${PN}-6.0-pcap.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}"
-		mkmake || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}"
-		mkinstall || die "Install ${dir} failed"
-	done
-
-	cd ${WORKDIR}/etc
-	insinto /etc
-	doins pf.os
-	newdoc pf.conf pf.conf.example
-
-	newinitd "${FILESDIR}/pf.initd" pf
-	newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index 49a0fa7a4014..4991b7e9751e 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -10,37 +10,37 @@ MD5 1eb113940f2deb194fc0e8050a998b93 files/freebsd-rescue-5.4-sbin-gentoo.patch
 RMD160 00982cbcd0922847d8754388e5a5e27df7cf7436 files/freebsd-rescue-5.4-sbin-gentoo.patch 817
 SHA256 8e9c30fb3a3e1344fadc63039165080bfb50ef8ea989383b67b8a343f7436fed files/freebsd-rescue-5.4-sbin-gentoo.patch 817
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc1.tar.bz2 405949 RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 size 405949
+DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-gnu-6.0.tar.bz2 866160 RMD160 7e98304027683188a9cbf12811fc3ce9e1923cff SHA256 ad1c93881074763daa0305d72eb365b5a2c7154f9fecfc73b8e369991ba6e6b3 size 866160
-DIST freebsd-gnu-6.1_rc1.tar.bz2 867322 RMD160 bc9b19e7db79614e9830bb876b32b9e06f9ff89e SHA256 5795b8dd00887efcc212f560d4df93cf99a3a753680d8e7d9132d8c7a507de1f size 867322
+DIST freebsd-gnu-6.1_rc2.tar.bz2 867149 RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 size 867149
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 DIST freebsd-rescue-6.0.tar.bz2 4939 size 4939
-DIST freebsd-rescue-6.1_rc1.tar.bz2 4945 RMD160 6896000f4b2a826c4841dd8cea11596e0ad55c73 SHA256 bc2e6b1bef502607cabc8bcb9e7eea4da6b116dc38aacce2016ee595e997da56 size 4945
+DIST freebsd-rescue-6.1_rc2.tar.bz2 4944 RMD160 46338046e36478ad76bd0c7700b3052bf4224735 SHA256 73d48f0e48b18e4a54054173785f9ce62916dc679b54eb645b46a70ee934be72 size 4944
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
+DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
-DIST freebsd-sys-6.1_rc1.tar.bz2 17096208 RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 size 17096208
+DIST freebsd-sys-6.1_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
+DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 EBUILD freebsd-rescue-6.0.ebuild 1344 RMD160 53841752e1a05e70c2e05fbba53cf6492c708d2e SHA1 069768eaf1655caf5a2bb9c54f7986299577b5f6 SHA256 482ab9af3857e6a4b998de390ff5c9f21886a5179efcf925e50e37c1c4db2915 size 1344
 MD5 05bdcef7237378530928df5e003f542f freebsd-rescue-6.0.ebuild 1344
 RMD160 53841752e1a05e70c2e05fbba53cf6492c708d2e freebsd-rescue-6.0.ebuild 1344
 SHA256 482ab9af3857e6a4b998de390ff5c9f21886a5179efcf925e50e37c1c4db2915 freebsd-rescue-6.0.ebuild 1344
-EBUILD freebsd-rescue-6.1_rc1.ebuild 1411 RMD160 18981778a629df998eaaca7602dd6c5d11bdc304 SHA1 cb4d6f801206f10ac2e8044dfb7bc60f39e8f18c SHA256 0a8505704c7c512bf6853d1cdbb7b238102b44e654a13433f3ac7f0ebdf9bc67 size 1411
-MD5 a9d81446966b6e943740440da63ac35e freebsd-rescue-6.1_rc1.ebuild 1411
-RMD160 18981778a629df998eaaca7602dd6c5d11bdc304 freebsd-rescue-6.1_rc1.ebuild 1411
-SHA256 0a8505704c7c512bf6853d1cdbb7b238102b44e654a13433f3ac7f0ebdf9bc67 freebsd-rescue-6.1_rc1.ebuild 1411
-MISC ChangeLog 1465 RMD160 8df8de57b4259aee8f8397e21ec8690cdf8255be SHA1 489ce2a8a2e182075380910594c9cce245dd63d3 SHA256 51bdb95be294b692a2a5e759385f35de4d4f3357cfc8d587f91bc1c5b3606d14 size 1465
-MD5 c8ef92281b16ea12fc26dbdfb5dbf579 ChangeLog 1465
-RMD160 8df8de57b4259aee8f8397e21ec8690cdf8255be ChangeLog 1465
-SHA256 51bdb95be294b692a2a5e759385f35de4d4f3357cfc8d587f91bc1c5b3606d14 ChangeLog 1465
+EBUILD freebsd-rescue-6.1_rc2.ebuild 1411 RMD160 0b32185a7a648d89e683fe61380e9c5e61227334 SHA1 4c24abc4b05b58d2aa716e057d8a1c1a1b5ab5c7 SHA256 90dbfc2fbc4584c95604c027bdf54018ca369856f7978d480c677c0818d58bb8 size 1411
+MD5 25dee19bc35b6a4337742b5f866d8d8c freebsd-rescue-6.1_rc2.ebuild 1411
+RMD160 0b32185a7a648d89e683fe61380e9c5e61227334 freebsd-rescue-6.1_rc2.ebuild 1411
+SHA256 90dbfc2fbc4584c95604c027bdf54018ca369856f7978d480c677c0818d58bb8 freebsd-rescue-6.1_rc2.ebuild 1411
+MISC ChangeLog 1645 RMD160 effcef79491631fe43ede1d5177221d8b99313a6 SHA1 6d8f897f696f1f463cbb8c7653e6241fec8e432d SHA256 c6a50a677b018288c1a8eea0e76225167b43347271afd9f8d98c342fa89551cf size 1645
+MD5 0c32f14f01ac8121421f23a471c16f2d ChangeLog 1645
+RMD160 effcef79491631fe43ede1d5177221d8b99313a6 ChangeLog 1645
+SHA256 c6a50a677b018288c1a8eea0e76225167b43347271afd9f8d98c342fa89551cf ChangeLog 1645
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -48,13 +48,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 1116dfa305b8808b96442ace49d27ce4 files/digest-freebsd-rescue-6.0 2379
 RMD160 0d0bd65ae84eb68b04bd87545098304477907572 files/digest-freebsd-rescue-6.0 2379
 SHA256 6678f801523cd128dccc6dc28685139a9c378376383545659001d8812c4f4fd8 files/digest-freebsd-rescue-6.0 2379
-MD5 62f6623c10b4c2658c4860535a50fd24 files/digest-freebsd-rescue-6.1_rc1 2683
-RMD160 b4e5c0af139b4245941aad8caf9f633c1c1c2124 files/digest-freebsd-rescue-6.1_rc1 2683
-SHA256 c3ec2c74df6c4d22f581e381671247cdf1c04d43b40d3cbc63956ebdf0669735 files/digest-freebsd-rescue-6.1_rc1 2683
+MD5 7fff65d4db2f001dc74abf3dc947d5f1 files/digest-freebsd-rescue-6.1_rc2 2683
+RMD160 f12de6a8eccdd55fb79a126cb2cc00e08833d90d files/digest-freebsd-rescue-6.1_rc2 2683
+SHA256 901992125c5309a1c34b354436b31a9d2728f17f9f56652b30d8547d2ef53cee files/digest-freebsd-rescue-6.1_rc2 2683
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVWwmAiZjviIA2XgRAvkdAJ9K1ydVn4uVPd8hi5t9D57ExlGRcACg2EiB
-B/9OIaMaffa6tmmCVM1dFTc=
-=Efmx
+iD8DBQFEV9YZAiZjviIA2XgRAmL7AJ9HdsK/66xK+2/vUnsDPPnRo6Fq+wCfZHzs
+s8govrJZfghfKbat+B0XamI=
+=strm
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1_rc1 b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1_rc1
deleted file mode 100644
index 0d2d3ffc3934..000000000000
--- a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1_rc1
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 5dcbd5450bcc3bcfd592f0ec86e55921 freebsd-bin-6.1_rc1.tar.bz2 405949
-RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f freebsd-bin-6.1_rc1.tar.bz2 405949
-SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 freebsd-bin-6.1_rc1.tar.bz2 405949
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 cadc8eee1e84543a67995c5165f2f82c freebsd-gnu-6.1_rc1.tar.bz2 867322
-RMD160 bc9b19e7db79614e9830bb876b32b9e06f9ff89e freebsd-gnu-6.1_rc1.tar.bz2 867322
-SHA256 5795b8dd00887efcc212f560d4df93cf99a3a753680d8e7d9132d8c7a507de1f freebsd-gnu-6.1_rc1.tar.bz2 867322
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 99cefff9f412b76163626fca39d502a6 freebsd-rescue-6.1_rc1.tar.bz2 4945
-RMD160 6896000f4b2a826c4841dd8cea11596e0ad55c73 freebsd-rescue-6.1_rc1.tar.bz2 4945
-SHA256 bc2e6b1bef502607cabc8bcb9e7eea4da6b116dc38aacce2016ee595e997da56 freebsd-rescue-6.1_rc1.tar.bz2 4945
-MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
-RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
-SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
-MD5 6045efaa93abaa1399d751d7eae279b2 freebsd-sys-6.1_rc1.tar.bz2 17096208
-RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 freebsd-sys-6.1_rc1.tar.bz2 17096208
-SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 freebsd-sys-6.1_rc1.tar.bz2 17096208
-MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
-SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1_rc1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1_rc1.ebuild
deleted file mode 100644
index 0f43b623aab8..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1_rc1.ebuild
+++ /dev/null
@@ -1,51 +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-rescue/freebsd-rescue-6.1_rc1.ebuild,v 1.1 2006/05/01 02:02:01 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm nis"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${RESCUE}.tar.bz2"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
-	for flag in atm nis; do
-		if use ${flag} && ! built_with_use sys-libs/freebsd-lib ${flag}; then
-			die "You can't add ${flag} support here without adding it to sys-libs/freebsd-lib"
-		fi
-	done
-
-#	append-flags -fno-stack-protector -fno-stack-protector-all
-}
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd ${WORKDIR}
-	epatch ${FILESDIR}/${PN}-5.4-gentoo.patch
-	epatch ${FILESDIR}/${PN}-5.4-sbin-gentoo.patch
-}
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 77f12f2a43c0..eab6172d6945 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -26,29 +26,29 @@ MD5 edcf04ea876f3ac2275867633fa4e96d files/sysctl.initd 778
 RMD160 09ed017c2dd767db57cfa71da6c9d656a8fbb23b files/sysctl.initd 778
 SHA256 12f1bbcd72244579ae3b23d2455a00739cc6ff074f68cbb7db1410d19c0f69f4 files/sysctl.initd 778
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
+DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 EBUILD freebsd-sbin-6.0-r1.ebuild 2127 RMD160 b0bc72f6c2a9a62b23297e431feedc12f32c76e6 SHA1 2093aae1c6d5c9fc3c7575b8aec98a1d069122a4 SHA256 09ece1d5395fbb75a039746906ad4fc4d0cb815763188eac38c9282b765e958f size 2127
 MD5 226f3c852e244b961b05828ee84cef56 freebsd-sbin-6.0-r1.ebuild 2127
 RMD160 b0bc72f6c2a9a62b23297e431feedc12f32c76e6 freebsd-sbin-6.0-r1.ebuild 2127
 SHA256 09ece1d5395fbb75a039746906ad4fc4d0cb815763188eac38c9282b765e958f freebsd-sbin-6.0-r1.ebuild 2127
-EBUILD freebsd-sbin-6.1_rc1.ebuild 2194 RMD160 3bf0973ea161e9087a541de03e855b84576eb8d1 SHA1 21d648d8deae42a0fdff26295ed7f333972ccfb7 SHA256 35fcc2513f998dc81f7b9cba818d4fc2f945f2e498a49752ef9518e5d79a2f2f size 2194
-MD5 e1f88dfc664b372bc1c6586e009b2612 freebsd-sbin-6.1_rc1.ebuild 2194
-RMD160 3bf0973ea161e9087a541de03e855b84576eb8d1 freebsd-sbin-6.1_rc1.ebuild 2194
-SHA256 35fcc2513f998dc81f7b9cba818d4fc2f945f2e498a49752ef9518e5d79a2f2f freebsd-sbin-6.1_rc1.ebuild 2194
-MISC ChangeLog 4408 RMD160 7fdaba32e3a90c998aa54e95d35423a5d4e893c2 SHA1 8890bc9c0ec8d0bccf09c1ad8889aa97558e6991 SHA256 13ab604c9a9e7087410d8437ae73d6f653f4499d0114477d09f757610214278c size 4408
-MD5 1841ef6941afed45ef45cdd419587588 ChangeLog 4408
-RMD160 7fdaba32e3a90c998aa54e95d35423a5d4e893c2 ChangeLog 4408
-SHA256 13ab604c9a9e7087410d8437ae73d6f653f4499d0114477d09f757610214278c ChangeLog 4408
+EBUILD freebsd-sbin-6.1_rc2.ebuild 2194 RMD160 869c2e5baf55b29c5a81f5d1511c0b5a4290d3b6 SHA1 9768a8914f889bd0a89e72f58ffd3823c8637900 SHA256 ff789006715eb680f4d86049e195d50422448c44e6fd570a8a2641056e9667fc size 2194
+MD5 ca8a19d175a7557a32d1ae71f1683c92 freebsd-sbin-6.1_rc2.ebuild 2194
+RMD160 869c2e5baf55b29c5a81f5d1511c0b5a4290d3b6 freebsd-sbin-6.1_rc2.ebuild 2194
+SHA256 ff789006715eb680f4d86049e195d50422448c44e6fd570a8a2641056e9667fc freebsd-sbin-6.1_rc2.ebuild 2194
+MISC ChangeLog 4583 RMD160 ee21175e6bac32a9a5dde29004cc6507839ab668 SHA1 d4829b75a33a9484409a5f0f4f8c7f10ac5fe1f2 SHA256 8140b0c94c36b98254e9bf4407f272f0e80d85cdf31bf4e0ff69e6474274293b size 4583
+MD5 8872834568a0871ff0c85b1d4e97b46e ChangeLog 4583
+RMD160 ee21175e6bac32a9a5dde29004cc6507839ab668 ChangeLog 4583
+SHA256 8140b0c94c36b98254e9bf4407f272f0e80d85cdf31bf4e0ff69e6474274293b ChangeLog 4583
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -56,13 +56,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 5fd83bcbf48686bcd615b60799613cce files/digest-freebsd-sbin-6.0-r1 1548
 RMD160 bf64735bbceeed83ebccd22f2b3a989100e6ec31 files/digest-freebsd-sbin-6.0-r1 1548
 SHA256 c10cfdca82d0a375d105c9ec1834a52f8ebab8e1ab244cedb63ff06f29d39c05 files/digest-freebsd-sbin-6.0-r1 1548
-MD5 afac92cd847410a795b7da1e0c4a87a4 files/digest-freebsd-sbin-6.1_rc1 1620
-RMD160 7afe63935383f3666ced5b7cc8cd5ef212113787 files/digest-freebsd-sbin-6.1_rc1 1620
-SHA256 257b461e18ac9ebe6bfd38bba1c1e30a65c96fef5b1db300a7802e0dfe07652d files/digest-freebsd-sbin-6.1_rc1 1620
+MD5 1d07ec06d5e2c43bf7e3832813d71deb files/digest-freebsd-sbin-6.1_rc2 1620
+RMD160 b91ef2a5cfd9e7f37b982410975a889c13251cae files/digest-freebsd-sbin-6.1_rc2 1620
+SHA256 587e973d251300bb09571b9ca2a35031ac20cbd1e95fbc1c99a691d97807bc9c files/digest-freebsd-sbin-6.1_rc2 1620
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVVTuAiZjviIA2XgRAoChAKCuR1+6e+Y5WMdB29wtIxcbG5LD4wCglQ/r
-Ljv420pUtbhuHFXTtgvtapk=
-=OvfA
+iD8DBQFEV9ZYAiZjviIA2XgRAuz6AJ4n4bBwifXf3uh1pnflqQ4iTwkHYQCdEpBz
+hC3KPmdzyLUfZFikr0KM3zQ=
+=6Q29
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc1 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc1
deleted file mode 100644
index 8320fb22c087..000000000000
--- a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
-RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
-SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc1.ebuild
deleted file mode 100644
index a2d3c84a6ff1..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc1.ebuild
+++ /dev/null
@@ -1,87 +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-sbin/freebsd-sbin-6.1_rc1.ebuild,v 1.1 2006/05/01 00:22:47 flameeyes Exp $
-
-inherit flag-o-matic bsdmk freebsd
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~x86-fbsd"
-SLOT="0"
-
-SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	ssl? ( dev-libs/openssl )
-	sys-libs/readline
-	sys-process/vixie-cron"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-PROVIDE="virtual/dev-manager
-	virtual/dhcpc"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter ipv6 vinum suid ssl"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= "
-
-	# O3 breaks this, apparently
-	replace-flags -O3 -O2
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd"
-
-PATCHES="${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-zlib.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-6.1-devd-conf.patch"
-}
-
-src_install() {
-	freebsd_src_install
-	keepdir /var/log
-
-	newinitd ${FILESDIR}/ipfw.initd ipfw
-	newinitd ${FILESDIR}/sysctl.initd sysctl
-
-	cd ${WORKDIR}/etc/
-	insinto /etc
-	doins devd.conf pccard_ether defaults/pccard.conf minfree rc.firewall \
-		sysctl.conf
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ip6fwlimit \
-		security/*.ip6fwdenied \
-		security/*.ipfwdenied
-
-	use ipfilter && doperiodic security \
-		security/*.ipf6denied \
-		security/*.ipfdenied
-}
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index 2d356f65651a..d30c044ffc9a 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -14,35 +14,35 @@ MD5 5b3ed8d353ad16881f8786815724678a files/freebsd-share-6.0-links.patch 539
 RMD160 272e428e61ceb22e204bf82bce94bc808c67f4b3 files/freebsd-share-6.0-links.patch 539
 SHA256 4858d5ba24d64ff41111142eeeecdb226703501b7a637b03baa3a7f5d0af9261 files/freebsd-share-6.0-links.patch 539
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc1.tar.bz2 405949 RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 size 405949
+DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-gnu-6.0.tar.bz2 866160 RMD160 7e98304027683188a9cbf12811fc3ce9e1923cff SHA256 ad1c93881074763daa0305d72eb365b5a2c7154f9fecfc73b8e369991ba6e6b3 size 866160
-DIST freebsd-gnu-6.1_rc1.tar.bz2 867322 RMD160 bc9b19e7db79614e9830bb876b32b9e06f9ff89e SHA256 5795b8dd00887efcc212f560d4df93cf99a3a753680d8e7d9132d8c7a507de1f size 867322
+DIST freebsd-gnu-6.1_rc2.tar.bz2 867149 RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 size 867149
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
+DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 DIST freebsd-share-6.0.tar.bz2 3719732 RMD160 f2acb308d4f0d571e4ae1cb23b8248623a131017 SHA256 5314ba2f6abbc41b63c6f5aa30c802f373a0a398e5dff63402fa1225b77b7e86 size 3719732
-DIST freebsd-share-6.1_rc1.tar.bz2 3742648 RMD160 ac699af1badb985a93702e8fc632ee43685bbc88 SHA256 5e70f5cef76a1efa521923f9ea6de3c6ff9491bdbd648beca6f0b6865f991aee size 3742648
+DIST freebsd-share-6.1_rc2.tar.bz2 3746442 RMD160 d45311e50ec1d730f7db3fdbf944bfb381435941 SHA256 a163f2e448b65d1f1ce115638ce00294eae5804af238b6d4a78abe72c21420c5 size 3746442
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
+DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 EBUILD freebsd-share-6.0-r1.ebuild 1734 RMD160 6c04383d4f924bfa305909cabbd9d6c2e10f4f38 SHA1 e889315c5f7830b88b929a533af530683dea4e1a SHA256 8214dd31e0b0c7b20b5ddb0efaacdc41126acb59def01b5edbaf080e0b71c489 size 1734
 MD5 81b5b0be188ed81fd608e066a07b5d93 freebsd-share-6.0-r1.ebuild 1734
 RMD160 6c04383d4f924bfa305909cabbd9d6c2e10f4f38 freebsd-share-6.0-r1.ebuild 1734
 SHA256 8214dd31e0b0c7b20b5ddb0efaacdc41126acb59def01b5edbaf080e0b71c489 freebsd-share-6.0-r1.ebuild 1734
-EBUILD freebsd-share-6.1_rc1.ebuild 1764 RMD160 425e32c36c94f32602da939ec09888baed8bf991 SHA1 248c17fabb52287697c04ab315ffc5680100271e SHA256 04faf0636ee2ff79c0a7d22aec61120d014be5c34285eefb5287fc586f94f492 size 1764
-MD5 f168d87cd4dd7e7294a8e51876851b9a freebsd-share-6.1_rc1.ebuild 1764
-RMD160 425e32c36c94f32602da939ec09888baed8bf991 freebsd-share-6.1_rc1.ebuild 1764
-SHA256 04faf0636ee2ff79c0a7d22aec61120d014be5c34285eefb5287fc586f94f492 freebsd-share-6.1_rc1.ebuild 1764
-MISC ChangeLog 2785 RMD160 37da1dec3224ba37cb4127ce21de7e294b818b18 SHA1 01ae02f419f433ad6fbc531594304820bb66b101 SHA256 1c28c80e6b88fa7cef6881569bebdc8fe33addc307f8eb89c098f1d897786ca0 size 2785
-MD5 d3bc82adf53bd6d86fa03b18526b2417 ChangeLog 2785
-RMD160 37da1dec3224ba37cb4127ce21de7e294b818b18 ChangeLog 2785
-SHA256 1c28c80e6b88fa7cef6881569bebdc8fe33addc307f8eb89c098f1d897786ca0 ChangeLog 2785
+EBUILD freebsd-share-6.1_rc2.ebuild 1764 RMD160 576b74b5ba1ea2b8a44f618a13da38bcd1250427 SHA1 dd588d22d878cf8b4569e0b1338a01ce6c7ea532 SHA256 e428d52e26e93a977e9eed4f67f85f30c33ff9a44b74052e35edb8683a68d4d4 size 1764
+MD5 08fdacf329f91cc7246042a24d9068df freebsd-share-6.1_rc2.ebuild 1764
+RMD160 576b74b5ba1ea2b8a44f618a13da38bcd1250427 freebsd-share-6.1_rc2.ebuild 1764
+SHA256 e428d52e26e93a977e9eed4f67f85f30c33ff9a44b74052e35edb8683a68d4d4 freebsd-share-6.1_rc2.ebuild 1764
+MISC ChangeLog 2962 RMD160 531612fb0b79f78c8e37907cedf93d5164ef051a SHA1 8b54d8476fd7ce97a8b4f01b202498b3f406c1d0 SHA256 35c2d681136f9c1ad283010765f414886989761165316fa09c0040377c47ef5a size 2962
+MD5 5903a932e7bbab06c2516f7634d1b08a ChangeLog 2962
+RMD160 531612fb0b79f78c8e37907cedf93d5164ef051a ChangeLog 2962
+SHA256 35c2d681136f9c1ad283010765f414886989761165316fa09c0040377c47ef5a ChangeLog 2962
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -50,13 +50,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 19fcc8bd1bce9e9f8789a41a4dc2bb42 files/digest-freebsd-share-6.0-r1 2301
 RMD160 051abc7348b55916a5cdc3a2d7182938839a7c4a files/digest-freebsd-share-6.0-r1 2301
 SHA256 1ce361c768542499214da47548a18e3482adb79ee88aef42d5e8fd3fb5db32d1 files/digest-freebsd-share-6.0-r1 2301
-MD5 519bbf1afb78da91255de1c7bb6a12f3 files/digest-freebsd-share-6.1_rc1 2409
-RMD160 e702f56b843c6a7fa00fcdfae5bb525aa0747e3e files/digest-freebsd-share-6.1_rc1 2409
-SHA256 88ad3c61be416a2ae472212dbfb5e38f012c3f1f4a28657aa42053913c090f97 files/digest-freebsd-share-6.1_rc1 2409
+MD5 e459de41faab371c8d0b753c6354d7cf files/digest-freebsd-share-6.1_rc2 2409
+RMD160 b3ee33fe7a963fccfe85b54f12355d05af0edef7 files/digest-freebsd-share-6.1_rc2 2409
+SHA256 1ac1d267be3824b025e2bccc635a7d2001d886a196c10edd1642ac197c9db9ea files/digest-freebsd-share-6.1_rc2 2409
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVnpRAiZjviIA2XgRAoqpAKCwuNNV4m86pw8npZspci4r20E63QCeM1f6
-DYdaqhoOMdghQxf9sa9/yC4=
-=3pAO
+iD8DBQFEV9aWAiZjviIA2XgRAo2kAKDYfa+AqfIomFHSf2EMh1yTI889ngCgnm+F
+tLUIJuO96qXIcT99TnJZJCs=
+=txbR
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc1 b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc1
deleted file mode 100644
index d9c69e375ca6..000000000000
--- a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc1
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 5dcbd5450bcc3bcfd592f0ec86e55921 freebsd-bin-6.1_rc1.tar.bz2 405949
-RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f freebsd-bin-6.1_rc1.tar.bz2 405949
-SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 freebsd-bin-6.1_rc1.tar.bz2 405949
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 cadc8eee1e84543a67995c5165f2f82c freebsd-gnu-6.1_rc1.tar.bz2 867322
-RMD160 bc9b19e7db79614e9830bb876b32b9e06f9ff89e freebsd-gnu-6.1_rc1.tar.bz2 867322
-SHA256 5795b8dd00887efcc212f560d4df93cf99a3a753680d8e7d9132d8c7a507de1f freebsd-gnu-6.1_rc1.tar.bz2 867322
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
-RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
-SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
-MD5 421c959ee3e6db692304d61459818aa1 freebsd-share-6.1_rc1.tar.bz2 3742648
-RMD160 ac699af1badb985a93702e8fc632ee43685bbc88 freebsd-share-6.1_rc1.tar.bz2 3742648
-SHA256 5e70f5cef76a1efa521923f9ea6de3c6ff9491bdbd648beca6f0b6865f991aee freebsd-share-6.1_rc1.tar.bz2 3742648
-MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
-SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.1_rc1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.1_rc1.ebuild
deleted file mode 100644
index dbfd0a9b254e..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-6.1_rc1.ebuild
+++ /dev/null
@@ -1,65 +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-share/freebsd-share-6.1_rc1.ebuild,v 1.2 2006/05/01 21:14:30 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="doc isdn"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
-RDEPEND=""
-
-RESTRICT="nostrip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo"
-
-PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch
-	${FILESDIR}/${PN}-5.4-gentoo-skel.patch
-	${FILESDIR}/${PN}-6.0-links.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.5::' ${S}/man/man5/Makefile
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' ${S}/man/man4/man4.{alpha,i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf ${S}/mk/*.mk
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# This is a groff problem and not a -shared problem.
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
-	mkmake || die "emake failed"
-}
-
-src_install() {
-	mkmake DESTDIR=${D} DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 596204ccda3e..344865e861b4 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -46,19 +46,19 @@ 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.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
-DIST freebsd-sys-6.1_rc1.tar.bz2 17096208 RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 size 17096208
+DIST freebsd-sys-6.1_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
 EBUILD freebsd-sources-6.0-r4.ebuild 2090 RMD160 845d1ef4c577205fa735ce5d11cee0b340b87181 SHA1 2ed100aea8b5964045a3d3c2e679a1514c535767 SHA256 03bc841690e36a1159faf7987c8255fd6533b84943b43524913341b9ebc12e98 size 2090
 MD5 aff23c6739f5cd117e5266494e740154 freebsd-sources-6.0-r4.ebuild 2090
 RMD160 845d1ef4c577205fa735ce5d11cee0b340b87181 freebsd-sources-6.0-r4.ebuild 2090
 SHA256 03bc841690e36a1159faf7987c8255fd6533b84943b43524913341b9ebc12e98 freebsd-sources-6.0-r4.ebuild 2090
-EBUILD freebsd-sources-6.1_rc1.ebuild 2052 RMD160 b9cad32abbb0a96116cde8922631e810237e6353 SHA1 fc6fcf3ccc23bf1165e5c7c1a6c191b8a355443c SHA256 eaa0e24caf307528f986e57ee751004b0a688cf930e1bce93c601ab3e53bf1ad size 2052
-MD5 44eef6cc528d85ed003eed4585a6ee97 freebsd-sources-6.1_rc1.ebuild 2052
-RMD160 b9cad32abbb0a96116cde8922631e810237e6353 freebsd-sources-6.1_rc1.ebuild 2052
-SHA256 eaa0e24caf307528f986e57ee751004b0a688cf930e1bce93c601ab3e53bf1ad freebsd-sources-6.1_rc1.ebuild 2052
-MISC ChangeLog 5180 RMD160 548988203d53c54a68f472f3b387ff11b4bab07f SHA1 87568662a59bc7286a32026bde3d5a85d086434a SHA256 c6b67a4602c711185991ad44bbf229729a8f59f42d86677156812f13d3630634 size 5180
-MD5 b2cda1c9bc92fc11570478d50af4e709 ChangeLog 5180
-RMD160 548988203d53c54a68f472f3b387ff11b4bab07f ChangeLog 5180
-SHA256 c6b67a4602c711185991ad44bbf229729a8f59f42d86677156812f13d3630634 ChangeLog 5180
+EBUILD freebsd-sources-6.1_rc2.ebuild 2010 RMD160 260d9fb55bc8a1047b172f5ded73d59929677e93 SHA1 b2b7564c34e47ddb7985a1225bea4e248f5d0a06 SHA256 bc4a12d918797d0750f3ead6d8b98763881ebd8d558d0d1a34293dcfa1bb8cc3 size 2010
+MD5 45aabe20f815d03465be81aa7ebeeecf freebsd-sources-6.1_rc2.ebuild 2010
+RMD160 260d9fb55bc8a1047b172f5ded73d59929677e93 freebsd-sources-6.1_rc2.ebuild 2010
+SHA256 bc4a12d918797d0750f3ead6d8b98763881ebd8d558d0d1a34293dcfa1bb8cc3 freebsd-sources-6.1_rc2.ebuild 2010
+MISC ChangeLog 5364 RMD160 c8a2bda57797c76af43707d5592996c211ba01da SHA1 81e734c9fe623b0cc33fa95cc70117d854b4c909 SHA256 a0bd82fdb5d82877fa5a92412dbff198ce58b8914cb388e380caf440368a284e size 5364
+MD5 b87733f7b2ccfa59722093b11c58453b ChangeLog 5364
+RMD160 c8a2bda57797c76af43707d5592996c211ba01da ChangeLog 5364
+SHA256 a0bd82fdb5d82877fa5a92412dbff198ce58b8914cb388e380caf440368a284e ChangeLog 5364
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -66,13 +66,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r4 256
 RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r4 256
 SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r4 256
-MD5 49cb5a5eed62a75d2a7636ee4a22e438 files/digest-freebsd-sources-6.1_rc1 268
-RMD160 181c9e1485dda9d015f50a3a88362e25f765f27e files/digest-freebsd-sources-6.1_rc1 268
-SHA256 504156c3acaa74fdc7ad0234ed9f9fb86814eddcc1c373eb43d646f0029238e8 files/digest-freebsd-sources-6.1_rc1 268
+MD5 312a83074ad6b43772df3ac9eebae5b1 files/digest-freebsd-sources-6.1_rc2 268
+RMD160 50e8b7f065ea2fe44a8ee13c4ac10d454c08ab6b files/digest-freebsd-sources-6.1_rc2 268
+SHA256 aea6031fefafef2da116542265cc3bceeab3facafc11df30645a038a91a592e7 files/digest-freebsd-sources-6.1_rc2 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVXwiAiZjviIA2XgRAq2nAJ9eT82r0Tn9bnSB2lpaysM5QsAWGACePkcu
-J0IK+4q4wa9+H03JpsTGfn4=
-=2QMP
+iD8DBQFEV9bKAiZjviIA2XgRAm7AAJ9A5sXTOnhSnrKj0ph/My+KsitbJACgsH2z
+9VEaF7tcwgwlCHpJF8Oig5s=
+=eB/O
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc1 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc1
deleted file mode 100644
index 6229226ead06..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6045efaa93abaa1399d751d7eae279b2 freebsd-sys-6.1_rc1.tar.bz2 17096208
-RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 freebsd-sys-6.1_rc1.tar.bz2 17096208
-SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 freebsd-sys-6.1_rc1.tar.bz2 17096208
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.ebuild
deleted file mode 100644
index 2ee3327c7bde..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.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_rc1.ebuild,v 1.2 2006/05/01 03:10:10 flameeyes 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="nostrip"
-
-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-14-fpu.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-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index c7b63996f8b6..79982a9e7423 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -42,29 +42,29 @@ MD5 764135d89f71d46bd96de7271f1083fc files/su.pamd 420
 RMD160 9888acbac2c2c79b64ec274cc7d96b13b86d8ad8 files/su.pamd 420
 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 files/su.pamd 420
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc1.tar.bz2 405949 RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 size 405949
+DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-include-6.0.tar.bz2 127219 RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b size 127219
-DIST freebsd-include-6.1_rc1.tar.bz2 127236 RMD160 b978bf654921e9f58f71b372881c494b39482b56 SHA256 4adecf2a0517b1c9040afe1df9f18873e76f6312ced22a7ed98ee1e7f61245ad size 127236
+DIST freebsd-include-6.1_rc2.tar.bz2 127237 RMD160 4235464be16e87e2f05022fe7024ee77f2afc3ae SHA256 5d346a1410f3daa2bbe2c2a4a158f7e0abf52f696b33ea332b2ad7c6aa14f730 size 127237
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
+DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
 EBUILD freebsd-ubin-6.0-r1.ebuild 2617 RMD160 292aab8acc32189d68a4a3fabc625b5896598bae SHA1 4186dc8c109934922b27d754e03f8c69e2659293 SHA256 e0ef405e4c278df67e25df85922161867e8286550f3a7f8f34770c89984e90f4 size 2617
 MD5 da749ba3892845a9be31236cdbd1faa0 freebsd-ubin-6.0-r1.ebuild 2617
 RMD160 292aab8acc32189d68a4a3fabc625b5896598bae freebsd-ubin-6.0-r1.ebuild 2617
 SHA256 e0ef405e4c278df67e25df85922161867e8286550f3a7f8f34770c89984e90f4 freebsd-ubin-6.0-r1.ebuild 2617
-EBUILD freebsd-ubin-6.1_rc1.ebuild 2581 RMD160 c30a21d4236d0c18b2a462d30c6a2972f0b3343a SHA1 39569cd64fefe1b5de0aa22386ebefac0828dbb1 SHA256 1ac0deee82f8f9cf942d29a7fc04d9028a086a0e7516e9644489bd0596714741 size 2581
-MD5 2cdefc5e7ea23af55776eeb9637185db freebsd-ubin-6.1_rc1.ebuild 2581
-RMD160 c30a21d4236d0c18b2a462d30c6a2972f0b3343a freebsd-ubin-6.1_rc1.ebuild 2581
-SHA256 1ac0deee82f8f9cf942d29a7fc04d9028a086a0e7516e9644489bd0596714741 freebsd-ubin-6.1_rc1.ebuild 2581
-MISC ChangeLog 6012 RMD160 145168eff4bc422ca953568201e674993c341efb SHA1 3a752c0dd010f46959b34fe3d3b045e1cd4f372a SHA256 24fcd7226cb84597a10df5e544d68104a13cf5dc6396c78704c9f3374025bd76 size 6012
-MD5 8f48e50a6e06815bd0e13738d08cbc49 ChangeLog 6012
-RMD160 145168eff4bc422ca953568201e674993c341efb ChangeLog 6012
-SHA256 24fcd7226cb84597a10df5e544d68104a13cf5dc6396c78704c9f3374025bd76 ChangeLog 6012
+EBUILD freebsd-ubin-6.1_rc2.ebuild 2581 RMD160 01760be2fdcf8f00b8062391139ee0b037f58019 SHA1 3f8b7c4dc50fb49408d57144ca6b8fd2c1e3d394 SHA256 300af2a3618293f678f628c66a83834044ae134c777586b41203732c1cad145b size 2581
+MD5 721a7483b095ef6f279ad3bc144e7ecd freebsd-ubin-6.1_rc2.ebuild 2581
+RMD160 01760be2fdcf8f00b8062391139ee0b037f58019 freebsd-ubin-6.1_rc2.ebuild 2581
+SHA256 300af2a3618293f678f628c66a83834044ae134c777586b41203732c1cad145b freebsd-ubin-6.1_rc2.ebuild 2581
+MISC ChangeLog 6186 RMD160 59e69cd5ae56ea3cbabb52d35fda00cad559b3b7 SHA1 0ef3964f2d5a0294355cb463c72f389948d3a298 SHA256 440e71490f26d28b47f0f879185be5da7b13c429048ee5ac42fa24ace3c0c995 size 6186
+MD5 5661005b993c40b47ee21d607c65e015 ChangeLog 6186
+RMD160 59e69cd5ae56ea3cbabb52d35fda00cad559b3b7 ChangeLog 6186
+SHA256 440e71490f26d28b47f0f879185be5da7b13c429048ee5ac42fa24ace3c0c995 ChangeLog 6186
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -72,13 +72,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 613424f0099cad1ce85a06d47bcb49f6 files/digest-freebsd-ubin-6.0-r1 1539
 RMD160 d39f6c71d301f5e62cfcd5624afd871e6ef9442d files/digest-freebsd-ubin-6.0-r1 1539
 SHA256 6841a99d17c9cf21996c35a5b0edeefb23aca499ff9479f825a733e1b31d1dec files/digest-freebsd-ubin-6.0-r1 1539
-MD5 5de7b32af95e66e9aa56e3002b246577 files/digest-freebsd-ubin-6.1_rc1 1611
-RMD160 65bec23d278a8a537d884329076a7c2bd3926b4f files/digest-freebsd-ubin-6.1_rc1 1611
-SHA256 73f3b36a5ccdd69a6d083d9b9488f44b28e551082c849f7f1d37218fe28fb162 files/digest-freebsd-ubin-6.1_rc1 1611
+MD5 dd09739ad90d047a3892abeee8935bd4 files/digest-freebsd-ubin-6.1_rc2 1611
+RMD160 25912fe8f0cdfe8f3d594150829eb20528c3049a files/digest-freebsd-ubin-6.1_rc2 1611
+SHA256 58912450dbd68c9c99fe7a91c72d47e769b737b0a81626cc7f801f9e73ac0221 files/digest-freebsd-ubin-6.1_rc2 1611
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVWL2AiZjviIA2XgRAgRsAJ9amw5nveSxFXAXwBbRZn5IxqV4+wCfboAG
-VCcpT4yQO/xSKR9wZANqntI=
-=Kb3h
+iD8DBQFEV9cGAiZjviIA2XgRAsL1AJ97P9PlZHRGP82w7t2aRNCqApzUVACg7/5j
+Q8L8j7iylnbTPJWu3kAzA/M=
+=zwv1
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc1
deleted file mode 100644
index c43b574278dd..000000000000
--- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 5dcbd5450bcc3bcfd592f0ec86e55921 freebsd-bin-6.1_rc1.tar.bz2 405949
-RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f freebsd-bin-6.1_rc1.tar.bz2 405949
-SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 freebsd-bin-6.1_rc1.tar.bz2 405949
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 8b52d1055322cf2b0cad3fc9c4c066b2 freebsd-include-6.1_rc1.tar.bz2 127236
-RMD160 b978bf654921e9f58f71b372881c494b39482b56 freebsd-include-6.1_rc1.tar.bz2 127236
-SHA256 4adecf2a0517b1c9040afe1df9f18873e76f6312ced22a7ed98ee1e7f61245ad freebsd-include-6.1_rc1.tar.bz2 127236
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
-SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc1.ebuild
deleted file mode 100644
index 65e7166d0046..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc1.ebuild
+++ /dev/null
@@ -1,93 +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-ubin/freebsd-ubin-6.1_rc1.ebuild,v 1.1 2006/05/01 01:22:49 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2"
-
-RDEPEND="sys-freebsd/freebsd-lib
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	sys-libs/zlib
-	virtual/pam"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-pkg_setup() {
-	use nls || mymakeopts="${mymakeopts} NO_NLS= "
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use usb || mymakeopts="${mymakeopts} NO_USB= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= "
-}
-
-# List of patches to apply
-PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
-	${FILESDIR}/${PN}-6.0-fixmakefiles.patch
-	${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-lint-stdarg.patch
-	${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar
-	tput tset
-	less lessecho lesskey
-	dig nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1
-}
-
-src_install() {
-	freebsd_src_install
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.pamd" ${pamdfile}
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb
-}
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 976e18fde7e7..e8217238791b 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -54,31 +54,31 @@ MD5 26bce1f4cc64c909807fecd318973e2a files/syslogd.initd 574
 RMD160 4dfc927915b794809d9570079a6fe1adf2ba8520 files/syslogd.initd 574
 SHA256 6532f12605e9f961c4e758a126db87428365779430a8e98644201bdded19461f files/syslogd.initd 574
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
+DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
+DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 EBUILD freebsd-usbin-6.0-r2.ebuild 4497 RMD160 8209e49747046ca194553c2f2bef6194c4d48bcb SHA1 23a6a5d8af837e37728823f2774334584f7eb62b SHA256 184369481778b09f527ca18e0d2fef7b674a4777cbf48e034183286fb39959f6 size 4497
 MD5 4ac1daaab9b9409fc8a2a8fa10ca7754 freebsd-usbin-6.0-r2.ebuild 4497
 RMD160 8209e49747046ca194553c2f2bef6194c4d48bcb freebsd-usbin-6.0-r2.ebuild 4497
 SHA256 184369481778b09f527ca18e0d2fef7b674a4777cbf48e034183286fb39959f6 freebsd-usbin-6.0-r2.ebuild 4497
-EBUILD freebsd-usbin-6.1_rc1.ebuild 4485 RMD160 c87bd654502849afcd4df62faf3a178a3b488212 SHA1 2c8b469fd6e5239f6fa993d86b0f7a736eda81b9 SHA256 e633b792447c51e79193580e0ef54d26ea864797596ead0aca32c20eb6ef8bbf size 4485
-MD5 f90644fa5552206f9af729beeebfb122 freebsd-usbin-6.1_rc1.ebuild 4485
-RMD160 c87bd654502849afcd4df62faf3a178a3b488212 freebsd-usbin-6.1_rc1.ebuild 4485
-SHA256 e633b792447c51e79193580e0ef54d26ea864797596ead0aca32c20eb6ef8bbf freebsd-usbin-6.1_rc1.ebuild 4485
-MISC ChangeLog 8238 RMD160 14562552cdde58e4c2057411348a470a33790eef SHA1 a2295165ca245ab38bd0f476e275ff86e4b3c72a SHA256 c74421632ba0022cf0936c31d1998c6db1504541cb7a5d25a4cc684e4b722714 size 8238
-MD5 c689d69680eb8d3e0c7f32134aa95dd3 ChangeLog 8238
-RMD160 14562552cdde58e4c2057411348a470a33790eef ChangeLog 8238
-SHA256 c74421632ba0022cf0936c31d1998c6db1504541cb7a5d25a4cc684e4b722714 ChangeLog 8238
+EBUILD freebsd-usbin-6.1_rc2.ebuild 4485 RMD160 ad4c4c3a95bc703cf6670509c4baa9f134b65868 SHA1 9de32c4e6760471af22ddf49eaef6aea90e76da9 SHA256 f62158e176ec879c1bcc1729d680be1866948c1296fe7aaa93f765d1a9c8aa4a size 4485
+MD5 ad05bebaad5eba76db6b310882dddbcb freebsd-usbin-6.1_rc2.ebuild 4485
+RMD160 ad4c4c3a95bc703cf6670509c4baa9f134b65868 freebsd-usbin-6.1_rc2.ebuild 4485
+SHA256 f62158e176ec879c1bcc1729d680be1866948c1296fe7aaa93f765d1a9c8aa4a freebsd-usbin-6.1_rc2.ebuild 4485
+MISC ChangeLog 8416 RMD160 42842271d8d35a556ce3bccd2424d7bcfbb62870 SHA1 2c3f98485c34d9d1a511a146834eb9db1a1a06b1 SHA256 6c9d314b5ff959e5755e160fc99ae09729900bf6fac952c086950ed3ce80d9b9 size 8416
+MD5 3f9fe925ee5fb6c630066af2458f1e5a ChangeLog 8416
+RMD160 42842271d8d35a556ce3bccd2424d7bcfbb62870 ChangeLog 8416
+SHA256 6c9d314b5ff959e5755e160fc99ae09729900bf6fac952c086950ed3ce80d9b9 ChangeLog 8416
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -86,13 +86,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 c9135c1dd494a2530c64932b005b3a6e files/digest-freebsd-usbin-6.0-r2 1804
 RMD160 518b8d1c0f014b712766336798e69fcde36d9eb4 files/digest-freebsd-usbin-6.0-r2 1804
 SHA256 e220ea79f7fe0698bcd6890c46fbd7e6280194f4cfc4cf88a491e41fa5b47a9b files/digest-freebsd-usbin-6.0-r2 1804
-MD5 927abee982bd14ca7cbfbe193643efc2 files/digest-freebsd-usbin-6.1_rc1 1888
-RMD160 1760364d0e89568d0a64294e6a9ef56cf6cbfdc5 files/digest-freebsd-usbin-6.1_rc1 1888
-SHA256 65f8ce2d3dfb59a8f66d935de6cebe642d2ea157a49f2423738d3726df79db73 files/digest-freebsd-usbin-6.1_rc1 1888
+MD5 ba9075f98872810c125053976196b1bb files/digest-freebsd-usbin-6.1_rc2 1888
+RMD160 098683e36230246dd66565cc1ed8c873893f8320 files/digest-freebsd-usbin-6.1_rc2 1888
+SHA256 21735ca6b0848f0448f06094c6f02a3b9057799e66f32887b21c3ce782cd16b2 files/digest-freebsd-usbin-6.1_rc2 1888
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVf7MAiZjviIA2XgRAn82AJ9neHMgnDVwRKI9GfW5oI0GgDE2sACgq9h3
-N87X0nwIJ5a6czSP7qEkVAU=
-=an9q
+iD8DBQFEV9dDAiZjviIA2XgRAnKQAJ9v62Qb/0FKkysJMxwtPQLAhf5jpQCdFltQ
+1vkqLG7PcLdQXMr28/q/GdQ=
+=qQPo
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc1 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc1
deleted file mode 100644
index 03e926afde88..000000000000
--- a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc1
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
-RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
-SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
-MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
-SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild
deleted file mode 100644
index 215d44c0c746..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild
+++ /dev/null
@@ -1,149 +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-usbin/freebsd-usbin-6.1_rc1.ebuild,v 1.2 2006/05/01 12:27:31 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm bluetooth tcpd ssl usb ipv6 acpi ipfilter isdn pam ssl radius
-	netgraph minimal ipsec nis pam suid nat radius"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*
-	sys-apps/texinfo
-	sys-devel/flex"
-
-PROVIDE="virtual/logger"
-
-S="${WORKDIR}/usr.sbin"
-
-pkg_setup() {
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use usb || mymakeopts="${mymakeopts} NO_USB= "
-	use acpi || mymakeopts="${mymakeopts} NO_ACPI= "
-	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
-	use pam || mymakeopts="${mymakeopts} NO_PAM= "
-	use radius || mymakeopts="${mymakeopts} NO_RADIUS= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= "
-	use ipsec || mymakeopts="${mymakeopts} NO_IPSEC= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-	use nat || mymakeopts="${mymakeopts} NO_NAT= "
-	use pam || mymakeopts="${mymakeopts} NO_PAM= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= PPP_NOSUID= "
-	use radius || mymakeopts="${mymakeopts} NO_RADIUS= "
-	use tcpd || mymakeopts="${mymakeopts} NO_WRAP= "
-
-	mymakeopts="${mymakeopts} NO_MAILWRAPPER= NO_BIND= NO_SENDMAIL= NO_PF= NO_AUTHPF= NO_LPR="
-
-	# kldxref does not build with -O2
-	replace-flags "-O?" "-O1"
-}
-
-PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch
-	${FILESDIR}/${PN}-6.1-nowrap.patch"
-
-REMOVE_SUBDIRS="
-	named named-checkzone named-checkconf rndc rndc-confgen
-		dnssec-keygen dnssec-signzone
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	sysinstall cron mailwrapper ntp bsnmpd mount_smbfs
-	tcpdump ndp traceroute pkg_install inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli
-	zic amd"
-
-src_unpack() {
-	freebsd_src_unpack
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-	ln -s "/usr/include" "${WORKDIR}/include"
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
-	for util in nfs nfsmount rpcbind syslogd moused powerd; do
-		newinitd ${FILESDIR}/${util}.initd ${util}
-		[[ -e ${FILESDIR}/${util}.confd ]] && \
-			newconfd ${FILESDIR}/${util}.confd ${util}
-	done
-
-	for class in daily monthly weekly; do
-		cat - > ${T}/periodic.${class} <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe ${T}/periodic.${class} periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf"
-
-	cd "${WORKDIR}/etc"
-	doins amd.map apmd.conf syslog.conf newsyslog.conf usbd.conf
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf
-
-	if use isdn; then
-		insinto /etc/isdn
-		doins isdn/*
-		rm -f ${D}/etc/isdn/Makefile
-	fi
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/*
-		rm -f ${D}/etc/bluetooth/Makefile
-	fi
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f ${ROOT}/var/log/${logfile} ]] || touch ${ROOT}/var/log/${logfile}
-	done
-}
-