gentoo resync : 15.06.2021

12 files changed, 56 insertions, 88 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 5bc86e1f05e7..51582347397f 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 61818bebbc5e..adc6b2d334e4 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,5 +1,3 @@
-DIST afew-3.0.0.tar.gz 36525 BLAKE2B fd9b676ad00d9f6d989d8901f8885a7861d753ab96e4a768f2a1118b72893517fc3a8122a7a63d2e26659bf1afc2467bc7503f279b8037c65da9c250c18b152b SHA512 8d1947d547bde7fdc9ec2fc8fb212165fecc1cd4bc37c2dda60133e5ffe31dee1393ad0a92e4f0e2c85863a01f7ae252555e88868fa8ba5dece8380080f0e36c
 DIST afew-3.0.1.tar.gz 40092 BLAKE2B 9ce125ec2359f7cf4630b9602b3068327adc06a699d325c90bc9b545df9ce7f3a62623cc733dfec55ee3e51523e4512ebec04e7186470fc56bb1589a7141cbc9 SHA512 1a76ecc78ed9fb8598be74c48a1d51c78db20df08b27c04c24779aaba01aa457c776457a647c54a5e92f0fda364a86810957a95c0d3f686e77e083d2103b1bf1
-EBUILD afew-3.0.0.ebuild 1158 BLAKE2B b04a876512c1687108e83a5c95eb2b3640195dcb300e206e00706cbe95731a114619dc58228f30bf53aa179a51431a7a2b863542c39cf8de37777201072a9da0 SHA512 ecf235b1e467a267b4dd259bfc8a9966a4bb36eca4330a126acbdc7020dfdcc7c48248c3e6645527c7e69dd809903309b030158813841b83ee990962d2ac1d06
 EBUILD afew-3.0.1.ebuild 1298 BLAKE2B 057eb66dde33f333a6c5cdcf29b152ca4a9142509a10586155a2dd8ea6a6d86b3562f37f4e44c8ebe1864c7e83cf88460779b45734d2974ccd07c68f9f3dd232 SHA512 17a881ed9f3ac448f631c18870fadbba54ef52e7b9b163559b4e20692dc198590e2707b7cc8057cb080f4b6a26d7f552562553cf156e7163c0befef12e70e3ee
 MISC metadata.xml 1030 BLAKE2B 1e2b0865e7bcbfd0203db5bdf91b2448f52e8dc3c72fa73f5788f870c496c06ba1a14074dbe90cf5393964f9da6ebb92376663d5999d1b71e661cb9af18eb90a SHA512 adce4d721d0c42d08134ba88ff79b2bc03589a16650d85f60b3745535c666c4b3a7e29b0612b080d8ebb8115a4293273ddc1174e10c4a32f521b49874bf1df95
