gentoo auto-resync : 14:01:2024 - 01:14:49

5 files changed, 70 insertions, 14 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 462cb7f4fbb6..b161db2c2c16 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/bmf/Manifest b/mail-filter/bmf/Manifest
index 6d0808f170a2..9b2347d98872 100644
--- a/mail-filter/bmf/Manifest
+++ b/mail-filter/bmf/Manifest
@@ -1,4 +1,5 @@
 AUX bmf-0.9.4_QA.patch 538 BLAKE2B fae81e486943274c96cf9efc1fa6782e7adb74d201a9dc81689edeaa27de6cd04ac6fe8de2f360b5b62cade50de289c265f75addd8dcd08a8b2ecb89db404674 SHA512 f5f2c54ddf3db6156dbe8b2fa05a03a8a31cd530a1f711d5cdb2229389ebfc95fa97d49ef7ede45f87178b1c966180ce915612d4d2ad7a6b0b21d77c9524fabd
 DIST bmf-0.9.4.tar.gz 36740 BLAKE2B f3bb262006e4e3e9db98f7df9b7160d8e3feeb0c3aa2b0564a65d5a302fb7b8894fd55d947828989dac488c605fcc153a9f18f840f63718cd12f374c0eb4fe2e SHA512 efbc7edd08ac9abd5a56fa8a00d0011363582e50dda309526b2114906f7d9a9795539df62d4db99457903a2277980bde02d24c97c2ec087d2af84df691cdb9f4
 EBUILD bmf-0.9.4-r3.ebuild 1273 BLAKE2B 1d0e3c411cba84a127c895c8dab7b83ddbb3ff3d5636e23d5825badd5cab3d1146e9df7752d921ebb0f9320ded4cbe22b0956b2d9b48f784681b1003eb8433de SHA512 ad128ce8dd7458564ff5e314f710871b1b65f79db2890e6b2d71331fd4ce4f6ae90a83066727f88b3ba19f881659e10b25acc8c5d027fca1c4d187fa6c07e4d5
+EBUILD bmf-0.9.4-r4.ebuild 1305 BLAKE2B 4164d9ea6f5fea2a82d379842506310ac890a00ce2d6674c2e95cf8a5127f9b1c90e2100d9ca98ce520bf6bb9b3dee6beb7df016eb7e428fbe690947085e35de SHA512 a3c552a739959b6e0f39941c653cdfc1934845df2b3ed7a2c72117296b5085ba13a802f1a99b3600bf5bed5239b21830a70c8fa0fdec1475a368992d75e5db6b
 MISC metadata.xml 241 BLAKE2B 37127914ac533d0d0a2e710f1d078516823fbc727b79319fbd5b97019a9fdfa89ea3ed8b839094c1b43cc9c07ecec909907f7e67bc306637be49ff2d5f8ddc31 SHA512 66877eb3f7313c166481339ec1ae25491d111ac6bd4848ef176eadbcaa7419ff051c562004e15380fa44f78ec7b75347c36c6c9e73e22894a268c002384a51d3
diff --git a/mail-filter/bmf/bmf-0.9.4-r4.ebuild b/mail-filter/bmf/bmf-0.9.4-r4.ebuild
new file mode 100644
index 000000000000..f557eb7c6cda
--- /dev/null
+++ b/mail-filter/bmf/bmf-0.9.4-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast and small Bayesian spam filter"
+HOMEPAGE="https://sourceforge.net/projects/bmf/"
+SRC_URI="mirror://sourceforge/bmf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql berkdb"
+
+DEPEND="
+	mysql? ( dev-db/mysql-connector-c:0= )
+	berkdb? ( >=sys-libs/db-3.2.9:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}_QA.patch" )
+
+src_prepare() {
+	# respect CFLAGS/LDFLAGS/CC
+	sed -i \
+		-e '/D_LINUX/s/CFLAGS="$CCDBG/CFLAGS+=" $CCDBG/' \
+		-e 's/LDFLAGS="$LDDBG/LDFLAGS+=" $LDDBG/' \
+		-e "s/CC=gcc/CC=$(tc-getCC)/" \
+		"${S}/configure" || die
+
+	# include mysql headers
+	sed -i -e '/HAVE_MYSQL/s/HAVE_MYSQL/HAVE_MYSQL `mysql_config --include`/' \
+		"${S}/configure" || die
+
+	# We don't need to be root to run install
+	sed -i -e 's/install: checkroot bmf/install: bmf/' Makefile.in || die
+
+	default
+}
+
+src_configure() {
+	# this is not an autotools script
+	./configure \
+		$(use_with mysql) \
+		$(use_with berkdb libdb) || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Important: Remember to train bmf before you start using it."
+	elog "See the README file for further instructions on training and using bmf"
+	elog "with procmail."
+	elog
+}
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index cf3c57925b13..281c6ad8c712 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -12,5 +12,5 @@ EBUILD maildrop-3.0.2-r1.ebuild 3771 BLAKE2B 38cec99a43f0ba0a7a61ae3dafc443cbe49
 EBUILD maildrop-3.0.2.ebuild 3632 BLAKE2B 05db139cdc26c5b5ca8086561fef8cafc180c28f3e541c4e1e93f6bb4a6835927d2cf7b3bde7e7df5665d2babde4bbbf70134ee10e7ba9a12378806f9ac8e656 SHA512 7b4cfb665022a88f8195f527a41c8f67b38c334df3aec52d280772e4e620addef6e4ef63b31f554aeb45e50d6f39563bf7bd00055262f192904af387d949f09b
 EBUILD maildrop-3.1.4.ebuild 3651 BLAKE2B c769ced131f857405ac2b96cf3dc59b906438fc8e577d0fb11f157e4def90ea543f5c427918b5a94478bedc9ea1c75edab5273d913fc79bf34842b5bcc4d4b1c SHA512 9b345cfe4c5f3bf9f3a1bfe467ac93e820a34d234b862a79a5970a63dbc592e4ee2817ed628d1837a6958e1f79f185a6f3e3d9dc6bf607d2667e15ac680652db
 EBUILD maildrop-3.1.5.ebuild 3668 BLAKE2B 7e91b2eef22e048e2e1e135fbe5cec32bafde7bb3fd9fc6f275210124b5084a7fa1a55a7866fade7595bd689e8b4b5937d1f5f4c4aed60971e1943af8f138e40 SHA512 254874894043a400f7c0cba50f64d699e89b8961c6358cd3c9651d2dfe73fbee6507e6545029cdb4a68fd7a6811c9d11ddfc06920a0c4c8c7d4043269b4eebaf
