commit: b5e9758e9142364cf5ebb277206c6b2463149814
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 06:34:55 2019 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 06:34:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e9758e
net-mail/cyrus-imapd: remove old
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/cyrus-imapd/Manifest | 1 -
net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild | 221 ---------------------
.../cyrus-imapd/files/cyrus-imapd-fix-tests.patch | 21 --
.../files/cyrus-imapd-libcap-libs.patch | 35 ----
.../files/cyrus-imapd-sieve-libs-v4.patch | 127 ------------
net-mail/cyrus-imapd/metadata.xml | 2 -
6 files changed, 407 deletions(-)
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index a8109439a59..cfb8cb572cd 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,2 @@
DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B
366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a
SHA512
1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B
ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06
SHA512
058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
-DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B
a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873
SHA512
262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
deleted file mode 100644
index ba030ccce89..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/";
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz";
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
- mysql nntp pam perl postgres replication +server sieve snmp \
- sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
- dev-libs/libpcre
- >=dev-libs/cyrus-sasl-2.1.13
- dev-libs/jansson
- dev-libs/icu:=
- afs? ( net-fs/openafs )
- caps? ( sys-libs/libcap )
- clamav? ( app-antivirus/clamav )
- http? ( dev-libs/libxml2 dev-libs/libical )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- lmdb? ( dev-db/lmdb )
- mysql? ( >=virtual/mysql-5.5 )
- nntp? ( !net-nntp/leafnode )
- pam? (
- virtual/pam
- >=net-mail/mailbase-1
- )
- perl? ( dev-lang/perl:= )
- postgres? ( dev-db/postgresql:* )
- snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
- ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
- sqlite? ( dev-db/sqlite:3 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? (
net-analyzer/net-snmp[tcpd=] ) )
- xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
- test? ( dev-util/cunit )"
-
-# all blockers really needed?
-RDEPEND="${CDEPEND}
- !mail-mta/courier
- !net-mail/bincimap
- !net-mail/courier-imap
- !net-mail/uw-imap
- !net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
- backup? ( sqlite )
- calalarm? ( http )
- http? ( sqlite )
- jmap? ( http xapian )
- sphinx? ( mysql )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewuser cyrus -1 -1 /usr/cyrus mail
- append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
- # bug 604470
- eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
- eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
- eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
- # Fix master(8)->cyrusmaster(8) manpage.
- for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
- sed -i -e 's:master\.8:cyrusmaster.8:g' \
- -e 's:master(8):cyrusmaster(8):g' \
- "${i}" || die "sed failed" || die "sed failed"
- done
- mv man/master.8 man/cyrusmaster.8 || die "mv failed"
- sed -i -e "s:MASTER:CYRUSMASTER:g" \
- -e "s:Master:Cyrusmaster:g" \
- -e "s:master:cyrusmaster:g" \
- man/cyrusmaster.8 || die "sed failed"
-
- # lock.h to afs/lock.h
- sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
- ptclient/afskrb.c || die
-
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
- if use afs ; then
- myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
- myconf+=" --with-afs-incdir=/usr/include/afs"
- fi
- econf \
- --enable-unit-tests \
- --enable-murder \
- --enable-idled \
- --enable-event-notification \
- --enable-autocreate \
- --enable-pcre \
- --with-cyrus-user=cyrus \
- --with-cyrus-group=mail \
- --with-com_err=yes \
- --with-sasl \
- --without-krb \
- --without-krbdes \
- --enable-squat \
- --with-zlib \
- $(use_enable afs) \
- $(use_enable afs krb5afspts) \
- $(use_enable backup) \
- $(use_enable calalarm calalarmd) \
- $(use_with caps libcap) \
- $(use_with clamav) \
- $(use_enable jmap) \
- $(use_enable nntp) \
- $(use_enable http) \
- $(use_enable replication) \
- $(use_enable kerberos gssapi) \
- $(use_with ldap) \
- $(use_with lmdb) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with perl) \
- $(use_with sqlite) \
- $(use_with ssl openssl) \
- $(use_enable server) \
- $(use_enable sieve) \
- $(use_with snmp) \
- $(use_enable sphinx) \
- $(use_enable static-libs static) \
- $(use_with tcpd libwrap) \
- $(use_enable xapian) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
- dodoc README*
- dodoc -r doc
- cp -r contrib tools "${D}/usr/share/doc/${PF}"
- rm -f doc/text/Makefile*
-
- mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
- insinto /etc
- newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf"
cyrus.conf
- newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf"
imapd.conf
-
- sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
- -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
- -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
- "${D}"etc/imapd.conf
-
- sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
- -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
- "${D}"etc/cyrus.conf
-
- # turn off sieve if not installed
- if ! use sieve; then
- sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
- fi
- # same thing for http(s) as well
- if ! use http; then
- sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
- fi
-
- newinitd "${FILESDIR}/cyrus.rc8" cyrus
- newconfd "${FILESDIR}/cyrus.confd" cyrus
- newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.}
; do
- keepdir "/var/${subdir}"
- fowners cyrus:mail "/var/${subdir}"
- fperms 0750 "/var/${subdir}"
- done
- for subdir in imap/{user,quota,sieve} spool/imap ; do
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ;
do
- keepdir "/var/${subdir}/${i}"
- fowners cyrus:mail "/var/${subdir}/${i}"
- fperms 0750 "/var/${subdir}/${i}"
- done
- done
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} ; then
- elog "For correct logging add the following to
/etc/syslog.conf:"
- elog " local6.* /var/log/imapd.log"
- elog " auth.debug /var/log/auth.log"
- echo
-
- elog "You have to add user cyrus to the sasldb2. Do this with:"
- elog " saslpasswd2 cyrus"
- fi
-}
-
-pkg_postinst() {
- # do not install server.{key,pem) if they exist
- if use ssl ; then
- if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
- install_cert /etc/ssl/cyrus/server
- chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
- fi
- fi
-
- echo
- ewarn "Please see https://www.cyrusimap.org/imap/download/upgrade.html";
- ewarn "for upgrade instructions."
- echo
-}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-fix-tests.patch
b/net-mail/cyrus-imapd/files/cyrus-imapd-fix-tests.patch
deleted file mode 100644
index c32f2065db0..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-fix-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile.am 2017-05-16 15:48:55.943709210 +0300
-+++ b/Makefile.am 2017-05-16 15:50:20.950184710 +0300
-@@ -635,7 +635,6 @@
- cunit/guid.testc \
- cunit/hash.testc \
- cunit/imapurl.testc \
-- cunit/jmapauth.testc \
- cunit/libconfig.testc \
- cunit/mboxname.testc \
- cunit/md5.testc \
-@@ -654,6 +653,10 @@
- cunit_TESTS += cunit/sieve.testc
- endif
-
-+if JMAP
-+cunit_TESTS += cunit/jmapauth.testc
-+endif
-+
- cunit_TESTS += \
- cunit/spool.testc \
- cunit/squat.testc \
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs.patch
b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs.patch
deleted file mode 100644
index e1f5332c6e8..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.ac 2017-07-15 07:26:38.375295969 +0200
-+++ b/configure.ac 2017-07-15 07:28:33.250194410 +0200
-@@ -1351,7 +1351,9 @@
- AC_CHECK_HEADERS([sys/capability.h sys/prctl.h], ,
have_libcap=no)
- if test "$have_libcap" = "yes"; then
- AC_DEFINE(HAVE_LIBCAP, [], [Do we have libcap system
capabilities handling (Linux systems only)?])
-- LIBS="$LIBS -lcap"
-+ LIBCAP="-lcap"
-+ AC_SUBST(LIBCAP)
-+ LIBS="$LIBS $LIBCAP"
- fi
- fi
- ;;
---- a/perl/imap/Makefile.PL.in 2017-07-15 07:28:49.886034889 +0200
-+++ b/perl/imap/Makefile.PL.in 2017-07-15 07:29:10.621836046 +0200
-@@ -90,7 +90,7 @@
- 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
- 'OBJECT' => 'IMAP.o',
- 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a
@top_builddir@/perl/.libs/libcyrus_min.a',
-- 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@
@PCRE_LIBS@ @SQLITE_LIBADD@"],
-+ 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@
@PCRE_LIBS@ @SQLITE_LIBADD@ @LIBCAP@"],
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@
@SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap",
- 'EXE_FILES' => [cyradm],
---- a/perl/sieve/managesieve/Makefile.PL.in 2017-07-15 07:29:29.433655659
+0200
-+++ b/perl/sieve/managesieve/Makefile.PL.in 2017-07-15 07:29:44.593510288
+0200
-@@ -69,7 +69,7 @@
- 'ABSTRACT' => 'Cyrus Sieve management interface',
- 'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", #
finds $VERSION
- 'MYEXTLIB' => '../lib/.libs/libisieve.a
@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
-- 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@
@PCRE_LIBS@ @SQLITE_LIBADD@"],
-+ 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@
@PCRE_LIBS@ @SQLITE_LIBADD@ @LIBCAP@"],
- 'CCFLAGS' => '@GCOV_CFLAGS@',
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve
-I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v4.patch
b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v4.patch
deleted file mode 100644
index 4a7bac2e3c1..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v4.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- a/configure.ac 2017-04-20 04:21:48.000000000 +0300
-+++ b/configure.ac 2017-05-16 10:30:37.337965921 +0300
-@@ -666,7 +666,9 @@
- fi
-
- if test "$cyrus_cv_pcre_utf8" = "yes"; then
-- LIBS="$LIBS -lpcre -lpcreposix";
-+ PCRE_LIBS="-lpcre -lpcreposix"
-+ AC_SUBST(PCRE_LIBS)
-+ LIBS="$LIBS $PCRE_LIBS"
- AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
- AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre
library?])
- else
-@@ -1938,6 +1940,7 @@
- fi
-
- LIBS="${LIBS} ${SQLITE_LIBADD}"
-+ AC_SUBST(SQLITE_LIBADD)
- CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
- AC_DEFINE(HAVE_SQLITE,[],[Build in SQLite support?])
- else
---- a/perl/imap/Makefile.PL.in 2017-04-07 08:31:10.000000000 +0300
-+++ b/perl/imap/Makefile.PL.in 2017-05-16 10:26:08.193965921 +0300
-@@ -90,7 +90,7 @@
- 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
- 'OBJECT' => 'IMAP.o',
- 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a
@top_builddir@/perl/.libs/libcyrus_min.a',
-- 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"],
-+ 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@
@PCRE_LIBS@ @SQLITE_LIBADD@"],
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@
@SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap",
- 'EXE_FILES' => [cyradm],
---- a/perl/sieve/managesieve/Makefile.PL.in 2017-04-07 08:31:10.000000000
+0300
-+++ b/perl/sieve/managesieve/Makefile.PL.in 2017-05-16 10:26:31.048965921
+0300
-@@ -69,7 +69,7 @@
- 'ABSTRACT' => 'Cyrus Sieve management interface',
- 'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", #
finds $VERSION
- 'MYEXTLIB' => '../lib/.libs/libisieve.a
@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
-- 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"],
-+ 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@
@PCRE_LIBS@ @SQLITE_LIBADD@"],
- 'CCFLAGS' => '@GCOV_CFLAGS@',
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve
-I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
---- a/configure.ac 2017-05-16 15:18:23.648756211 +0300
-+++ b/configure.ac 2017-05-16 15:26:49.241756211 +0300
-@@ -633,8 +633,6 @@
-
- AC_ARG_ENABLE(sieve,
- [AS_HELP_STRING([--disable-sieve], [disable Sieve
support])],,[enable_sieve="yes";])
--AC_ARG_ENABLE(pcre,
-- [AS_HELP_STRING([--disable-pcre], [disable PCRE library])])
-
- if test "$enable_sieve" != "no"; then
- AC_DEFINE(USE_SIEVE,[],[Build in Sieve support?])
-@@ -650,42 +648,46 @@
- if test -z "$ac_cv_prog_LEX"; then
- AC_MSG_ERROR([Sieve requires flex/lex, but none is installed])
- fi
-+fi
-+AM_CONDITIONAL([SIEVE], [test "${enable_sieve}" != "no"])
-+
-
-- if test "$enable_pcre" != "no"; then
-- AC_CHECK_HEADER(pcreposix.h)
-- if test "$ac_cv_header_pcreposix_h" = "yes"; then
-- AC_MSG_CHECKING(for utf8 enabled pcre)
-- AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include
<pcreposix.h>
-+AC_ARG_ENABLE(pcre,
-+ [AS_HELP_STRING([--disable-pcre], [disable PCRE library])])
-+
-+if test "$enable_pcre" != "no"; then
-+ AC_CHECK_HEADER(pcreposix.h)
-+ if test "$ac_cv_header_pcreposix_h" = "yes"; then
-+ AC_MSG_CHECKING(for utf8 enabled pcre)
-+ AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include
<pcreposix.h>
- #ifndef REG_UTF8
- #include </nonexistent>
- #endif],cyrus_cv_pcre_utf8=yes,cyrus_cv_pcre_utf8=no))
-- AC_MSG_RESULT($cyrus_cv_pcre_utf8)
-- else
-- cyrus_cv_pcre_utf8="no"
-- fi
-+ AC_MSG_RESULT($cyrus_cv_pcre_utf8)
-+ else
-+ cyrus_cv_pcre_utf8="no"
- fi
-+fi
-
-- if test "$cyrus_cv_pcre_utf8" = "yes"; then
-- PCRE_LIBS="-lpcre -lpcreposix"
-- AC_SUBST(PCRE_LIBS)
-- LIBS="$LIBS $PCRE_LIBS"
-- AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
-- AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre
library?])
-+if test "$cyrus_cv_pcre_utf8" = "yes"; then
-+ PCRE_LIBS="-lpcre -lpcreposix"
-+ AC_SUBST(PCRE_LIBS)
-+ LIBS="$LIBS $PCRE_LIBS"
-+ AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
-+ AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
-+else
-+ AC_CHECK_HEADERS(rxposix.h)
-+ if test "$ac_cv_header_rxposix_h" = "yes"; then
-+ LIBS="$LIBS -lrx"
-+ AC_DEFINE(ENABLE_REGEX, [],
-+ [Do we have a regex library?])
- else
-- AC_CHECK_HEADERS(rxposix.h)
-- if test "$ac_cv_header_rxposix_h" = "yes"; then
-- LIBS="$LIBS -lrx"
-- AC_DEFINE(ENABLE_REGEX, [],
-- [Do we have a regex library?])
-- else
-- AC_SEARCH_LIBS(regcomp, regex,
-- AC_DEFINE(ENABLE_REGEX, [],
-- [Do we have a regex library?]), [])
-- fi
-+ AC_SEARCH_LIBS(regcomp, regex,
-+ AC_DEFINE(ENABLE_REGEX, [],
-+ [Do we have a regex library?]), [])
- fi
- fi
-
--AM_CONDITIONAL([SIEVE], [test "${enable_sieve}" != "no"])
-
- dnl look for an option to disable sign-comparison warnings (needed for
- dnl flex-generated sieve sources when building with -Werror)
diff --git a/net-mail/cyrus-imapd/metadata.xml
b/net-mail/cyrus-imapd/metadata.xml
index 04d897e5405..271895d4f88 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -9,8 +9,6 @@
<flag name="server">Enable building server binaries</flag>
<flag name="backup">Enable backup service support</flag>
<flag name="calalarm">Enable CalDAV alarm support</flag>
- <flag name="jmap">Enable JMAP support</flag>
- <flag name="sphinx">Enable Sphinx search engine support</flag>
<flag name="xapian">Enable Xapian search engine support</flag>
<flag name="lmdb">Enable support for using <pkg>dev-db/lmdb</pkg></flag>
</use>
