gentoo resync : 23.06.2018

2 files changed, 35 insertions, 25 deletions

diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 954284bccce9..a46b6932d64f 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -19,7 +19,7 @@ AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c
 AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
-DIST courier-imap-4.18.0.tar.bz2 3202389 BLAKE2B 3889d8db1bca082b1a8a1f1c8f04996ddcdf30b46e2aa3d16b45c46987426f75721223fc63810884a8fa2d8f8daf60d85c2909321abf0ef27e77cfcd0dc3c531 SHA512 16dedefe8a43ef48f76388c65ee7f100aaf12c30d9610f4c85f9adbd1adab374f9a0978930e70c221b551a60ed3d804f6b5e87a979b549f5c8249c34af1a3a64
+DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
 EBUILD courier-imap-4.17.3.ebuild 6787 BLAKE2B 4f560cbb7538ff3c61ecc73705db27e46b3bd95673747c4322c7bf9043cc3c06f576b44d727048388542aa3c5473ee59c9f5461dea8df1e4b65136da46bfb79a SHA512 c8e3b52940b45fb492b2af63a1912eebd8ba48e996228953f1c59896f1630c16f2c9f448b369c033d2e2d183a1f1626c8d3556606ad3de97ec0cf26b23e5d8b5
-EBUILD courier-imap-4.18.0.ebuild 6764 BLAKE2B 10986db94919f747aee195359295f83aa4b632eaf0305fb2bd429baf1a0265619e68c5504a0fa024bb7e7a242875c32cb015f77c2246314daba440eccd193d32 SHA512 04b7b67a0cce4f9a29782e4de0c831c9103fb21e0b7cca0f8a1cbac4ea4c743d4c90431829a4f1f406a1b7398762d7f9938778e7d9ff0b2fa78fe4b5a48d77f5
+EBUILD courier-imap-4.18.2.ebuild 6857 BLAKE2B bca5cd6d8df1872c2b2ae789b585d2b1fd29d4c65dc1b0091b506c482f8ce29f492fcfe6a93d04e23e5879076252bb305ee59f2c6f1c1b876ef09570837f4e10 SHA512 9ef62d539a49e8c6ae329a92e45cde7d4f9b678c828762445ab4ab4b9c167e5e5462e6fa6da528564633ff302018192fbf8b64e932fcd95880e3fa2e2cbd38f3
 MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110
diff --git a/net-mail/courier-imap/courier-imap-4.18.0.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
index 8226e3abd98a..0c5927a7d1a2 100644
--- a/net-mail/courier-imap/courier-imap-4.18.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit autotools libtool systemd
+inherit autotools libtool readme.gentoo-r1 systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
@@ -12,8 +11,8 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 
+IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
 
 CDEPEND="
@@ -22,30 +21,46 @@ CDEPEND="
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	>=net-libs/courier-authlib-0.61
+	>=net-libs/courier-authlib-0.66.4
 	>=net-libs/courier-unicode-2
 	>=net-mail/mailbase-0.00-r8
 	berkdb? ( sys-libs/db:= )
 	fam? ( virtual/fam )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+"
 DEPEND="${CDEPEND}
 	dev-lang/perl
 	!mail-mta/courier
-	userland_GNU? ( sys-process/procps )"
+	userland_GNU? ( sys-process/procps )
+"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )"
+	selinux? ( sec-policy/selinux-courier )
+"
 
 # get rid of old style virtual - bug 350792
-# all blockers really needed?
 RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
+	!net-mail/uw-imap
+"
 
 RC_VER="4.0.6-r1"
 INITD_VER="4.0.6-r1"
 
+# make check is not supported by this package due to the
+# --enable-workarounds-for-imap-client-bugs option.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
+and remove TLS_DHPARAMS from configuration files or run mkdhparams
+
+For a quick-start howto please refer to
+${PN}-gentoo.readme in /usr/share/doc/${PF}
+"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
 	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
@@ -108,13 +123,15 @@ src_configure() {
 		die "sed failed"
 }
 
-src_compile() {
-	# spurious failures with parallel compiles
-	emake -j1
-}
+#src_compile() {
+	# spurious failures with parallel compiles, bug #????
+#	emake -j1
+#}
 
 src_install() {
 	dodir "/var/lib/${PN}" /etc/pam.d
+	keepdir /var/lib/courier-imap
+
 	default
 	rm -r "${D}/etc/pam.d" || die
 
@@ -203,6 +220,7 @@ src_install() {
 		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
 
 	dodoc AUTHORS INSTALL NEWS README ChangeLog
+	readme.gentoo_create_doc
 	dodoc "${FILESDIR}/${PN}-gentoo.readme"
 	docinto imap
 	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
@@ -215,17 +233,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading"
-	elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams"
-
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
 	# Some users have been reporting that permissions on this directory were
 	# getting scrambled, so let's ensure that they are sane.
 	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
-}
 
-src_test() {
-	ewarn "make check is not supported by this package due to the"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
+	readme.gentoo_print_elog
 }