-EBUILD maildrop-3.1.6.ebuild 3624 BLAKE2B 156c03938b17de79a5a579ccc4b46c4ff500808107f2282dbb6465b8fd372d4ac267f5e9916f0e36af71b745bd0a145baea6717b06d557b83df44d27921932bb SHA512 1ca29c6e798636ddb029556933e444ba9d339d70d705814f04328e0f92b38ef08879b6803c3f08263bd6eb047b84a19bd05b4e32b7d6bfe5dec6d9c2c74e2f80
+EBUILD maildrop-3.1.6-r1.ebuild 3690 BLAKE2B c25efc6687ceca97b8f9709ab00aabf97e4f0610ad0d058b500b4e3ffc1623b7b15a308f1f52884d60ee1eec2580291790d5524409d1a275716f4cdac6f54bef SHA512 81f6df0f381942e6ab65a2c07cb296a5364d762327d1d207819f8d155e007859367bd311316799af6644b02b78e26a3305e7b63a94731053a176dc859d5b7433
 MISC metadata.xml 639 BLAKE2B 7b97d1b0ecf5622dcb89729dcfb27480f05c764df98d7d22e0477fbc1498911cdecf47ea5544cdca325e85126fa07d139cc019774ec8e988b4eff5dd4ace29f8 SHA512 077c7066f2ac3e44ccecf1e45a76e293d20c1ff858455e32599fb0b7348d4b5ef8da6c3f55f44b3e2368f9c9c6d3d2b538e12fd3bc82fab983181e2a694a4d49
diff --git a/mail-filter/maildrop/maildrop-3.1.6.ebuild b/mail-filter/maildrop/maildrop-3.1.6-r1.ebuild
index 2d42ec234f61..3f3ae815bab4 100644
--- a/mail-filter/maildrop/maildrop-3.1.6.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,13 +32,13 @@ CDEPEND="!mail-mta/courier
 	berkdb? ( net-mail/courier-imap[gdbm?,berkdb?] )
 	tools? (
 		!mail-mta/netqmail
-		!net-mail/courier-imap
+		!<net-mail/courier-imap-5.2.6
+		net-mail/courier-common
 	)"
 DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
 	dev-lang/perl
-	dovecot? ( net-mail/dovecot )
-	!net-mail/courier-common"
+	dovecot? ( net-mail/dovecot )"
 BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
@@ -115,6 +115,15 @@ src_install() {
 		fperms 4755 /usr/bin/maildrop
 	fi
 
+	#  Moved to courier-common
+	rm "${D}"/usr/bin/deliverquota || die
+	rm "${D}"/usr/bin/maildirkw || die
+	rm "${D}"/usr/bin/makedat || die
+	rm "${D}"/usr/bin/makedatprog || die
+	rm "${D}"/usr/share/man/man1/maildirkw.1 || die
+	rm "${D}"/usr/share/man/man1/makedat.1 || die
+	rm "${D}"/usr/share/man/man8/deliverquota.8 || die
+
 	dodoc AUTHORS ChangeLog INSTALL NEWS README \
 		README.postfix README.dovecotauth UPGRADE \
 		maildroptips.txt
@@ -122,15 +131,6 @@ src_install() {
 	dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
 		libs/maildir/README*.txt libs/maildir/*.html
 
-	# bugs 61116, 374009, and 639124
-	if ! use tools ; then
-		for tool in maildirmake maildirkw deliverquota; do
-			rm "${D}/usr/bin/${tool}" || die
-			rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] || die
-		done
-		rm "${D}/usr/share/man/man5/maildir.5" || die
-	fi
-
 	insinto /etc
 	doins "${FILESDIR}"/maildroprc