From 1f23f671d001ca7a0073e504f5ae0184eb5d024d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 24 Jan 2023 12:57:16 +0000
Subject: gentoo auto-resync : 24:01:2023 - 12:57:16

---
 net-mail/Manifest.gz                               | Bin 14233 -> 14245 bytes
 net-mail/courier-imap/Manifest                     |   2 +-
 net-mail/courier-imap/courier-imap-5.2.1-r1.ebuild | 258 ---------------------
 net-mail/courier-imap/courier-imap-5.2.1-r2.ebuild | 246 ++++++++++++++++++++
 net-mail/courier-makedat/Manifest                  |   2 +-
 .../files/courier-makedat-3.1.0-gentoo.patch       |  10 +-
 6 files changed, 257 insertions(+), 261 deletions(-)
 delete mode 100644 net-mail/courier-imap/courier-imap-5.2.1-r1.ebuild
 create mode 100644 net-mail/courier-imap/courier-imap-5.2.1-r2.ebuild

(limited to 'net-mail')

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 158ddb99acfe..27e37780e7eb 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 50e489257bf1..04522d57a446 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -32,6 +32,6 @@ EBUILD courier-imap-5.1.3-r1.ebuild 7062 BLAKE2B 65a4b28c409357713d9f7a3b337e46c
 EBUILD courier-imap-5.1.4.ebuild 7056 BLAKE2B 56a06f662daa0b4e45c0ed755c536a2f29f5168cfc84fe62db809de2865cbb4c3e74c2104034d9dce707d9e405c09f4c8523cbd163f7a96adf9669c27446ec3e SHA512 381c68368c66c33f7a0f709ac0b3ab430e5b10b57c0bc12ac6943969c7bb3dca1780bc423437316203fc9ac0d7ab50ae7906ac50cba0fa9302a4d17704c2eb7f
 EBUILD courier-imap-5.1.7.ebuild 7062 BLAKE2B 65a4b28c409357713d9f7a3b337e46cccf01853ab7fac27dcd0c5895d5275a61de53350a6b7961739eae42d007fe811b1eecf66e07b955734f46f0d8afff1835 SHA512 e0538948fb23aecc78e5d62f3ec86344e42e751577aac6443f0e556a326a04e51c0ac6b53ce154f0ba53c019f46be3726f13b5b9a7c5576c6c5d07149d588ecf
 EBUILD courier-imap-5.1.8.ebuild 7070 BLAKE2B dd69c32c0842f300301ff00e8b5da9f448c0197a8fa86301f8847ee27dae131d75a90a3facf4180b4564dbe4147e21caf13b3e7b9617fe4f0f4c0d298ede20ce SHA512 324e24e982e846ac4562ffc5952968cc81e7f644452086f08790aaa4529b79467140b29981fd4ab8686a904d8cec3447fcc0b0a18e7b6edeaeadfa4988c9a568
-EBUILD courier-imap-5.2.1-r1.ebuild 7194 BLAKE2B 03b3d8dfc39d5610ecf473f7752277351afe51553c941d586cf2f67cfab0a6da3d1e3b804868d2ec5825c7946f7f5df6fd199a537acac5d04dc34715569787d5 SHA512 ed1cb6966b534da04864d51bd78c2a39ed3a598ef4c99a20476f2a17620392675d3ff391c26a3e54169bdf69074031f2457b15a39dd01a1da1d05d0cd629f989
+EBUILD courier-imap-5.2.1-r2.ebuild 7011 BLAKE2B e26d3e3539b36fe6b38fb03e2887201b0a513cdb6fce4d2f3d09eb0013d3cbc4899f83b87e6a7e078d51ac9e0a16b5c35c2c1015a1979c39eaa5e4f482755c5c SHA512 3c2fb9fcf3be39e555387eea20539cf13635934c7cb7ee3708e225c97f46a6bf76d4028e41edeefd94f7875410ed0d797873a4322f9d163a06dbde6d17a4549b
 EBUILD courier-imap-5.2.1.ebuild 7070 BLAKE2B dd69c32c0842f300301ff00e8b5da9f448c0197a8fa86301f8847ee27dae131d75a90a3facf4180b4564dbe4147e21caf13b3e7b9617fe4f0f4c0d298ede20ce SHA512 324e24e982e846ac4562ffc5952968cc81e7f644452086f08790aaa4529b79467140b29981fd4ab8686a904d8cec3447fcc0b0a18e7b6edeaeadfa4988c9a568
 MISC metadata.xml 463 BLAKE2B 548ad09a1ed2b0c44cbb80ab66b653185b178873ae88f5a33545b759914fcb9e6491eef7c9e6da0a713f40c92b3b084cb36dec6f411ca8cba6db76767c8ca237 SHA512 d1aaf82b4ce4775d8e8f97f8900e10aaf403b1224744263d76c3eb890e0ec08c8e108b2f631498bd21ae3551c211747374526d73dd9764c01c4e6af5de78b950