diff --git a/mail-filter/afew/afew-3.0.0.ebuild b/mail-filter/afew/afew-3.0.0.ebuild
deleted file mode 100644
index b78e2e89172a..000000000000
--- a/mail-filter/afew/afew-3.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/dkimpy[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS=( "README.rst" )
-
-python_prepare_all() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	esetup.py build_sphinx -b man --build-dir=docs/build
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	doman docs/build/man/*
-	dodoc afew/defaults/afew.config
-	use doc && local HTML_DOCS=( docs/build/html/. )
-}
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 5135673448ef..70caedb0b6a6 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,4 +1,4 @@
 AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
 EBUILD bogofilter-1.2.4-r3.ebuild 3775 BLAKE2B ef688072e111d237d6052dd0cd1c0b313c8c646a97224e8f5a0c7775f94006828a46e15f66af446ac71da4a6d0ee90926a4dac33d647b102b598e40905fee1ac SHA512 caed65cf0d86b6bc299a57534fee24f8134678f3080a72ce996e6b3676e7d15772a6392275cdb153bdf6926345643df1e6ced6ed335446895fa77c84bba70bb0
-MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277
+MISC metadata.xml 603 BLAKE2B fcd011f6d9229b71b37139e18d232297f138d56901b4bd61a9a4b5b6d8a7de6ace1d020e73b5bfc4e6a72876a1380f472c1d359136991f76530ea7493b10698a SHA512 43d591e4893f97a8be8527d1de553e6a835a45439489ba9196b9cea2eb71008baa0bc5d5e525ddf7e7f885212144af69207b2fc22c6f70b71dd9f73223fade94
diff --git a/mail-filter/bogofilter/metadata.xml b/mail-filter/bogofilter/metadata.xml
index e8137c9d6c99..65b8ce194286 100644
--- a/mail-filter/bogofilter/metadata.xml
+++ b/mail-filter/bogofilter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Bogofilter is a mail filter that classifies mail as spam or ham (non-spam)
 		by a statistical analysis of the message's header and content (body). The
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 47036ecbda1b..157e65eedcbd 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -10,6 +10,6 @@ DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fc
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
 EBUILD libmilter-1.0.2.ebuild 1903 BLAKE2B 1623fdd49f8cbe33bfb2f197d3fb18b6e107734e6a2ddd8b5e8fe2795d5d199a6dd9afb7d9f89ec739f05c9504bd67082c90e7a3bf2c4039ceff9c7fc4d0fdfd SHA512 af0dd4f1051f90235abd91cbc7e39939c5079487c7ade83d82fb25b39e5d5f802e06c0be2fee82d7bf07bf44ff95ff17dd40d71935d6457fbdccb5cdacb032b0
-EBUILD libmilter-1.0.2_p1-r1.ebuild 2139 BLAKE2B a14e2a310a8f2661c5c1a6be95f0d1894ff98fd5d89b1e43acf180e318a18a3268707ea4e32ce49702a423e69207f0d53361353bfcd5a997cadbcd8f49cba64e SHA512 d48ebff4bd7564c479338d3c47685175e382c3a11536a05c9c7000d38af1859787ffa105bca4209c605b13c1b9caff9b3fff85fbc31bdaf0e2232cb83f4f2e2b
+EBUILD libmilter-1.0.2_p1-r2.ebuild 2275 BLAKE2B 5d22054cb7cc6af8596ddefcb61f19a01d1f52ed092ac2728b1f586606fc24dbe6b225d50433d60bfb2e739f510c9c2f82b40ed0e669d25b2c7ff933b58677ef SHA512 d5664b12dc006abcafd7a26b41ee80fa4355441f68e0b3a219ec36c85590cb1f5b4216469f0c538e3befe0e289ec5196cdeb4f15f7a47d2b29649d1029b0ce0d
 EBUILD libmilter-1.0.2_p1.ebuild 2214 BLAKE2B 8452d0976b146f92d7a8684986c5ef8e9dceecbc504806b3b53e2778d982d8a51bf4e440fbbe04dbd3392386fd5b1afdc62106e4e5d0faf3e863215a9b9622e8 SHA512 128027206c5978e49ccec7469ef14b1a67f977478b8182dec00a478671dafb0599a7a3a8338f2d8c2077ec806209faa6cc51070c6bfe70164d5fc344a4fc0013
 MISC metadata.xml 241 BLAKE2B 7e817e3e8547331152f2d3378fe5681d02cccc2ec04dfbe21833282edc6c826a93b9493110f5f0afd05edbbbb84a1a185db7e17d154399aabd1e70ab044c3ecd SHA512 bec8ce3a2140871a48e34ad88eeefd1bf05b2d6508e2a5ca4c406aa0ca2729b0b827ae02dd4fd707630894e1c8fc367cdb9840b791ad8ee596d067d40c36aa42
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1-r1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
index 46d223aaf2a0..6c2477f4e76b 100644
--- a/mail-filter/libmilter/libmilter-1.0.2_p1-r1.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+# Note: please bump this together with mail-mta/sendmail
+
 inherit toolchain-funcs
 
 # This library is part of sendmail, but it does not share the version number with it.
@@ -18,58 +20,63 @@ S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
 
 LICENSE="Sendmail"
 SLOT="0/${PV}"
+# TODO: restore keywords soon for bug 730890 after testing
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 poll"
 
+RDEPEND="!<mail-mta/sendmail-8.16.1"
+
 # build system patch copied from sendmail ebuild
 PATCHES=(
-	"${FILESDIR}/sendmail-8.16.1-build-system.patch"
-	"${FILESDIR}/${PN}-sharedlib.patch"
+	"${FILESDIR}"/sendmail-8.16.1-build-system.patch
+	"${FILESDIR}"/${PN}-sharedlib.patch
 )
 
 src_prepare() {
 	default
 
-	local CC="$(tc-getCC)"
 	local ENVDEF="-DNETUNIX -DNETINET -DHAS_GETHOSTBYNAME2=1"
 
-	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
-	use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
+	use ipv6 && ENVDEF+=" -DNETINET6"
+	use poll && ENVDEF+=" -DSM_CONF_POLL=1"
 
 	if use elibc_musl; then
-		use ipv6 && ENVDEF="${ENVDEF} -DNEEDSGETIPNODE"
+		use ipv6 && ENVDEF+=" -DNEEDSGETIPNODE"
 
-		eapply "${FILESDIR}/${PN}-musl-stack-size.patch"
-		eapply "${FILESDIR}/${PN}-musl-disable-cdefs.patch"
+		eapply "${FILESDIR}"/${PN}-musl-stack-size.patch
+		eapply "${FILESDIR}"/${PN}-musl-disable-cdefs.patch
 	fi
 
-	sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
-		-e "s|@@LDFLAGS@@|${LDFLAGS}|" \
-		-e "s|@@CC@@|${CC}|" \
+	sed -e "s|@@CC@@|$(tc-getCC)|" \
+		-e "s|@@CFLAGS@@|${CFLAGS}|" \
 		-e "s|@@ENVDEF@@|${ENVDEF}|" \
-		"${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
+		-e "s|@@LDFLAGS@@|${LDFLAGS}|" \
+		"${FILESDIR}"/gentoo.config.m4 > devtools/Site/site.config.m4 \
 		|| die "failed to generate site.config.m4"
 }
 
 src_compile() {
-	pushd libmilter
-	emake -j1 MILTER_SOVER=${PV}
-	popd
+	emake -j1 -C libmilter AR="$(tc-getAR)" MILTER_SOVER=${PV}
 }
 
 src_install() {
-	local MY_LIBDIR=/usr/$(get_libdir)
-	dodir "${MY_LIBDIR}"
-	emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-		SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \
-		LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \
-		MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \
-		MSPQOWN=root CFOWN=root CFGRP=0 \
-		MILTER_SOVER=${PV} \
-		install -C obj.*/libmilter
+	dodir /usr/$(get_libdir)
+
+	local emakeargs=(
+		DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)"
+		MANROOT=/usr/share/man/man
+		SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0
+		LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0
+		MANOWN=root MANGRP=0 INCOWN=root INCGRP=0
+		MSPQOWN=root CFOWN=root CFGRP=0
+		MILTER_SOVER=${PV}
+	)
+	emake -C obj.*/libmilter "${emakeargs[@]}" install
 
 	dodoc libmilter/README
