6 files changed, 2 insertions, 275 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 51ebc221ba35..31ea5d4a4ccd 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 4c8e3e08303a..b6ff95c36f18 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -2,5 +2,5 @@ AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
 DIST bogofilter-1.2.5.tar.xz 801240 BLAKE2B 90fc5f0ab258ada722ca2fb79d17279b621eb089f646eade2ab41b78c44deea7f3fd8f219053e09ce5b4c64f5fc81f43a17c20b84261b22d5529c06106e80b3c SHA512 3a7280485cfe5802dd3e9721c153f88ccf28bff7a6a24590e985e860d1f1e0ddea7bde8a8e5ad1ff643e94c9fd7b26b2a5ed5a9fb991cee3fd5b0ce67ce9abfe
 EBUILD bogofilter-1.2.4-r3.ebuild 3775 BLAKE2B ef688072e111d237d6052dd0cd1c0b313c8c646a97224e8f5a0c7775f94006828a46e15f66af446ac71da4a6d0ee90926a4dac33d647b102b598e40905fee1ac SHA512 caed65cf0d86b6bc299a57534fee24f8134678f3080a72ce996e6b3676e7d15772a6392275cdb153bdf6926345643df1e6ced6ed335446895fa77c84bba70bb0
-EBUILD bogofilter-1.2.5.ebuild 3747 BLAKE2B ead6ad64784dea07e3db6e60af953f1ebdafb7d3f4980d4c5bc3e8c619884a05a161ee62a45622350c3bcc12a3fc4171de076a502d9f0a9d2522cb5466d8c1ec SHA512 798bdc0c67077dea27e80023985a8ba0803e65bce534c9bef7d97abc84211a5bf540a41192169f10923a2f5a5b6d188b7a2646b30cf82019dcaa951adc17b4cb
+EBUILD bogofilter-1.2.5.ebuild 3734 BLAKE2B 897b4d4874e65eac748c691ff8e33f3d06dc7c2863131b097b063ccfe8ee5a2ef482ac13e0f48b2ec8b967a37dad331c956df0851bc184fd18626253e5697e1f SHA512 67d63de48374fb1b125208ea6b5ac6a29d2223b273b9467e0ff4a9e86a5287e7853e84c145695dccb1b3a298d69ba1749c3ac3e6904487b715f960e4c52814ea
 MISC metadata.xml 831 BLAKE2B 29a5717658b796c2cccd8314136429ea280806d9577f7f9be49fd2f52da21f77b8dc9c079a4d57a49c2a9447abd239c686574dfe299b3a3aed34357dba37456a SHA512 639441fd16521622e2ca72fa6c44560ee9a237395c4bc25e1013a4404d05d9d64e828a50ce7293ebb85f9dcf231fcbb57769a0260592d801cdff3af6debab4c7
diff --git a/mail-filter/bogofilter/bogofilter-1.2.5.ebuild b/mail-filter/bogofilter/bogofilter-1.2.5.ebuild
index 6b621458523e..f6824cef0e84 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.5.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for s
 HOMEPAGE="http://bogofilter.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
-LICENSE="GPL-3+ CC-BY-ND-3.0"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="berkdb sqlite tokyocabinet"
diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index ca4949b9f9b1..7028f0905e78 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -1,8 +1,5 @@
-AUX sqlgrey-1.7.6-init.patch 408 BLAKE2B 09ac51cd9c16ebf21261eeae4a405042e57444a1b727dc62a10cb5a073a50e9a774dc19e26fdeed152c86d199a10d862cef224987a27fa165abba03b7c0b5821 SHA512 f22a872651e21bd45aeb22723c7d45f1c637e9227a51636655189e92f9ffa3cd2680d78d43ffc807fd85930110b5052eb74fdc07b5f32522255ae7218e29a2d3
 AUX sqlgrey-1.8.0-init-openrc.patch 284 BLAKE2B 33384a04eeca7d22a8cd7c6e95d997428be6c90a958e7598c17a29aa6c158118de25819c9e005f6fd4cbc9eb6750793c2c6c5bc3b98c75d30d77e1e3cf2e91cc SHA512 8d403977fff4afb82d32e3901da0f0791b798239e4a2bdac075adeeb9629e2cade8c9392860af91a9aa627bfdbd34fc889175c28841e3113ad7afac33689aecb
 AUX sqlgrey.service 429 BLAKE2B 330c83bbe4f4ce4aabef28d9eb3c00d9c1659ad899e1c4aa5fe82f99cf2f5e46eb5900c4a0ee0731c27184a60568af14bb78baed3b0053134b121fea0f00a070 SHA512 7e41344e3820537d73a413d728d455de58c5358922a354904cba5a870f61fecbf96f84f91dadad283d406cad05010bc3fd57644f18ba319083af92a1810d9a27
-DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9fad7f17bfc0f1f7e2cfe1b1b05664179abacb873acf1829114093c48764c34e1a0a3128503f8e3f134dd0772d SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81
 DIST sqlgrey-1.8.0.tar.gz 69476 BLAKE2B f48aa9e41a988338a817026fbf022e145922db0bad9983e4d7cde7bc621560ce6189e494cfba5dd5f48ba4ff30e47686c54298f9a006b8fcc2b27444e102b0d1 SHA512 97ab057bf7111159166a6963d5948c10468731730136ddca6449d2d629f39235c09d00497a52408bb87057905c1bf43bc064571ee6302d7f1f8c6408af82d044
-EBUILD sqlgrey-1.7.6-r2.ebuild 8425 BLAKE2B 80f5698cc229439f5ae8f04ca118ef55b5b38536f28f8526c4e26f21a27993c085bed14c74ec96b8255992d68dbe2688ba35ead05d52321888a1e59219360513 SHA512 e1852b976f89d8721398dcf66224e70bac48a6bd97dd6629fc4a9b911a8c380a3c563dc1f633aafde8163b58c1e4e1cb0a8f0b29207e1016b74d1f8b73347e98
 EBUILD sqlgrey-1.8.0.ebuild 1645 BLAKE2B 85b101cfd67e073a7bdcd6912b4ea51ee82660e15fa3ed40a043506f8623a3d94e74ddbb18025ab564963ad2856eef73a7ea042754be00fea95b460690ca01a4 SHA512 f42d5ad7a647b97cbc2e3a63dd9e1ee7d033b579f58868c06281cd62076594a40ec1f7786bf2479f80bb1a347ef1b810bbfeaeb1287905e3aa1910d112aa6391
 MISC metadata.xml 495 BLAKE2B d71772d1e3521cf45d0f0596e0507b31a4a71919abfd05f113498bcb3f73f68295fad905266be85f1bb11b9f56d1de6e715332fdcdfbfdc272ea7e1b4f5e696d SHA512 c35db2f9c06d1660c4766d09abc6ab05360cafcca7f27aa8903dc788f58323ba1a47bbcf9a2b0222117a898823e46015ff7198ad9cd1532c77efe6a03d5a4239
