Update to 6.1, replace gentoover patch with a simple script.

(Portage version: 2.1_pre10)

3 files changed, 78 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 8e074a6311ea..dbcc56f3abfa 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.7 2006/04/19 23:44:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.8 2006/04/30 20:17:44 flameeyes Exp $
+
+*freebsd-sources-6.1_rc1 (30 Apr 2006)
+
+  30 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +freebsd-sources-6.1_rc1.ebuild:
+  Update to 6.1, replace gentoover patch with a simple script.
 
 *freebsd-sources-6.0-r4 (19 Apr 2006)
 
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
new file mode 100644
index 000000000000..6229226ead06
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc1
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..dd6863a33341
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.ebuild
@@ -0,0 +1,68 @@
+# 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.1 2006/04/30 20:17:44 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"
+}
+
+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
+}