diff --git a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.7-r2.ebuild
copy from net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
copy to net-ftp/vsftpd/vsftpd-2.0.7-r2.ebuild
--- a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.7-r2.ebuild
@@ -10,8 +10,8 @@ SRC_URI="ftp://vsftpd.beasts.org/users/c
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
-IUSE="caps logrotate pam tcpd ssl selinux xinetd"
+KEYWORDS="amd64 ~x86"
+IUSE="caps pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( sys-libs/libcap )
 	pam? ( virtual/pam )
@@ -19,7 +19,6 @@ DEPEND="caps? ( sys-libs/libcap )
 	ssl? ( >=dev-libs/openssl-0.9.7d )"
 RDEPEND="${DEPEND}
 	net-ftp/ftpbase
-	logrotate? ( app-admin/logrotate )
 	selinux? ( sec-policy/selinux-ftpd )
 	xinetd? ( sys-apps/xinetd )"
 
@@ -39,22 +38,22 @@ src_unpack() {
 	# Configure vsftpd build defaults
 	echo "#!/bin/sh" > vsf_findlibs.sh
 	if use tcpd; then
-	    echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	    echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh
+		echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+		echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh
 	fi
 	if use ssl; then
-	    echo "#define VSF_BUILD_SSL" >> builddefs.h
-	    echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh
+		echo "#define VSF_BUILD_SSL" >> builddefs.h
+		echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh
 	fi
 	if use pam; then
-	    echo "\"-lpam\"" >> vsf_findlibs.sh
+		echo "\"-lpam\"" >> vsf_findlibs.sh
 	else
-	    echo "#undef VSF_BUILD_PAM" >> builddefs.h
+		echo "#undef VSF_BUILD_PAM" >> builddefs.h
 	fi
 
 	# Ensure that we don't link against libcap unless asked
 	if use caps ; then
-	    echo "echo \"-lcap\"" >> vsf_findlibs.sh
+		echo "echo \"-lcap\"" >> vsf_findlibs.sh
 	else
 		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
 		sed -i '/libcap/ d' vsf_findlibs.sh
@@ -87,10 +86,8 @@ src_install() {
 	insinto /etc/vsftpd
 	newins vsftpd.conf vsftpd.conf.example
 
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-	fi
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d