diff --git a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
deleted file mode 100644
index 355cb4539248..000000000000
--- a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
-+++ sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
-@@ -14,13 +14,13 @@
- 	# SQLite puts files in the working directory
- 	cd ~sqlgrey
- 	sqlgrey -d
--	eend
-+	eend $?
- }
- 
- stop() {
- 	ebegin "Shutting down SQLgrey"
- 	sqlgrey -k
--	eend
-+	eend $?
- }
- 
- # hack: seems Net::Server doesn't set REUSEADDR on socket?
diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
deleted file mode 100644
index 1e7d2013e063..000000000000
--- a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="A postfix policy service implementing a grey-listing policy"
-HOMEPAGE="http://sqlgrey.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="mysql +postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="dev-lang/perl
-	dev-perl/DBI
-	dev-perl/Date-Calc
-	dev-perl/Net-Server
-	virtual/mailx
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-PATCHES=(
-	"${FILESDIR}/${P}-init.patch"
-)
-
-pkg_setup() {
-	enewgroup sqlgrey
-	enewuser sqlgrey -1 -1 /var/spool/sqlgrey sqlgrey
-}
-
-src_install() {
-	emake gentoo-install ROOTDIR="${D}"
-	dodoc HOWTO FAQ README README.OPTINOUT README.PERF TODO Changelog
-
-	# keeps SQLgrey data in /var/spool/sqlgrey
-	diropts -m0775 -o sqlgrey -g sqlgrey
-	keepdir /var/spool/sqlgrey
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	elog "To make use of greylisting, please update your postfix config."
-	elog
-	elog "Put something like this in /etc/postfix/main.cf:"
-	elog "    smtpd_recipient_restrictions ="
-	elog "           ..."
-	elog "           check_policy_service inet:127.0.0.1:2501"
-	elog
-	elog "Remember to restart Postfix after that change. Also remember"
-	elog "to make the daemon start durig boot:"
-	elog "  rc-update add sqlgrey default"
-	elog
-	elog
-	elog "To setup SQLgrey to run out-of-the-box on your system, run:"
-	elog "emerge --config ${PN}"
-	elog
-	ewarn "Read the documentation for more info (perldoc sqlgrey) or the"
-	ewarn "included howto /usr/share/doc/${PF}/HOWTO.gz"
-	ewarn
-	ewarn "If you are using MySQL >= 4.1 use \"latin1\" as charset for"
-	ewarn "the SQLgrey db"
-}
-
-pkg_config() {
-	# SQLgrey configuration file
-	local SQLgrey_CONFIG="/etc/sqlgrey/sqlgrey.conf"
-	local SQLgrey_DB_USER_NAME="sqlgrey"
-	local SQLgrey_DB_NAME="sqlgrey"
-
-	# Check if a password is set in sqlgrey.conf
-	local SQLgrey_CONF_PWD=""
-	if [ -f "${SQLgrey_CONFIG}" ]; then
-		if (grep -iq "^[\t ]*db_pass[\t ]*=[\t ]*.*$" ${SQLgrey_CONFIG}); then
-			# User already has a db_pass entry
-			SQLgrey_CONF_PWD="$(sed -n 's:^[\t ]*db_pass[\t ]*=[\t ]*\(.*\)[\t ]*:\1:gIp' ${SQLgrey_CONFIG})"
-		else
-			SQLgrey_CONF_PWD=""
-		fi
-	else
-		ewarn "SQLgrey configuration missing. Exiting now."
-		echo
-		exit 0
-	fi
-
-	# Check if we need SQLgrey to configure for this system or not
-	local SQLgrey_DB_HOST="localhost"
-	local SQLgrey_KEY_INPUT="l,r,x"
-	einfo "SQLgrey database backend configuration"
-	einfo "  Please select where SQLgrey database will run:"
-	einfo "    [l] Database backend runs on localhost"
-	einfo "    [r] Database backend runs on remote host"
-	einfo "    [x] Exit"
-	echo
-	einfo "  Press one of the keys [${SQLgrey_KEY_INPUT}]: "
-	while true; do
-		read -n 1 -s SQLgrey_ACCESS_TYPE
-		case "${SQLgrey_ACCESS_TYPE}" in
-			"r" | "R" )
-				SQLgrey_ACCESS_TYPE="r"
-				einfo "  remote setup"
-				read -p "     Please enter the remote hostname: " SQLgrey_DB_HOST
-				echo
-				break
-			;;
-			"l" | "L" )
-				SQLgrey_ACCESS_TYPE="l"
-				einfo "  local setup"
-				echo
-				break
-			;;
-			"x" | "X" )
-				exit 0
-			;;
-		esac
-	done
-
-	# Generate random password
-	if [[ "${SQLgrey_CONF_PWD}" == "" ]]; then
-		einfo "Generating random database user password..."
-		local SQLgrey_PWD_MATRIX="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-		local SQLgrey_DB_USER_PWD=""
-		while [ "${n:=1}" -le "16" ]; do
-			SQLgrey_DB_USER_PWD="${SQLgrey_DB_USER_PWD}${SQLgrey_PWD_MATRIX:$(($RANDOM%${#SQLgrey_PWD_MATRIX})):1}"
-			let n+=1
-		done
-	else
-		einfo "Reusing current database user password..."
-		local SQLgrey_DB_USER_PWD="${SQLgrey_CONF_PWD}"
-	fi
-	echo
-
-	# Configure the various database backends
-	local SQLgrey_KEY_INPUT=""
-	einfo "Creating SQLgrey database backend data and configuration"
-	einfo "  Please select what kind of database you like to use:"
-	if use postgres || has_version dev-perl/DBD-Pg ; then
-		einfo "    [p] PostgreSQL"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},p"
-	fi
-	if use mysql || has_version dev-perl/DBD-mysql ; then
-		einfo "    [m] MySQL"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},m"
-	fi
-	if use sqlite || has_version dev-perl/DBD-SQLite ; then
-		einfo "    [s] SQLite"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},s"
-	fi
-	einfo "    [x] Exit"
-	SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},x"
-	echo
-	einfo "  Press one of the keys [${SQLgrey_KEY_INPUT:1}]: "
-	while true; do
-		read -n 1 -s SQLgrey_DB_TYPE
-		case "${SQLgrey_DB_TYPE}" in
-			"p" | "P" )
-				SQLgrey_DB_TYPE="p"
-				einfo "  PostgreSQL database backend"
-				echo
-				break
-			;;
-			"m" | "M" )
-				SQLgrey_DB_TYPE="m"
-				einfo "  MySQL database backend"
-				echo
-				break
-			;;
-			"s" | "S" )
-				SQLgrey_DB_TYPE="s"
-				einfo "  SQLite database backend"
-				echo
-				break
-			;;
-			"x" | "X" )
-				exit 0
-			;;
-		esac
-	done
-
-	# If we don't use SQLite, the password must not be set
-	if [[ ( "${SQLgrey_DB_TYPE}" != "s" ) && ( "${SQLgrey_CONF_PWD}" != "" ) ]]; then
-		ewarn "This configuration is only for new installations. You seem to"
-		ewarn "have already a modified sqlgrey.conf"
-		ewarn "Do you want to continue?"
-		SQLgrey_KEY_INPUT="y,n"
-		einfo "   Press one of the keys [$SQLgrey_KEY_INPUT]: "
-		while true; do
-			read -n 1 -s SQLgrey_Ignore
-			case "$SQLgrey_Ignore" in
-				"y"|"Y" )
-					break
-				;;
-				"n"|"N" )
-					exit 0
-				;;
-			esac
-		done
-	fi
-
-	## Per-RDBMS configuration ##
-	# POSTGRESQL
-	if [[ "${SQLgrey_DB_TYPE}" == "p" ]] ; then
-
-		ewarn "If prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
-
-		einfo "Creating SQLgrey PostgreSQL database \"${SQLgrey_DB_NAME}\" and user \"${SQLgrey_DB_USER_NAME}\""
-		/usr/bin/psql -h ${SQLgrey_DB_HOST} -d template1 -U postgres -c "CREATE USER ${SQLgrey_DB_USER_NAME} WITH PASSWORD '${SQLgrey_DB_USER_PWD}' NOCREATEDB NOCREATEUSER; CREATE DATABASE ${SQLgrey_DB_NAME}; GRANT ALL PRIVILEGES ON DATABASE ${SQLgrey_DB_NAME} TO ${SQLgrey_DB_USER_NAME}; GRANT ALL PRIVILEGES ON SCHEMA public TO ${SQLgrey_DB_USER_NAME}; UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='${SQLgrey_DB_USER_NAME}') WHERE datname='${SQLgrey_DB_NAME}';"
-
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1Pg:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*= \).*:\1${SQLgrey_DB_USER_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= \).*:\1${SQLgrey_DB_USER_PWD}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= \).*:\1${SQLgrey_DB_HOST}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-	elif [[ "${SQLgrey_DB_TYPE}" == "m" ]] ; then
-	# MYSQL
-		ewarn "If prompted for a password, please enter your MySQL root password"
-		ewarn ""
-
-		einfo "Creating SQLgrey MySQL database \"${SQLgrey_DB_NAME}\" and user \"${SQLgrey_DB_USER_NAME}\""
-		echo -ne "     "
-		/usr/bin/mysql -u root -h ${SQLgrey_DB_HOST} -p -e "CREATE DATABASE IF NOT EXISTS ${SQLgrey_DB_NAME} CHARACTER SET latin1; GRANT ALL ON ${SQLgrey_DB_NAME}.* TO ${SQLgrey_DB_USER_NAME}@${SQLgrey_DB_HOST} IDENTIFIED BY '${SQLgrey_DB_USER_PWD}';FLUSH PRIVILEGES;" -D mysql
-		echo
-
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1mysql:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*= \).*:\1${SQLgrey_DB_USER_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= \).*:\1${SQLgrey_DB_USER_PWD}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= \).*:\1${SQLgrey_DB_HOST}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-	elif [[ "${SQLgrey_DB_TYPE}" == "s" ]] ; then
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1SQLite:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*=.*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_cleandelay[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-	fi
-	echo
-	if [[ "${SQLgrey_DB_TYPE}" != "s" ]]; then
-		einfo "Note: the database password is stored in $SQLgrey_CONFIG"
-	fi
-}