From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 3 Jul 2021 22:39:47 +0100
Subject: gentoo resync : 03.07.2021

---
 net-libs/courier-authlib/Manifest                  |  10 +-
 .../courier-authlib-0.69.0-r1.ebuild               | 147 --------------------
 .../courier-authlib-0.69.0-r3.ebuild               | 149 +++++++++++++++++++++
 .../courier-authlib-0.70.0-r2.ebuild               | 149 +++++++++++++++++++++
 .../courier-authlib/courier-authlib-0.70.0.ebuild  | 147 --------------------
 .../courier-authlib-0.71.0-r2.ebuild               | 149 +++++++++++++++++++++
 .../courier-authlib/courier-authlib-0.71.0.ebuild  | 147 --------------------
 .../courier-authlib-0.71.1-r2.ebuild               | 149 +++++++++++++++++++++
 .../courier-authlib/courier-authlib-0.71.1.ebuild  | 147 --------------------
 .../courier-authlib-0.71.2-r2.ebuild               | 149 +++++++++++++++++++++
 .../courier-authlib/courier-authlib-0.71.2.ebuild  | 147 --------------------
 11 files changed, 750 insertions(+), 740 deletions(-)
 delete mode 100644 net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
 create mode 100644 net-libs/courier-authlib/courier-authlib-0.69.0-r3.ebuild
 create mode 100644 net-libs/courier-authlib/courier-authlib-0.70.0-r2.ebuild
 delete mode 100644 net-libs/courier-authlib/courier-authlib-0.70.0.ebuild
 create mode 100644 net-libs/courier-authlib/courier-authlib-0.71.0-r2.ebuild
 delete mode 100644 net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
 create mode 100644 net-libs/courier-authlib/courier-authlib-0.71.1-r2.ebuild
 delete mode 100644 net-libs/courier-authlib/courier-authlib-0.71.1.ebuild
 create mode 100644 net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild
 delete mode 100644 net-libs/courier-authlib/courier-authlib-0.71.2.ebuild

(limited to 'net-libs/courier-authlib')

diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 9d41a1b8f29a..d3a44bef3295 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -4,9 +4,9 @@ DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced59
 DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec
 DIST courier-authlib-0.71.1.tar.bz2 2208870 BLAKE2B 5058a5d3182c53020c3be0a693908bd90e6e2397f03124df3efd7c3bd39ebdc794166d49c6153880bbf93518afbf4388160680cd701236b075b6e59624fb6882 SHA512 a1b36f4f3b0f11fb34e5dab197b3a0471bc6a99528fe77836b3b2d12f9dac292be4c181aeba5afa3410685dd6882ed00ff6692e74cd0132ba591de1294d0f2d7
 DIST courier-authlib-0.71.2.tar.bz2 2208460 BLAKE2B 49aaea85032166ba4867e7834bb2f6c8d3eccb0ebe24b94bac3033a3da2154e3162d06892354b37eb0c38db092ce0096b050246db341b18a32065c19f322238a SHA512 b0bd2356013d48a998908d4825901e8e730ec276699005696948781e8af4014e25eded3116fa5a8a38b6236e9713f454170628b51aedab7b7d2ebec082643a47
