Update to 6.1_rc2.

(Portage version: 2.1_pre10-r2)

3 files changed, 80 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 2a6288549187..cfe7294a5103 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.9 2006/05/01 03:10:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.10 2006/05/02 22:01:38 flameeyes Exp $
+
+*freebsd-sources-6.1_rc2 (02 May 2006)
+
+  02 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-sources-6.1_rc1.ebuild, +freebsd-sources-6.1_rc2.ebuild:
+  Update to 6.1_rc2.
 
   01 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-sources-6.0-r4.ebuild, freebsd-sources-6.1_rc1.ebuild:
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
new file mode 100644
index 000000000000..26bf283c442a
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc2
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..dc51f6b1ca19
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc2.ebuild
@@ -0,0 +1,70 @@
+# 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
+}