gentoo resync : 03.07.2021

10 files changed, 322 insertions, 17 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index c64e478505f6..ff10426752f0 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 5179a1873bb1..4c46d734d2a5 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -2,5 +2,5 @@ AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7
 AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
 AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
-EBUILD checkpassword-0.90-r4.ebuild 948 BLAKE2B c4f3f62bb5912aac678e2e7b6af84c8606a1aed0c1c31ba952b06e27b747b5904e9264ede9491d9802a7a705c17786b407d2c2ba8c834b0478d5d74a64507f35 SHA512 67eee00e7582195fd0fa81fd7d739d42b4b4cff2de6f6b924193514aef9f1587bc246c0bb9f7eaa9aa78bfa545fd0b2aff2755e810c1920a741b9e4aaf971666
+EBUILD checkpassword-0.90-r5.ebuild 998 BLAKE2B a45f167fb76c4e2d8e5bc77bd43598e31859feedcf3c1bcbdd2809723071581e03452192cd705d96b1ee63719c45ebff149d61922d9db491372a1aadb53a22c2 SHA512 47756ede127e502563d81487d1ef2827e66d1e6f4d756b5965b07b34cb83e68e305d9cbced8f5577b4ce8e097d62972197c688a9e7f335b9b1ea602a4a25c1f9
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r5.ebuild
index 1f19512efe51..04702ce840d7 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r5.ebuild
@@ -16,6 +16,9 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-errno.patch
 	"${FILESDIR}"/${P}-exit.patch
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index f3210e0c1cbc..ae313f8e2489 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -6,6 +6,6 @@ AUX dbmail-pop3d.initd 867 BLAKE2B 2d24bbe482c28fab0884377bbd47fe7a859313d8c8b20
 AUX dbmail-timsieved.initd 930 BLAKE2B 4eb24e608540d994d75c8aea44aa8128e603fd9c64c4a8205c9581cc521e4a0ca75391796d4a9b369cdcbe74636cdaf55c00408c14b7cc9ec4ad4db307445909 SHA512 7f66fa4b77a638e803f1763809da66bd26f54b435f8e4cff3304d4b4e62d1510485c1af943046489a8c37b3b93a8b6cf4901feefa9f1f38dcdaa313211f19fa0
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
-EBUILD dbmail-3.2.3-r3.ebuild 3939 BLAKE2B b0f244ece5c4099d736ea940bd64198a7e77c7b03d26f694052bc94aba4e3951b80340cd2d22c9bf1112d74a6081570d23e43ad36ebcb80dee2caa94361f4aea SHA512 f0949d7fd1e86f19111449a72d9af6fe26d1a98ab77f279332640f5efdd984d7c8f0dfa8ba61440d3f4006c028d78216568abd2de3bb73256dea8245fbf6bac1
-EBUILD dbmail-3.2.5.ebuild 2371 BLAKE2B 5e3f63bfdbac0b3306def0eb9f247e0e85ca9b7ddb0419b0592baccc939b0631ba7be21cbb3ccb919b9b589d1808098986cd410ae01780ffa5e05f16c9b20d02 SHA512 bb8d1ddf62d2992eed5ff6303668bacaa2781865a684d7b65d0ee138baf2d4757217c81287bfd91b10fa480db2f9a14d8366b07538922ee2786832d7c3570818
+EBUILD dbmail-3.2.3-r4.ebuild 3961 BLAKE2B 7d2de1e5199d39fdafa496a032ba1ab77f82f0450bd405b9af2463414c658a482c8e343a030bd78db42cdb257e2fc812ddfcd87cedf160a0c32bcbb1f098bf05 SHA512 e5bbcb2e140cd93c3ec4ff34ffb4b3a3263f83075f1b7f966b20da3b284b91225bc1cdd4b1b6ba920ae849d7b2a4aeb0c4a41adc6750673dc3b391bc87366861
+EBUILD dbmail-3.2.5-r1.ebuild 2393 BLAKE2B 157dcd4e53ba3fc54ee20b2acee586c23944e38aa59bb70362e96a5404ee84be58236357668e51e3881e0724a69349b0483d788a5fcb3ed0ed9229c3ffe66766 SHA512 d0e58dda7855d6e48e3f3a748f25075d5229eeb6b9993e2dbdad923c262a2e9ca4177bd71c464b819dddc26cb174f2dfacc3983767c66cf798ff0ebd9994e896
 MISC metadata.xml 570 BLAKE2B 5f2c04c5edfeba1166114d6b3d103abf9acd2bf312a359b4d25fc622b482b75b8660d2b3c48239a6cd8f87ed63bc591e9495346af944c8b853c74123ac67fb22 SHA512 b993fc2d7954a9afe0a5c53f84e3791a78c033abd64f3d279a54c34053bbe344ba4d0aa4456c9aca5ef9b2131db08698fecb717f5d7f130c501d659ec8fd59a8
