gentoo resync : 15.12.2019

3 files changed, 1 insertions, 172 deletions

diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 8de7d003c83b..1a08d421c81c 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,14 +1,12 @@
 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.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 5160 BLAKE2B 97bd4ca75aa660b49f40e7458d621bffe7ec1cc88129316edf1c623ad68e64035197cc3958a8ee586f2a6595a842205e81f885acff7c7b326ad064b39cb0aeb3 SHA512 4f62af3dcf687066910a2ea0e044020660178e4def189f8d93e42ab279d83f8553fb64fb6f507ac97709d593e3691b47ef08ad40918f3976d698fb63e1127538
 EBUILD courier-authlib-0.66.4.ebuild 4503 BLAKE2B f7da9bbceb5cbc3eb7b2ed0075ae41ccbb7ec68c4b14d85f35a937aaf055e6af2555d8f5bbd7da6e0ac21b4d8e4156bb55c6fcec74658f1de1fceae93f0032d1 SHA512 2377192f2252912a6ff63c0390c533852f885a923141f9c76631aefd5ce1cff8e001b844d199d1ce138c6137d28a3847172b6f569b88efa298a8f09ec1c351c3
 EBUILD courier-authlib-0.67.0.ebuild 4556 BLAKE2B 8db66be2de9b5184766de9580d55dd7d8b02ad1be7a17aeea6cba66b7996e1fe7058f42a816525456d3fa22cc8b4a5791b6fc35b95d4300fea9623dc77d1d976 SHA512 6ffe4259af6f944c5d63cb56cb0f3ebb33aa77deac3c5cff03afb0ce9ec3e46967cf5dda518a0b6160ab76adc3a51fe63ddd7a627f51788cfa3a41fc8af9b7c7
 EBUILD courier-authlib-0.68.0-r1.ebuild 4557 BLAKE2B 6b93605b9a09477ec3b7b2436e2df4d821b4af3a9d4b45a6938ce31b5c0370d355dd3e904ebac32d75ef69c394f40346fed8ab5e9b534d71f6e2cbc218ac181c SHA512 66eb959da8b97598c1770ca97ef0c818afe1eae88f76a50634297ce3708774819d3aed1809556baf41f0e83fdf2e44c5e64aec65f2ec264828dbc99ec9230b20
 EBUILD courier-authlib-0.69.0-r1.ebuild 4512 BLAKE2B 02b1d273bd5f53ce0415ac047e4ebb840923b37e441f39f4696b04e784a704b0c5888db29d45cd0ee644cce310f6112dcce2ed9b12b79e9844c0bb271ba747f8 SHA512 5078372621121fd5b68803326c7f1d19c3cc221d33bc8d0447b5fa8250f45baa92ef97db2f136b9e44f61119625add93b20f8137764fa7b1859c5df653e716ed
-MISC metadata.xml 375 BLAKE2B 6f871e1db850090f00a5d249021c00707ca687cf5ac6eba2d4f84b6fea30120936cfd65d13615b38e5405329319fa425f1c01d838ae871e6f91b58a252b9e2ec SHA512 46db3b082b8928e49a73b070458f474594a55bd5252178bdbd0cccd0b0cddd7e489e8afba20c69227140fc12882b1903d5e15935f23a1adc18ba9f4dee8553cd
+MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
deleted file mode 100644
index eb34fc958461..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib user
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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 vpopmail"
-
-RESTRICT="userpriv
-	!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( sys-libs/pam )
-		postgres? ( >=dev-db/postgresql-8.4 )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-# vpopmail support removed upstream
-REQUIRED_USE="( !vpopmail )"
-
-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_prepare() {
-	# move local macro to m4 and run eautoreconf
-	mkdir "${S}/m4" || die
-	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
-		m4/sysconftool.m4 || die
-	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
-	epatch "${FILESDIR}/${P}-sqlite.patch"
-	eautoreconf
-}
-
-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
-
-	# Suggest cleaning out the following old files
-	list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
-	if [[ ! -z "${list}" ]] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		elog "The following files are no longer needed and can likely be removed:"
-		elog " rm $(echo \"${list}\")"
-	fi
-}
diff --git a/net-libs/courier-authlib/metadata.xml b/net-libs/courier-authlib/metadata.xml
index d67e9c36e56b..7f3dcf9c674c 100644
--- a/net-libs/courier-authlib/metadata.xml
+++ b/net-libs/courier-authlib/metadata.xml
@@ -4,9 +4,6 @@
   <maintainer type="person">
     <email>hanno@gentoo.org</email>
   </maintainer>
-  <use>
-    <flag name="vpopmail">Enable vpopmail support</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">courier</remote-id>
   </upstream>