8 files changed, 459 insertions, 0 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 2e3b5dafa963..158ddb99acfe 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 90c1956c6a35..50e489257bf1 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -14,6 +14,7 @@ AUX courier-imap-4.17-db4-bdbobj_configure.ac.patch 1499 BLAKE2B d619e493b066e0d
 AUX courier-imap-4.17-db4-configure.ac.patch 1464 BLAKE2B 7f3aa5c86c7d12d369844757dbb3038afe9d12a034ec5d63860df76dba86ce18724fefc2c12f5596a27620ae05849ec9595ba1e410cadb0853dc4c322f965dd9 SHA512 55433b330d1039cd177af058cbc4a2bf7a65e53b8ecf29955c499dd6a68d634d7582449f54d1c70675ed759586e4d9dc7f43ce3703113e76df81b2a8703085bd
 AUX courier-imap-5.0.8-ar-fix.patch 263 BLAKE2B d21499a4bda24e7434cc41a29a9eadfeab41e52fd4b6a2d58569789aa76f8c73578d1a3c412021cfcbf56d8e33138c545d6d921e1030120dee8309e37679ec14 SHA512 a25d0e40a43a3539c7f5bb0e694a410fbdb3a5538ee8c5c82bd0c361023f4d5d8f40002fe2b79f517366cbe004d42238d6190642d003660ffd132142a959c840
 AUX courier-imap-5.1.8-aclocal-fix.patch 306 BLAKE2B 4fc75b3a14002976bd6a27a57ee40afa12cf3899c7aaac916ea42939b78fa1018919b6ce5f3f80c4a97b7d7dbf50e533c68a23279b476c6158c6bc1581d4882b SHA512 1e49d00d5040f5b735a965eb84cc35948c0dbe918cfb56b0c43e0a32848373afd8ca7fbb6f3fa4ffcf77b74b3c0c83ba3e3931ab1c6d5ea748a759874ab0f2f0
+AUX courier-imap-5.2.1-makedat.patch 1275 BLAKE2B 9cef2f9f92be6daaaed593ba47f8f7ba674deaf438567e7d5c0762cfe02977d8c173a8c864e0b7521033cdaf4e033f36c5bed26d4156a8945ec3b1e6f84ef145 SHA512 1a4da5ca6cb569b4229d772893b8fc69c9928a152b49e7bc8da129c8141bc5024a7229057950b3ed9e25e521437a9550ab866a7d6a8e479c91b72b6dc2742138
 AUX courier-imap-gentoo.readme 2827 BLAKE2B fc45b7180165b5ed69a1722c268d5a6f742a16effe3f883b7ed268ee8b76527675d7b792712bfdb2b68d5bfe49fbc9d2e6af61ba2bd5b3dbed28f9be6ba397b8 SHA512 a677218ed39483dbe07358382f557a877486d5028b890ce25822663a6fff58a4744d245537a5395c7a403a566522753c91f9c0c511b9a7229ac1ea2ba4a9c54c
 AUX courier-imap.cron 32 BLAKE2B ccdf922262a94899370df48f49654e57c77758abb7843e112bf3232752ae25e9fc19337a425bd30914e1207a5bdcc1ca258ab8780a3516790c31eaff51a77039 SHA512 a4d3c648e83d3e067321cb28e613eddd1f689532e67811ae612089c43b1d8b163459d138fdd695cc11a0aef399028c880f7a97b33745e1fcd84ffd9b61e6ee93
 AUX courier-imapd-r1.service 299 BLAKE2B 7b1fb3acc3b75cac873967f1eca099e9f65951feecb2fe6cded69ac437f47387bca493071012c1f98b579c184cdbbf0f1e464eed44d441a308f370fe112f4365 SHA512 5b44983d067b447bc60bd5365340c7ffd0c7102eba93fd87dda6cafb95c8625efe5badfaa4607c13a21ce37a7e781f5b81a47b9b18666403263e3d8789310d44
