bump to 9.1_rc2

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

3 files changed, 112 insertions, 5 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index b97d6c24c6c3..2733156b3a1f 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.75 2012/09/11 17:34:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.76 2012/10/14 15:28:12 aballier Exp $
+
+*freebsd-sources-9.1_rc2 (14 Oct 2012)
+
+  14 Oct 2012; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-sources-9.1_rc2.ebuild:
+  bump to 9.1_rc2
 
   11 Sep 2012; Alexis Ballier <aballier@gentoo.org>
   -freebsd-sources-9.0.ebuild, -freebsd-sources-9.0-r1.ebuild,
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 0a2e568560f9..40781010c2d4 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -37,17 +37,19 @@ DIST freebsd-sys-8.0.tar.bz2 22552771 SHA256 2d822bdeecbbea660aea06ba147a23878cb
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1_rc1.tar.bz2 32607060 SHA256 0f375b358f5c407c16308a4884207b97022a7a5466e0291087642685f3c83957 SHA512 7aced802f7dd72cee12bdc7311d10137c73eedc9c661e81524b4a91b27df85b947d2b13f18345fa40325e6f87c759023af2620956353d0753653e230fcbfbd9d WHIRLPOOL a0849c14427c5920140a67bb693f54502bbe0860516b41090fb7f84628e4f55e1d0b26e83efbb013c59d57a9136249d8a0dce5b9ac76f0909c604960f56af45f
+DIST freebsd-sys-9.1_rc2.tar.bz2 32602564 SHA256 9b4914b1d5aae492af14c2fb28be5c28d98db43b8642bf397d261b982dbd78ac SHA512 5bf3729849b3d090542ee99995182663c2ccdc004a5ed8ff8792ad01b9db0fdaa9d37bcfed47dd4df25c9aa7121c91bd5acf34fe396e760a6b2ee015d07d69bf WHIRLPOOL 18b61b90e3f978c531bfa3001bc195deb4ac780234e5725b2f4140b0b8e56c00acd9ddfc98e26f50ff6fecb17e3925e7fba4fdda1a337ec34a374994c4ad9caa
 EBUILD freebsd-sources-7.2-r3.ebuild 3943 SHA256 f6b279fd482a0b156924fc23fbb7a110b156d7c61a583e25817c1afa3f48b3a8 SHA512 ee770ebee1b9c9ae6f32dfe0e653b29dfed36c1db3c367d631839c4898d633e662bdf12a1d9f7cff4f4dfb64e8be4ea83269aedee4a958108a6d715c828c97aa WHIRLPOOL bbc5234cc8ade99526c8bb15e33de2c4e920722b549d7e6e910e5551249e34f75d63cffe201ce9aed53a9cb3f582bb4f5fd27713f6a76485f2a35232fd6d4853
 EBUILD freebsd-sources-8.0.ebuild 3671 SHA256 4b9c2b8f9a800697543e942138914a7784f3e111dc33db7dfe8daa31c37b3262 SHA512 89a9b735d64b24e192e546154d066d7ad4492054bc1c5079b64eae01c7ec992295d911a4fe55ea05a77885a4549775a3d85e1ed4f6d87560db1509bd2ed28b43 WHIRLPOOL 7be82aae09e023fc1cb25fb8f9ebee963c5874d2223e75fef878d167d7df967ee9356a710666a6f563ebf377e18cace1eab1017f7778f69bc23a63e59d54f883
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
 EBUILD freebsd-sources-9.0-r4.ebuild 3452 SHA256 b69418e11c38e8a9e547421b570ec38c541d60d820795dd01c7a3d0e46ecc606 SHA512 9271ffbd85b0c1cc26ba32c8a50f0dc58e0252d22e630095b8f89d30e6706314e0c606c970b75084c13b7e0ef57228deac6f69e284327b4f6128d66756f9c333 WHIRLPOOL 10e184efc4b149bce360ebc1f8be2a68f9a0d02ecfc7c7de5a768b6ced1cd771bc6707623c3ad5dbe5752baeb05d9c89a82d52a2d9a28fac6a97d4e8f5bd6bb6
 EBUILD freebsd-sources-9.1_rc1.ebuild 3356 SHA256 aa973cc4d514a65aed559ce0913bc82461a96b506a7eeef72b39b5de52038190 SHA512 6fb6275e93aec000e9ad5cdb237b16a8d23c43d1b36873775817fc730bbc07b09e0a65f4038b87dce1d39cfee9713fd52b44e3b41c989c7776c99f3fdf0669c6 WHIRLPOOL 4b370a0ae98608b383b0ef0fc7a42903dc8e99d49603cda9c0c4da2bbd115d5376c59ab9bb45b6a88ca38a61d3d0af6badc3bb41368a085aaae76993ca95e769
-MISC ChangeLog 20137 SHA256 339048c14c8d115ab157b7cd83c55f9c96fb8cda04afc492bda56616fd625ed0 SHA512 3b33d45c6068dbaf9f279f85c6aee2f4c185098c8ab925ba6a9b74dd8e0cb3c7ed53a0c45a2f8457f65c0844f0ff38aa38395a9aea5c865110b1b42d4661a6b6 WHIRLPOOL c4efd2e8305056f19a773d10d402c9ef38fd9e19ba7abf545b1a8bb7729b201e1c83abdc710c8842cfbc70501b86b2193335fcb1887c7831efcb61c7db6974d8
+EBUILD freebsd-sources-9.1_rc2.ebuild 3356 SHA256 ff3e9b680124ffa080317346a23b62b8423c7098b738c6fb4f2a8719f98c676d SHA512 d755e72f391c99a39f58f9bdd8908fe7c8097653265bf45d2dbe1e48f9dd62cef3c776f7e58a065f5569862d9891f74a86ebecba8d22b5d820d16d8b96abcd91 WHIRLPOOL 1d0d1d08b8f3ab3949d1d559c6d07aa231c3306ea51f1bc3451f6a3307a5f62a8e602296e1818b810fa279f0a5144735cdd76cd5c348f2b6aa2280df6b564750
+MISC ChangeLog 20283 SHA256 15fb89e8e4d8e6a58de408cf80e032cb13ac4a0438ebfbd90cc0537de7667b1d SHA512 986edf5404cb3442c03835118eb97bba935f1cf3f73c7b87ffab77869fb8dec1c1f3ea16ca0cdf719bb1fbe235ce634aced8d07f16e588cec9d23e30b1494cd6 WHIRLPOOL e457663c2132e3db382a0bbb23a4381deb50af2e877a2fcfb7567e269bd93e80e3dee6e572b1a1027f29487fbb6347ae4b1dfd333ad58d985bc7b4b4ccbd0c75
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBPdjkACgkQvFcC4BYPU0qecQCfSdzv0Tsor/VyJhTMlXrk3bFs
-8kkAoJLN/JZr+X0TsxXUJgZojCyFHLu6
-=VSKa
+iEYEAREIAAYFAlB62g0ACgkQvFcC4BYPU0rhvwCeNWsrxE+nG/s0Vm6ulJZxB/2/
+gWoAoLgQaoeZJ7dVD37Jp5QA3+MYv/es
+=PdXn
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2.ebuild
new file mode 100644
index 000000000000..571a89fb6b31
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2.ebuild,v 1.1 2012/10/14 15:28:12 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+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"
+
+	# workaround a kernel panic for amd64-fbsd, bug #408019
+	epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+
+	# __FreeBSD_cc_version comes from FreeBSD's gcc.
+	# on 9.0-RELEASE it's 900001.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	# Remove -Werror
+	sed -e "s:-Werror:-Wno-error:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die
+
+	epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
+	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
+	epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
+
+	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
+	# vop_whiteout to tmpfs, so it can be used as an overlay
+	# unionfs filesystem over the cd9660 readonly filesystem.
+	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.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 symlink to sys-${MY_PVR}..."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		# just in case...
+		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+		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 to sys-${MY_PVR}..."
+		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't remove previous symlinks, please fix manually."
+		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
+
+	if use sparc-fbsd ; then
+		ewarn "WARNING: kldload currently causes kernel panics"
+		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+		ewarn "Please compile all modules you need into the kernel"
+	fi
+}