gentoo resync : 24.12.2018

6 files changed, 52 insertions, 304 deletions

diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 23ad91435c4e..dec20808a87a 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,15 +1,14 @@
 AUX courier-authlib-0.65.0-sqlite.patch 798 BLAKE2B 305fb4f7349b030b98f4a13c7d104ecfdc61c098659b05a6c8258ab7311fdea586682ec5566447a3dd767540b2038fd45049db97bdd180a25a5114bdd7adc55d SHA512 f9148c23195cb9ec3265fcc86a2c8ea4c0d114046d81e527dd5759f45844b425f5270fcec52fd497e82b8272fa99984e7facb8cca6f696956896ad177c5f81fb
 AUX courier-authlib-r1 985 BLAKE2B cc970ee300a367c6c742a8fc4266bf0a1c3113e7bd16c8ab4a73d49cde013fcc8500ca1288c81f530edaca96ad0fb79a2b15d471cb3e0fea5af814064202b820 SHA512 ff5022dcc50c9bd9c112cac0ac3a47b37d496603aaef4db2cdd1b96236b5c3deff085e742301a9144dd8113cf5b51d0ee32b4a50e574274855fc1614f4769cd3
+AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a440293d73da748d423aca137031a2b043e832f5009f2384f3f7ae352c2d10dfccfeb6082fd42aa1513bb SHA512 8681f041431150027f41058ae8dd5fb2105a74caecb096aef42b1f0e255026c2f8509d9f688f2725ab1e12b792604cb481a95a6eeb177967c16ae5e3390f44d4
 DIST courier-authlib-0.65.0.tar.bz2 2303751 BLAKE2B 595a91a87d9f0f87ded7db73f88a9a74f8e5140452cab2bada43de9836b4f3e8b123dbb10295493e71e52e1920950f28d67a74ec026ff33c27ffa14024d079a1 SHA512 edc4a51bc0d748e7d6cdbf9e9c67c43eeedd9e3846d91a8eea24613f6fb5125d2e713ef7fd63cbbe1905205f2a406b4ff3f31d7c3fb7028939123dbc728d8e38
-DIST courier-authlib-0.66.3.tar.bz2 2085083 BLAKE2B eeb4fe55cf3abd087d6e3a8185f57d7b90ecd12323dcfa0f1a2a0dd2a34e315662569c5beead6bf2d231a5e11592c9568b4ed44fe239c12cd51024db6ffbb146 SHA512 09d97c8efc79d84437feefca13f5161c0e113864b9c971a4a980b359c9c14699f8d07eac6b52ac0a7d30f9770656e672f64c3445ecf4dcad88f51a427310d530
 DIST courier-authlib-0.66.4.tar.bz2 2192331 BLAKE2B 8fd68153b2defb63bbafb44b34c0f7ab5f7156800dc3eeb3c31fc0952c9a4637d4937babceae624c1a22512076bb11a1a356e0e0332c13d61026470a03b7e1c9 SHA512 0987bc9d33a013ae842e0ea3e4e83ef9d6196c2f923a6970e049a36b8ccddbf0c4465c43c7e27d6718480e981f573795f6417478de1ff685264f3439e8dffdc9
 DIST courier-authlib-0.67.0.tar.bz2 2194546 BLAKE2B 2ccb6ed15c2f02d206606f8bba04c9f2da415da3d739e456914e44010c955c9aaeae1f1c0746c8812f5165eb8db1997284e1c378132a6144da2b8f77d77a6eff SHA512 6e3da28d555761177727c44b1422bf5baf6ffbf28f53cea89a4a8e13daa5433803deba1614295d9679c41b5be4750f464e7869a2d3ecbfd91ae84e7281c4f3ef
 DIST courier-authlib-0.68.0.tar.bz2 2194982 BLAKE2B e463390b49bb3ca147467d3054a83d5a8ce96b604bde0b624c4d7ce81235c6f747e5d847dde794c81c4ad36aeef49bdd27cf904142b4542df833484c5eb7a57e SHA512 5c4adaf0fd69f4b9e780962aa3f9eeac6b15cea3f302288ff4549ce2b0be9ea0808b4501670ef3c4e0419c3d27505c256c082f795dea4683dd5265fd7dcab93b
+DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
 EBUILD courier-authlib-0.65.0-r3.ebuild 5163 BLAKE2B 6c096213af78df0374243ba9c783157f848870b4bb7afe97cb93381c9b152597688598eed8f45bbf650609c5532257691987d6d2ee311c7fa15aef5613a1c009 SHA512 a79b21359604c6536bc0bfb2686e0752147d091bf8c9c1297b849d99aeddcfa99651c0f0466d7491a2a35e2042403db3f21d7505ed9c2dd7f21d943411eef596
-EBUILD courier-authlib-0.66.3.ebuild 4465 BLAKE2B d2dd6e77898e81a731678e37c9c3a438a83fb5497d978b50eb02074438b22a63b2ffe37a3eedf7457209d94e1ee02d616cb72145cc87673ae307420a6a274554 SHA512 0738d4d20f42b55e5425142f215c3f10fbce26a1c4cd42b0a93c94b6de9d6ca657ff2891e2258279a0fa8c7ded193739c15ccba9dbbb74460e15b6685c8d4323
-EBUILD courier-authlib-0.66.4-r1.ebuild 4516 BLAKE2B 6babad0243712dc97ee8e717460962482bdf7f31f9a5d059d35f5e876cd1e8aedac11f4606795ccc9b86f414445126b3b6faf8c9cb6a6eab001e0567a3b12257 SHA512 7d3f38818e17602829e6ff0f30f00c32abbaffec7419fd482a973bd30239fce34933b78ed1fab7b6b149771ed4d3e36da43eb2eaf4caf994efcf624956dc02c4
 EBUILD courier-authlib-0.66.4.ebuild 4507 BLAKE2B 7ccddf9fe24f3c2787bdebf26ac5cc721ed64b6a3acb94d778a51dbd5ac177f08af4e07406d4bda38bf30dcacda24a4ffecfbb878b66c4115edde49ec153eb07 SHA512 f23af0db15399330915a10eb8cf24dae2724c1eba1810ea010db6ebfe6b98127c4ccf4e7b122c7ccc857381446eb18eb81d62d9b9aec187612a3344f80751cad
-EBUILD courier-authlib-0.67.0.ebuild 4559 BLAKE2B a6ccafc2841c77b7f20d4a9345d538b981e6720ef7ce8c3c2c7a6945150cd5443061d1966de7852ea95e0adb7df06cd9d2be6188b52aad285f906e56c91e19aa SHA512 8e2d0c01762c859d77db022637afae695d6f412bdc28e272d6e0431fcec53ecce8e66a573387de80ad7316889af114eff202d96ac55ee7d9d0b847a9db28d47b
+EBUILD courier-authlib-0.67.0.ebuild 4556 BLAKE2B a7ce689042a690e58f263a4dbcc0ccf31d322ab8a3aa58215cdb8dd6bc00510e868d80c79159d8fef8a7798ac7b2b29fe433a31b83c9789e6824b9e9675fc4d8 SHA512 addc437779e8afe7ffb797f9f472ac9edb5138e08e1cdfe5069d434ffb1749df2718afc3a9c2700f7868a9fad0a1a8a4f8abb3b1da7faa4eedb7f31ae11520ff
 EBUILD courier-authlib-0.68.0-r1.ebuild 4560 BLAKE2B df061f092e834802c5c9b7ed00dfe2dc4689d125539ceea03d19dfe0cd5a2d98369cf38254b592d86b522767631699d582b35791a462a32c4c0e67f0d74400df SHA512 7951967aeda9b1c3a0fa51ce74e53a98605db8216b276bf8b3d19deaffe2af1bd2b2273dd8d1d11fa07836c0f0baf0a3858dcb45f0e1ff67bcf2c6a35347bb86
