--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -29,1 +29,1 @@ 
-IUSE="acl authfile ban +caps case clamav ctrls deflate doc exec hardened ifsession +ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota +ssl tcpd trace vroot xinetd"
---
+IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota +ssl tcpd trace vroot xinetd"
@@ -38,2 +38,0 @@ 
-	sftp? ( dev-libs/openssl )
-	ssl? ( dev-libs/openssl )
@@ -42,0 +40,2 @@ 
+	sftp? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl )
@@ -56,0 +56,12 @@ 
+pkg_setup() {
+	if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then
+		eerror "Your ProFTPD server is running. In order to install this update"
+		eerror "you have to stop the running server. If you are using ProFTPD in"
+		eerror "the standalone mode you can stop the server by executing:"
+		eerror "  /etc/init.d/proftpd stop"
+		eerror "If you are sure that ProFTPD is not running anymore you have to"
+		eerror "delete the /var/run/proftpd.pid file."
+		die "This update requires to stop the ProFTPD server!"
+	fi
+}
+
@@ -84,1 +96,4 @@ 
-	use ctrls && mymodules="${mymodules}:mod_ctrls_admin"
---
+	if use ctrls || use shaper ; then
+		myconf="${myconf} --enable-ctrls"
+		mymodules="${mymodules}:mod_ctrls_admin"
+	fi
@@ -118,1 +133,1 @@ 
-	if use ssl || use sftp; then
---
+	if use sftp || use ssl ; then
@@ -120,2 +135,1 @@ 
-		myconf="${myconf} --with-includes=/usr/include/openssl"
-		myconf="${myconf} --enable-openssl"
---
+		myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
@@ -154,1 +168,0 @@ 
-		--enable-ctrls \
@@ -193,1 +206,1 @@ 
-	if use exec; then
---
+	if use exec ; then