Update to 6.1-RELEASE.

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

3 files changed, 15 insertions, 88 deletions

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 344865e861b4..ed822520239b 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_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
+DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f size 17361671
 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_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
+EBUILD freebsd-sources-6.1.ebuild 2006 RMD160 7637a480578e497a2945e8c30f4dba85db3e88c8 SHA1 eb75527211ba554d3e5fcbc40c9b99f235554475 SHA256 38c3d12e8fd27b2dff14c1d31ee72db6d106ee7cd1c8318a23aad07e21807387 size 2006
+MD5 d32c8da0c60ce665834024cdc605443c freebsd-sources-6.1.ebuild 2006
+RMD160 7637a480578e497a2945e8c30f4dba85db3e88c8 freebsd-sources-6.1.ebuild 2006
+SHA256 38c3d12e8fd27b2dff14c1d31ee72db6d106ee7cd1c8318a23aad07e21807387 freebsd-sources-6.1.ebuild 2006
+MISC ChangeLog 5543 RMD160 ee79980722256050b92d67dac8b9e5c733c082d7 SHA1 11cc726d0889197a87a056f230a0915e6cf2d0a0 SHA256 1aa4109e0a5923cce6371ad95259ffe456ec76dea12c578056ddf29af64a27d1 size 5543
+MD5 cfc1f4832733ee1574da7ed3906b3781 ChangeLog 5543
+RMD160 ee79980722256050b92d67dac8b9e5c733c082d7 ChangeLog 5543
+SHA256 1aa4109e0a5923cce6371ad95259ffe456ec76dea12c578056ddf29af64a27d1 ChangeLog 5543
 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 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
+MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1 256
+RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1 256
+SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9bKAiZjviIA2XgRAm7AAJ9A5sXTOnhSnrKj0ph/My+KsitbJACgsH2z
-9VEaF7tcwgwlCHpJF8Oig5s=
-=eB/O
+iD8DBQFEYEgnAiZjviIA2XgRAmv3AKCUqS8emu1Qv8/S5tXRmDviyPxNVACg82hU
+ux1R6fiDXpf+dDDlH3OZGK0=
+=lGNl
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc2 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc2
deleted file mode 100644
index 26bf283c442a..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 232a881d16f64a526796fcd6a054c495 freebsd-sys-6.1_rc2.tar.bz2 17197678
-RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f freebsd-sys-6.1_rc2.tar.bz2 17197678
-SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 freebsd-sys-6.1_rc2.tar.bz2 17197678
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc2.ebuild
deleted file mode 100644
index dc51f6b1ca19..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc2.ebuild
+++ /dev/null
@@ -1,70 +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_rc2.ebuild,v 1.1 2006/05/02 22:01:38 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"
-
-	# 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
-}