3 files changed, 15 insertions, 52 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