-EBUILD courier-authlib-0.69.0-r1.ebuild 4452 BLAKE2B e79a211dcd59c555ed48d02b243115a4a828cd100fa5c7970791b2de0b895f92756959521679fdf579dc682e5b8501100da9fa6a819c27ef8522aad14824ac97 SHA512 ebf0d33aea13b122d8a8a4de1449cd9bc993a2b5771c7ca02e59b0f7cb612595fd0f4467ab307d09ec13754f78fafeab168811845b5d8f174a5807ccc8fab427
-EBUILD courier-authlib-0.70.0.ebuild 4460 BLAKE2B 8dbc3fdec9cdc5d9492d500630fe5abec099ebabdc29bc8670d4a945e34550ab8df4875c79e4bd81ec46457c220f5982a2a9b2d50472de821c385b89dfe4e99a SHA512 d35c6a06d8508ddaaa8742f651dd99626249db8b7da85e3745cf1a51a58eb18de3bdf1d04df61d86a81326cda1521ef38675d7fcbf52685c3b7c4c8831feb8e9
-EBUILD courier-authlib-0.71.0.ebuild 4452 BLAKE2B e79a211dcd59c555ed48d02b243115a4a828cd100fa5c7970791b2de0b895f92756959521679fdf579dc682e5b8501100da9fa6a819c27ef8522aad14824ac97 SHA512 ebf0d33aea13b122d8a8a4de1449cd9bc993a2b5771c7ca02e59b0f7cb612595fd0f4467ab307d09ec13754f78fafeab168811845b5d8f174a5807ccc8fab427
-EBUILD courier-authlib-0.71.1.ebuild 4462 BLAKE2B 77343ec67e0a1806f6545e862b2f500c0125aa67e647d03083d888b623ceaa7f6d419628cf4283953919227f6c9ec79842affe91eb5b9ae731865363aa8a3c8d SHA512 cf377d4ea863ff3ad206f2a666c0c89100dd75bf3d1241a4d64695561468e8db97d6f81025c84d6a6c8f54ccab56d48496f7b3227db2ff2850f4079ef6e2c4f6
-EBUILD courier-authlib-0.71.2.ebuild 4462 BLAKE2B 9b46449737236b73b6d83517d3352d5f8ef72983de1d0dba0c44ba668a0f4d3ab9e2e75382cabfa7c3aeef60168abf2018b7d912582bb6d3332fa012a6e4d500 SHA512 69fe0dbc5cc4a8e440be73bcb7db560afb89395a6ea964645a7acde6b7d56382e53f92c1f70381eda62c395358602aa155a47d4bb09fee71fdaf061b50cd6e0e
+EBUILD courier-authlib-0.69.0-r3.ebuild 4462 BLAKE2B 9d4820ae42e6c5f89f74a2a38c75358b7bea3ff5ce1abb658edfe7b6f8167fa0392b4fc6da69efb2a06f602f20bc434deccce93a837839cb725e29a2913931a2 SHA512 e1da10fd1729f371d37116ef3d59ebf32c401fa3aefcea4e46b117321ed9fd46f16226ff10bc8ffb6ce96e3fae4b2f2fc2b9c7ec3b2675ad7405aa750b3f3f29
+EBUILD courier-authlib-0.70.0-r2.ebuild 4470 BLAKE2B 1c1dcbde260e5b444297ed285da434310f860d9244a81d707fc9cd4c1909beea24bdc9ef58976ea39a6cbeb9b21204355bed0f3a0c9e2b7c08f05d1970c5c21f SHA512 0fd647c724cadf384242261bc14f7a2d1286ca9bed7fd4d433c32e536488736076a34609371cc597423c03680c3109da6667dbbae9e9d0eaa4be7dc0443d8ae8
+EBUILD courier-authlib-0.71.0-r2.ebuild 4462 BLAKE2B 9d4820ae42e6c5f89f74a2a38c75358b7bea3ff5ce1abb658edfe7b6f8167fa0392b4fc6da69efb2a06f602f20bc434deccce93a837839cb725e29a2913931a2 SHA512 e1da10fd1729f371d37116ef3d59ebf32c401fa3aefcea4e46b117321ed9fd46f16226ff10bc8ffb6ce96e3fae4b2f2fc2b9c7ec3b2675ad7405aa750b3f3f29
+EBUILD courier-authlib-0.71.1-r2.ebuild 4472 BLAKE2B 6b0fcf845187e296e305d7c09f6e5cc29ad0447f04af56313a866dfe5a7d94b9b86e6f2804be1d31c913004eb0fe6053fb0528377e49aba71583d1a8a58f9353 SHA512 c4e46181e82bfaa7a6b24e53675d04d6615324ecc348ba018200f44bff9f0c085a9e8ac0f70fdf9b432cf7eec58e9b6076518d6337019b4e5d08907694821a37
+EBUILD courier-authlib-0.71.2-r2.ebuild 4472 BLAKE2B f0dd169000245ab779510f2ee924fbd3be8d10c341fdb9c95fe42e1f13266b7eb08dee3ac05e5aa5373f48ec9be5606271ba8ae25950b149cba3b1f95fa5f0dd SHA512 1a038d06ce25ede4b4ee0b99a796dd03b43c7328298df7c2a9d188a4b8999a495b178306951cc0919c98a823b99aff14229460b896035ac5873d720223f69616
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
deleted file mode 100644
index 1f4954c3e5e8..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.1
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r3.ebuild
new file mode 100644
index 000000000000..cfb9546ced48
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0-r3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+	>=net-libs/courier-unicode-2.1
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.70.0-r2.ebuild b/net-libs/courier-authlib/courier-authlib-0.70.0-r2.ebuild
new file mode 100644
index 000000000000..550f95917095
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.70.0-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+	>=net-libs/courier-unicode-2.1
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.70.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.70.0.ebuild
deleted file mode 100644
index a0536faa59ff..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.70.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.1
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0-r2.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0-r2.ebuild
new file mode 100644
index 000000000000..cfb9546ced48
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+	>=net-libs/courier-unicode-2.1
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
deleted file mode 100644
index 1f4954c3e5e8..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.1
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.1-r2.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.1-r2.ebuild
new file mode 100644
index 000000000000..60d2a698741f
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.71.1-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+	>=net-libs/courier-unicode-2.1.2
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.1.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.1.ebuild
deleted file mode 100644
index 4627dee726d5..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.71.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.1.2
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild
new file mode 100644
index 000000000000..d6f766f1d735
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+	>=net-libs/courier-unicode-2.2.3
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.2.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.2.ebuild
deleted file mode 100644
index f65a8c7d1d26..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.71.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.2.3
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
-- 
cgit v1.2.3