[gentoo-commits] repo/gentoo:master commit in: net-mail/dovecot/

[Eray Aslan]

commit:     20dac6145e40477473a4c6517e55fb2e2418489d
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 17 05:44:29 2021 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Sep 17 05:44:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20dac614

net-mail/dovecot: clean up compress USE flags

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/dovecot/dovecot-2.3.16-r1.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-mail/dovecot/dovecot-2.3.16-r1.ebuild 
b/net-mail/dovecot/dovecot-2.3.16-r1.ebuild
index 944c319e573..e247acb3400 100644
--- a/net-mail/dovecot/dovecot-2.3.16-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.16-r1.ebuild
@@ -32,7 +32,7 @@ LICENSE="LGPL-2.1 MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_COMPRESS="lz4 zstd"
 IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
        selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
 
@@ -41,18 +41,19 @@ IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 DEPEND="
+       app-arch/bzip2
+       app-arch/xz-utils
        dev-libs/icu:=
        dev-libs/openssl:0=
+       sys-libs/zlib:=
        virtual/libiconv
        argon2? ( dev-libs/libsodium:= )
-       bzip2? ( app-arch/bzip2 )
        caps? ( sys-libs/libcap )
        kerberos? ( virtual/krb5 )
        ldap? ( net-nds/openldap )
        lua? ( ${LUA_DEPS} )
        lucene? ( >=dev-cpp/clucene-2.3 )
        lz4? ( app-arch/lz4 )
-       lzma? ( app-arch/xz-utils )
        mysql? ( dev-db/mysql-connector-c:0= )
        pam? ( sys-libs/pam:= )
        postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
@@ -66,7 +67,6 @@ DEPEND="
        tcpd? ( sys-apps/tcp-wrappers )
        textcat? ( app-text/libexttextcat )
        unwind? ( sys-libs/libunwind:= )
-       zlib? ( sys-libs/zlib:= )
        zstd? ( app-arch/zstd:= )
        virtual/libcrypt:=
        "
@@ -121,18 +121,19 @@ src_configure() {
                --with-statedir="${EPREFIX}/var/lib/dovecot" \
                --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
                --disable-rpath \
+               --with-bzlib \
                --without-libbsd \
+               --with-lzma \
                --with-icu \
                --with-ssl \
+               --with-zlib \
                $( use_with argon2 sodium ) \
-               $( use_with bzip2 bzlib ) \
                $( use_with caps libcap ) \
                $( use_with kerberos gssapi ) \
                $( use_with lua ) \
                $( use_with ldap ) \
                $( use_with lucene ) \
                $( use_with lz4 ) \
-               $( use_with lzma ) \
                $( use_with mysql ) \
                $( use_with pam ) \
                $( use_with postgres pgsql ) \
@@ -143,7 +144,6 @@ src_configure() {
                $( use_with tcpd libwrap ) \
                $( use_with textcat ) \
                $( use_with unwind libunwind ) \
-               $( use_with zlib ) \
                $( use_with zstd ) \
                $( use_enable static-libs static ) \
                ${conf}