gentoo resync : 09.07.2022

8 files changed, 61 insertions, 11 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 88b920575238..bf8db46f9fcc 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 88c2965f248c..e0c76ef514e5 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -2,5 +2,7 @@ AUX 0.8.4-fix-parallel-build.patch 4549 BLAKE2B ed49f301046c489538d9e4e5544cf8d6
 AUX rcfile.example1 4010 BLAKE2B 83f425417e6c270ace4198bd6f4d4b5ecd1993a5926fa73cc2233986c5a3cfc55946114f535a09ebcd9bb6289ee8db22af2a9b3bf71c35ef71d6764275862b85 SHA512 875d926b525610c129dcbbba0cdaa177b4ea1a004eab853fc1f5f507e7e853923e7dfca58147b65cd403b561b85e3a9acf0da9101b344718f3ae732fae91038f
 AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d14ce3e9b920a614590a290614e70e63983dc3438523d3ced08cdcb0820da1e9c047c621d8a1db669a SHA512 d58be80921e3372c9be79d1774a27106a113e710e4d1ee20a60f9ac2d6e8db86dd360df59801ba1c27c46069a341625069fcb36559f9d4c9847656f395f61f21
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
+DIST mailfilter-0.8.7.tar.gz 570116 BLAKE2B f8376c195a3cd64cad95e6d58300159ee6142d3b37f912370e8a49245874b991709b618be3358394ea8ef282c872a87ccf804ac5723d41134f2aec5512868241 SHA512 98193ae8b3c6bca14ea97fc11fb9dfedb351529564d357c91c748523c2ac1837dbd128ead99c99065655e3858066f977abbeb01916ef66eae6f167d9172971d3
 EBUILD mailfilter-0.8.4.ebuild 618 BLAKE2B ed957402454a75f72de927bc7cbb5324794b52d5f092aaa43cceddb5e6bf0b9a01885e4aec25011e942f50d0474baa0c4ab30dc4d02cfaff90630ab4af48075d SHA512 f852288ffad5a16743d0500cbd4211cb144a510a72853743072aaa13cfcf29800567b6b392aa71470814bab479cff85d4b2b64037fbf3d92174935a696a13331
+EBUILD mailfilter-0.8.7.ebuild 589 BLAKE2B 9670c107471fa81870d66f84b79e066f49251bf38c5e16998162ee0ad7a45b3682ad49dd40a8f5ae3e2b254c4247f06cc5dfcd7cee27e8e7fe6f72b083ade5d8 SHA512 b4ef6cf08279c4c7a8b0300141772bc1e42d5a4dde2bc4b4742eff7b2db578bd3b77b7f3185ed75a29b526351ecbb5e1d96c0f021ace9aea2258fd93963db5ab
 MISC metadata.xml 248 BLAKE2B 52f68f17f004ba79f5d31a54975727fab21137fd73d2351f262aed2227866bf4e0d422c4df99389c288dc77a6bbc9fd713668b4ca9a32c27fa1c9961fad60196 SHA512 b81782ee337f1970e06648ace6dcf267095e58c50580b23ba5cb9a49722114f80d65446f6110f8a48ee90dea7b6358e88da0cf61c67405e335a70ddd5b083303
diff --git a/mail-filter/mailfilter/mailfilter-0.8.7.ebuild b/mail-filter/mailfilter/mailfilter-0.8.7.ebuild
new file mode 100644
index 000000000000..1a42a9b11c6d
--- /dev/null
+++ b/mail-filter/mailfilter/mailfilter-0.8.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
+HOMEPAGE="http://mailfilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+ssl"
+
+DEPEND="sys-devel/flex
+	ssl? ( dev-libs/openssl:0= )"
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+
+src_configure() {
+	econf $(use_with ssl openssl)
+}
+
+src_install() {
+	default
+	dodoc INSTALL doc/FAQ "${FILESDIR}"/rcfile.example{1,2}
+}
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index 9e11e8f653bf..0fa904eae944 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -2,5 +2,5 @@ AUX razor-2.85-cosmetic-pv-fix.patch 616 BLAKE2B 58def0277c1142b664f65ae9f6e7f31
 AUX razor-2.85-makefile-quoting-fix.patch 574 BLAKE2B 03616893b3537e00f0a56b357a70956cb87e266feb72d588343427f248d73c2e61d8c9515572d7bc0f312420d5328dd6e0039a297be322f83dfd270615922289 SHA512 ee43993dbf4e1ed932a293636cfad98c8c4bb5b94a8df00262c39d34dd9c95143ba8dca1f088185123d352b940e0dd19d5b0a6f4afc04e63b36cc49a4963cbe4
 AUX razor-2.85-use-sha-not-sha1.patch 3897 BLAKE2B 5cbdd0cbf6a80f4d2e1eba364d2db5ef972368257110daaf07c8ee6444884b07ff930184a4c92c1b0e7af89cfd5384ada7d00ddd79114c799bc8ad34e8f61a51 SHA512 891a93408f56bb6a7b43814a501cce8775c51abe7cf227c39dd18699ac5f4c1aa5484842435edda58f7141a87e5ebe1496bfe959afab09fb44c3558c66511289
 DIST razor-agents-2.85.tar.bz2 81691 BLAKE2B fdb389ca4192dc2a3b87935fe97a4750ab715ae163aa1cf8adf5c6dd54e8e2f2ca53f1fcc37505b5ea0ec4e9bdb78a14ae8b30fca770de80a2a69e3e534ec3ab SHA512 31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db