diff --git a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild b/net-mail/dbmail/dbmail-3.2.3-r4.ebuild
index 6d3339b9400f..4bc7382ac4c6 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r4.ebuild
@@ -23,8 +23,9 @@ RDEPEND="
 	dev-db/libzdb
 	>=dev-libs/glib-2.16
 	dev-libs/gmime:2.6
-	dev-libs/libevent
+	dev-libs/libevent:=
 	sys-libs/zlib
+	virtual/libcrypt:=
 	ldap? ( >=net-nds/openldap-2.3.33 )
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ssl? (
diff --git a/net-mail/dbmail/dbmail-3.2.5.ebuild b/net-mail/dbmail/dbmail-3.2.5-r1.ebuild
index fecbd53a0c11..f4d3ee2d7c21 100644
--- a/net-mail/dbmail/dbmail-3.2.5.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.5-r1.ebuild
@@ -24,7 +24,8 @@ DEPEND="dev-db/libzdb
 	sys-libs/zlib
 	dev-libs/gmime:2.6
 	>=dev-libs/glib-2.16
-	dev-libs/libevent
+	dev-libs/libevent:=
+	virtual/libcrypt:=
 	ssl? (
 		dev-libs/openssl:0=
 	)"
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 675131928537..e0ba38eeeb38 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,6 +4,8 @@ AUX notmuch-0.32.1-tests.patch 4674 BLAKE2B c2eff70dcbf18a3276a97b3a9058f2a51647
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
 DIST notmuch-0.32.1.tar.xz 725196 BLAKE2B 6163f512e88f1b9415b93f7c4a146dc1af6e41bacdbbd29bdb48706af4af4822b626a719d50146f0cfe4d35508d8aa767b0e75eadebf9d619912f3ee6ba0e59e SHA512 c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36
+DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
 EBUILD notmuch-0.31.3.ebuild 6678 BLAKE2B 967b4938b066a4f4350c92358aa19f9522104c904a83d100bceeefa273b2946d22d310a1146f6556ee8ae854a3bd0b71ae09811c7badd41827322011628f728b SHA512 9577a0958a649037ff9efc3ec12516ccaf24d9ad12c4047e765057b0530229a2515da459a1ccbb32a0a7f3c14dc43a42a9ed0213799641dcef29c9cb8b259ddf
 EBUILD notmuch-0.32.1.ebuild 6725 BLAKE2B 496d1ce926cbbf39171bfa4ff9dd53899a9ca26e6a4a3bd49dd0166485a35094ac9f1b53650c287ba1a9c3458b3f9651f118c0c884d1569622afe6e39a84397c SHA512 06e0bac43fda25a96aa1c57052be35095ca54076997ab950b0c5e384522ebb718650d0dfbd662899c0c2e091b4dacc0cef7c26b4f252b95263bc2fbca2d0b256
+EBUILD notmuch-0.32.2.ebuild 6733 BLAKE2B 616c269a845b76af0ba953f943bb68551d7cc9e07d618d64a382bfb3ee4f80daae2e3ef8e8c4b6a0326dad980789a16a411dafaa42e707e4f726070419bf2fac SHA512 e8b87188e5c26499af210dfc857d321f49926af8886d518e846b28caa0e74746f60ddbd57b418f388be11f0839580b9170a25475c9bf010b61639d193201e16f
 MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
diff --git a/net-mail/notmuch/notmuch-0.32.2.ebuild b/net-mail/notmuch/notmuch-0.32.2.ebuild
new file mode 100644
index 000000000000..2c5173f19dba
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.32.2.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? ( sys-process/parallel )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.32.1-tests.patch"
+)
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 740e2418d71e..9873ec98d448 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -1,5 +1,5 @@
 AUX tpop3d-1.5.4-gold.patch 730 BLAKE2B e3f30e0aae7ca80c3834dbe63216bff73de20981ad7b02b062b3f13d61c83e4183d0228a065139d2be5b2792f2bf5001b1bede35b7382a57ff895e7fc9437955 SHA512 cf4b2ab8b6f51bf749e32a8204e850ef97426a6de14f3d5d5128725791838717b5b8cbcc4fb80a5534d6820200ebef50dde8d2e20e44133f029be3a2d72a57c6
 AUX tpop3d-1.5.4.init 607 BLAKE2B 8cc947bb35566f09236a5a6c06f6b1b8938d51f9dfe0ef3230507a5a6885bdee8eac11a3e90cdee52b24219cade824c45b15e5777a154a28b78167eaef6decce SHA512 004d2e5ca802ad7681c3f6392728602f54c13c6072d38b147be469e5f9ef09916f7c6c57af944c845e4b504f46fe4893323d5a125b7dc4bdfc2d479a5ee696e9
 DIST tpop3d-1.5.5.tar.gz 285027 BLAKE2B e8cc76040757a5c8931ee34b27a57c52889f3533b71a53c7a2fe589823129ce5972f2ddfa9ecdb46d7a04ac77e8d735c02b07cf7e8192135e4ebea6c392b38ab SHA512 918a057c62d7518613daa6335d8fd5a2553d278dc4d6adbcf5ba3caa3ba561587f1d9e18f564690383e91f3ee2e5120af919d2799b69e93bfe3a3b8ea4f5d7e6
