gentoo resync : 22.05.2021

5 files changed, 3 insertions, 19 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index ec61459f6ea7..b63f9814a4dd 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index cfd868531eec..33adeb41395f 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1,7 +1,6 @@
 AUX milter-regex-2.6-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b
 AUX milter-regex-conf-2.6 459 BLAKE2B d15f232945a919e49f26df7a5489701b1a13567fca10d877e93943e2ac31865bdf6af26a10da196a64ce0d42238e58631b041e2b846187e82dff0ff38e8aac83 SHA512 2178c0b11ca6fca9121da66a2b4c828105efe9e94ba4b4b6dd56b235dfe3b3ab14a6f7ac9004d7a1fb2b50ff4730f875e85afa0d11c72ab2949aa150b28f1c8c
 AUX milter-regex-init 818 BLAKE2B 9130db7e295262a02cfc61464945029810f61fba4947e422fca9820d0d58762db228bcc760bc8e1f55aaa61cff9455abed19f66ff7bd910aecd9a969eaa3c12d SHA512 04549ec85a8b3c9fe4e65bcfe903aefbd9019b8324041448586bb3ed3bada20c0bf60fbe485e90bb1cf777703c696d2a0c9b3630c218d7037e1c6b2680eace75
-AUX milter-regex-init-2.6 438 BLAKE2B 36f12dc620dca2f1dd2bc0d471c76355474fe0d50c2cb87559cdf0f6b19f9058bf12b085fa0737e32d02509994752c567f719ec7dbb42e9bf5d48b55c862b718 SHA512 a6754fefd61f884733fca4d0bdb9fc7ed057b4d87d37e63dc473b06aa270da0b6cb4df7b95ba59e6198e9a013f959a052e426b0df987eb4690122528bea819b8
 DIST milter-regex-2.7.tar.gz 20579 BLAKE2B e48c5747537d439372d8f473d9b39e337501c24b46d52e13f727b32ee29bb58f266e45ecabad01937f5e56a4a773659daf34d12c6728b6700679b04a2cb595d0 SHA512 d698a7c35768846bcc87a31167cf9a5c41c99d8fa3f3cb5c231e100a7e149d9bca6fc689ece805bd80688787b6d3fa0d9ace49592e1d6c53a25fc2086ebf9962
 EBUILD milter-regex-2.7.ebuild 1122 BLAKE2B 7974a8b954484fabec28215b75101f07a71ba4cee8228f2ab9c0b99123ff265bba062fd8ef62be5e0e06f5931f402daff79429a77baa5e987dd935fe3256c182 SHA512 d5d0a071a6c461186c14fc0416f4bd6290e0057290fc1e027bf93fc9855b654a8acd4060aa1aa02c4820701973c3cb55f3c6982e47d11fbff5d914fa4b217177
 MISC metadata.xml 726 BLAKE2B d9fe810fe04582c3c061ce0158041d6e86b7970c52beadd71fe4f183238ff6be018ad47c072f5ddb91d3d243f2d428b34ca97263ef0b4112df848bfa8d8e22b9 SHA512 390a6d4ebb6d1d2189724496b5d7da6ef9cf19c2e432c65b747091de8a24bdea4bf8d66564afadedea4e59f381f88b060eda017882da5b57efddf603d9c11fd0
diff --git a/mail-filter/milter-regex/files/milter-regex-init-2.6 b/mail-filter/milter-regex/files/milter-regex-init-2.6
deleted file mode 100644
index 9987363e272f..000000000000
--- a/mail-filter/milter-regex/files/milter-regex-init-2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/${RC_SVCNAME}.pid"
-command="/usr/bin/milter-regex"
-command_args="-c ${MR_CONF} -r ${pidfile} -u ${MR_USER} -p ${MR_SOCKET} -P ${MR_PERM} -U ${MR_USER} -G ${MR_GROUP} ${MR_OPTS}"
-
-depend() {
-	before mta
-}
-
-start_pre() {
-	checkpath --directory --mode 0755 --owner ${MR_USER}:${MR_GROUP} ${MR_RUNDIR}
-}
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index 9a845f25c17f..b0891e73654c 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -4,5 +4,5 @@ AUX spamprobe-1.4d-gcc47.patch 636 BLAKE2B f6373e6f8c63011d1443db28c1af873d7bb60
 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-r1.ebuild 874 BLAKE2B b98681b1850e1eb5e8366a18dac3695663487e85d608534be0d93ed3db2997079b383118a749ab6163a0264387d74b465756016d54eb1eae7fcdce46a2f1d772 SHA512 c76def3ce8d202dfd73ccbfe12d6403db9ab9b21c23eeabffe2616c84037eb1dc443ca82f234249389ba7a43bf523b3869202b151ee0c0be41e99fcdcdad3759
+EBUILD spamprobe-1.4d-r2.ebuild 875 BLAKE2B d88335560f5774beb0f3de7cb892d59e0dbf48fd241c8446b6bb2f22a78f509fcff0fe571ba4e332c13b12d3029801542d99af10841ea6218990c8d95559bd51 SHA512 b20000d19a13d52a11463e3bc03c68fc606170e08dba0ab03e3694a6fe229c047e376e61ce2ec9d2192ad78e00fa2affd34e30163bf4a73fd4c5b41cf91e21bc
 MISC metadata.xml 246 BLAKE2B 3023ab70839d09f3aaca34488e42cca7ce42bbf0977917b05a8dd9a92510c60de45b861d40ba278d58f0ff03b7c28c4f3d6215a789adc47960190d07f2604a50 SHA512 199467df377190d8874692821dfa57ad34f2630b631a8011943546ec92c3679f6e23b196231580af44ab19ddb8a7e9b8885aa4917d824f043f260c3ff243c07f
diff --git a/mail-filter/spamprobe/spamprobe-1.4d-r1.ebuild b/mail-filter/spamprobe/spamprobe-1.4d-r2.ebuild
index 6ea964ca31e1..dfe97b87b27f 100644
--- a/mail-filter/spamprobe/spamprobe-1.4d-r1.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.4d-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="Fast, intelligent, automatic spam detector using Bayesian analysis"
 HOMEPAGE="http://spamprobe.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="QPL"
+LICENSE="QPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="berkdb gif jpeg png"