add vsftpd support, make dovecot default, correct dependency when not using nginx or lighttpd but fpm
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
parent
2d3a95cea3
commit
e73b754ea0
|
@ -22,7 +22,7 @@ HOMEPAGE="http://www.froxlor.org/"
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
LICENSE="GPL-2"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
IUSE="awstats bind domainkey dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd quota ssl +tickets"
|
IUSE="awstats bind domainkey +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd quota ssl +tickets vsftpd"
|
||||||
|
|
||||||
PHP_REQUIRED_FLAGS="bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib"
|
PHP_REQUIRED_FLAGS="bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib"
|
||||||
|
|
||||||
|
@ -35,9 +35,16 @@ DEPEND="
|
||||||
pureftpd? (
|
pureftpd? (
|
||||||
net-ftp/pure-ftpd[mysql,ssl=]
|
net-ftp/pure-ftpd[mysql,ssl=]
|
||||||
)
|
)
|
||||||
|
vsftpd? (
|
||||||
|
net-ftp/vsftpd[pam,ssl=]
|
||||||
|
sys-auth/pam_mysql
|
||||||
|
)
|
||||||
!pureftpd? (
|
!pureftpd? (
|
||||||
net-ftp/proftpd[mysql,ssl=]
|
( !vsftpd? (
|
||||||
ftpquota? ( net-ftp/proftpd[softquota] )
|
net-ftp/proftpd[mysql,ssl=]
|
||||||
|
ftpquota? ( net-ftp/proftpd[softquota] )
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
awstats? (
|
awstats? (
|
||||||
www-misc/awstats
|
www-misc/awstats
|
||||||
|
@ -55,8 +62,8 @@ DEPEND="
|
||||||
)
|
)
|
||||||
!lighttpd? (
|
!lighttpd? (
|
||||||
( !nginx? (
|
( !nginx? (
|
||||||
|
www-servers/apache[ssl=]
|
||||||
!fpm? (
|
!fpm? (
|
||||||
www-servers/apache[ssl=]
|
|
||||||
dev-lang/php[apache2]
|
dev-lang/php[apache2]
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -78,7 +85,7 @@ DEPEND="
|
||||||
dovecot? ( >=net-mail/dovecot-2.2.0[mysql,ssl=]
|
dovecot? ( >=net-mail/dovecot-2.2.0[mysql,ssl=]
|
||||||
>=mail-mta/postfix-2.4[dovecot-sasl]
|
>=mail-mta/postfix-2.4[dovecot-sasl]
|
||||||
)
|
)
|
||||||
!dovecot? ( dev-libs/cyrus-sasl[crypt,mysql,ssl=]
|
!dovecot? ( dev-libs/cyrus-sasl[mysql,ssl=]
|
||||||
net-libs/courier-authlib[crypt,mysql]
|
net-libs/courier-authlib[crypt,mysql]
|
||||||
net-mail/courier-imap
|
net-mail/courier-imap
|
||||||
>=mail-mta/postfix-2.4[sasl]
|
>=mail-mta/postfix-2.4[sasl]
|
||||||
|
@ -88,7 +95,7 @@ DEPEND="
|
||||||
|
|
||||||
RDEPEND="${DEPEND}"
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm )"
|
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) vsftpd? ( !ftpquota )"
|
||||||
|
|
||||||
# we need that to set the standardlanguage later
|
# we need that to set the standardlanguage later
|
||||||
LANGS="de en fr it nl pt se"
|
LANGS="de en fr it nl pt se"
|
|
@ -22,7 +22,7 @@ HOMEPAGE="http://www.froxlor.org/"
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
LICENSE="GPL-2"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
IUSE="awstats bind domainkey dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd quota ssl +tickets"
|
IUSE="awstats bind domainkey +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd quota ssl +tickets vsftpd"
|
||||||
|
|
||||||
PHP_REQUIRED_FLAGS="bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib"
|
PHP_REQUIRED_FLAGS="bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib"
|
||||||
|
|
||||||
|
@ -35,9 +35,16 @@ DEPEND="
|
||||||
pureftpd? (
|
pureftpd? (
|
||||||
net-ftp/pure-ftpd[mysql,ssl=]
|
net-ftp/pure-ftpd[mysql,ssl=]
|
||||||
)
|
)
|
||||||
|
vsftpd? (
|
||||||
|
net-ftp/vsftpd[pam,ssl=]
|
||||||
|
sys-auth/pam_mysql
|
||||||
|
)
|
||||||
!pureftpd? (
|
!pureftpd? (
|
||||||
net-ftp/proftpd[mysql,ssl=]
|
( !vsftpd? (
|
||||||
ftpquota? ( net-ftp/proftpd[softquota] )
|
net-ftp/proftpd[mysql,ssl=]
|
||||||
|
ftpquota? ( net-ftp/proftpd[softquota] )
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
awstats? (
|
awstats? (
|
||||||
www-misc/awstats
|
www-misc/awstats
|
||||||
|
@ -55,8 +62,8 @@ DEPEND="
|
||||||
)
|
)
|
||||||
!lighttpd? (
|
!lighttpd? (
|
||||||
( !nginx? (
|
( !nginx? (
|
||||||
|
www-servers/apache[ssl=]
|
||||||
!fpm? (
|
!fpm? (
|
||||||
www-servers/apache[ssl=]
|
|
||||||
dev-lang/php[apache2]
|
dev-lang/php[apache2]
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -78,7 +85,7 @@ DEPEND="
|
||||||
dovecot? ( >=net-mail/dovecot-2.2.0[mysql,ssl=]
|
dovecot? ( >=net-mail/dovecot-2.2.0[mysql,ssl=]
|
||||||
>=mail-mta/postfix-2.4[dovecot-sasl]
|
>=mail-mta/postfix-2.4[dovecot-sasl]
|
||||||
)
|
)
|
||||||
!dovecot? ( dev-libs/cyrus-sasl[crypt,mysql,ssl=]
|
!dovecot? ( dev-libs/cyrus-sasl[mysql,ssl=]
|
||||||
net-libs/courier-authlib[crypt,mysql]
|
net-libs/courier-authlib[crypt,mysql]
|
||||||
net-mail/courier-imap
|
net-mail/courier-imap
|
||||||
>=mail-mta/postfix-2.4[sasl]
|
>=mail-mta/postfix-2.4[sasl]
|
||||||
|
@ -88,7 +95,7 @@ DEPEND="
|
||||||
|
|
||||||
RDEPEND="${DEPEND}"
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm )"
|
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) vsftpd? ( !ftpquota )"
|
||||||
|
|
||||||
# we need that to set the standardlanguage later
|
# we need that to set the standardlanguage later
|
||||||
LANGS="de en fr it nl pt se"
|
LANGS="de en fr it nl pt se"
|
||||||
|
|
Loading…
Reference in New Issue