-EBUILD tpop3d-1.5.5-r1.ebuild 2903 BLAKE2B cbbaca6d70dfaa5901a5816b3b1df861e0351aae6d4162936c3ddede25f5c846e50685c2f4e806851ed3c2d8ec3623898d70e6a224ee462a49063b80ae9acbe0 SHA512 3d7eae7439692f4b8f39aa335787bd6fd078e4e898a5053a86edf018e6286fd532fbd2c75358a4776dd1b2d7217fcba5e74e212f62a02b86d859a4c38df67f46
+EBUILD tpop3d-1.5.5-r3.ebuild 2974 BLAKE2B 96b9d2cb8c37029c3de7287a58c04679552923db35d80978f17fcc6e5eb57d4c20bf7f93d53b81d648a373357f9f37f34d95d0725b1d5bc1a88f93a8ee0f8012 SHA512 7153caa3731a8f8d39ec2968d382644f15eb39824200cd6d90595208695f09d173be1e4ade8e5566d968430eacb3b87797cbeb78f361d2c8b4c8dabf6818cad1
 MISC metadata.xml 560 BLAKE2B f0fabe58e865bfe72fc237eca7cba05badd40682b5a03e420a00c96460106743c10d700082522f379828be1000fd1302863ad7f975ace5786c8f312fb5c6053c SHA512 892cc588c2be8dce623ed1844a7680339ce36fdee74e16b99436925b2defec116b164926f3a000db186ca25a079f90352d73795561a6c361e0c65c8c22c92eaf
diff --git a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild b/net-mail/tpop3d/tpop3d-1.5.5-r3.ebuild
index 9bce01af9548..ef6ade499c19 100644
--- a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,22 +15,28 @@ KEYWORDS="~amd64 x86"
 IUSE="authexternal debug flatfile gdbm ldap maildir mbox mysql offensive
 	pam passwd perl postgres +sha1 shadow ssl tcpd"
 
-RDEPEND="sha1?		( >=dev-libs/openssl-0.9.6:0= )
-	ssl?		( >=dev-libs/openssl-0.9.6:0= )
-	ldap?		( >=net-nds/openldap-2.0.7 )
-	mysql?		( dev-db/mysql-connector-c:0= )
-	postgres?	( dev-db/postgresql[server] )
-	perl?		( >=dev-lang/perl-5.6.1 )
-	pam?		( sys-libs/pam
-				  >=net-mail/mailbase-0.00-r8 )
-	tcpd?		( >=sys-apps/tcp-wrappers-7.6 )"
-
+RDEPEND="virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	sha1? ( >=dev-libs/openssl-0.9.6:0= )
+	ssl? ( >=dev-libs/openssl-0.9.6:0= )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql[server] )
+	perl? ( >=dev-lang/perl-5.6.1:= )
+	pam? (
+		>=net-mail/mailbase-0.00-r8
+		sys-libs/pam
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-1.5.4-gold.patch" )
 
 src_prepare() {
 	default
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }