gentoo resync : 02.08.2019

6 files changed, 43 insertions, 228 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index bf2952ff2965..0f14fe89ef9d 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,14 +1,11 @@
-AUX cyrus-imapd-fix-tests.patch 471 BLAKE2B b527a435ef74b42dc1e68ac0089dd2050a2cdfbdf11264fc7097b39c16db9a690000f397bf29cdd3e8003d3e15546e9f67c9c9aeb505d50976a3568404bafddd SHA512 ab967c8f493d902510f25268d3d63c3c60246cfd2661ae3a19e5a89cd238028ac3eac4369736b51fc2a0c27407958963ffb1e6f8ba19b5d19b53a680d3737fa0
 AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6
-AUX cyrus-imapd-libcap-libs.patch 2251 BLAKE2B 2caa105c2f5608468e89f0c533cd0942ef286f93f941ab5163e53ab9302f3e68c7ba72969f4fcd13efa41e1d99a239f946f2970d0b34583e3a33331bfe3d4adb SHA512 c8f6676549f1e4e91be40da22a3061ae9b660d159c0d64e4848f0550214c190e7d1357dce20ba181ea2d8425e21552ce44faa04213b862740da62bf3f2f09b14
-AUX cyrus-imapd-sieve-libs-v4.patch 5751 BLAKE2B 016a21356199580e431f86b6a594576679dc8b586668fcf333d65ae570dd129fb8fb4174d26965e09d398729c7a8205bc89167442e4d43228942298bb402b844 SHA512 cd9f5c23f79720d768b3b8a089b3f5c078825465b3b0f28b7b629bc07415598f9195218e35bb7bebaca3499bdfdd30a137ea6a3a455a84386e9d02de41abba51
 AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88db4abe01f4a367c0a65da939d94b81fafe68aaa1e788ae5f37bc6aa43fa07e52c0b1636ebdf6 SHA512 e4e02ddd02b7c77a1b43ee49f7ab9dcada1d518aaeae6e285b206d67d05b96a2f9007264967984c18cedc62cd1e9e9f59c802eb37da6e77d6990db7ced5e559a
 AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20
 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4
 AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc77713939a537141df8b1ace2bfc6f3a384c28e155bece1bec480bbaf90fcd1899af854d441b518eee SHA512 9340877dd83cd4d5770c12a7f107ee697b42736a57cf304695f03f9f673c5c53b4477f20832ee4815515b2e33e8b33335b298cf5dd48015a6a581b8ab4f4f240
 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f
 DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
-DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
+DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06 SHA512 058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
 EBUILD cyrus-imapd-3.0.10-r1.ebuild 5954 BLAKE2B fd04209d2bb501f6f183d629912a31c092c39353e34cba5289227886ba64cb6958e272b468572276633a04ecc6ec3dd250723877c953542fac0b6bf11a4b6bb8 SHA512 375231311469c78dc6060a34d229dfaa044cee815b9e68b8d891f4149e098bcf3c0181a41f5703b1b2a9d2c2126fde0b6b689c924cc97daa47647beae2c20116
-EBUILD cyrus-imapd-3.0.5.ebuild 5941 BLAKE2B 967f7a303604386b5ec601401fea24a8460539511242917ac1d2c9650348208f3c08ae721cb1da476bcf142017fdd4c486639d5cbb5dd17dd35dcf40543fd99f SHA512 bd66a2c18b99d7a97646cbf4bd56317b523ac2f768fd43692e88e8a8b72e9e0e5bbd14488c1a5e04ee71dd2d70b7833b5bf616dd3e0944a33e46a785e7a4aa50
-MISC metadata.xml 793 BLAKE2B 9cc25eb60bf75328abe6d1e06ff11074a1234ab404b4886868c73a34b265bdc189e61d21686f6dce56cdde932ef5bbbcff3a6705689ad8c12cb7ea08fe9c8f79 SHA512 b371032c270fd20385959cfcb4356f0258fce84b5f4d35f499225ae81beba6e3933c09e180c9b482358ae3c8447d25b30bc87c1671e24d94018ecae71658f655
+EBUILD cyrus-imapd-3.0.11.ebuild 5958 BLAKE2B bebdea64973b145dc0d0cd52501a8ada7cde9e6a718233b65d39cc1d51d44f53c940646ddf318c986cfcdce29bd31c8a50760c38fe5af709fd415a2e6de51d1c SHA512 0744dca8ba77808ca0b49181d8f1d3e1131e1d99a72166f23722e97b123b0ecd60f65f32a4b2e29d6ec4de6e3f9f7e9edd9de9e78abfe4716c59d3e92b497906
+MISC metadata.xml 677 BLAKE2B d1172bd68328762c6f54a337b9c7587bb430caf74a9b343bc747363de8508f856f3d6ed6ad2ef89c99dacb2b08528f72101fa73c1107f7b6adeb82a49a24f3e5 SHA512 e6e10b820ce521fc2bb51dc7e8bcbbc669055f9cdcc595801e0ad461bfbb7bc01125047caec84788b355f2dc30502bace67cf948647255e366a49963a52b0095
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
index ba030ccce89f..2a381e5de2d7 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
@@ -4,33 +4,33 @@
 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"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
-LICENSE="BSD-with-attribution"
+LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
+	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
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
-	dev-libs/icu:=
+	dev-libs/icu:0=
+	sys-libs/e2fsprogs-libs
 	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( >=virtual/mysql-5.5 )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
 			virtual/pam
@@ -38,42 +38,47 @@ CDEPEND="sys-libs/zlib
 		)
 	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] )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	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 )"
-
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
 DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
+	test? ( dev-util/cunit )
+"
 
 # all blockers really needed?
+# file collision with app-arch/dump - bug 619584
 RDEPEND="${CDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/courier-imap
 	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
+	!app-arch/dump
+"
 
-REQUIRED_USE="afs? ( kerberos )
+REQUIRED_USE="
+	afs? ( kerberos )
 	backup? ( sqlite )
 	calalarm? ( http )
 	http? ( sqlite )
-	jmap? ( http xapian )
-	sphinx? ( mysql )"
+"
 
-S=${WORKDIR}/${MY_P}
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
 
 pkg_setup() {
 	enewuser cyrus -1 -1 /usr/cyrus mail
+	# https://bugs.gentoo.org/604466
 	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"
+	default
 	# 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' \
@@ -90,7 +95,6 @@ src_prepare() {
 	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
 		ptclient/afskrb.c || die
 
-	eapply_user
 	eautoreconf
 }
 
@@ -100,6 +104,7 @@ src_configure() {
 		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
 		myconf+=" --with-afs-incdir=/usr/include/afs"
 	fi
+	# sphinx is unmaintained and dead, bug #662944
 	econf \
 		--enable-unit-tests \
 		--enable-murder \
@@ -107,12 +112,12 @@ src_configure() {
 		--enable-event-notification \
 		--enable-autocreate \
 		--enable-pcre \
+		--with-com_err \
 		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
 		--with-sasl \
 		--without-krb \
 		--without-krbdes \
+		--disable-sphinx \
 		--enable-squat \
 		--with-zlib \
 		$(use_enable afs) \
@@ -121,7 +126,6 @@ src_configure() {
 		$(use_enable calalarm calalarmd) \
 		$(use_with caps libcap) \
 		$(use_with clamav) \
-		$(use_enable jmap) \
 		$(use_enable nntp) \
 		$(use_enable http) \
 		$(use_enable replication) \
@@ -136,7 +140,6 @@ src_configure() {
 		$(use_enable server) \
 		$(use_enable sieve) \
 		$(use_with snmp) \
-		$(use_enable sphinx) \
 		$(use_enable static-libs static) \
 		$(use_with tcpd libwrap) \
 		$(use_enable xapian) \
@@ -215,7 +218,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	ewarn "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	ewarn "for upgrade instructions."
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "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 c32f2065db00..000000000000
--- 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 e1f5332c6e83..000000000000
--- 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 4a7bac2e3c1f..000000000000
--- 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 04d897e54055..271895d4f887 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>