-EBUILD razor-2.85-r3.ebuild 2584 BLAKE2B f9ed418ffac4d0a3286464e0d2c6b96a93b6b6ccbf83e8db296844033c8def3ed853c03e12397b1b9825427ab1570c55f3989a73db0a509871ca2b187727685d SHA512 ecb702eee2ed3760474d408a63a30086412fd5e96f4ddd36d0d3ea3bf8746f1f200dfaef146439f5cb3629f5c7a2b72f2d1b3a08edd6e05c843e84b7497700cc
+EBUILD razor-2.85-r4.ebuild 2574 BLAKE2B 62586c4c388ee81fc8006e68b005f503436ce54a1490d20d432f7ab22b931559986c4c2a3d529b8cc047371af0e1db51208844ef0c0a1f617a871d5d537dfad3 SHA512 d2e1a56db283c19ca750c2f1962cef17d5a92be49b84a155a2f1583a44d91f7b0dd2148968ade5273485c7c9446435295bea1272e3b5f604678170139444e1bc
 MISC metadata.xml 582 BLAKE2B 57c41d87b4801dbd7c5211a40f3f08ed62d66a473397c9154dd0abdb19784363c901d503cf3545369fa50c287181433388882d2bc609c3ac457d3296522a80cd SHA512 6e2e828a0669c4f45749862af2c7d7d3a975078147d99a52d0e389e5165d6c975628667c950ec19bbb23191a83004e3fafbbb401507b77d6866c4750a06d128b
diff --git a/mail-filter/razor/razor-2.85-r3.ebuild b/mail-filter/razor/razor-2.85-r4.ebuild
index d32ddaffbd55..7710577cc0e8 100644
--- a/mail-filter/razor/razor-2.85-r3.ebuild
+++ b/mail-filter/razor/razor-2.85-r4.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+DIST_TEST="do parallel"
 inherit perl-module readme.gentoo-r1
 
 MY_PN="razor-agents"
@@ -10,6 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Distributed, collaborative spam detection and filtering network"
 HOMEPAGE="http://razor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/razor/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic"
 SLOT="0"
@@ -23,7 +26,6 @@ RDEPEND="
 	dev-perl/Digest-Nilsimsa
 	|| ( virtual/perl-Digest-SHA dev-perl/Digest-SHA1 )
 "
-DEPEND=""
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.85-use-sha-not-sha1.patch"
@@ -31,10 +33,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.85-makefile-quoting-fix.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
-SRC_TEST="do parallel"
-
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 Run 'razor-admin -create' to create a default config file in your
diff --git a/mail-filter/scmail/Manifest b/mail-filter/scmail/Manifest
index 22654dc45e6f..8af7625a99de 100644
--- a/mail-filter/scmail/Manifest
+++ b/mail-filter/scmail/Manifest
@@ -1,6 +1,7 @@
 AUX scmail-doc-encoding.patch 1271 BLAKE2B c554ebfed8350a10939364b9d4b50d446d839ad2ea171ec88a0929f25c8f76bd0a213c7bfc82ab0863320c921fb43d52706145012b47745e0f2e4505802d974a SHA512 fb38ddca2bb938d7397d6edcfb49ff0fd971a0079f2b1571db9efa1ac8fed49ed27cb4d6a32b911d7135b6e58c5c61b12db64c47ad5422a86cb4701b79c40cf5