@@ -31,5 +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.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
new file mode 100644
index 000000000000..e49fb6eb3694
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-5.2.1-r1.ebuild
@@ -0,0 +1,258 @@
+# 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/files/courier-imap-5.2.1-makedat.patch b/net-mail/courier-imap/files/courier-imap-5.2.1-makedat.patch
new file mode 100644
index 000000000000..374bc8f045f8
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-5.2.1-makedat.patch
@@ -0,0 +1,34 @@
+--- a/Makefile.am	2023-01-23 22:58:11.644686431 +0100
++++ b/Makefile.am	2023-01-23 22:58:34.812309175 +0100
+@@ -13,7 +13,7 @@
+ SUBDIRS=libs/numlib libs/bdbobj libs/gdbmobj libs/soxwrap \
+ 	libs/rfc822 libs/rfc2045 \
+ 	libs/md5 libs/sha1 libs/random128 libs/rfc1035 libs/liblock \
+-	libs/maildir libs/makedat libs/libhmac \
++	libs/maildir libs/libhmac \
+ 	libs/waitlib libs/tcpd libs/rootcerts libs/imap
+ 
+ sbin_SCRIPTS=sharedindexinstall sharedindexsplit
+@@ -22,9 +22,9 @@
+ databin_SCRIPTS=mkimapdcert mkpop3dcert mkdhparams
+ 
+ binPROGRAMS=imapd pop3d maildirmake maildiracl deliverquota maildirkw \
+-	makeimapaccess makedat
++	makeimapaccess
+ sbinPROGRAMS=imaplogin pop3login
+-libexecPROGRAMS=makedatprog couriertcpd
++libexecPROGRAMS=couriertcpd
+ 
+ bin_PROGRAMS= @binPROGRAMS_exec@
+ sbin_PROGRAMS=@sbinPROGRAMS_exec@
+--- a/configure.ac	2023-01-23 22:59:15.960638991 +0100
++++ b/configure.ac	2023-01-23 22:59:29.744414452 +0100
+@@ -213,7 +213,7 @@
+ AC_CONFIG_SUBDIRS(libs/numlib libs/bdbobj libs/gdbmobj libs/soxwrap
+ 	libs/rfc822 libs/rfc1035 libs/rfc2045
+ 	libs/md5 libs/sha1 libs/random128 libs/liblock
+-	libs/maildir libs/makedat libs/libhmac
++	libs/maildir libs/libhmac
+ 	libs/waitlib libs/tcpd libs/rootcerts libs/imap)
+ 
+ # Courier-IMAP standalone does not use SOCKSv5
diff --git a/net-mail/courier-makedat/Manifest b/net-mail/courier-makedat/Manifest
new file mode 100644
index 000000000000..43d9f075a879
--- /dev/null
+++ b/net-mail/courier-makedat/Manifest
@@ -0,0 +1,4 @@
+AUX courier-makedat-3.1.0-gentoo.patch 3561 BLAKE2B 5e7b6b0481cc07ddb2e43c61fd90928a0b17c3536268a93d90552c737cf385621423c0a7683e9d7e9ba75fee4e4d5b5de6f23604ab518e6eeda631c3a8968761 SHA512 ec96078e7e345b82ad30c5613d8e32a310903d7e9e527d73e35fa825ec192ef37ecaeb5449e79e71fcc377c35cd468f0dffd0747ce65b4474200aff3ccbf11ca
+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/courier-makedat-3.1.0.ebuild b/net-mail/courier-makedat/courier-makedat-3.1.0.ebuild
new file mode 100644
index 000000000000..3f4249bb4809
--- /dev/null
+++ b/net-mail/courier-makedat/courier-makedat-3.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+MYP=maildrop-${PV}
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="https://www.courier-mta.org/maildrop/"
+SRC_URI="mirror://sourceforge/courier/${MYP}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb gdbm"
+
+RDEPEND="!mail-mta/courier
+	!<=net-mail/courier-imap-5.2.1
+	!<=mail-filter/maildrop-3.0.2
+	gdbm? ( >=sys-libs/gdbm-1.8.0:= )
+	!gdbm? ( berkdb? ( >=sys-libs/db-3:= ) )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+S=${WORKDIR}/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	# Prefer gdbm over berkdb
+	if use gdbm ; then
+		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
+	fi
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-devel
+	)
+
+	if use gdbm ; then
+		myeconfargs+=( --with-db=gdbm )
+	else
+		myeconfargs+=( --with-db=db )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
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
new file mode 100644
index 000000000000..d8517d7d483d
--- /dev/null
+++ b/net-mail/courier-makedat/files/courier-makedat-3.1.0-gentoo.patch
@@ -0,0 +1,97 @@
+--- a/Makefile.am	2023-01-23 20:26:38.281754514 +0100
++++ b/Makefile.am	2023-01-23 20:56:23.015425918 +0100
+@@ -10,7 +10,7 @@
+ 
+ HTML2TXT=elinks -dump -no-numbering -no-references
+ 
+-SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 @DBSUBDIR@ libs/makedat libs/maildir libs/maildrop
++SUBDIRS=@DBSUBDIR@ libs/makedat
+ 
+ DIST_SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/makedat libs/maildir libs/maildrop
+ 
+@@ -51,21 +51,13 @@
+ uninstall-deliverquota:
+ 	rm -f $(DESTDIR)$(bindir)/deliverquota
+ 
+-MAILDROPHTML=lockmail.html maildiracl.html maildirkw.html \
+-	maildirwatch.html \
+-	maildirmake.html maildropex.html \
+-	maildir.html \
+-	maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
+-	makemime.html reformail.html reformime.html
++MAILDROPHTML=
+ 
+ if HAVE_DBLIBRARY
+ MAILDROPHTML += makedat.html
+ endif
+ 
+-MAILDROPMAN=lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
+-	maildirkw.1 maildirwatch.1 \
+-	maildir.5 \
+-	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
++MAILDROPMAN=
+ 
+ if HAVE_DBLIBRARY
+ MAILDROPMAN += makedat.1
+@@ -82,8 +74,8 @@
+ 
+ lib_LTLIBRARIES=@DEVEL_LIBS@
+ 
+-htmldataclean=$(DELIVERQUOTAHTML) \
+-	$(MAILDROPHTML) rfc822.html rfc2045.html
++htmldataclean= \
++	$(MAILDROPHTML)
+ 
+ html_DATA=$(htmldataclean) manpage.css
+ 
+@@ -91,7 +83,7 @@
+ html_DATA += makedat.html
+ endif
+ 
+-man_MANS=$(DELIVERQUOTAMAN) \
++man_MANS= \
+ 	$(MAILDROPMAN) $(DEVEL_MAN)
+ 
+ if !HAVE_DBLIBRARY
+@@ -108,7 +100,7 @@
+ librfc822_la_LDFLAGS=-rpath $(libdir) -version-info @LIBVERSION_INFO@
+ librfc2045_la_LDFLAGS=-rpath $(libdir) -version-info @LIBVERSION_INFO@
+ 
+-install-data-local: install-man install-deliverquota install-maildrop
++install-data-local: install-man install-maildrop
+ 
+ uninstall-local: uninstall-deliverquota uninstall-maildrop
+ 
+@@ -130,21 +122,10 @@
+ 
+ install-maildrop:
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-	for f in maildrop mailbot reformail ; do \
+-		$(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
+-	done
+-	$(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
+-	$(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
+-	$(INSTALL_PROGRAM) libs/maildir/maildirkw $(DESTDIR)$(bindir)/maildirkw
+-	$(INSTALL_PROGRAM) libs/maildir/maildirwatch $(DESTDIR)$(bindir)/maildirwatch
+-	$(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
+-	$(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
+ 	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+ 		$(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
+ 	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+ 		$(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(bindir)/makedat
+-	. libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
+-	. libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
+ 
+ uninstall-maildrop:
+ 	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 @@
+ 
+ AC_SUBST(REPOSITORY)
+ 
+-AC_CONFIG_SUBDIRS(libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/makedat libs/maildir libs/maildrop)
++AC_CONFIG_SUBDIRS(libs/gdbmobj libs/bdbobj libs/makedat)
+ 
+ AC_CONFIG_FILES([Makefile
+ 	courier-debuild
diff --git a/net-mail/courier-makedat/metadata.xml b/net-mail/courier-makedat/metadata.xml
new file mode 100644
index 000000000000..f546727ff5dc
--- /dev/null
+++ b/net-mail/courier-makedat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">courier</remote-id>
+	</upstream>
+</pkgmetadata>