From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Fri, 29 Dec 2006 15:22:27 +0000 (+0000)
Subject: Bump to rc2 and remove older versions.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa3fe4a75109b810243610a14387315681365c7e;p=gentoo.git

Bump to rc2 and remove older versions.
Package-Manager: portage-2.1.2_rc4-r1
---

diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index 3ecc9fd1c3c4..8d067f8e3239 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/boot0
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.17 2006/11/19 13:35:02 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.18 2006/12/29 15:15:19 flameeyes Exp $
+
+*boot0-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -boot0-6.2_beta2.ebuild, -boot0-6.2_beta3.ebuild, -boot0-6.2_rc1.ebuild,
+  +boot0-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
   19 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> boot0-6.2_rc1.ebuild:
   Patched to make it compile on GCC 4.
diff --git a/sys-freebsd/boot0/boot0-6.2_rc2.ebuild b/sys-freebsd/boot0/boot0-6.2_rc2.ebuild
new file mode 100644
index 000000000000..cd5d3469c0b5
--- /dev/null
+++ b/sys-freebsd/boot0/boot0-6.2_rc2.ebuild
@@ -0,0 +1,36 @@
+# 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.2_rc2.ebuild,v 1.1 2006/12/29 15:15:19 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD's bootloader"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~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
+	${FILESDIR}/freebsd-sources-6.2-sparc64.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	grep -lr --null -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		"s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" || die
+	sed -i -e '/-fomit-frame-pointer/d' "${S}"/i386/boot2/Makefile || die
+}
+
+src_install() {
+	dodir /boot/defaults
+
+	mkinstall FILESDIR=/boot || die "mkinstall failed"
+}
diff --git a/sys-freebsd/boot0/files/digest-boot0-6.2_rc2 b/sys-freebsd/boot0/files/digest-boot0-6.2_rc2
new file mode 100644
index 000000000000..2dec293d3f2d
--- /dev/null
+++ b/sys-freebsd/boot0/files/digest-boot0-6.2_rc2
@@ -0,0 +1,3 @@
+MD5 692607c3bf8e5645c584fa6dcaad0cc9 freebsd-sys-6.2_rc2.tar.bz2 18339807
+RMD160 ab2e6110b767319a0135130f9ad16d074de61483 freebsd-sys-6.2_rc2.tar.bz2 18339807
+SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 freebsd-sys-6.2_rc2.tar.bz2 18339807
diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index 24f97c5fb736..6ee84c172c37 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.24 2006/12/28 16:28:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.25 2006/12/29 15:15:52 flameeyes Exp $
+
+*freebsd-bin-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-bin-6.2_beta3.ebuild, -freebsd-bin-6.2_rc1.ebuild,
+  +freebsd-bin-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
   28 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-bin-6.2_rc1.ebuild:
diff --git a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.2_rc2 b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.2_rc2
new file mode 100644
index 000000000000..39eef5f9f3b7
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.2_rc2
@@ -0,0 +1,9 @@
+MD5 d42e5143b1e45778f55f398455c106e1 freebsd-bin-6.2_rc2.tar.bz2 406726
+RMD160 49f94f065296854cf9020426db2d35aa2e1273bb freebsd-bin-6.2_rc2.tar.bz2 406726
+SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f freebsd-bin-6.2_rc2.tar.bz2 406726
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
+MD5 8282c2d079adef376bb7e195409b84f6 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a freebsd-sbin-6.2_rc2.tar.bz2 1161795
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.2_rc2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.2_rc2.ebuild
new file mode 100644
index 000000000000..4201367d34a2
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-6.2_rc2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.2_rc2.ebuild,v 1.1 2006/12/29 15:15:52 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD /bin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="nls"
+
+SRC_URI="mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	dev-libs/libedit
+	sys-libs/ncurses
+	sys-apps/ed
+	!app-admin/realpath"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	>=sys-devel/flex-2.5.31-r2"
+
+S=${WORKDIR}/bin
+
+PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
+		${FILESDIR}/${PN}-6.2-mkdir-posix.patch"
+
+pkg_setup() {
+	use nls || mymakeopts="${mymakeopts} NO_NLS= "
+
+	mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= NO_OPENSSL= NO_CRYPT= NO_RCMDS= "
+}
+
+# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
+REMOVE_SUBDIRS="csh rmail ed"
diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 0bbc1e4ced56..d1decdd11c67 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-contrib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.20 2006/11/22 12:10:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.21 2006/12/29 15:16:21 flameeyes Exp $
+
+*freebsd-contrib-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-contrib-6.2_rc1.ebuild, +freebsd-contrib-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
   22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-contrib-6.2_rc1.ebuild:
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_rc2 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_rc2
new file mode 100644
index 000000000000..3ff4153a36c3
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_rc2
@@ -0,0 +1,6 @@
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 883c4224734443853428056c3ddd1517 freebsd-gnu-6.2_rc2.tar.bz2 874291
+RMD160 9d182b42a407bd690340fe603e4950c6f28b0760 freebsd-gnu-6.2_rc2.tar.bz2 874291
+SHA256 7dac776dfae37bb1d7ab228ac8267aac15dc6ac041961aba8f2d2997875e5481 freebsd-gnu-6.2_rc2.tar.bz2 874291
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc2.ebuild
new file mode 100644
index 000000000000..af50f1649c80
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc2.ebuild,v 1.1 2006/12/29 15:16:21 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="Contributed sources for FreeBSD."
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+LICENSE="BSD GPL-2 as-is"
+
+IUSE=""
+
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/gnu"
+
+src_unpack() {
+	echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
+	tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libdialog gnu/usr.bin/sort gnu/usr.bin/patch
+	echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
+	tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
+
+	freebsd_do_patches
+	freebsd_rename_libraries
+}
+
+src_compile() {
+	cd "${S}/lib/libdialog"
+	freebsd_src_compile
+
+	cd "${S}/usr.bin/sort"
+	freebsd_src_compile
+
+	cd "${S}/usr.bin/patch"
+	freebsd_src_compile
+}
+
+src_install() {
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
+
+	cd "${S}/lib/libdialog"
+	mkinstall || die "libdialog install failed"
+
+	cd "${S}/usr.bin/sort"
+	mkinstall DESTDIR="${D}/bin/" || die "libdialog install failed"
+
+	cd "${S}/usr.bin/patch"
+	mkinstall DESTDIR="${D}/usr/bin/" || die "libdialog install failed"
+}
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 611958d46f63..c235d480f260 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.44 2006/12/28 16:27:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.45 2006/12/29 15:17:06 flameeyes Exp $
+
+*freebsd-lib-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-lib-6.2_rc1.ebuild, -freebsd-lib-6.2_rc1-r1.ebuild,
+  +freebsd-lib-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
 *freebsd-lib-6.2_rc1-r1 (28 Dec 2006)
 
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_rc2 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_rc2
new file mode 100644
index 000000000000..764ef923f92c
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_rc2
@@ -0,0 +1,24 @@
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 0584132e1704bd72159ef1fd51e3711a freebsd-crypto-6.2_rc2.tar.bz2 4005390
+RMD160 443e09ccd6b26590f6ed160888e5da9f01929e85 freebsd-crypto-6.2_rc2.tar.bz2 4005390
+SHA256 6db02fa1a722d309c1a92f717f2419cdc068553134e192a646eb1e6abaef4bec freebsd-crypto-6.2_rc2.tar.bz2 4005390
+MD5 670878e7e0c1933986380aa65e8babf3 freebsd-etc-6.2_rc2.tar.bz2 189416
+RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c freebsd-etc-6.2_rc2.tar.bz2 189416
+SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e freebsd-etc-6.2_rc2.tar.bz2 189416
+MD5 5fbab2a6ad020b692a37997443daf582 freebsd-include-6.2_rc2.tar.bz2 131650
+RMD160 811494045dd44c953efeb690258a52ec89a169fe freebsd-include-6.2_rc2.tar.bz2 131650
+SHA256 ab4264cf293c5acffb9cfbabce3605841187c900b76eb1cd4a403053ee57220c freebsd-include-6.2_rc2.tar.bz2 131650
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
+MD5 5af0c026855212bb30ab2c204632b003 freebsd-libexec-6.2_rc2.tar.bz2 277162
+RMD160 e1868104643febadcd503d2da8b781ef7f24b22e freebsd-libexec-6.2_rc2.tar.bz2 277162
+SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 freebsd-libexec-6.2_rc2.tar.bz2 277162
+MD5 692607c3bf8e5645c584fa6dcaad0cc9 freebsd-sys-6.2_rc2.tar.bz2 18339807
+RMD160 ab2e6110b767319a0135130f9ad16d074de61483 freebsd-sys-6.2_rc2.tar.bz2 18339807
+SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 freebsd-sys-6.2_rc2.tar.bz2 18339807
+MD5 35113347d351fc17583b66b8f1deb680 freebsd-usbin-6.2_rc2.tar.bz2 2696638
+RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a freebsd-usbin-6.2_rc2.tar.bz2 2696638
+SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 freebsd-usbin-6.2_rc2.tar.bz2 2696638
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_rc2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_rc2.ebuild
new file mode 100644
index 000000000000..dd4cfacfb652
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_rc2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_rc2.ebuild,v 1.1 2006/12/29 15:17:06 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="6.0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build bootstrap"
+
+# Crypto is needed to have an internal OpenSSL header
+# sys is needed for libalias, probably we can just extract that instead of
+# extracting the whole tarball
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${CRYPTO}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		nis? ( mirror://gentoo/${USBIN}.tar.bz2 )
+		build? (
+			mirror://gentoo/${SYS}.tar.bz2 )"
+
+if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		kerberos? ( virtual/krb5 )
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*
+		!bootstrap? ( app-arch/bzip2 )"
+
+	PROVIDE="virtual/libc
+		virtual/os-headers"
+
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
+
+pkg_setup() {
+	[[ -c /dev/zero ]] || \
+		die "You forgot to mount /dev; the compiled libc would break."
+
+	if ! use ssl && use kerberos; then
+		eerror "If you want kerberos support you need to enable ssl support, too."
+	fi
+
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
+
+	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= "
+
+	replace-flags "-O?" -"O1"
+
+	if [[ ${CTARGET} != ${CHOST} ]]; then
+		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
+		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
+	fi
+}
+
+PATCHES="${FILESDIR}/${PN}-bsdxml.patch
+	${FILESDIR}/${PN}-6.0-pmc.patch
+	${FILESDIR}/${PN}-6.0-gccfloat.patch
+	${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
+	${FILESDIR}/${PN}-6.0-binutils-asm.patch
+	${FILESDIR}/${PN}-6.0-ssp.patch
+	${FILESDIR}/${PN}-6.1-csu.patch
+	${FILESDIR}/${PN}-6.2-gcc41.patch
+	${FILESDIR}/${PN}-6.2-sparc64.patch"
+
+# Here we disable and remove source which we don't need or want
+# In order:
+# - ncurses stuff
+# - archiving libraries (have their own ebuild)
+# - sendmail libraries (they are installed by sendmail)
+# - SNMP library and dependency (have their own ebuilds)
+#
+# The rest are libraries we already have somewhere else because
+# they are contribution.
+# Note: libtelnet is an internal lib used by telnet and telnetd programs
+# as it's not used in freebsd-lib package itself, it's pointless building
+# it here.
+REMOVE_SUBDIRS="libncurses libform libmenu libpanel libedit \
+	libz libbz2 libarchive \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libsmb libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	sed -i -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+
+	use build && return 0
+
+	if [[ ${CTARGET} == ${CHOST} ]]; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+	else
+		sed -i -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
+			"${S}/libc/"{yp,rpc}"/Makefile.inc"
+	fi
+
+	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
+		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine"
+
+	use bootstrap && dummy_mk libstand
+}
+
+src_compile() {
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
+
+	use crosscompile_opts_headers-only && return 0
+
+	# Don't use ssp until properly fixed
+	append-flags $(test-flags -fno-stack-protector -fno-stack-protector-all)
+
+	strip-flags
+	if [[ ${CTARGET} != ${CHOST} ]]; then
+		export YACC='yacc -by'
+		CHOST=${CTARGET} tc-export CC LD CXX
+
+		local machine
+		machine=$(tc-arch-kernel ${CTARGET})
+
+		local csudir
+		if [[ -d "${S}/csu/${machine}-elf" ]]; then
+			csudir="${S}/csu/${machine}-elf"
+		else
+			csudir="${S}/csu/${machine}"
+		fi
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
+
+		append-flags "-isystem /usr/${CTARGET}/usr/include"
+		append-flags "-B ${csudir}"
+		append-ldflags "-B ${csudir}"
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+
+		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+	else
+		# Forces to use the local copy of headers as they might be outdated in
+		# the system
+		append-flags "-isystem '${WORKDIR}/sys' -isystem '${WORKDIR}/include'"
+
+		cd "${S}"
+		NOFLAGSTRIP=yes freebsd_src_compile
+	fi
+}
+
+src_install() {
+	cd "${WORKDIR}/include"
+
+	[[ ${CTARGET} == ${CHOST} ]] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+
+	dodir "${INCLUDEDIR}"
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=$(tc-arch-kernel) \
+		DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed"
+
+	# Install math.h when crosscompiling, at this point
+	if [[ ${CHOST} != ${CTARGET} ]]; then
+		insinto "/usr/${CTARGET}/usr/include"
+		doins "${S}/msun/src/math.h"
+	fi
+
+	use crosscompile_opts_headers-only && return 0
+
+	if [[ ${CTARGET} != ${CHOST} ]]; then
+		local csudir
+		if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
+		else
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
+		fi
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
+			FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
+
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
+
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
+
+		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+	else
+		cd "${S}"
+		mkinstall || die "Install failed"
+	fi
+
+	# Don't install the rest of the configuration files if crosscompiling
+	[[ ${CTARGET} != ${CHOST} ]] && return 0
+
+	# Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly
+	# identical, remove when problems will actually happen)
+	dosym /lib/libc.so.6 /usr/lib/libc.so.5
+	dosym /lib/libm.so.4 /usr/lib/libm.so.3
+
+	# install libstand files
+	dodir /usr/include/libstand
+	insinto /usr/include/libstand
+	doins "${S}"/libstand/*.h
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins auth.conf nls.alias mac.conf netconfig
+
+	# Install ttys file
+	doins "etc.$(tc-arch-kernel)"/*
+
+	dodir /etc/sandbox.d
+	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
+# /dev/crypto is used mostly by OpenSSL on *BSD platforms
+# leave it available as packages might use OpenSSL commands
+# during compile or install phase.
+SANDBOX_PREDICT="/dev/crypto"
+EOF
+}
+
diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index 66a677e81d37..943c2133e932 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.21 2006/11/22 13:24:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.22 2006/12/29 15:17:39 flameeyes Exp $
+
+*freebsd-libexec-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-libexec-5.3_rc1-ypxfr-makefile.patch,
+  -freebsd-libexec-6.2_rc1.ebuild, +freebsd-libexec-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
   22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   -freebsd-libexec-6.2_beta3.ebuild, freebsd-libexec-6.2_rc1.ebuild:
diff --git a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.2_rc2 b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.2_rc2
new file mode 100644
index 000000000000..85d19bcdf313
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.2_rc2
@@ -0,0 +1,21 @@
+MD5 d42e5143b1e45778f55f398455c106e1 freebsd-bin-6.2_rc2.tar.bz2 406726
+RMD160 49f94f065296854cf9020426db2d35aa2e1273bb freebsd-bin-6.2_rc2.tar.bz2 406726
+SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f freebsd-bin-6.2_rc2.tar.bz2 406726
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 670878e7e0c1933986380aa65e8babf3 freebsd-etc-6.2_rc2.tar.bz2 189416
+RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c freebsd-etc-6.2_rc2.tar.bz2 189416
+SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e freebsd-etc-6.2_rc2.tar.bz2 189416
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
+MD5 5af0c026855212bb30ab2c204632b003 freebsd-libexec-6.2_rc2.tar.bz2 277162
+RMD160 e1868104643febadcd503d2da8b781ef7f24b22e freebsd-libexec-6.2_rc2.tar.bz2 277162
+SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 freebsd-libexec-6.2_rc2.tar.bz2 277162
+MD5 92379f69fe95688de1a25f2b8a4ccf21 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+MD5 35113347d351fc17583b66b8f1deb680 freebsd-usbin-6.2_rc2.tar.bz2 2696638
+RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a freebsd-usbin-6.2_rc2.tar.bz2 2696638
+SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 freebsd-usbin-6.2_rc2.tar.bz2 2696638
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_rc2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_rc2.ebuild
new file mode 100644
index 000000000000..ee5b3ddbb016
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_rc2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_rc2.ebuild,v 1.1 2006/12/29 15:17:39 flameeyes Exp $
+
+inherit bsdmk freebsd pam
+
+DESCRIPTION="FreeBSD libexec things"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="pam ssl kerberos ipv6 nis"
+
+SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${UBIN}.tar.bz2
+	mirror://gentoo/${BIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-sources-${RV}*"
+
+S="${WORKDIR}/libexec"
+
+PATCHES="${FILESDIR}/${PN}-setXid.patch
+	${FILESDIR}/${PN}-nossp.patch
+	${FILESDIR}/${PN}-6.1-libfallback.patch
+	${FILESDIR}/${PN}-6.2-sparc64.patch"
+
+# Remove sendmail, tcp_wrapper and other useless stuff
+REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
+
+pkg_setup() {
+	use pam || mymakeopts="${mymakeopts} NO_PAM= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
+	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+
+	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_PF= "
+}
+
+src_unpack() {
+	freebsd_src_unpack
+
+	ln -s /usr/include "${WORKDIR}/include"
+}
+
+src_compile() {
+	NOSSP_FLAGS="$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	export NOSSP_FLAGS
+	freebsd_src_compile
+}
+
+src_install() {
+	freebsd_src_install
+
+	newinitd "${FILESDIR}/bootpd.initd"
+	newconfd "${FILESDIR}/bootpd.confd"
+
+	insinto /etc
+	doins "${WORKDIR}/etc/gettytab"
+}
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index 9c347794f921..0b5f35c8c8f8 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.26 2006/11/24 17:16:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.27 2006/12/29 15:18:08 flameeyes Exp $
+
+*freebsd-mk-defs-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-mk-defs-6.2_beta3.ebuild, -freebsd-mk-defs-6.2_rc1.ebuild,
+  +freebsd-mk-defs-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
   24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/freebsd-mk-defs-6.2-2-gentoo.patch:
diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.2_rc2 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.2_rc2
new file mode 100644
index 000000000000..aeefb35f51a9
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.2_rc2
@@ -0,0 +1,3 @@
+MD5 5fd7b385af6e9c2ac27658b531ecdf7d freebsd-share-6.2_rc2.tar.bz2 3762566
+RMD160 d7e8392c49cd1b5f0989a1b87144cc799ae418fa freebsd-share-6.2_rc2.tar.bz2 3762566
+SHA256 bff220ae3d7ab346494e339270a1c7f173593541db05fd102a1c6e8ef52fdda3 freebsd-share-6.2_rc2.tar.bz2 3762566
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2_rc2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2_rc2.ebuild
new file mode 100644
index 000000000000..0918358f1a8b
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2_rc2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2_rc2.ebuild,v 1.1 2006/12/29 15:18:08 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc-fbsd ~x86 ~x86-fbsd"
+
+IUSE=""
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
+
+RDEPEND=""
+DEPEND=""
+
+RESTRICT="nostrip"
+
+S="${WORKDIR}/share/mk"
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}/share
+	epatch "${FILESDIR}/${PN}-6.2-2-gentoo.patch"
+
+	[[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
+		epatch "${FILESDIR}/${PN}-6.0-gnu.patch"
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	if [[ ${CHOST} != *-freebsd* ]]; then
+		insinto /usr/share/mk/freebsd
+	else
+		insinto /usr/share/mk
+	fi
+	doins *.mk
+}
diff --git a/sys-freebsd/freebsd-pam-modules/ChangeLog b/sys-freebsd/freebsd-pam-modules/ChangeLog
index 3b7d6d900308..03aa15bb480d 100644
--- a/sys-freebsd/freebsd-pam-modules/ChangeLog
+++ b/sys-freebsd/freebsd-pam-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-pam-modules
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.16 2006/11/19 01:39:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.17 2006/12/29 15:18:33 flameeyes Exp $
+
+*freebsd-pam-modules-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-pam-modules-6.2_beta3.ebuild,
+  -freebsd-pam-modules-6.2_rc1.ebuild, +freebsd-pam-modules-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
 *freebsd-pam-modules-6.2_rc1 (19 Nov 2006)
 
diff --git a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.2_rc2 b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.2_rc2
new file mode 100644
index 000000000000..9f0fa777ee88
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.2_rc2
@@ -0,0 +1,3 @@
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.2_rc2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.2_rc2.ebuild
new file mode 100644
index 000000000000..72acd15154eb
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.2_rc2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.2_rc2.ebuild,v 1.1 2006/12/29 15:18:33 flameeyes Exp $
+
+inherit bsdmk freebsd multilib pam
+
+DESCRIPTION="FreeBSD's PAM authentication modules"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="kerberos nis"
+
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
+
+RDEPEND=">=sys-auth/openpam-20050201-r1
+	kerberos? ( dev-libs/openssl
+		virtual/krb5 )"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-sources-${RV}*"
+
+S=${WORKDIR}/lib/libpam/modules
+
+pkg_setup() {
+	# Avoid installing pam_ssh as that has its own ebuild.
+	mymakeopts="${mymakeopts} NO_OPENSSH= "
+	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${WORKDIR}/lib
+
+	for module in pam_deny pam_passwdqc pam_permit; do
+		sed -i -e "s:${module}::" ${S}/modules.inc
+	done
+
+	# Avoid using static versions; use gentoo /lib/security dir
+	epatch ${FILESDIR}/${PN}-6.0-gentoo.patch
+}
+
+src_install() {
+	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
+
+	dodoc "${FILESDIR}/5.4/README.pamd"
+	dopamd "${FILESDIR}/5.4/pam.d/"*
+}
diff --git a/sys-freebsd/freebsd-pf/ChangeLog b/sys-freebsd/freebsd-pf/ChangeLog
index 8b3f6441509d..df79e3fa81fe 100644
--- a/sys-freebsd/freebsd-pf/ChangeLog
+++ b/sys-freebsd/freebsd-pf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-pf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.17 2006/11/19 01:40:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.18 2006/12/29 15:19:01 flameeyes Exp $
+
+*freebsd-pf-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-pf-6.2_beta3.ebuild, -freebsd-pf-6.2_rc1.ebuild,
+  +freebsd-pf-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
 *freebsd-pf-6.2_rc1 (19 Nov 2006)
 
diff --git a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.2_rc2 b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.2_rc2
new file mode 100644
index 000000000000..152fb78b76e3
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.2_rc2
@@ -0,0 +1,12 @@
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 670878e7e0c1933986380aa65e8babf3 freebsd-etc-6.2_rc2.tar.bz2 189416
+RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c freebsd-etc-6.2_rc2.tar.bz2 189416
+SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e freebsd-etc-6.2_rc2.tar.bz2 189416
+MD5 8282c2d079adef376bb7e195409b84f6 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a freebsd-sbin-6.2_rc2.tar.bz2 1161795
+MD5 35113347d351fc17583b66b8f1deb680 freebsd-usbin-6.2_rc2.tar.bz2 2696638
+RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a freebsd-usbin-6.2_rc2.tar.bz2 2696638
+SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 freebsd-usbin-6.2_rc2.tar.bz2 2696638
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.2_rc2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.2_rc2.ebuild
new file mode 100644
index 000000000000..a3f2f37f56db
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-6.2_rc2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.2_rc2.ebuild,v 1.1 2006/12/29 15:19:01 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE=""
+
+# Crypto is needed to have an internal OpenSSL header
+SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	sys-freebsd/freebsd-mk-defs
+	=sys-freebsd/freebsd-sources-${RV}*"
+
+S="${WORKDIR}"
+
+SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd"
+
+PATCHES="${FILESDIR}/${PN}-6.0-pcap.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+src_compile() {
+	for dir in ${SUBDIRS}; do
+		einfo "Starting make in ${dir}"
+		cd "${S}/${dir}"
+		mkmake || die "Make ${dir} failed"
+	done
+}
+
+src_install() {
+	for dir in ${SUBDIRS}; do
+		einfo "Starting install in ${dir}"
+		cd "${S}/${dir}"
+		mkinstall || die "Install ${dir} failed"
+	done
+
+	cd ${WORKDIR}/etc
+	insinto /etc
+	doins pf.os
+	newdoc pf.conf pf.conf.example
+
+	newinitd "${FILESDIR}/pf.initd" pf
+	newconfd "${FILESDIR}/pf.confd" pf
+}
diff --git a/sys-freebsd/freebsd-rescue/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog
index 92fe2b669cfc..2c76365b9646 100644
--- a/sys-freebsd/freebsd-rescue/ChangeLog
+++ b/sys-freebsd/freebsd-rescue/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-rescue
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.14 2006/11/19 01:41:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.15 2006/12/29 15:19:36 flameeyes Exp $
+
+*freebsd-rescue-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-rescue-6.2_beta3.ebuild, -freebsd-rescue-6.2_rc1.ebuild,
+  +freebsd-rescue-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
 *freebsd-rescue-6.2_rc1 (19 Nov 2006)
 
diff --git a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.2_rc2 b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.2_rc2
new file mode 100644
index 000000000000..6b33275e1ffb
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.2_rc2
@@ -0,0 +1,30 @@
+MD5 d42e5143b1e45778f55f398455c106e1 freebsd-bin-6.2_rc2.tar.bz2 406726
+RMD160 49f94f065296854cf9020426db2d35aa2e1273bb freebsd-bin-6.2_rc2.tar.bz2 406726
+SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f freebsd-bin-6.2_rc2.tar.bz2 406726
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 883c4224734443853428056c3ddd1517 freebsd-gnu-6.2_rc2.tar.bz2 874291
+RMD160 9d182b42a407bd690340fe603e4950c6f28b0760 freebsd-gnu-6.2_rc2.tar.bz2 874291
+SHA256 7dac776dfae37bb1d7ab228ac8267aac15dc6ac041961aba8f2d2997875e5481 freebsd-gnu-6.2_rc2.tar.bz2 874291
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
+MD5 5af0c026855212bb30ab2c204632b003 freebsd-libexec-6.2_rc2.tar.bz2 277162
+RMD160 e1868104643febadcd503d2da8b781ef7f24b22e freebsd-libexec-6.2_rc2.tar.bz2 277162
+SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 freebsd-libexec-6.2_rc2.tar.bz2 277162
+MD5 1596130104a3d47b1900ec48670cdddd freebsd-rescue-6.2_rc2.tar.bz2 4947
+RMD160 a59872457cc7ec283c8fcafef4bc3119e11fd77b freebsd-rescue-6.2_rc2.tar.bz2 4947
+SHA256 f58a047d34b061990a7366679977850a1f687de9100857ac1400d406bfae6534 freebsd-rescue-6.2_rc2.tar.bz2 4947
+MD5 8282c2d079adef376bb7e195409b84f6 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a freebsd-sbin-6.2_rc2.tar.bz2 1161795
+MD5 692607c3bf8e5645c584fa6dcaad0cc9 freebsd-sys-6.2_rc2.tar.bz2 18339807
+RMD160 ab2e6110b767319a0135130f9ad16d074de61483 freebsd-sys-6.2_rc2.tar.bz2 18339807
+SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 freebsd-sys-6.2_rc2.tar.bz2 18339807
+MD5 92379f69fe95688de1a25f2b8a4ccf21 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+MD5 35113347d351fc17583b66b8f1deb680 freebsd-usbin-6.2_rc2.tar.bz2 2696638
+RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a freebsd-usbin-6.2_rc2.tar.bz2 2696638
+SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 freebsd-usbin-6.2_rc2.tar.bz2 2696638
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2_rc2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2_rc2.ebuild
new file mode 100644
index 000000000000..f345482d5b14
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2_rc2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2_rc2.ebuild,v 1.1 2006/12/29 15:19:36 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD's rescue binaries"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE="atm nis"
+
+SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		mirror://gentoo/${SYS}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${RESCUE}.tar.bz2"
+
+RDEPEND=""
+DEPEND="sys-devel/flex
+	=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/rescue"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+
+	for flag in atm nis; do
+		if use ${flag} && ! built_with_use sys-libs/freebsd-lib ${flag}; then
+			die "You can't add ${flag} support here without adding it to sys-libs/freebsd-lib"
+		fi
+	done
+
+#	append-flags -fno-stack-protector -fno-stack-protector-all
+}
+
+src_unpack() {
+	freebsd_src_unpack
+
+	# As they are patches from ${WORKDIR} apply them by hand
+	cd ${WORKDIR}
+	epatch ${FILESDIR}/${PN}-5.4-gentoo.patch
+	epatch ${FILESDIR}/${PN}-5.4-sbin-gentoo.patch
+}
diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 5f61e48f194d..082e25ebef5b 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.28 2006/11/19 01:43:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.29 2006/12/29 15:20:11 flameeyes Exp $
+
+*freebsd-sbin-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-sbin-6.2_beta3.ebuild, -freebsd-sbin-6.2_rc1.ebuild,
+  +freebsd-sbin-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
 *freebsd-sbin-6.2_rc1 (19 Nov 2006)
 
diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2_rc2 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2_rc2
new file mode 100644
index 000000000000..4d6317e6a718
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2_rc2
@@ -0,0 +1,21 @@
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 670878e7e0c1933986380aa65e8babf3 freebsd-etc-6.2_rc2.tar.bz2 189416
+RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c freebsd-etc-6.2_rc2.tar.bz2 189416
+SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e freebsd-etc-6.2_rc2.tar.bz2 189416
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
+MD5 5af0c026855212bb30ab2c204632b003 freebsd-libexec-6.2_rc2.tar.bz2 277162
+RMD160 e1868104643febadcd503d2da8b781ef7f24b22e freebsd-libexec-6.2_rc2.tar.bz2 277162
+SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 freebsd-libexec-6.2_rc2.tar.bz2 277162
+MD5 8282c2d079adef376bb7e195409b84f6 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a freebsd-sbin-6.2_rc2.tar.bz2 1161795
+MD5 692607c3bf8e5645c584fa6dcaad0cc9 freebsd-sys-6.2_rc2.tar.bz2 18339807
+RMD160 ab2e6110b767319a0135130f9ad16d074de61483 freebsd-sys-6.2_rc2.tar.bz2 18339807
+SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 freebsd-sys-6.2_rc2.tar.bz2 18339807
+MD5 35113347d351fc17583b66b8f1deb680 freebsd-usbin-6.2_rc2.tar.bz2 2696638
+RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a freebsd-usbin-6.2_rc2.tar.bz2 2696638
+SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 freebsd-usbin-6.2_rc2.tar.bz2 2696638
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_rc2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_rc2.ebuild
new file mode 100644
index 000000000000..7ad71c7f2aff
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_rc2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_rc2.ebuild,v 1.1 2006/12/29 15:20:11 flameeyes Exp $
+
+inherit flag-o-matic bsdmk freebsd
+
+DESCRIPTION="FreeBSD sbin utils"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+
+SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2
+	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	=sys-freebsd/freebsd-libexec-${RV}*
+	ssl? ( dev-libs/openssl )
+	sys-libs/readline
+	sys-process/vixie-cron"
+DEPEND="${RDEPEND}
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+PROVIDE="virtual/dev-manager"
+
+S="${WORKDIR}/sbin"
+
+IUSE="atm ipfilter ipv6 vinum suid ssl build"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
+	use suid || mymakeopts="${mymakeopts} NO_SUID= "
+
+	# O3 breaks this, apparently
+	replace-flags -O3 -O2
+}
+
+REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
+
+PATCHES="${FILESDIR}/${PN}-setXid.patch
+	${FILESDIR}/${PN}-zlib.patch
+	${FILESDIR}/${PN}-6.1-pr102701.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+src_install() {
+	freebsd_src_install
+	keepdir /var/log
+
+	# Allow users to use ping and other commands
+	dodir /bin
+	mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed"
+
+	newinitd "${FILESDIR}/devd.initd" devd
+	newinitd "${FILESDIR}/ipfw.initd" ipfw
+	newinitd "${FILESDIR}/sysctl.initd" sysctl
+
+	# Gentoo devd.conf
+	# devd_queue is a filter so that only the last event is applied to an
+	# init script
+	insinto /etc
+	newins "${FILESDIR}/devd.conf" devd.conf
+	exeinto /etc
+	newexe "${FILESDIR}/devd_queue" devd_queue
+
+	# Do we need pccard.conf if we have devd?
+	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins defaults/pccard.conf minfree sysctl.conf
+
+	# Install a crontab for adjkerntz
+	insinto /etc/cron.d
+	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic security \
+		security/*.ipfwlimit \
+		security/*.ip6fwlimit \
+		security/*.ip6fwdenied \
+		security/*.ipfwdenied
+
+	use ipfilter && doperiodic security \
+		security/*.ipf6denied \
+		security/*.ipfdenied
+}
diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index 2123708eb291..04107795eaad 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-share
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.22 2006/12/08 17:24:52 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.23 2006/12/29 15:20:44 flameeyes Exp $
+
+*freebsd-share-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-share-6.2_beta3.ebuild, -freebsd-share-6.2_rc1.ebuild,
+  +freebsd-share-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
   08 Dec 2006; Timothy Redaelli <drizzt@gentoo.org>
   freebsd-share-6.2_rc1.ebuild:
diff --git a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.2_rc2 b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.2_rc2
new file mode 100644
index 000000000000..97a6062a8621
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.2_rc2
@@ -0,0 +1,27 @@
+MD5 d42e5143b1e45778f55f398455c106e1 freebsd-bin-6.2_rc2.tar.bz2 406726
+RMD160 49f94f065296854cf9020426db2d35aa2e1273bb freebsd-bin-6.2_rc2.tar.bz2 406726
+SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f freebsd-bin-6.2_rc2.tar.bz2 406726
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 670878e7e0c1933986380aa65e8babf3 freebsd-etc-6.2_rc2.tar.bz2 189416
+RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c freebsd-etc-6.2_rc2.tar.bz2 189416
+SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e freebsd-etc-6.2_rc2.tar.bz2 189416
+MD5 883c4224734443853428056c3ddd1517 freebsd-gnu-6.2_rc2.tar.bz2 874291
+RMD160 9d182b42a407bd690340fe603e4950c6f28b0760 freebsd-gnu-6.2_rc2.tar.bz2 874291
+SHA256 7dac776dfae37bb1d7ab228ac8267aac15dc6ac041961aba8f2d2997875e5481 freebsd-gnu-6.2_rc2.tar.bz2 874291
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
+MD5 8282c2d079adef376bb7e195409b84f6 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a freebsd-sbin-6.2_rc2.tar.bz2 1161795
+MD5 5fd7b385af6e9c2ac27658b531ecdf7d freebsd-share-6.2_rc2.tar.bz2 3762566
+RMD160 d7e8392c49cd1b5f0989a1b87144cc799ae418fa freebsd-share-6.2_rc2.tar.bz2 3762566
+SHA256 bff220ae3d7ab346494e339270a1c7f173593541db05fd102a1c6e8ef52fdda3 freebsd-share-6.2_rc2.tar.bz2 3762566
+MD5 92379f69fe95688de1a25f2b8a4ccf21 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+MD5 35113347d351fc17583b66b8f1deb680 freebsd-usbin-6.2_rc2.tar.bz2 2696638
+RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a freebsd-usbin-6.2_rc2.tar.bz2 2696638
+SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 freebsd-usbin-6.2_rc2.tar.bz2 2696638
diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild
new file mode 100644
index 000000000000..1a4cb648ed4e
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild,v 1.1 2006/12/29 15:20:44 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD shared tools/files"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="doc isdn"
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${UBIN}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${BIN}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2"
+
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
+RDEPEND=""
+
+RESTRICT="nostrip"
+
+S="${WORKDIR}/share"
+
+pkg_setup() {
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
+
+	mymakeopts="${mymakeopts} NO_SENDMAIL= "
+}
+
+REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
+
+PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch
+	${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	# Remove make.conf manpage as it describes bsdmk's make.conf.
+	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
+	# Remove mailer.conf manpage
+	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
+
+	# Don't install the arch-specific directories in subdirectories
+	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{alpha,i386,sparc64}/Makefile
+
+	# Remove them so that they can't be included by error
+	rm -rf "${S}"/mk/*.mk
+
+	# Change the order, colldef has to go after mklocale or it creates symlinks
+	# with the names of directories
+	sed -i -e 's:colldef::' -e 's:mklocale:mklocale colldef:' "${S}/Makefile"
+}
+
+src_compile() {
+	export ESED="/usr/bin/sed"
+
+	# This is a groff problem and not a -shared problem.
+	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
+	mkmake || die "emake failed"
+}
+
+src_install() {
+	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
+}
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index d614b286c3d6..2902293d23a9 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2006/11/19 01:45:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.33 2006/12/29 15:21:13 flameeyes Exp $
+
+*freebsd-sources-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-sources-6.2_beta3.ebuild, -freebsd-sources-6.2_rc1.ebuild,
+  +freebsd-sources-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
 *freebsd-sources-6.2_rc1 (19 Nov 2006)
 
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_rc2 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_rc2
new file mode 100644
index 000000000000..2dec293d3f2d
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_rc2
@@ -0,0 +1,3 @@
+MD5 692607c3bf8e5645c584fa6dcaad0cc9 freebsd-sys-6.2_rc2.tar.bz2 18339807
+RMD160 ab2e6110b767319a0135130f9ad16d074de61483 freebsd-sys-6.2_rc2.tar.bz2 18339807
+SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 freebsd-sys-6.2_rc2.tar.bz2 18339807
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.2_rc2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.2_rc2.ebuild
new file mode 100644
index 000000000000..109c0790dab8
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.2_rc2.ebuild
@@ -0,0 +1,83 @@
+# 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.2_rc2.ebuild,v 1.1 2006/12/29 15:21:13 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
+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"
+
+	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}/${PN}-6.2-gcc41.patch"
+	epatch "${FILESDIR}/${PN}-6.2-sparc64.patch"
+	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+
+	# Disable SSP for the kernel
+	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		"s:-ffreestanding:-ffreestanding $(test-flags -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 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
+}
diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 6ea12da945c3..1ef2e940ed40 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.38 2006/11/24 12:51:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.39 2006/12/29 15:21:51 flameeyes Exp $
+
+*freebsd-ubin-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-ubin-6.2_beta3.ebuild, -freebsd-ubin-6.2_rc1.ebuild,
+  +freebsd-ubin-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
   24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/freebsd-ubin-setXid.patch:
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_rc2 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_rc2
new file mode 100644
index 000000000000..7a41e4ed15b8
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_rc2
@@ -0,0 +1,21 @@
+MD5 d42e5143b1e45778f55f398455c106e1 freebsd-bin-6.2_rc2.tar.bz2 406726
+RMD160 49f94f065296854cf9020426db2d35aa2e1273bb freebsd-bin-6.2_rc2.tar.bz2 406726
+SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f freebsd-bin-6.2_rc2.tar.bz2 406726
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 670878e7e0c1933986380aa65e8babf3 freebsd-etc-6.2_rc2.tar.bz2 189416
+RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c freebsd-etc-6.2_rc2.tar.bz2 189416
+SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e freebsd-etc-6.2_rc2.tar.bz2 189416
+MD5 5fbab2a6ad020b692a37997443daf582 freebsd-include-6.2_rc2.tar.bz2 131650
+RMD160 811494045dd44c953efeb690258a52ec89a169fe freebsd-include-6.2_rc2.tar.bz2 131650
+SHA256 ab4264cf293c5acffb9cfbabce3605841187c900b76eb1cd4a403053ee57220c freebsd-include-6.2_rc2.tar.bz2 131650
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
+MD5 692607c3bf8e5645c584fa6dcaad0cc9 freebsd-sys-6.2_rc2.tar.bz2 18339807
+RMD160 ab2e6110b767319a0135130f9ad16d074de61483 freebsd-sys-6.2_rc2.tar.bz2 18339807
+SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 freebsd-sys-6.2_rc2.tar.bz2 18339807
+MD5 92379f69fe95688de1a25f2b8a4ccf21 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 freebsd-ubin-6.2_rc2.tar.bz2 1773409
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_rc2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_rc2.ebuild
new file mode 100644
index 000000000000..2e7ec2a8f16b
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_rc2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_rc2.ebuild,v 1.1 2006/12/29 15:21:51 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic pam
+
+DESCRIPTION="FreeBSD's base system source for /usr/bin"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build"
+
+SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	sys-libs/zlib
+	virtual/pam
+	!dev-util/csup"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+RDEPEND="${RDEPEND}
+	sys-process/cronbase"
+
+S="${WORKDIR}/usr.bin"
+
+pkg_setup() {
+	use nls || mymakeopts="${mymakeopts} NO_NLS= "
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
+	use usb || mymakeopts="${mymakeopts} NO_USB= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+
+	mymakeopts="${mymakeopts} NO_SENDMAIL= "
+}
+
+# List of patches to apply
+PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
+	${FILESDIR}/${PN}-6.0-fixmakefiles.patch
+	${FILESDIR}/${PN}-setXid.patch
+	${FILESDIR}/${PN}-lint-stdarg.patch
+	${FILESDIR}/${PN}-6.0-kdump-ioctl.patch
+	${FILESDIR}/${PN}-6.1-gcc41.patch
+	${FILESDIR}/${PN}-6.2-rpcgen-gcc4.1.patch
+	${FILESDIR}/${PN}-6.2-sparc64.patch"
+
+# Here we remove some sources we don't need because they are already
+# provided by portage's packages or similar. In order:
+# - Archiving tools, provided by their own ebuilds
+# - ncurses stuff
+# - less stuff
+# - bind utils
+# - rsh stuff
+# and the rest are misc utils we already provide somewhere else.
+REMOVE_SUBDIRS="bzip2 bzip2recover tar
+	tput tset
+	less lessecho lesskey
+	dig nslookup nsupdate host
+	rsh rlogin rusers rwho ruptime
+	compile_et lex vi smbutil file vacation nc ftp telnet
+	c99 c89
+	whois"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+
+	# Rename manpage for renamed cmp
+	mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1
+	# Fix whereis(1) manpath search.
+	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
+}
+
+src_install() {
+	freebsd_src_install
+
+	dodir /bin
+	for bin in awk sed mkfifo uname true false touch tty; do
+		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
+		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
+	done
+
+	for pamdfile in login passwd su; do
+		newpamd "${FILESDIR}/${pamdfile}.pamd" ${pamdfile}
+	done
+
+	cd "${WORKDIR}/etc"
+	insinto /etc
+	doins remote phones opieaccess fbtab
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb
+}
+
+pkg_postinst() {
+	# We need to ensure that login.conf.db is up-to-date.
+	if [[ -e ${ROOT}etc/login.conf ]] ; then
+		einfo "Updating ${ROOT}etc/login.conf.db"
+		${ROOT}usr/bin/cap_mkdb	-f ${ROOT}etc/login.conf ${ROOT}etc/login.conf
+		einfo "Remember to run cap_mkdb /etc/login.conf after making changes to it"
+	fi
+}
diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 9c6508e70fa6..9198280a9ae5 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.35 2006/12/07 18:00:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.36 2006/12/29 15:22:27 flameeyes Exp $
+
+*freebsd-usbin-6.2_rc2 (29 Dec 2006)
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-usbin-6.2_beta3.ebuild, -freebsd-usbin-6.2_rc1.ebuild,
+  +freebsd-usbin-6.2_rc2.ebuild:
+  Bump to rc2 and remove older versions.
 
   07 Dec 2006; Roy Marples <uberlord@gentoo.org> files/rpcbind.initd:
   rpcbind init script now uses start-stop-daemon.
diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_rc2 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_rc2
new file mode 100644
index 000000000000..961f54648d15
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_rc2
@@ -0,0 +1,27 @@
+MD5 38128bd86edd415ed1d057d1201e8945 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa freebsd-contrib-6.2_rc2.tar.bz2 36594463
+SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 freebsd-contrib-6.2_rc2.tar.bz2 36594463
+MD5 670878e7e0c1933986380aa65e8babf3 freebsd-etc-6.2_rc2.tar.bz2 189416
+RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c freebsd-etc-6.2_rc2.tar.bz2 189416
+SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e freebsd-etc-6.2_rc2.tar.bz2 189416
+MD5 5fbab2a6ad020b692a37997443daf582 freebsd-include-6.2_rc2.tar.bz2 131650
+RMD160 811494045dd44c953efeb690258a52ec89a169fe freebsd-include-6.2_rc2.tar.bz2 131650
+SHA256 ab4264cf293c5acffb9cfbabce3605841187c900b76eb1cd4a403053ee57220c freebsd-include-6.2_rc2.tar.bz2 131650
+MD5 f2c0ffe3aa4a618e3738a11dda1e3feb freebsd-lib-6.2_rc2.tar.bz2 2670872
+RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 freebsd-lib-6.2_rc2.tar.bz2 2670872
+SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 freebsd-lib-6.2_rc2.tar.bz2 2670872
+MD5 5af0c026855212bb30ab2c204632b003 freebsd-libexec-6.2_rc2.tar.bz2 277162
+RMD160 e1868104643febadcd503d2da8b781ef7f24b22e freebsd-libexec-6.2_rc2.tar.bz2 277162
+SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 freebsd-libexec-6.2_rc2.tar.bz2 277162
+MD5 8282c2d079adef376bb7e195409b84f6 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 freebsd-sbin-6.2_rc2.tar.bz2 1161795
+SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a freebsd-sbin-6.2_rc2.tar.bz2 1161795
+MD5 692607c3bf8e5645c584fa6dcaad0cc9 freebsd-sys-6.2_rc2.tar.bz2 18339807
+RMD160 ab2e6110b767319a0135130f9ad16d074de61483 freebsd-sys-6.2_rc2.tar.bz2 18339807
+SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 freebsd-sys-6.2_rc2.tar.bz2 18339807
+MD5 92379f69fe95688de1a25f2b8a4ccf21 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 freebsd-ubin-6.2_rc2.tar.bz2 1773409
+MD5 35113347d351fc17583b66b8f1deb680 freebsd-usbin-6.2_rc2.tar.bz2 2696638
+RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a freebsd-usbin-6.2_rc2.tar.bz2 2696638
+SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 freebsd-usbin-6.2_rc2.tar.bz2 2696638
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild
new file mode 100644
index 000000000000..889b655a789f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild,v 1.1 2006/12/29 15:22:27 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="atm bluetooth tcpd ssl usb ipv6 acpi ipfilter isdn pam ssl radius
+	 minimal ipsec nis pam suid nat radius build"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
+		build? ( mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	=sys-freebsd/freebsd-libexec-${RV}*
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	sys-apps/texinfo
+	sys-devel/flex"
+
+PROVIDE="virtual/logger"
+
+S="${WORKDIR}/usr.sbin"
+
+pkg_setup() {
+	# Release crunch is something like minimal. It seems to remove everything
+	# which is not needed to work.
+	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
+
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
+	use usb || mymakeopts="${mymakeopts} NO_USB= "
+	use acpi || mymakeopts="${mymakeopts} NO_ACPI= "
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	use pam || mymakeopts="${mymakeopts} NO_PAM= "
+	use radius || mymakeopts="${mymakeopts} NO_RADIUS= "
+	use suid || mymakeopts="${mymakeopts} NO_SUID= "
+	use ipsec || mymakeopts="${mymakeopts} NO_IPSEC= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+	use nat || mymakeopts="${mymakeopts} NO_NAT= "
+	use pam || mymakeopts="${mymakeopts} NO_PAM= "
+	use suid || mymakeopts="${mymakeopts} NO_SUID= PPP_NOSUID= "
+	use radius || mymakeopts="${mymakeopts} NO_RADIUS= "
+	use tcpd || mymakeopts="${mymakeopts} NO_WRAP= "
+
+	mymakeopts="${mymakeopts} NO_MAILWRAPPER= NO_BIND= NO_SENDMAIL= NO_PF= NO_AUTHPF= NO_LPR="
+
+	# kldxref does not build with -O2
+	replace-flags "-O?" "-O1"
+}
+
+PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch
+	${FILESDIR}/${PN}-6.1-nowrap.patch
+	${FILESDIR}/${PN}-6.1-gcc41.patch
+	${FILESDIR}/${PN}-adduser.patch"
+
+REMOVE_SUBDIRS="
+	named named-checkzone named-checkconf rndc rndc-confgen
+		dnssec-keygen dnssec-signzone
+	tcpdchk tcpdmatch
+	sendmail praliases editmap mailstats makemap
+	sysinstall cron mailwrapper ntp bsnmpd mount_smbfs
+	tcpdump ndp traceroute inetd
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli
+	zic amd
+	pkg_install freebsd-update"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/include" "${WORKDIR}/include"
+	fi
+}
+
+src_compile() {
+	strip-flags
+	append-flags -I "${WORKDIR}/sys"
+
+	NOFLAGSTRIP="yes" freebsd_src_compile
+}
+
+src_install() {
+	# By creating these directories we avoid having to do a
+	# more complex hack
+	dodir /usr/share/doc
+	dodir /sbin
+	dodir /usr/libexec
+	dodir /usr/bin
+
+	# FILESDIR is used by some makefiles which will install files
+	# in the wrong place, just put it in the doc directory.
+	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
+
+	for util in nfs nfsmount rpcbind syslogd moused powerd syscons rarpd; do
+		newinitd ${FILESDIR}/${util}.initd ${util}
+		[[ -e ${FILESDIR}/${util}.confd ]] && \
+			newconfd ${FILESDIR}/${util}.confd ${util}
+	done
+
+	for class in daily monthly weekly; do
+		cat - > ${T}/periodic.${class} <<EOS
+#!/bin/sh
+/usr/sbin/periodic ${class}
+EOS
+		exeinto /etc/cron.${class}
+		newexe ${T}/periodic.${class} periodic
+	done
+
+	# Install the pw.conf file to let pw use Gentoo's skel location
+	insinto /etc
+	doins "${FILESDIR}/pw.conf"
+
+	cd "${WORKDIR}/etc"
+	doins amd.map apmd.conf syslog.conf newsyslog.conf usbd.conf
+
+	insinto /etc/ppp
+	doins ppp/ppp.conf
+
+	if use isdn; then
+		insinto /etc/isdn
+		doins isdn/*
+		rm -f ${D}/etc/isdn/Makefile
+	fi
+
+	if use bluetooth; then
+		insinto /etc/bluetooth
+		doins bluetooth/*
+		rm -f ${D}/etc/bluetooth/Makefile
+	fi
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic daily daily/*.accounting
+	doperiodic monthly monthly/*.accounting
+}
+
+pkg_postinst() {
+	# We need to run pwd_mkdb if key files are not present
+	# If they are, then there is no need to run pwd_mkdb
+	if [[ ! -e ${ROOT}etc/passwd || ! -e ${ROOT}etc/pwd.db || ! -e ${ROOT}etc/spwd.db ]] ; then
+		if [[ -e ${ROOT}etc/master.passwd ]] ; then
+			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
+			${ROOT}usr/sbin/pwd_mkdb -p -d ${ROOT}etc ${ROOT}etc/master.passwd
+		else
+			eerror "${ROOT}etc/master.passwd does not exist!"
+			eerror "You will no be able to log into your system!"
+		fi
+	fi
+
+	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
+		debug.log slip.log ppp.log; do
+		[[ -f ${ROOT}/var/log/${logfile} ]] || touch ${ROOT}/var/log/${logfile}
+	done
+}
+