+AUX scmail-gauche-0.9.10.patch 725 BLAKE2B 2afac66683d944ff54796fc098aa775e6a1f7e8d08981e9a626c45eed2aa1c50cd217712f98283dd0235d699795516aa5896d824bd363210a1c067160812a969 SHA512 729751bf69f3ee37a33306106d94660e7ea0cd14c96a0d72dd084cacdfb392bb37d0aef3d123962b4b53f70bfd2cb0c2df5a7d1fbf3109484bb8501ab2fd7a9b
 AUX scmail-gauche-0.9.patch 1295 BLAKE2B 2bf2ee2aa2c99ef72d6fbd25c65448a99d1c3a16be20373db867c3ec07604b94ea2fb7a6fac76f1bca4aa8be378140dc6eb6718ead1f61844cba9127a0bd2ea8 SHA512 4aee907271c20254a41035160418429fcd7e35890a0d7a6251d4adefcaafe8581dc5e3df4bc70b27b541eb6a888acc7811231a183d62f2c267b1d2ccf652dc69
 AUX scmail-undefined-reference.patch 1351 BLAKE2B b0758cf2a1de5be0bd32d16bbc44d28d7e3b4e3a65f9a9151e76245c4f5473e8c82a682324544018e7aecf53f2534cc5e2fa2d27451947ff285684221b091e55 SHA512 2b8acf57f55a3367157bf20da796f2529258e48877b049f2928ff06c3365c24c41c6a8824f32b0fbf14fb193f94a2f147afa97c9c03a13227b62b13bd0b550d0
 DIST scmail-1.3.tar.gz 52744 BLAKE2B 2e2848472bb6f9ce913fea381c905ec28a1cac5201fe3a8c89e25c96a0fd646e7f96ddcf6cdfd1e0d88f34b5d51ea754faa5c3574635715ed1dc92cfd9d2980c SHA512 ae94de7f34f9279e892533137d76f07642ade63f9d179bbc96202003f49cf8ae6dd6cc5b9d53fa1d2f8be2bebcbe071635910d48593c9e57fb6609cc7ec6e95d
-EBUILD scmail-1.3.ebuild 900 BLAKE2B 879eb1116e6e9b160395ae0b89ca011957d867c17ac412fe4337f3099a6ffb8d4eda7699ad725101978c71c8ff71498c335bf7c07277815d15d8cb1bd5bb3b5d SHA512 0c54c8b91f354888e76ef8ab723f6a8ee58053c8cc814cfe970fa9805dc06de7169ce3a8262eb71e041c0a74a3f9a4b45dec02a47da9fb3dd8d6db5fcb491d64
+EBUILD scmail-1.3.ebuild 941 BLAKE2B 1cd2931e43eb0584f39f859730787cb27f1946b2547e0829da89bdcbb458be0ef161b333bfe0a28d7b061ceaff963c57db366b2e1bef5cf382a03340d111dbb5 SHA512 26fc7bc1a9c76979e3048549cef705c94be8532ab89fbdaf26ff9ec7718b211ac5fbf6367fcd4e47ad570ea73577431e483b00e76894cdf2a5525b532ab523f8
 MISC metadata.xml 222 BLAKE2B 425bba0db7c4bc483eddcb51bb4151324b62afc42496047413bf9d0480fd731ea78201a8b99c42d9adfa9b20614f9507e8e89a87e9afce32aa9db82f42f827ed SHA512 7ae4d3d64e85fb01194d31b41843c10e3bf6a782e9f308cbe3f0a75c0a07d6af2a88013549b5840b3cd5e766d5044f0da290c31a4800d1823f6eca4028b082da
diff --git a/mail-filter/scmail/files/scmail-gauche-0.9.10.patch b/mail-filter/scmail/files/scmail-gauche-0.9.10.patch
new file mode 100644
index 000000000000..ab6f5e04d2f6
--- /dev/null
+++ b/mail-filter/scmail/files/scmail-gauche-0.9.10.patch
@@ -0,0 +1,22 @@
+--- a/scmail/mail.scm
++++ b/scmail/mail.scm
+@@ -202,7 +202,7 @@
+ 	  (send-command "DATA" 354)
+ 	  (port-for-each (lambda (line)
+                            (format out "~a~a\r\n"
+-                                   (if (string-prefix? "." line) "." "")
++                                   (if (and (not (string-incomplete? line)) (string-prefix? "." line)) "." "")
+                                    line))
+ 			 (lambda () (read-line iport #t)))
+ 	  (send-command "." 250)
+--- a/tests/mailbox.scm
++++ b/tests/mailbox.scm
+@@ -9,7 +9,7 @@
+ (test-module 'scmail.mailbox)
+ 
+ (define mailbox-table
+-  '((mh      #f "Mail"    "inbox")
++  `((mh      #f "Mail"    "inbox")
+     (maildir #f "Maildir" "")))
+ 
+ (define (mailbox-list)
diff --git a/mail-filter/scmail/scmail-1.3.ebuild b/mail-filter/scmail/scmail-1.3.ebuild
index 9e0798bddb6a..25809d282452 100644
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit fixheadtails
 
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-doc-encoding.patch
 	"${FILESDIR}"/${PN}-gauche-0.9.patch
+	"${FILESDIR}"/${PN}-gauche-0.9.10.patch
 	"${FILESDIR}"/${PN}-undefined-reference.patch
 )
 HTML_DOCS=( doc/{${PN},scbayes}{,-ja}.html )