-EBUILD courier-authlib-0.68.0.ebuild 4560 BLAKE2B 0f6e95e479106c135f25227f998c6f66082661d27cec454c63a7814be242a3c96a024bf3b4fe71ee0d7d26860dbea14f031c9d3ad5d3f8f27136eaa247b94e24 SHA512 45919327d442a889a1c7803a64d2b93c9549e01aebbb72d10670002bb2b9d5dd8a6cdac11e68cefb237b4f5f665b76604ef5add6f3a63dc947b2388c310aa2bb
+EBUILD courier-authlib-0.69.0.ebuild 4566 BLAKE2B 25cbfef129e3ad98804aae80d20036b4d98c6ccd479feffbc96a9099b87f9945d0529b56b04fd7306f0c1dcfd8eabd65d8e8c9fc2425152534020f8d6b8541bd SHA512 a06799d8ff498e1ed743ce7ac134a0d75e81cbe69c626fbf7aad53fd103f827679ce4ccdc33771c867c84fbc29a940f46fb1692d47bb7db88b51bd450ae55fbf
 MISC metadata.xml 405 BLAKE2B 825e1751581d92e1716769ead19217a1fbd01e31acaace5ef73a51fcb92ef7737e6e73fcd5d3fb124c586fdb39bed2c837b0057547581bd0529ea9034504c21b SHA512 ca3fcfc719c6c05c2f693a1e4896f7788acbfd083dce4358a94e1c0227b7d50d4e06f657ba80236a574b052fca6c03bce45a256bd65aa963915f4f577a413bbe
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
deleted file mode 100644
index d956b78af02f..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib user
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs vpopmail"
-
-RESTRICT="userpriv
-	!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		=net-libs/courier-unicode-1.3
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/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 \
-		--libexecdir=/usr/$(get_libdir)/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
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	if use mysql ; then
-		dodoc README.authmysql.myownquery
-		dohtml README.authmysql.html
-	fi
-	if use postgres ; then
-		dohtml README.authpostgres.html README.authmysql.html
-	fi
-	if use ldap ; then
-		dodoc README.ldap
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		dohtml README.authsqlite.html README.authmysql.html
-	fi
-	newinitd "${FILESDIR}/${PN}-r1" "${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.66.4-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4-r1.ebuild
deleted file mode 100644
index 2930679a0653..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.66.4-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib user
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-1.3
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/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 \
-		--libexecdir=/usr/$(get_libdir)/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
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	if use mysql ; then
-		dodoc README.authmysql.myownquery
-		dohtml README.authmysql.html
-	fi
-	if use postgres ; then
-		dohtml README.authpostgres.html README.authmysql.html
-	fi
-	if use ldap ; then
-		dodoc README.ldap
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		dohtml README.authsqlite.html README.authmysql.html
-	fi
-	newinitd "${FILESDIR}/${PN}-r1" "${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.67.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
index fd7d8f6786c4..b181779f7a08 100644
--- a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-libs/courier-authlib/courier-authlib-0.68.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0.ebuild
index 951b69d639fd..fb790c542669 100644
--- a/net-libs/courier-authlib/courier-authlib-0.68.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
@@ -16,13 +16,13 @@ IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-lib
 RESTRICT="!berkdb? ( test )"
 
 DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-1.3
+		>=net-libs/courier-unicode-2.0
 		gdbm? ( sys-libs/gdbm )
 		!gdbm? ( sys-libs/db:= )
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
+		mysql? ( dev-db/mysql-connector-c )
 		pam? ( virtual/pam )
 		postgres? ( dev-db/postgresql:= )
 		sqlite? ( dev-db/sqlite:3 )"
@@ -55,7 +55,6 @@ src_configure() {
 	econf \
 		--sysconfdir=/etc/courier \
 		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
 		--localstatedir=/var/lib/courier \
 		--sharedstatedir=/var/lib/courier/com \
 		--with-authdaemonvar=/var/lib/courier/authdaemon \
@@ -135,9 +134,11 @@ src_install() {
 	fi
 	einstalldocs
 
-	newinitd "${FILESDIR}/${PN}-r1" "${PN}"
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
 
 	use static-libs || find "${D}" -name "*.a" -delete
+
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/courier-authlib/files/courier-authlib-r2 b/net-libs/courier-authlib/files/courier-authlib-r2
new file mode 100644
index 000000000000..4d810007cef1
--- /dev/null
+++ b/net-libs/courier-authlib/files/courier-authlib-r2
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	provide authdaemond
+}
+
+checkconfig() {
+	if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
+		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
+		return 1
+	fi
+}
+
+setauth() {
+	. /etc/courier/authlib/authdaemonrc
+	AUTHLIB="/usr/libexec/courier-authlib"
+	AUTHDAEMOND="authdaemond"
+	pidfile="/var/run/authdaemon.pid"
+	logger="/usr/sbin/courierlogger"
+	export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
+}
+
+start() {
+	checkconfig || return 1
+	setauth
+	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
+		/usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}" 
+	eend $?
+}
+
+stop() {
+	setauth
+	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --stop --pidfile "${pidfile}"
+	eend $?
+}