diff --git a/net-mail/courier-imap/courier-imap-5.2.1-r1.ebuild b/net-mail/courier-imap/courier-imap-5.2.1-r1.ebuild
deleted file mode 100644
index e49fb6eb3694..000000000000
--- a/net-mail/courier-imap/courier-imap-5.2.1-r1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/imap/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-	gnutls? ( net-libs/gnutls:=[tools] )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=net-libs/courier-authlib-0.71
-	>=net-libs/courier-unicode-2:=
-	>=net-mail/mailbase-0.00-r8
-	net-dns/libidn:=
-	berkdb? (
-		sys-libs/db:=
-		net-mail/courier-makedat[berkdb?,gdbm?]
-	)
-	fam? ( virtual/fam )
-	gdbm? (
-		>=sys-libs/gdbm-1.8.0:=
-		net-mail/courier-makedat[berkdb?,gdbm?]
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	!mail-mta/courier
-	sys-process/procps
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )
-"
-
-# get rid of old style virtual - bug 350792
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/cyrus-imapd
-"
-
-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}
-
-Please convert maildir to utf8
-and rerun mkdhparams if needed. Location has changed
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.8-aclocal-fix.patch"
-	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
-	"${FILESDIR}/${P}-makedat.patch"
-)
-
-src_prepare() {
-	default
-
-	# These patches should fix problems detecting BerkeleyDB.
-	# We now can compile with db4 support.
-	if use berkdb ; then
-		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
-		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	# Default to gdbm if both berkdb and gdbm are present.
-	if use gdbm ; then
-		einfo "Building with GDBM support"
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB support"
-		myconf="${myconf} --with-db=db"
-	fi
-
-	if use trashquota ; then
-		einfo "Building with Trash Quota Support"
-		myconf="${myconf} --with-trashquota"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	econf \
-		--with-notice=unicode \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--sysconfdir="/etc/${PN}" \
-		--libexecdir="/usr/$(get_libdir)/${PN}" \
-		--localstatedir="/var/lib/${PN}" \
-		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-certsdir="/etc/courier-imap" \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with gnutls) \
-		${myconf}
-}
-
-#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
-
-	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
-	for name in imapd pop3d ; do
-		mv "${D}/usr/sbin/"{,courier-}${name} \
-			|| die "failed to rename ${name} to courier-${name}"
-	done
-
-	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		sed -e 's/Maildir/${MAILDIR}/' \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-	done
-
-	# Rename the config files correctly and add a value for ${MAILDIR}
-	# to them.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		mv "${D}/etc/${PN}/${service}"{.dist,} \
-			|| die "failed to rename ${service}.dist to ${service}"
-		echo -e '\n# Hardwire a value for ${MAILDIR}' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for service in imapd pop3d ; do
-		echo -e '# Put any program for ${PRERUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
-		echo -e '# Put any program for ${LOGINRUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo -e '# this is for relay-ctrl-allow in 4*' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for x in "${D}/usr/sbin"/* ; do
-		if [[ -L "${x}" ]] ; then
-			rm "${x}" || die "failed to remove ${x}"
-		fi
-	done
-
-	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
-	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
-
-	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
-
-	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
-
-	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
-
-	for initd in courier-{imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
-			> "${T}/${initd}" \
-			|| die "initd libdir-sed failed"
-		doinitd "${T}/${initd}"
-	done
-
-	cp "${FILESDIR}"/courier-*-r1.service .
-
-	sed -i \
-		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		courier-*-r1.service \
-		|| die
-
-	systemd_newunit courier-authdaemond-r1.service \
-					courier-authdaemond.service
-	systemd_newunit courier-imapd-ssl-r1.service \
-					courier-imapd-ssl.service
-	systemd_newunit courier-imapd-r1.service \
-					courier-imapd.service
-
-	exeinto "/usr/$(get_libdir)/${PN}"
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
-			> "${T}/${exe}" \
-			|| die "exe libdir-sed failed"
-		doexe "${T}/${exe}"
-	done
-
-	# Avoid a collision with mail-mta/netqmail, bug 482098.
-	mv "${D}/usr/sbin/"{,courier-}maildirmake \
-		|| die "failed to rename maildirmake to courier-maildirmake"
-	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
-		|| 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*
-	docinto maildir
-	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
-	docinto rfc2045
-	dodoc libs/rfc2045/*.html
-	docinto tcpd
-	dodoc libs/tcpd/README* libs/tcpd/*.html
-	exeinto /etc/cron.monthly
-	newexe "${FILESDIR}"/${PN}.cron ${PN}
-}
-
-pkg_postinst() {
-	# 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}"
-
-	readme.gentoo_print_elog
-
-	elog ""
-	elog "Courier Imap now run as user mail:mail."
-	elog ""
-	elog "This require you to enable read/write access to the caches:"
-	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
-	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
-}
diff --git a/net-mail/courier-imap/courier-imap-5.2.1-r2.ebuild b/net-mail/courier-imap/courier-imap-5.2.1-r2.ebuild
new file mode 100644
index 000000000000..403ebd030787
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-5.2.1-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/imap/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="berkdb debug +gdbm gnutls ipv6 selinux trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+	gnutls? ( net-libs/gnutls:=[tools] )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=net-libs/courier-authlib-0.71
+	>=net-libs/courier-unicode-2:=
+	>=net-mail/mailbase-0.00-r8
+	net-dns/libidn:=
+	net-mail/courier-makedat[berkdb?,gdbm?]
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:= )
+"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	!mail-mta/courier
+	sys-process/procps
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-courier )
+"
+
+# get rid of old style virtual - bug 350792
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/cyrus-imapd
+"
+
+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}
+
+Please convert maildir to utf8
+and rerun mkdhparams if needed. Location has changed
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.8-aclocal-fix.patch"
+	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
+	"${FILESDIR}/${P}-makedat.patch"
+)
+
+src_prepare() {
+	default
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
+		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	econf \
+		--with-notice=unicode \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--sysconfdir="/etc/${PN}" \
+		--libexecdir="/usr/$(get_libdir)/${PN}" \
+		--localstatedir="/var/lib/${PN}" \
+		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-certsdir="/etc/courier-imap" \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+}
+
+src_install() {
+	dodir "/var/lib/${PN}" /etc/pam.d
+	keepdir /var/lib/courier-imap
+
+	default
+	rm -r "${D}/etc/pam.d" || die
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	for name in imapd pop3d ; do
+		mv "${D}/usr/sbin/"{,courier-}${name} \
+			|| die "failed to rename ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -e 's/Maildir/${MAILDIR}/' \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR}
+	# to them.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv "${D}/etc/${PN}/${service}"{.dist,} \
+			|| die "failed to rename ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for x in "${D}/usr/sbin"/* ; do
+		if [[ -L "${x}" ]] ; then
+			rm "${x}" || die "failed to remove ${x}"
+		fi
+	done
+
+	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
+	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
+
+	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
+
+	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
+			> "${T}/${initd}" \
+			|| die "initd libdir-sed failed"
+		doinitd "${T}/${initd}"
+	done
+
+	cp "${FILESDIR}"/courier-*-r1.service .
+
+	sed -i \
+		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		courier-*-r1.service \
+		|| die
+
+	systemd_newunit courier-authdaemond-r1.service \
+					courier-authdaemond.service
+	systemd_newunit courier-imapd-ssl-r1.service \
+					courier-imapd-ssl.service
+	systemd_newunit courier-imapd-r1.service \
+					courier-imapd.service
+
+	exeinto "/usr/$(get_libdir)/${PN}"
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
+			> "${T}/${exe}" \
+			|| die "exe libdir-sed failed"
+		doexe "${T}/${exe}"
+	done
+
+	# Avoid a collision with mail-mta/netqmail, bug 482098.
+	mv "${D}/usr/sbin/"{,courier-}maildirmake \
+		|| die "failed to rename maildirmake to courier-maildirmake"
+	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
+		|| 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*
+	docinto maildir
+	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
+	docinto rfc2045
+	dodoc libs/rfc2045/*.html
+	docinto tcpd
+	dodoc libs/tcpd/README* libs/tcpd/*.html
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/${PN}.cron ${PN}
+}
+
+pkg_postinst() {
+	# 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}"
+
+	readme.gentoo_print_elog
+
+	elog ""
+	elog "Courier Imap now run as user mail:mail."
+	elog ""
+	elog "This require you to enable read/write access to the caches:"
+	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
+}
diff --git a/net-mail/courier-makedat/Manifest b/net-mail/courier-makedat/Manifest
index 43d9f075a879..d03a2bdeba4e 100644
--- a/net-mail/courier-makedat/Manifest
+++ b/net-mail/courier-makedat/Manifest
@@ -1,4 +1,4 @@
-AUX courier-makedat-3.1.0-gentoo.patch 3561 BLAKE2B 5e7b6b0481cc07ddb2e43c61fd90928a0b17c3536268a93d90552c737cf385621423c0a7683e9d7e9ba75fee4e4d5b5de6f23604ab518e6eeda631c3a8968761 SHA512 ec96078e7e345b82ad30c5613d8e32a310903d7e9e527d73e35fa825ec192ef37ecaeb5449e79e71fcc377c35cd468f0dffd0747ce65b4474200aff3ccbf11ca
+AUX courier-makedat-3.1.0-gentoo.patch 3739 BLAKE2B e72dcca247adaca8a8de04d83f8cbd3bb73327a9d8d64fdde8f8ccfa62fd7815528bfbf196d65bee73d42c9d8df60197bd5cc11e80c6adb27545366e6873bc2e SHA512 b2ddd5b6c2d07e7223eb4f9b7f734e321c9a65c87a7aeebd67892e863aae995d3036a0963e849f6de067e6680e4e16b2391bb48d886fa4a6cc2d27456bc69cc6
 DIST maildrop-3.1.0.tar.bz2 2154698 BLAKE2B 8eaec33ccb3f117e0cd069eac2af736f5cc3485314ea14ac594f8e716e68d3f1e20143ba47533c08a835707dda1e8ba0fad2eea5d3bf5845668f8ad375e56387 SHA512 4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56
 EBUILD courier-makedat-3.1.0.ebuild 1058 BLAKE2B 3bb0acbcf0fd7911946ef1b771354382fbcd85a83913ce39c4b27a06bfd9059680ef382d9ea833cc49f5befe2db6041bd65cc0d4d3626bfbdc92ae3686c8724e SHA512 b9f890bd13e7d2228186bbe48c9fbd317faee0f10aafba60e54bc3ac59c92ddff9b22c229a9a09a5833dcd8c2991ef7e296782f4f9d11f9554adf4b70263ae71
 MISC metadata.xml 325 BLAKE2B 023d4556dfa6439e94cfab6f1dda984cf895bcc72c0f9f6dec30ab524760c8b6fbfd4ca7b31ac2dd39381648ffe26c03064c77792b9d4b5ff9f2883920ac2413 SHA512 518c12524579e302876f908c7553469e52ca29867b398b3daa85f4f887d77abc424b6d2e9523b7b49c11fafe0a34c633b2448153008fb95d7837676168eaa189
diff --git a/net-mail/courier-makedat/files/courier-makedat-3.1.0-gentoo.patch b/net-mail/courier-makedat/files/courier-makedat-3.1.0-gentoo.patch
index d8517d7d483d..9a6a0c0d6998 100644
--- a/net-mail/courier-makedat/files/courier-makedat-3.1.0-gentoo.patch
+++ b/net-mail/courier-makedat/files/courier-makedat-3.1.0-gentoo.patch
@@ -86,7 +86,15 @@
  	for f in maildrop mailbot maildirmake reformail lockmail makemime reformime maildirkw maildirwatch; do \
 --- a/configure.ac	2023-01-23 20:25:07.119321103 +0100
 +++ b/configure.ac	2023-01-23 20:30:33.445719448 +0100
-@@ -203,7 +203,7 @@
+@@ -129,7 +129,6 @@
+ 	AC_MSG_ERROR([libidn not found])
+ fi
+ 
+-AX_COURIER_UNICODE_VERSION(2.1)
+ 
+ AC_ARG_WITH(plentyofbeer,
+ [  --enable-sendmail=prog       set sendmail location
+@@ -203,7 +202,7 @@
  
  AC_SUBST(REPOSITORY)
  
-- 
cgit v1.2.3