-	dodoc libmilter/docs/*
+
+	docinto html
+	dodoc -r libmilter/docs/.
 
 	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/mail-filter/postsrsd/Manifest b/mail-filter/postsrsd/Manifest
index fc6617599740..d544caad98e3 100644
--- a/mail-filter/postsrsd/Manifest
+++ b/mail-filter/postsrsd/Manifest
@@ -1,5 +1,5 @@
 AUX postsrsd.init 737 BLAKE2B 76342c7707e86c8d111e550393ce2e624c2ed192e16a4521cf6b14deb81a21d2bc8be9ca1027890dd0dc883cadf6659fedd17b417d0712e55e38781f5ec8cffe SHA512 9550e26ddee4eec5b324bc6364b52ea8ebf755c1463498ab7380aac87e79d1a84e2048ef0bfdd250d029674d5050bab1bb5d1cec455ec5d4863e08d320e06111
 AUX postsrsd.init-r1 787 BLAKE2B 6d5431bb32974dc88ace86d2781681fdc9058475569080d057cb0336f337b8ccb3bd63f12344829085e5ba7399569dc951a820e6bdb8c5e0cecba718bfa19774 SHA512 dd80b6be1e2c28ddd7ff48ac761ce15b46d01db58aa91ddaa29db63acec5c071a52c055b9ecf8839f04696765a937dfcd2532be4a99fe2cf04bd881a7bd5acc2
-DIST postsrsd-1.10.tar.gz 34844 BLAKE2B 4722e8f3ec1d5d7de0648d8afc03c38f485c92b092bd42bc02c82c4072b5eb053cbb907bd1198de1219acf465c850b4f08ee8bca629f85734ca2ff643d77c1e4 SHA512 79f824cbc56de2e79da2eb67b1888c1c171a10a7bae5f19384c22024ff7e65dd36a447e632ddaf77bea6bdfa4972c7a918a30cd3b06f7b7ae49ab7552c43be0e
-EBUILD postsrsd-1.10.ebuild 754 BLAKE2B d28c852abfe740d9ae0f443e275a97d99dfdfd98773f1234be34eac7b83b9f377a861ef4d775d91002166b89517b12b521af465a513b8b1bcfdfb8caac5b9f02 SHA512 fe657197db0f0fc3d699f32bb0055e74385be862bba28cc4b021e919fe61ec4026dcf87bfacc60a2c17ff5b4018a8440c0d6c90784a202b13d39bb83046fe29e
+DIST postsrsd-1.11.tar.gz 36309 BLAKE2B 352894d82cf0bc16f711433b83282f31f94dc6358fcdda1362c00834bf41d70ea9f543c45428fca19d9798888a6a3b7c1676b8e3b35e4f21e8e27b707f986592 SHA512 cc041bbbd0277dd416a19e427d63eace3489dc518ebe3a61a022b3e2e159bcb09731a0eb5547eb85bd55887821726b66e828326c109c2ebe26b27dbd062a8d89
+EBUILD postsrsd-1.11.ebuild 754 BLAKE2B e6dc7a2410d0482a306a5a83f6756d7ebcc1d63e34b1ccd759d91d900f4e9552ad770df60b0564f21048f3bcbc11078a7b156fceebd8b2255150124152c0c83f SHA512 ac29922ad2ef289850da012f919b0faba93e2397c249cc4a1d3a9b6b038e9fddd7a5b1d8083c7a49d455dec377ed5735b043eb2e7b98eaf4b9260aebdc3238f1
 MISC metadata.xml 337 BLAKE2B caac016ab1be7bad01670321e5aae7cf8c3699a394f4911350b4104d313e5b921071cb3406a47f976f16d1fc6879a16b2d6be03e0765a02f0e1e65de5703df0f SHA512 9093270e1a174ca6c5e1316015b3e9605f247bcd4fccf1e1c9595f5b94e3e182e532dced5c483a0be24c053fd453a5b9ba272c1004fbc54fe95cc3069dfe7d59
diff --git a/mail-filter/postsrsd/postsrsd-1.10.ebuild b/mail-filter/postsrsd/postsrsd-1.11.ebuild
index 9e1777c300cc..b787d3ab26a2 100644
--- a/mail-filter/postsrsd/postsrsd-1.10.ebuild
+++ b/mail-filter/postsrsd/postsrsd-1.11.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
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index b0891e73654c..8adb07187517 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,8 +1,9 @@
 AUX spamprobe-1.4b-gcc43.patch 4002 BLAKE2B 94f9a5b87750e244fcceda91d27d9355dc533ed4330c2a9513b6ec4cd9b668cdc395928525e63f13ecc797dba3ac7b8b3a583bba55efcb3bb308e2d0e340a3d5 SHA512 4ae363124ced22ee9c1b6fba934cb320e491230e5b553bbcb13d20b2ff07e5c554be78088017f1e3f88ed0c5189a5055c136d0d5cfdb467cce3318b65ef8f775
 AUX spamprobe-1.4d+db-5.0.patch 768 BLAKE2B 3745ad75e2a853106c97369ee7c43b6f8d1835bd2ca1e21cf767b5ed3eb51ad51d97ed6e8ddff1a269769bae7222b9d1d5487c4d084295373cd1230258f952a2 SHA512 da18dd185dfdf31f91b82de0d6d9ac4230db90cebb4decf880b3c931968653afc1879ddf30893ae9d74f3962539d33c8dcdcfec10fe0117e717a29346633706a
+AUX spamprobe-1.4d-gcc11-const-comp.patch 366 BLAKE2B 95e76683dceefd94e0ed4369a13778377276996676e975d5ba4fab06925335a40e460e8e443376dceeafb52469ef7933d3a3dbb6c59a445b064c6abd145d0383 SHA512 e0eca77529fb4afac9d4b9aaf45ae1a6ff8db25cd48ab04de94b5256bb03abc51ddb01526178f34ec8208b48b4bcb43c67cac90267337a3d9f91bc09caa5471b
 AUX spamprobe-1.4d-gcc47.patch 636 BLAKE2B f6373e6f8c63011d1443db28c1af873d7bb6022e40af7ed5844c2fbf25cfe8be7b96f73e02e5f7a0ae2794add2847ba905b2c3e3338790b3169fbefc83533b98 SHA512 4148ff29d0d610dd5a7a4550c4424f49723f53f0954873a799180aff12dbe517846930f5e976edf39f6eb48122b7ccb1cb90a741ecb7dfe76b9af9c1b7194e52
 AUX spamprobe-1.4d-giflib5.patch 650 BLAKE2B e1eabc2b1adffc9fc4ec6e95526da831f9089480b23a8023a5b975512a12095d777691a3ec4191d6a4d9a32001477748f0fe3b12e50927d4e67bd7a3b6a42429 SHA512 982730b1f442f8ce30b0e82f75bb21a6b2e3294441ea972d575c21612b5445acaf8528fbf57f1a2ac93049e93ae8a857e85bf3a5108a2d2702ed01ff76c862aa
 AUX spamprobe-1.4d-libpng14.patch 790 BLAKE2B 389fe84ab2eb162b40aeb5f638bf93007b82925cd9d3621ab595ba5a59c82896573255618531db70181cdfe3e9050ceb89916a9a6892dbfae6d8cf0d7befe388 SHA512 19e471ed2920a88fd6e4df7cac1aaf2f86d275f3d2f74ce467e1ce1ce88365bde241bb9350d18d5dcf8c165cce5b509ed694227e2ee82e7198470303d14dc50a
 DIST spamprobe-1.4d.tar.gz 262761 BLAKE2B b6d9c80840078d15ad2d08938f8d693fbd3ad007af9166295e89361d208f9e227d19f77a57f236d85efdecdcf7fa80f37b948ea629da8cb45fda8b4965a9b852 SHA512 176097b7e9de04a26a0a6a2c6b331ff375108ef7eb20cdfbda9abeec7ceb24a52c0edc932d8fcd8a5731f06b891469b4ee328562f4e88fbe6c737b719f45a8d8
-EBUILD spamprobe-1.4d-r2.ebuild 875 BLAKE2B d88335560f5774beb0f3de7cb892d59e0dbf48fd241c8446b6bb2f22a78f509fcff0fe571ba4e332c13b12d3029801542d99af10841ea6218990c8d95559bd51 SHA512 b20000d19a13d52a11463e3bc03c68fc606170e08dba0ab03e3694a6fe229c047e376e61ce2ec9d2192ad78e00fa2affd34e30163bf4a73fd4c5b41cf91e21bc
+EBUILD spamprobe-1.4d-r2.ebuild 919 BLAKE2B 8ab77686b9663938d77b9fef47bf630398bff8a6f98825a935e4436256a610337f46424615ddbd9210dd327f1b62ece9afcf7b9b556f5c5333be2b2ffb86d533 SHA512 d503d3be504bcdf3822fd23ccb4d276cfda2bce3060902cfba770f91e659304fed3c529204724c01f880ae34195feaa24715cc7bcbabc471840661ead4ea8bf5
 MISC metadata.xml 246 BLAKE2B 3023ab70839d09f3aaca34488e42cca7ce42bbf0977917b05a8dd9a92510c60de45b861d40ba278d58f0ff03b7c28c4f3d6215a789adc47960190d07f2604a50 SHA512 199467df377190d8874692821dfa57ad34f2630b631a8011943546ec92c3679f6e23b196231580af44ab19ddb8a7e9b8885aa4917d824f043f260c3ff243c07f
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4d-gcc11-const-comp.patch b/mail-filter/spamprobe/files/spamprobe-1.4d-gcc11-const-comp.patch
new file mode 100644
index 000000000000..1eec9cc6ee02
--- /dev/null
+++ b/mail-filter/spamprobe/files/spamprobe-1.4d-gcc11-const-comp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/includes/LRUCache.h b/src/includes/LRUCache.h
+index cf7df30..50467d5 100644
+--- a/src/includes/LRUCache.h
++++ b/src/includes/LRUCache.h
+@@ -60,7 +60,7 @@ public:
+   {
+   public:
+     bool operator()(const NodeType *a,
+-                    const NodeType *b)
++                    const NodeType *b) const
+     {
+       return a->key < b->key;
+     }
diff --git a/mail-filter/spamprobe/spamprobe-1.4d-r2.ebuild b/mail-filter/spamprobe/spamprobe-1.4d-r2.ebuild
index dfe97b87b27f..8ff7226aac12 100644
--- a/mail-filter/spamprobe/spamprobe-1.4d-r2.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.4d-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Fast, intelligent, automatic spam detector using Bayesian analysis"
 HOMEPAGE="http://spamprobe.sourceforge.net/"
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}+db-5.0.patch
 	"${FILESDIR}"/${P}-gcc47.patch
 	"${FILESDIR}"/${P}-giflib5.patch
+	"${FILESDIR}"/${P}-gcc11-const-comp.patch
 )
 
 src_configure() {
@@ -37,6 +38,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	insinto /usr/share/${PN}/contrib
 	doins contrib/*
 }