[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2023-07-02 Thread David Seifert
commit: a489c9343b03c19a13e21716e29e644094da8de3
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jul  2 11:14:22 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jul  2 11:14:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a489c934

net-mail/cyrus-imapd: drop versions

Signed-off-by: David Seifert  gentoo.org>

 net-mail/cyrus-imapd/Manifest |   6 -
 net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild | 231 
 net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild | 232 
 net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild | 234 
 net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild  | 233 
 net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild  | 242 -
 net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild  | 247 --
 net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild | 242 -
 net-mail/cyrus-imapd/files/cyrus.conf |  41 
 net-mail/cyrus-imapd/files/imapd.conf |  50 -
 net-mail/cyrus-imapd/metadata.xml |   1 -
 11 files changed, 1759 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index ef9fd5701264..da14e74b3b1a 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,7 +1 @@
-DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 
10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596
 SHA512 
c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
-DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B 
bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f
 SHA512 
75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
-DIST cyrus-imapd-3.0.18.tar.gz 11465046 BLAKE2B 
74b0ad899341959dd70f872fe5c190ddf5f4452834b0ee3f339b7c6c1c925d2a3ce091b826881fc3077aeb2ac0f9817f275469473155452236f5385134e3bcd7
 SHA512 
e4c2ebd979223ad577bf2d91299c324e08fa9e8a7871ef99d2db9e3ea29b44d170c36aa57ffe84bbbdd28014d06af9c54d5e72eb18036d5ee8aed910f45f5941
-DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 
515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871
 SHA512 
4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
-DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 
485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2
 SHA512 
5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
-DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 
105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3
 SHA512 
7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2
 DIST cyrus-imapd-3.4.5.tar.gz 13291987 BLAKE2B 
4ac383ef7f3dea66a7dc11c2241b8663e3cda323b73e3b439255468cf9b6d80302a135793f952843ddee418acb4aa4a9a9d56fcb743b5d589d535764c2289c1d
 SHA512 
e43185193130af2e11ced89b2241a7b6f321847cf8bc01c0d89cbbb1cb222a962fe00cdd54b1f89cea141a569b57d2ce2f0edffaca8db9fd5f7fc2cd82b4537b

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
deleted file mode 100644
index 06d4168cf795..
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/;
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz;
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-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 \
-   sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   sys-libs/zlib:0=
-   dev-libs/libpcre:3
-   >=dev-libs/cyrus-sasl-2.1.13:2
-   dev-libs/jansson:=
-   dev-libs/icu:0=
-   sys-fs/e2fsprogs
-   afs? ( net-fs/openafs )
-   calalarm? ( dev-libs/libical:0= )
-   caps? ( sys-libs/libcap )
-   clamav? ( app-antivirus/clamav )
-   http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
-   kerberos? ( virtual/krb5 )
-   ldap? ( 

[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2022-09-14 Thread Sam James
commit: 15c7f1aa8f2e0ff391b19af7573679ae33689b78
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 15 00:08:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 15 00:09:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c7f1aa

net-mail/cyrus-imapd: fix build w/ LLD

Closes: https://bugs.gentoo.org/721466
Signed-off-by: Sam James  gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild   | 247 +
 .../cyrus-imapd-3.4.4-0001-Test-for-libm.patch |  32 +++
 ...3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch |  23 ++
 3 files changed, 302 insertions(+)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild
new file mode 100644
index ..b1811815cfe3
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/;
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz;
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+   mysql nntp pam perl postgres replication +server sieve \
+   sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libpcre:3
+   >=dev-libs/cyrus-sasl-2.1.13:2
+   dev-libs/jansson:=
+   dev-libs/icu:=
+   sys-apps/util-linux
+   sys-fs/e2fsprogs:=
+   sys-libs/zlib:=
+   afs? ( net-fs/openafs )
+   calalarm? ( dev-libs/libical:= )
+   caps? ( sys-libs/libcap )
+   clamav? ( app-antivirus/clamav )
+   http? (
+   app-arch/brotli:=
+   app-arch/zstd:=
+   dev-libs/libxml2
+   dev-libs/libical:=
+   net-libs/nghttp2:=
+   sci-libs/shapelib:=
+   )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   nntp? ( !net-nntp/leafnode )
+   pam? (
+   >=net-mail/mailbase-1
+   sys-libs/pam
+   )
+   perl? (
+   dev-lang/perl:=
+   virtual/perl-Term-ReadLine
+   )
+   postgres? ( dev-db/postgresql:* )
+   ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+   sqlite? ( dev-db/sqlite:3 )
+   tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+   xapian? ( >=dev-libs/xapian-1.4.0:= )"
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${DEPEND}
+   acct-group/mail
+   acct-user/cyrus
+   !mail-mta/courier
+   !net-mail/bincimap
+   !net-mail/courier-imap
+   !net-mail/uw-imap
+   !app-arch/dump"
+DEPEND+=" test? ( dev-util/cunit )"
+BDEPEND="sys-devel/flex
+   virtual/pkgconfig
+   virtual/yacc"
+
+REQUIRED_USE="afs? ( kerberos )
+   backup? ( sqlite )
+   calalarm? ( http )
+   http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#  "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.4.4-0001-Test-for-libm.patch
+   "${FILESDIR}"/${PN}-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
+)
+
+src_prepare() {
+   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' \
+   -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
+
+   eautoreconf
+}
+
+src_configure() {
+   local myconf
+
+   # bug #604466
+   append-ldflags $(no-as-needed)
+
+   # Workaround runtime crash
+   # bug #834573
+   append-flags -fno-toplevel-reorder
+
+   if use afs ; then
+   myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+   myconf+=" --with-afs-incdir=/usr/include/afs"
+   fi
+
+   # TODO:
+   # - revisit --with-sphinx-build=no? (it's docs this time, not the 
search engine)
+   # - post-emerge message re lmdb removal?
+   econf \
+   --enable-murder \
+   --enable-idled \
+   --enable-autocreate \
+  

[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2019-07-30 Thread Eray Aslan
commit: b5e9758e9142364cf5ebb277206c6b2463149814
Author: Eray Aslan  gentoo  org>
AuthorDate: Tue Jul 30 06:34:55 2019 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Tue Jul 30 06:34:55 2019 +
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  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..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2019-03-15 Thread Eray Aslan
commit: d90a3246db6e4d20a92632c266022dfcb85822fc
Author: Eray Aslan  gentoo  org>
AuthorDate: Fri Mar 15 07:38:16 2019 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Fri Mar 15 07:38:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90a3246

net-mail/cyrus-imapd: bump to 3.0.9

and fix underlinking perl modules
Closes: https://bugs.gentoo.org/678754
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Eray Aslan  gentoo.org>

 net-mail/cyrus-imapd/Manifest  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild  | 218 +
 .../files/cyrus-imapd-libcap-libs-r1.patch |  35 
 3 files changed, 254 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 36d2675692e..6f70f5a7858 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -4,3 +4,4 @@ DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 
209e379731c996ee083b0de61d6122b37
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B 
a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873
 SHA512 
262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B 
d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9
 SHA512 
375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
 DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 
27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a
 SHA512 
f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960
+DIST cyrus-imapd-3.0.9.tar.gz 10771916 BLAKE2B 
cc483246c83ed55fa7d4e85aa8189852f2e6be23aff5bb478c2d2123e3d928cc8248e580c80c1474b2b3eea9aa1c0f8b3336f779e72e690d8d093e70993cd657
 SHA512 
d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
new file mode 100644
index 000..c6ba07699df
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
@@ -0,0 +1,218 @@
+# 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
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/;
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${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 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:=
+   sys-libs/e2fsprogs-libs
+   afs? ( net-fs/openafs )
+   calalarm? ( dev-libs/libical )
+   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? ( dev-db/mysql-connector-c:0= )
+   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?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+   !mail-mta/courier
+   !net-mail/bincimap
+   !net-mail/courier-imap
+   !net-mail/uw-imap
+   !app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+   backup? ( sqlite )
+   calalarm? ( http )
+   http? ( sqlite )
+   sphinx? ( mysql )"
+
+# 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() {
+   default
+   # Fix 

[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2018-01-22 Thread Eray Aslan
commit: d736f075a435fb21769b64d0590578b6b27a84e7
Author: Eray Aslan  gentoo  org>
AuthorDate: Mon Jan 22 13:45:05 2018 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Mon Jan 22 13:45:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d736f075

net-mail/cyrus-imapd: remove old

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-mail/cyrus-imapd/Manifest|   1 -
 net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild   | 178 ---
 net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild | 216 ---
 net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild| 215 --
 net-mail/cyrus-imapd/files/cyrus.rc7 |  22 ---
 5 files changed, 632 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index be25800da38..4f7ad744835 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,4 +1,3 @@
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 
588764d47b3d458633e0ced2619cc1cccdf26c18d54effd38d4f9f6df12ad98f554efa632af9c7e4b43d7899b04a14a8a71fc152ea360a38cdab6a50685ddf5e
 SHA512 
78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 
9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9
 SHA512 
bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
-DIST cyrus-imapd-3.0.3.tar.gz 10819454 BLAKE2B 
5f86378e37c39c5f6fb6f6280d0b0a500e671cbe29968f1579c6be59e15335e1b36b0d119e03bc683ed17b594ddebc7d0cd5588f762062ee9a01f8633e7f12f7
 SHA512 
0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 
209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0
 SHA512 
9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild
deleted file mode 100644
index 5ed4f130966..000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://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 berkdb clamav http kerberos mysql nntp pam perl postgres \
-   replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-   dev-libs/libpcre
-   >=dev-libs/cyrus-sasl-2.1.13
-   dev-libs/jansson
-   afs? ( net-fs/openafs )
-   berkdb? ( >=sys-libs/db-3.2:* )
-   clamav? ( app-antivirus/clamav )
-   http? ( dev-libs/libxml2 dev-libs/libical )
-   kerberos? ( virtual/krb5 )
-   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 )
-   sqlite? ( dev-db/sqlite:3 )
-   ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-   tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( 
net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-   !mail-mta/courier
-   !net-mail/bincimap
-   !net-mail/courier-imap
-   !net-mail/uw-imap
-   !net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-   http? ( sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-   enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-   eapply -p0 "${FILESDIR}/${PN}-db.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:' \
-   

[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2017-09-06 Thread Eray Aslan
commit: b930b70fa5a5f5b011610d81c19a6fc5f761b84b
Author: Eray Aslan  gentoo  org>
AuthorDate: Wed Sep  6 12:25:52 2017 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Wed Sep  6 12:26:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b930b70f

net-mail/cyrus-imapd: version bump to 3.0.4

Also sync cyrus and imapd socket locations and have the socket directory
created during startup - bug 627804

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-mail/cyrus-imapd/Manifest |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild | 220 ++
 net-mail/cyrus-imapd/files/cyrus.rc8  |  34 
 3 files changed, 255 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index d64ddbe28af..da4c847f44e 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,4 @@
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 
b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 
78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa
 WHIRLPOOL 
d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 
36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 
bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
 WHIRLPOOL 
e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67
 DIST cyrus-imapd-3.0.3.tar.gz 10819454 SHA256 
6a76d8d00b26a2c9d03c65197724a28ab6d044527d7e230e6331f8de79af889a SHA512 
0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df
 WHIRLPOOL 
6d543b09d3f18d10c481133fafb78f82a6e2d0dd3fb7c4cdb1d181d906acef7db4c6da5dcc86254a836f69fc7cbd54034f889b0808da060a083f35dd8ee40434
+DIST cyrus-imapd-3.0.4.tar.gz 10819487 SHA256 
ed17b4321bbe54df2c9b8832e189f52de4561f51e199f7c620216e79910c73a0 SHA512 
9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
 WHIRLPOOL 
a67a9d033ddb601608590f085f513a6f8b220cf5a0df786c68dcb642bb9f72018ca220ce8abdc57221aac81c60e3bddee7c8dd3ad8b1fb61ead8d653400f8b51

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
new file mode 100644
index 000..9b55bcb7b8f
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools pam ssl-cert user
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://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
+}
+
+src_prepare() {
+   # bug 604470
+   eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
+   eapply -p1 

[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2017-08-11 Thread Eray Aslan
commit: 286be1db4511e0bde9f8094b03ce936407b06364
Author: Eray Aslan  gentoo  org>
AuthorDate: Fri Aug 11 15:47:31 2017 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Fri Aug 11 15:50:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=286be1db

net-mail/cyrus-imapd: security bump to 3.0.3

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-mail/cyrus-imapd/Manifest  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild  | 215 +
 .../files/cyrus-imapd-sieve-libs-v4.patch  | 127 
 net-mail/cyrus-imapd/files/cyrus.rc7   |  22 +++
 net-mail/cyrus-imapd/metadata.xml  |  20 +-
 5 files changed, 375 insertions(+), 10 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index d9f96c0ec77..3917ba2fa70 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,3 +2,4 @@ DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 
b38f4fd72825a298ac47426dcd2a50c843
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 
36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 
bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
 WHIRLPOOL 
e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67
 DIST cyrus-imapd-3.0.1.tar.gz 10515460 SHA256 
24a9886aa6bbe001484a54b29309ff99415c0f355b98325ebb29ad61fff5e257 SHA512 
0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337
 WHIRLPOOL 
830284e3d96b2d34d88350f8e65de2cac28c34c9d302dc7fe4247022c5d96251d72989714062408cfcf08828650a7b67aecfb1672165fed344b2e98c2dc06265
 DIST cyrus-imapd-3.0.2.tar.gz 10706654 SHA256 
5612f3cfa0504eb50bc3e49a77bf04a31c1aff3096fa1bbddb26cd7dbb69d94d SHA512 
95f145733a4b2589b2f7eb6281ce0d1df5788521dea0c81fda10c7c7ae4ac7cf1a9037dba45deee6101a73bbde4552906d7c6bfa9369aa3c802061a7f5cec85d
 WHIRLPOOL 
cf56390ea0d8ecd9fcfb9a2459a552ba7815474b52b089c54b1428b42691826f91b163cfe723c795b28289530911ed614e2252e038919c4d710d9a95658f8997
+DIST cyrus-imapd-3.0.3.tar.gz 10819454 SHA256 
6a76d8d00b26a2c9d03c65197724a28ab6d044527d7e230e6331f8de79af889a SHA512 
0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df
 WHIRLPOOL 
6d543b09d3f18d10c481133fafb78f82a6e2d0dd3fb7c4cdb1d181d906acef7db4c6da5dcc86254a836f69fc7cbd54034f889b0808da060a083f35dd8ee40434

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild
new file mode 100644
index 000..f4638e0cc79
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools pam ssl-cert user
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://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
+}
+

[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2017-05-09 Thread Eray Aslan
commit: 5a962760019eb9bfd19f0d3c01fc4d13d8b82bd8
Author: Eray Aslan  gentoo  org>
AuthorDate: Tue May  9 09:44:47 2017 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Tue May  9 09:44:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a962760

net-mail/cyrus-imapd: fix underlinking for sieve perl module

Thanks to Maciej S. Szmigiero for the patch. Bug 604470

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild  | 180 +
 .../cyrus-imapd/files/cyrus-imapd-sieve-libs.patch |  43 +
 2 files changed, 223 insertions(+)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild
new file mode 100644
index 000..cbe96037773
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://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 berkdb clamav http kerberos mysql nntp pam perl postgres \
+   replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+   dev-libs/libpcre
+   >=dev-libs/cyrus-sasl-2.1.13
+   dev-libs/jansson
+   afs? ( net-fs/openafs )
+   berkdb? ( >=sys-libs/db-3.2:* )
+   clamav? ( app-antivirus/clamav )
+   http? ( dev-libs/libxml2 dev-libs/libical )
+   kerberos? ( virtual/krb5 )
+   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 )
+   sqlite? ( dev-db/sqlite:3 )
+   ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+   tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( 
net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+   !mail-mta/courier
+   !net-mail/bincimap
+   !net-mail/courier-imap
+   !net-mail/uw-imap
+   !net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )
+   http? ( sqlite )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+   enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+   eapply -p0 "${FILESDIR}/${PN}-db.patch"
+   # bug 604470
+   eapply -p1 "${FILESDIR}/${PN}-sieve-libs.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-murder \
+   --enable-netscapehack \
+   --enable-idled \
+   --enable-event-notification \
+   --enable-autocreate \
+   --enable-pcre \
+   --with-service-path=/usr/$(get_libdir)/cyrus \
+   --with-cyrus-user=cyrus \
+   --with-cyrus-group=mail \
+   --with-com_err=yes \
+   --with-sasl \
+   --without-krb \
+   --without-krbdes \
+   --with-zlib \
+   $(use_enable afs) \
+   $(use_enable afs krb5afspts) \
+   $(use_with berkdb bdb) \
+   $(use_with clamav) \
+   $(use_enable nntp) \
+   $(use_enable http) \
+   $(use_enable replication) \
+   $(use_enable kerberos gssapi) \
+   $(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