--- openssh-4.3_p2-r1.ebuild	2006-06-26 18:38:07.000000000 -0700
+++ openssh-4.3_p2_sftpchroot.ebuild	2006-09-18 13:22:36.000000000 -0700
@@ -24,7 +24,7 @@
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard sftplogging hpn libedit"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard sftplogging hpn libedit sftpchroot"
 
 RDEPEND="pam? ( virtual/pam )
 	kerberos? ( virtual/krb5 )
@@ -60,6 +60,13 @@
 	use X509 && epatch "${DISTDIR}"/${X509_PATCH}
 	use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
 	use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch
+	if use sftpchroot ; then
+		use chroot \
+			&& ewarn "sftpchroot can't be used with chroot, disabling sftpchroot" \
+			|| (epatch "${FILESDIR}"/openssh-4.3_p2-sftpchroot.patch \
+			    && sed -i '/LD.*sftp-server/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid")
+	fi
+
 	if use X509 ; then
 		cp "${FILESDIR}"/openssh-4.3_p2-selinux.patch .
 		epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch.glue ./openssh-4.3_p2-selinux.patch
@@ -139,6 +146,8 @@
 	newconfd "${FILESDIR}"/sshd.confd sshd
 	keepdir /var/empty
 
+	use sftpchroot && ! use chroot && fperms 4755 /usr/lib/misc/sftp-server
+
 	newpamd "${FILESDIR}"/sshd.pam_include sshd
 	dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
 	use pam \